X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=d9e02334173f2d0ed4d006a94e6bf78eb824ba98;hb=8abd6d423bffc9cd35928e1911c138163f7dbda9;hp=1380d657dce79f36431581024c3f0d15ab321ef1;hpb=1b1f2a1a069edcf3db99ae07020eeedae3023f76;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index 1380d65..d9e0233 100644 --- a/src/tint.c +++ b/src/tint.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -58,10 +59,10 @@ void init (int argc, char *argv[]) exit(0); } if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) { - printf("tint2 version 0.7.svn\n"); + printf("tint2 version 0.8\n"); exit(0); } - if (!strcmp(argv[i], "-c")) { + if (!strcmp(argv[i], "-c")) { i++; if (i < argc) config_path = strdup(argv[i]); @@ -72,7 +73,6 @@ void init (int argc, char *argv[]) snapshot_path = strdup(argv[i]); } } - // Set signal handler struct sigaction sa = { .sa_handler = signal_handler }; sigaction(SIGUSR1, &sa, 0); @@ -80,19 +80,24 @@ void init (int argc, char *argv[]) sigaction(SIGTERM, &sa, 0); sigaction(SIGHUP, &sa, 0); signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork() - // block all signals, such that no race conditions occur before pselect in our main loop - sigset_t block_mask; - sigaddset(&block_mask, SIGINT); - sigaddset(&block_mask, SIGTERM); - sigaddset(&block_mask, SIGHUP); - sigaddset(&block_mask, SIGUSR1); - sigprocmask(SIG_BLOCK, &block_mask, 0); + // BSD is too stupid to support pselect(), therefore we have to use select and hope that we do not + // end up in a race condition there + // block all signals, such that no race conditions occur before pselect in our main loop +// sigset_t block_mask; +// sigaddset(&block_mask, SIGINT); +// sigaddset(&block_mask, SIGTERM); +// sigaddset(&block_mask, SIGHUP); +// sigaddset(&block_mask, SIGUSR1); +// sigprocmask(SIG_BLOCK, &block_mask, 0); // set global data memset(&server, 0, sizeof(Server_global)); memset(&systray, 0, sizeof(Systraybar)); +} +void init_X11() +{ server.dsp = XOpenDisplay (NULL); if (!server.dsp) { fprintf(stderr, "tint2 exit : could not open display.\n"); @@ -101,17 +106,13 @@ void init (int argc, char *argv[]) server_init_atoms (); server.screen = DefaultScreen (server.dsp); server.root_win = RootWindow(server.dsp, server.screen); - server.depth = DefaultDepth (server.dsp, server.screen); - 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_init_visual(); XSetErrorHandler ((XErrorHandler) server_catch_error); imlib_context_set_display (server.dsp); imlib_context_set_visual (server.visual); - imlib_context_set_colormap (DefaultColormap (server.dsp, server.screen)); + imlib_context_set_colormap (server.colormap); /* Catch events */ XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); @@ -122,6 +123,7 @@ void init (int argc, char *argv[]) gchar *path; const gchar * const *data_dirs; data_dirs = g_get_system_data_dirs (); + int i; 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)) @@ -153,8 +155,7 @@ void cleanup() if (config_path) g_free(config_path); if (snapshot_path) g_free(snapshot_path); - if (server.monitor) free(server.monitor); - XFreeGC(server.dsp, server.gc); + cleanup_server(); XCloseDisplay(server.dsp); } @@ -241,26 +242,61 @@ void window_action (Task *tsk, int action) } +int tint2_handles_click(Panel* panel, XButtonEvent* e) +{ + Task* task = click_task(panel, e->x, e->y); + if (task) { + if( (e->button == 1) + || (e->button == 2 && mouse_middle != 0) + || (e->button == 3 && mouse_right != 0) + || (e->button == 4 && mouse_scroll_up != 0) + || (e->button == 5 && mouse_scroll_down !=0) ) + { + return 1; + } + else + return 0; + } + // no task clicked --> check if taskbar clicked + Taskbar *tskbar = click_taskbar(panel, e->x, e->y); + if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP) + return 1; + if (click_clock(panel, e->x, e->y)) { + if ( (e->button == 1 && clock_lclick_command) || (e->button == 2 && clock_rclick_command) ) + return 1; + else + return 0; + } + return 0; +} + + +void forward_click(XEvent* e) +{ + // forward the click to the desktop window (thanks conky) + XUngrabPointer(server.dsp, e->xbutton.time); + 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; + //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y); + //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time); + XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e); +} + + void event_button_press (XEvent *e) { Panel *panel = get_panel(e->xany.window); if (!panel) return; - 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) ) { - // forward the click to the desktop window (thanks conky) - XUngrabPointer(server.dsp, e->xbutton.time); - 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; - //printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y); - //XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time); - XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e); + if (wm_menu && !tint2_handles_click(panel, &e->xbutton) ) { + forward_click(e); return; } + task_drag = click_task(panel, e->xbutton.x, e->xbutton.y); XLowerWindow (server.dsp, panel->main_win); } @@ -271,6 +307,12 @@ void event_button_release (XEvent *e) Panel *panel = get_panel(e->xany.window); if (!panel) return; + if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) { + forward_click(e); + task_drag = 0; + return; + } + int action = TOGGLE_ICONIFY; switch (e->xbutton.button) { case 2: @@ -359,6 +401,7 @@ void event_property_notify (XEvent *e) panel1[i].area.resize = 1; } task_refresh_tasklist(); + active_task(); panel_refresh = 1; } // Change desktop @@ -369,8 +412,11 @@ void event_property_notify (XEvent *e) Panel *panel = &panel1[i]; 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.resize = 1; + if (server.nb_desktop > old_desktop) { + // can happen if last desktop is deleted and we've been on the last desktop + panel->taskbar[old_desktop].area.is_active = 0; + panel->taskbar[old_desktop].area.resize = 1; + } panel->taskbar[server.desktop].area.is_active = 1; panel->taskbar[server.desktop].area.resize = 1; panel_refresh = 1; @@ -379,13 +425,15 @@ void event_property_notify (XEvent *e) Taskbar *tskbar; Task *tsk; GSList *l; - tskbar = &panel->taskbar[old_desktop]; - for (l = tskbar->area.list; l ; l = l->next) { - tsk = l->data; - if (tsk->desktop == ALLDESKTOP) { - tsk->area.on_screen = 0; - tskbar->area.resize = 1; - panel_refresh = 1; + if (server.nb_desktop > old_desktop) { + tskbar = &panel->taskbar[old_desktop]; + for (l = tskbar->area.list; l ; l = l->next) { + tsk = l->data; + if (tsk->desktop == ALLDESKTOP) { + tsk->area.on_screen = 0; + tskbar->area.resize = 1; + panel_refresh = 1; + } } } tskbar = &panel->taskbar[server.desktop]; @@ -435,6 +483,8 @@ void event_property_notify (XEvent *e) else return; } + else + return; } } //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title); @@ -516,16 +566,12 @@ void event_property_notify (XEvent *e) // Window desktop changed else if (at == server.atom._NET_WM_DESKTOP) { int desktop = window_get_desktop (win); - int active = tsk->area.is_active; //printf(" Window desktop changed %d, %d\n", tsk->desktop, desktop); // bug in windowmaker : send unecessary 'desktop changed' when focus changed if (desktop != tsk->desktop) { remove_task (tsk); tsk = add_task (win); - if (tsk && active) { - tsk->area.is_active = 1; - task_active = tsk; - } + active_task(); panel_refresh = 1; } } @@ -569,9 +615,10 @@ void event_configure_notify (Window win) GSList *l; for (l = systray.list_icons; l ; l = l->next) { traywin = (TrayWindow*)l->data; - if (traywin->id == win) { + if (traywin->tray_id == win) { //printf("move tray %d\n", traywin->x); XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height); + XResizeWindow(server.dsp, traywin->tray_id, traywin->width, traywin->height); panel_refresh = 1; return; } @@ -587,9 +634,13 @@ void event_configure_notify (Window 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; + GSList* task_list = task_get_tasks(win); + while (task_list) { + Task *tsk = task_list->data; + tsk->area.is_active = 1; + task_active = tsk; + task_list = task_list->next; + } } panel_refresh = 1; } @@ -633,13 +684,11 @@ int main (int argc, char *argv[]) int x11_fd, i; Panel *panel; GSList *it; - GSList* timer_iter; - struct timer* timer; + struct timeval* timeout; init (argc, argv); - - i = 0; init_config(); + i = 0; if (config_path) i = config_read_file (config_path); else @@ -649,6 +698,8 @@ int main (int argc, char *argv[]) cleanup(); exit(1); } + + init_X11(); init_panel(); cleanup_config(); if (snapshot_path) { @@ -657,16 +708,19 @@ int main (int argc, char *argv[]) exit(0); } + int damage_event, damage_error; + XDamageQueryExtension(server.dsp, &damage_event, &damage_error); x11_fd = ConnectionNumber(server.dsp); XSync(server.dsp, False); - sigset_t empty_mask; - sigemptyset(&empty_mask); +// sigset_t empty_mask; +// sigemptyset(&empty_mask); while (1) { if (panel_refresh) { panel_refresh = 0; + // QUESTION: do we need this first refresh_systray, because we check refresh_systray once again later... if (refresh_systray) { panel = (Panel*)systray.area.panel; XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None); @@ -674,15 +728,19 @@ int main (int argc, char *argv[]) for (i=0 ; i < nb_panel ; i++) { panel = &panel1[i]; - 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); - XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0); + if (panel->is_hidden) + XCopyArea(server.dsp, panel->hidden_pixmap, panel->main_win, server.gc, 0, 0, panel->hidden_width, panel->hidden_height, 0, 0); + else { + 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); + XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0); + } } XFlush (server.dsp); - if (refresh_systray) { + panel = (Panel*)systray.area.panel; + if (refresh_systray && !panel->is_hidden) { refresh_systray = 0; panel = (Panel*)systray.area.panel; // tint2 doen't draw systray icons. it just redraw background. @@ -693,26 +751,33 @@ int main (int argc, char *argv[]) } // thanks to AngryLlama for the timer - // Create a File Description Set containing x11_fd, and every timer_fd + // Create a File Description Set containing x11_fd FD_ZERO (&fdset); FD_SET (x11_fd, &fdset); - int max_fd = x11_fd; - timer_iter = timer_list; - while (timer_iter) { - timer = timer_iter->data; - max_fd = timer->id > max_fd ? timer->id : max_fd; - FD_SET(timer->id, &fdset); - timer_iter = timer_iter->next; - } + update_next_timeout(); + if (next_timeout.tv_sec >= 0 && next_timeout.tv_usec >= 0) + timeout = &next_timeout; + else + timeout = 0; // Wait for X Event or a Timer - if (pselect(max_fd+1, &fdset, 0, 0, 0, &empty_mask) > 0) { + if (select(x11_fd+1, &fdset, 0, 0, timeout) > 0) { while (XPending (server.dsp)) { XNextEvent(server.dsp, &e); + panel = get_panel(e.xany.window); + if (panel && panel_autohide) { + if (e.type == EnterNotify) + autohide_trigger_show(panel); + else if (e.type == LeaveNotify) + autohide_trigger_hide(panel); + if (panel->is_hidden) + continue; // discard further processing of this event because the panel is not visible yet + } + switch (e.type) { case ButtonPress: - tooltip_hide(); + tooltip_hide(0); event_button_press (&e); break; @@ -724,16 +789,16 @@ int main (int argc, char *argv[]) if (!g_tooltip.enabled) break; Panel* panel = get_panel(e.xmotion.window); Area* area = click_area(panel, e.xmotion.x, e.xmotion.y); - if (area->_get_tooltip_text) { + if (area->_get_tooltip_text) tooltip_trigger_show(area, panel, e.xmotion.x_root, e.xmotion.y_root); - } else tooltip_trigger_hide(); break; } case LeaveNotify: - tooltip_trigger_hide(); + if (g_tooltip.enabled) + tooltip_trigger_hide(); break; case Expose: @@ -766,7 +831,7 @@ int main (int argc, char *argv[]) if (e.xany.window == g_tooltip.window || !systray.area.on_screen) break; for (it = systray.list_icons; it; it = g_slist_next(it)) { - if (((TrayWindow*)it->data)->id == e.xany.window) { + if (((TrayWindow*)it->data)->tray_id == e.xany.window) { remove_icon((TrayWindow*)it->data); break; } @@ -782,23 +847,26 @@ int main (int argc, char *argv[]) dnd_message(&e.xclient); } break; - } - } - // we need to iterate over the whole timer list, since fd_set can only be checked with the - // brute force method FD_ISSET for every possible timer - timer_iter = timer_list; - while (timer_iter) { - timer = timer_iter->data; - if (FD_ISSET(timer->id, &fdset)) { - uint64_t dummy; - read(timer->id, &dummy, sizeof(uint64_t)); - timer->_callback(); + default: + if (e.type == XDamageNotify+damage_event) { + TrayWindow *traywin; + GSList *l; + XDamageNotifyEvent* de = (XDamageNotifyEvent*)&e; + for (l = systray.list_icons; l ; l = l->next) { + traywin = (TrayWindow*)l->data; + if ( traywin->id == de->drawable ) { + systray_render_icon(traywin); + break; + } + } + } } - timer_iter = timer_iter->next; } } + callback_timeout_expired(); + switch (signal_pending) { case SIGUSR1: // reload config file signal_pending = 0;