void init (int argc, char *argv[])
{
- int c;
+ int i;
// read options
- while ((c = getopt(argc , argv, "c:j:v")) != -1) {
- switch (c) {
- case 'c':
- config_path = strdup (optarg);
- break;
- case 'j':
- thumbnail_path = strdup (optarg);
- break;
- case 'v':
- printf("tint2 version 0.7-svn\n");
+ for (i = 1; i < argc; ++i) {
+ if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
+ printf("Usage: tint2 [-c] <config_file>\n");
+ exit(0);
+ }
+ if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) {
+ printf("tint2 version 0.7.svn\n");
exit(0);
- break;
+ }
+ if (!strcmp(argv[i], "-c")) {
+ i++;
+ if (i < argc)
+ config_path = strdup(argv[i]);
+ }
+ if (!strcmp(argv[i], "-s")) {
+ i++;
+ if (i < argc)
+ snapshot_path = strdup(argv[i]);
}
}
server.visual = DefaultVisual (server.dsp, server.screen);
server.desktop = server_get_current_desktop ();
XGCValues gcv;
- server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv) ;
+ server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
XSetErrorHandler ((XErrorHandler) server_catch_error);
XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
setlocale (LC_ALL, "");
+
+ // load default icon
+ char *path;
+ const gchar * const *data_dirs;
+ data_dirs = g_get_system_data_dirs ();
+ for (i = 0; data_dirs[i] != NULL; i++) {
+ path = g_build_filename(data_dirs[i], "tint2", "default_icon.png", NULL);
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
+ default_icon = imlib_load_image(path);
+ g_free(path);
+ }
+
+ // get monitor and desktop config
+ get_monitors();
+ get_desktops();
}
void cleanup()
{
+ cleanup_systray();
+ stop_net();
cleanup_panel();
-
- if (time1_font_desc) pango_font_description_free(time1_font_desc);
- if (time2_font_desc) pango_font_description_free(time2_font_desc);
- if (time1_format) g_free(time1_format);
- if (time2_format) g_free(time2_format);
+ cleanup_tooltip();
+ cleanup_clock();
#ifdef ENABLE_BATTERY
- if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
- if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
- if (battery_low_cmd) g_free(battery_low_cmd);
- if (path_energy_now) g_free(path_energy_now);
- if (path_energy_full) g_free(path_energy_full);
- if (path_current_now) g_free(path_current_now);
- if (path_status) g_free(path_status);
+ cleanup_battery();
#endif
- if (clock_lclick_command) g_free(clock_lclick_command);
- if (clock_rclick_command) g_free(clock_rclick_command);
+
+ if (default_icon) {
+ imlib_context_set_image(default_icon);
+ imlib_free_image();
+ }
if (config_path) g_free(config_path);
- if (thumbnail_path) g_free(thumbnail_path);
+ if (snapshot_path) g_free(snapshot_path);
if (server.monitor) free(server.monitor);
XFreeGC(server.dsp, server.gc);
}
+void get_snapshot(const char *path)
+{
+ Panel *panel = &panel1[0];
+
+ if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
+ panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+
+ refresh(&panel->area);
+
+ Imlib_Image img = NULL;
+ imlib_context_set_drawable(panel->temp_pmap);
+ img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0);
+
+ imlib_context_set_image(img);
+ imlib_save_image(path);
+ imlib_free_image();
+}
+
+
Taskbar *click_taskbar (Panel *panel, int x, int y)
{
Taskbar *tskbar;
XIconifyWindow (server.dsp, tsk->win, server.screen);
break;
case TOGGLE_ICONIFY:
- if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
- else set_active (tsk->win);
+ if (task_active && tsk->win == task_active->win)
+ XIconifyWindow (server.dsp, tsk->win, server.screen);
+ else
+ set_active (tsk->win);
break;
case SHADE:
window_toggle_shade (tsk->win);
e->xbutton.window = server.root_win;
// icewm doesn't open under the mouse.
// and xfce doesn't open at all.
- //e->xbutton.x = e->xbutton.x_root;
- //e->xbutton.y = e->xbutton.y_root;
+ e->xbutton.x = e->xbutton.x_root;
+ e->xbutton.y = e->xbutton.y_root;
//printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
- XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+ //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
return;
}
if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
// redraw both taskbar
panel->taskbar[old_desktop].area.is_active = 0;
- panel->taskbar[old_desktop].area.redraw = 1;
+ panel->taskbar[old_desktop].area.resize = 1;
panel->taskbar[server.desktop].area.is_active = 1;
- panel->taskbar[server.desktop].area.redraw = 1;
+ panel->taskbar[server.desktop].area.resize = 1;
panel_refresh = 1;
}
// check ALLDESKTOP task => resize taskbar
}
// Change active
else if (at == server.atom._NET_ACTIVE_WINDOW) {
- GSList *l0;
- if (task_active) {
- for (i=0 ; i < nb_panel ; i++) {
- for (j=0 ; j < panel1[i].nb_desktop ; j++) {
- for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
- tsk = l0->data;
- tsk->area.is_active = 0;
- }
- }
- }
- task_active = 0;
- }
- Window w1 = window_get_active ();
- Task *t = task_get_task(w1);
- if (!t) {
- Window w2;
- if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
- if (w2) t = task_get_task(w2);
- }
- if (task_urgent == t) {
- init_precision();
- task_urgent = 0;
- }
- // put active state on all task (multi_desktop)
- if (t) {
- for (i=0 ; i < nb_panel ; i++) {
- for (j=0 ; j < panel1[i].nb_desktop ; j++) {
- for (l0 = panel1[i].taskbar[j].area.list; l0 ; l0 = l0->next) {
- tsk = l0->data;
- if (tsk->win == t->win) {
- tsk->area.is_active = 1;
- //printf("active monitor %d, task %s\n", panel1[i].monitor, tsk->title);
- }
- }
- }
- }
- task_active = t;
- }
+ active_task();
panel_refresh = 1;
}
else if (at == server.atom._XROOTPMAP_ID) {
else {
tsk = task_get_task (win);
if (!tsk) {
- if ( at != server.atom._NET_WM_STATE)
- return;
- else if ( !(tsk = add_task(win)) )
+ if (at != server.atom._NET_WM_STATE)
return;
+ else {
+ // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped
+ // if it is mapped and not set as skip_taskbar, we must add it to our task list
+ XWindowAttributes wa;
+ XGetWindowAttributes(server.dsp, win, &wa);
+ if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) {
+ if ( (tsk = add_task(win)) )
+ panel_refresh = 1;
+ else
+ return;
+ }
+ }
}
//printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
// Demand attention
else if (at == server.atom._NET_WM_STATE) {
if (window_is_urgent (win)) {
- task_urgent = tsk;
- tick_urgent = 0;
- time_precision = 1;
+ add_urgent(tsk);
}
if (window_is_skip_taskbar(win)) {
remove_task( tsk );
panel_refresh = 1;
}
}
+// We do not check for the iconified state, since it only unsets our active window
+// but in openbox a shaded window is considered iconified. So we would loose the active window
+// property on unshading it again (commented 01.10.2009)
// else if (at == server.atom.WM_STATE) {
// // Iconic state
// // TODO : try to delete following code
else if (at == server.atom.WM_HINTS) {
XWMHints* wmhints = XGetWMHints(server.dsp, win);
if (wmhints && wmhints->flags & XUrgencyHint) {
- task_urgent = tsk;
- tick_urgent = 0;
- time_precision = 1;
+ add_urgent(tsk);
}
XFree(wmhints);
}
{
// change in root window (xrandr)
if (win == server.root_win) {
- int i, old_monitor = server.nb_monitor;
-
get_monitors();
- if (old_monitor != server.nb_monitor) {
- }
- for (i=0 ; i < nb_panel ; i++) {
- Panel *panel = &panel1[i];
-
- init_panel_size_and_position(panel);
- XMoveResizeWindow(server.dsp, panel->main_win, panel->posx, panel->posy, panel->area.width, panel->area.height);
- set_panel_background(panel);
-
- // force the resize of childs
- GSList *l0;
- panel->area.resize = 1;
- for (l0 = panel->area.list; l0 ; l0 = l0->next)
- ((Area*)l0->data)->resize = 1;
- }
- panel_refresh = 1;
+ init_config();
+ config_read_file (config_path);
+ init_panel();
+ cleanup_config();
return;
}
time_clock.tv_sec -= time_clock.tv_sec % time_precision;
// urgent task
- if (task_urgent) {
- if (tick_urgent < max_tick_urgent) {
- task_urgent->area.is_active = !task_urgent->area.is_active;
- task_urgent->area.redraw = 1;
- tick_urgent++;
+ GSList* urgent_task = urgent_list;
+ while (urgent_task) {
+ Task_urgent* t = urgent_task->data;
+ if ( t->tick < max_tick_urgent) {
+ t->tsk->area.is_active = !t->tsk->area.is_active;
+ t->tsk->area.redraw = 1;
+ t->tick++;
}
+ urgent_task = urgent_task->next;
}
// update battery
#ifdef ENABLE_BATTERY
- if (panel1[0].battery.area.on_screen) {
+ if (battery_enabled) {
update_battery();
for (i=0 ; i < nb_panel ; i++)
panel1[i].battery.area.resize = 1;
GSList *it;
init (argc, argv);
-load_config:
+
i = 0;
init_config();
if (config_path)
cleanup();
exit(1);
}
- config_finish();
- if (thumbnail_path) {
- // usage: tint2 -j <file> for internal use
- printf("file %s\n", thumbnail_path);
+ init_panel();
+ cleanup_config();
+ if (snapshot_path) {
+ get_snapshot(snapshot_path);
cleanup();
exit(0);
}
break;
case MotionNotify: {
+ if (!g_tooltip.enabled) break;
Panel* panel = get_panel(e.xmotion.window);
Task* task = click_task(panel, e.xmotion.x, e.xmotion.y);
if (task)
break;
case ReparentNotify:
- if (!systray.area.on_screen)
+ if (!systray_enabled)
break;
panel = (Panel*)systray.area.panel;
if (e.xany.window == panel->main_win) // reparented to us
event_timer();
switch (signal_pending) {
- case SIGUSR1:
+ case SIGUSR1: // reload config file
signal_pending = 0;
- goto load_config;
+ init_config();
+ config_read_file (config_path);
+ init_panel();
+ cleanup_config();
+ break;
case SIGINT:
case SIGTERM:
case SIGHUP:
projects / chaz / tint2 / blobdiff