#include <Imlib2.h>
#include <signal.h>
-#include "version.h"
+#include <version.h>
#include "server.h"
#include "window.h"
#include "config.h"
#include "task.h"
#include "taskbar.h"
#include "systraybar.h"
+#include "launcher.h"
#include "panel.h"
#include "tooltip.h"
#include "timer.h"
default_battery();
#endif
default_clock();
+ default_launcher();
default_taskbar();
default_tooltip();
default_panel();
// Set signal handler
signal_pending = 0;
struct sigaction sa = { .sa_handler = signal_handler };
+ struct sigaction sa_chld = { .sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT };
sigaction(SIGUSR1, &sa, 0);
sigaction(SIGINT, &sa, 0);
sigaction(SIGTERM, &sa, 0);
sigaction(SIGHUP, &sa, 0);
- signal(SIGCHLD, SIG_IGN); // don't have to wait() after fork()
+ sigaction(SIGCHLD, &sa_chld, 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
+ // BSD does not support pselect(), therefore we have to use select and hope that we do not
+ // end up in a race condition there (see 'man select()' on a linux machine for more information)
// block all signals, such that no race conditions occur before pselect in our main loop
// sigset_t block_mask;
// sigaddset(&block_mask, SIGINT);
XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
setlocale (LC_ALL, "");
+ // config file use '.' as decimal separator
+ setlocale(LC_NUMERIC, "POSIX");
// load default icon
gchar *path;
cleanup_panel();
cleanup_tooltip();
cleanup_clock();
+ cleanup_launcher();
#ifdef ENABLE_BATTERY
cleanup_battery();
#endif
else
return 0;
}
- // no task clicked --> check if taskbar clicked
+ LauncherIcon *icon = click_launcher_icon(panel, e->x, e->y);
+ if (icon) {
+ if (e->button == 1) {
+ return 1;
+ } else {
+ return 0;
+ }
+ }
+ // no launcher/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;
}
task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
}
void event_button_motion_notify (XEvent *e)
if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
forward_click(e);
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
task_drag = 0;
return;
}
if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) {
clock_action(e->xbutton.button);
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
+ task_drag = 0;
+ return;
+ }
+
+ if ( click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
+ LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
+ if (icon) {
+ launcher_action(icon);
+ }
task_drag = 0;
return;
}
Taskbar *tskbar;
if ( !(tskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y)) ) {
// TODO: check better solution to keep window below
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
task_drag = 0;
return;
}
window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
// to keep window below
- XLowerWindow (server.dsp, panel->main_win);
+ if (panel_layer == BOTTOM_LAYER)
+ XLowerWindow (server.dsp, panel->main_win);
}
Panel *panel;
GSList *it;
struct timeval* timeout;
+ int hidden_dnd = 0;
start:
init (argc, argv);
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
+ if (panel->is_hidden) {
+ if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
+ hidden_dnd = 1;
+ autohide_show(panel);
+ }
+ else
+ continue; // discard further processing of this event because the panel is not visible yet
+ }
+ else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
+ hidden_dnd = 0;
+ autohide_hide(panel);
+ }
}
switch (e.type) {
// Start real_transparency
signal_pending = SIGUSR1;
}
- if (!systray.area.on_screen) break;
- if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+ if (systray.area.on_screen && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
net_message(&e.xclient);
}
else if (e.xclient.message_type == server.atom.XdndPosition) {