Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 134

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@164 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-08-29 16:19:01 +00:00
parent e43c22ddfd
commit f3260b67c5
4 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/tint.c
View File

@@ -46,8 +46,19 @@ void signal_handler(int sig)
}
void init ()
void init (int argc, char *argv[])
{
int c;
// read options
c = getopt (argc, argv, "c:");
if (c != -1) {
config_path = strdup (optarg);
c = getopt (argc, argv, "j:");
if (c != -1)
thumbnail_path = strdup (optarg);
}
// Set signal handler
signal(SIGUSR1, signal_handler);
signal(SIGINT, signal_handler);
@@ -105,6 +116,8 @@ void cleanup()
#endif
if (clock_lclick_command) g_free(clock_lclick_command);
if (clock_rclick_command) g_free(clock_rclick_command);
if (config_path) g_free(config_path);
if (thumbnail_path) g_free(thumbnail_path);
if (server.monitor) free(server.monitor);
XFreeGC(server.dsp, server.gc);
@@ -618,35 +631,32 @@ int main (int argc, char *argv[])
{
XEvent e;
fd_set fd;
int x11_fd, i, c;
int x11_fd, i;
struct timeval tv;
Panel *panel;
GSList *it;
init ();
init (argc, argv);
load_config:
i = 0;
c = getopt (argc, argv, "c:");
init_config();
if (c != -1) {
i = config_read_file (optarg);
c = getopt (argc, argv, "j:");
if (c != -1) {
// usage: tint2 [-c] <config_file> -j <file> for internal use
printf("file %s\n", optarg);
cleanup();
exit(0);
}
if (config_path)
i = config_read_file (config_path);
else
i = config_read ();
if (!i) {
fprintf(stderr, "usage: tint2 [-c] <config_file>\n");
cleanup();
exit(1);
}
if (!i)
i = config_read ();
if (!i) {
fprintf(stderr, "usage: tint2 [-c] <config_file>\n");
cleanup();
exit(1);
}
config_finish();
if (thumbnail_path) {
// usage: tint2 -j <file> for internal use
printf("file %s\n", thumbnail_path);
cleanup();
exit(0);
}
x11_fd = ConnectionNumber(server.dsp);
XSync(server.dsp, False);