X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=7e373a401351994cfd4ebdf40962bc5212383247;hb=067e29cba8a299728e6e2d9c029a049c753ae4ad;hp=35980bffbcb07ce4273d8024b41bcd7494d2d38e;hpb=979e3f22d26bbe63fc3781cbcd07300d4541e5cd;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index 35980bf..7e373a4 100644 --- a/src/tint.c +++ b/src/tint.c @@ -103,13 +103,42 @@ void init (int argc, char *argv[]) XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); setlocale (LC_ALL, ""); + + // load default icon + int i; + 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(); cleanup_panel(); + if (default_icon) { + imlib_context_set_image(default_icon); + imlib_free_image(); + } + if (g_tooltip.window) { + XDestroyWindow(server.dsp, g_tooltip.window); + g_tooltip.window = 0; + } + if (g_tooltip.font_desc) { + pango_font_description_free(g_tooltip.font_desc); + g_tooltip.font_desc = 0; + } 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); @@ -265,7 +294,11 @@ void event_button_press (XEvent *e) { Panel *panel = get_panel(e->xany.window); if (!panel) return; - +/* + if (wm_menu && (e->xbutton.button != 1) ) { + task_drag = click_task(panel, e->xbutton.x, e->xbutton.y); + if (!task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) ) { + */ task_drag = click_task(panel, e->xbutton.x, e->xbutton.y); if (wm_menu && !task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) && (e->xbutton.button != 1) ) { @@ -274,10 +307,10 @@ void event_button_press (XEvent *e) 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; } @@ -291,13 +324,6 @@ void event_button_release (XEvent *e) Panel *panel = get_panel(e->xany.window); if (!panel) return; - if (wm_menu && click_padding(panel, e->xbutton.x, e->xbutton.y)) { - // forward the click to the desktop window (thanks conky) - e->xbutton.window = server.root_win; - XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e); - return; - } - int action = TOGGLE_ICONIFY; switch (e->xbutton.button) { case 2: @@ -435,44 +461,7 @@ void event_property_notify (XEvent *e) } // 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) { @@ -524,6 +513,9 @@ void event_property_notify (XEvent *e) 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 @@ -613,43 +605,42 @@ void event_expose (XEvent *e) void event_configure_notify (Window win) { + // change in root window (xrandr) if (win == server.root_win) { - printf("ConfigureNotify on root\n"); - //XMoveWindow(dpy, fen, pos_x, pos_y); - //XResizeWindow(dpy, fen, largeur, hauteur); + get_monitors(); + init_panel(); + return; } - else { - // check 'win' move in systray - TrayWindow *traywin; - GSList *l; - for (l = systray.list_icons; l ; l = l->next) { - traywin = (TrayWindow*)l->data; - if (traywin->id == win) { - //printf("move tray %d\n", traywin->x); - XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height); - panel_refresh = 1; - return; - } - } - // check 'win' move in another monitor - if (nb_panel == 1) return; - if (server.nb_monitor == 1) return; - Task *tsk = task_get_task (win); - if (!tsk) return; - - Panel *p = tsk->area.panel; - if (p->monitor != window_get_monitor (win)) { - remove_task (tsk); - add_task (win); - if (win == window_get_active ()) { - Task *tsk = task_get_task (win); - tsk->area.is_active = 1; - task_active = tsk; - } + // 'win' is a trayer icon + TrayWindow *traywin; + GSList *l; + for (l = systray.list_icons; l ; l = l->next) { + traywin = (TrayWindow*)l->data; + if (traywin->id == win) { + //printf("move tray %d\n", traywin->x); + XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height); panel_refresh = 1; + return; } } + + // 'win' move in another monitor + if (nb_panel == 1) return; + Task *tsk = task_get_task (win); + if (!tsk) return; + + Panel *p = tsk->area.panel; + if (p->monitor != window_get_monitor (win)) { + remove_task (tsk); + add_task (win); + if (win == window_get_active ()) { + Task *tsk = task_get_task (win); + tsk->area.is_active = 1; + task_active = tsk; + } + panel_refresh = 1; + } } @@ -731,7 +722,7 @@ int main (int argc, char *argv[]) GSList *it; init (argc, argv); -load_config: + i = 0; init_config(); if (config_path) @@ -839,9 +830,13 @@ load_config: 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: