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

play with vertical panel

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@123 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
lorthiois@bbsoft.fr
2009-06-23 19:13:29 +00:00
parent 430f5476a3
commit c334860bb2
11 changed files with 423 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/panel.c
View File

@@ -201,45 +201,78 @@ void cleanup_panel()
void resize_panel(void *obj)
{
Panel *panel = (Panel*)obj;
int taskbar_width, modulo_width, taskbar_on_screen;
taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
if (panel->clock.area.on_screen && panel->clock.area.width)
taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
#ifdef ENABLE_BATTERY
if (panel->battery.area.on_screen && panel->battery.area.width)
taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
#endif
// TODO : systray only on first panel. search better implementation !
if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
taskbar_width -= (systray.area.width + panel->area.paddingx);
if (panel_horizontal) {
int taskbar_width, modulo_width = 0;
if (panel_mode == MULTI_DESKTOP) {
taskbar_on_screen = panel->nb_desktop;
int width = taskbar_width - ((taskbar_on_screen-1) * panel->area.paddingx);
taskbar_width = width / taskbar_on_screen;
modulo_width = width % taskbar_on_screen;
}
else {
taskbar_on_screen = 1;
modulo_width = 0;
taskbar_width = panel->area.width - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
if (panel->clock.area.on_screen && panel->clock.area.width)
taskbar_width -= (panel->clock.area.width + panel->area.paddingx);
#ifdef ENABLE_BATTERY
if (panel->battery.area.on_screen && panel->battery.area.width)
taskbar_width -= (panel->battery.area.width + panel->area.paddingx);
#endif
// TODO : systray only on first panel. search better implementation !
if (systray.area.on_screen && systray.area.width && panel == &panel1[0])
taskbar_width -= (systray.area.width + panel->area.paddingx);
if (panel_mode == MULTI_DESKTOP) {
int width = taskbar_width - ((panel->nb_desktop-1) * panel->area.paddingx);
taskbar_width = width / panel->nb_desktop;
modulo_width = width % panel->nb_desktop;
}
// change posx and width for all taskbar
int i, posx;
posx = panel->area.pix.border.width + panel->area.paddingxlr;
for (i=0 ; i < panel->nb_desktop ; i++) {
panel->taskbar[i].area.posx = posx;
panel->taskbar[i].area.width = taskbar_width;
panel->taskbar[i].area.resize = 1;
if (modulo_width) {
panel->taskbar[i].area.width++;
modulo_width--;
}
//printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width);
if (panel_mode == MULTI_DESKTOP)
posx += panel->taskbar[i].area.width + panel->area.paddingx;
}
}
else {
int taskbar_height, modulo_height = 0;
int i, posy;
// change posx and width for all taskbar
int i, posx;
posx = panel->area.pix.border.width + panel->area.paddingxlr;
for (i=0 ; i < panel->nb_desktop ; i++) {
panel->taskbar[i].area.posx = posx;
panel->taskbar[i].area.width = taskbar_width;
panel->taskbar[i].area.resize = 1;
if (modulo_width) {
panel->taskbar[i].area.width++;
modulo_width--;
}
//printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width);
if (panel_mode == MULTI_DESKTOP)
posx += panel->taskbar[i].area.width + panel->area.paddingx;
}
taskbar_height = panel->area.height - (2 * panel->area.paddingxlr) - (2 * panel->area.pix.border.width);
if (panel->clock.area.on_screen && panel->clock.area.height)
taskbar_height -= (panel->clock.area.height + panel->area.paddingx);
#ifdef ENABLE_BATTERY
if (panel->battery.area.on_screen && panel->battery.area.height)
taskbar_height -= (panel->battery.area.height + panel->area.paddingx);
#endif
// TODO : systray only on first panel. search better implementation !
if (systray.area.on_screen && systray.area.height && panel == &panel1[0])
taskbar_height -= (systray.area.height + panel->area.paddingx);
posy = panel->area.height - panel->area.pix.border.width - panel->area.paddingxlr - taskbar_height;
if (panel_mode == MULTI_DESKTOP) {
int height = taskbar_height - ((panel->nb_desktop-1) * panel->area.paddingx);
taskbar_height = height / panel->nb_desktop;
modulo_height = height % panel->nb_desktop;
}
// change posy and height for all taskbar
for (i=0 ; i < panel->nb_desktop ; i++) {
panel->taskbar[i].area.posy = posy;
panel->taskbar[i].area.height = taskbar_height;
panel->taskbar[i].area.resize = 1;
if (modulo_height) {
panel->taskbar[i].area.height++;
modulo_height--;
}
if (panel_mode == MULTI_DESKTOP)
posy += panel->taskbar[i].area.height + panel->area.paddingx;
}
}
}

134
src/taskbar/taskbar.c
View File

@@ -49,18 +49,31 @@ void init_taskbar()
// taskbar
panel->g_taskbar._resize = resize_taskbar;
panel->g_taskbar.posy = panel->area.pix.border.width + panel->area.paddingy;
panel->g_taskbar.height = panel->area.height - (2 * panel->g_taskbar.posy);
panel->g_taskbar.redraw = 1;
panel->g_taskbar.on_screen = 1;
if (panel_horizontal) {
panel->g_taskbar.posy = panel->area.pix.border.width + panel->area.paddingy;
panel->g_taskbar.height = panel->area.height - (2 * panel->g_taskbar.posy);
}
else {
panel->g_taskbar.posx = panel->area.pix.border.width + panel->area.paddingy;
panel->g_taskbar.width = panel->area.width - (2 * panel->g_taskbar.posx);
}
// task
panel->g_task.area._draw_foreground = draw_task;
panel->g_task.area.posy = panel->g_taskbar.posy + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
panel->g_task.area.use_active = 1;
panel->g_task.area.redraw = 1;
panel->g_task.area.on_screen = 1;
if (panel_horizontal) {
panel->g_task.area.posy = panel->g_taskbar.posy + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
}
else {
panel->g_task.area.posx = panel->g_taskbar.posx + panel->g_taskbar.pix.border.width + panel->g_taskbar.paddingy;
panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
panel->g_task.area.height = panel->g_task.maximum_width;
}
if (panel->g_task.area.pix.border.rounded > panel->g_task.area.height/2) {
panel->g_task.area.pix.border.rounded = panel->g_task.area.height/2;
@@ -207,51 +220,96 @@ void resize_taskbar(void *obj)
{
Taskbar *taskbar = (Taskbar*)obj;
Panel *panel = (Panel*)taskbar->area.panel;
int task_count, pixel_width, modulo_width=0;
int x, taskbar_width;
Task *tsk;
GSList *l;
int task_count;
//printf("resize_taskbar : posx et width des taches\n");
taskbar->area.redraw = 1;
// new task width for 'desktop'
task_count = g_slist_length(taskbar->area.list);
if (!task_count) pixel_width = panel->g_task.maximum_width;
else {
taskbar_width = taskbar->area.width - (2 * panel->g_taskbar.pix.border.width) - (2 * panel->g_taskbar.paddingxlr);
if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.paddingx);
if (panel_horizontal) {
int pixel_width, modulo_width=0;
int x, taskbar_width;
pixel_width = taskbar_width / task_count;
if (pixel_width > panel->g_task.maximum_width)
pixel_width = panel->g_task.maximum_width;
else
modulo_width = taskbar_width % task_count;
}
// new task width for 'desktop'
task_count = g_slist_length(taskbar->area.list);
if (!task_count) pixel_width = panel->g_task.maximum_width;
else {
taskbar_width = taskbar->area.width - (2 * panel->g_taskbar.pix.border.width) - (2 * panel->g_taskbar.paddingxlr);
if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.paddingx);
if ((taskbar->task_width == pixel_width) && (taskbar->task_modulo == modulo_width)) {
}
else {
taskbar->task_width = pixel_width;
taskbar->task_modulo = modulo_width;
taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
}
pixel_width = taskbar_width / task_count;
if (pixel_width > panel->g_task.maximum_width)
pixel_width = panel->g_task.maximum_width;
else
modulo_width = taskbar_width % task_count;
}
// change pos_x and width for all tasks
x = taskbar->area.posx + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
tsk->area.posx = x;
tsk->area.width = pixel_width;
tsk->area.redraw = 1;
if (modulo_width) {
tsk->area.width++;
modulo_width--;
}
if ((taskbar->task_width == pixel_width) && (taskbar->task_modulo == modulo_width)) {
}
else {
taskbar->task_width = pixel_width;
taskbar->task_modulo = modulo_width;
taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.pix.border.width - panel->g_task.area.paddingx;
}
x += tsk->area.width + panel->g_taskbar.paddingx;
}
// change pos_x and width for all tasks
x = taskbar->area.posx + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
tsk->area.posx = x;
tsk->area.width = pixel_width;
tsk->area.redraw = 1;
if (modulo_width) {
tsk->area.width++;
modulo_width--;
}
x += tsk->area.width + panel->g_taskbar.paddingx;
}
}
else {
int pixel_height, modulo_height=0;
int y, taskbar_height;
// new task width for 'desktop'
task_count = g_slist_length(taskbar->area.list);
if (!task_count) pixel_height = panel->g_task.maximum_width;
else {
taskbar_height = taskbar->area.height - (2 * panel->g_taskbar.pix.border.width) - (2 * panel->g_taskbar.paddingxlr);
if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.paddingx);
pixel_height = taskbar_height / task_count;
if (pixel_height > panel->g_task.maximum_width)
pixel_height = panel->g_task.maximum_width;
else
modulo_height = taskbar_height % task_count;
}
if ((taskbar->task_width == pixel_height) && (taskbar->task_modulo == modulo_height)) {
}
else {
taskbar->task_width = pixel_height;
taskbar->task_modulo = modulo_height;
taskbar->text_width = taskbar->area.width - (2 * taskbar->area.paddingy) - (2 * taskbar->area.pix.border.width);
}
// change pos_y and height for all tasks
y = taskbar->area.posy + taskbar->area.pix.border.width + taskbar->area.paddingxlr;
for (l = taskbar->area.list; l ; l = l->next) {
tsk = l->data;
tsk->area.posy = y;
tsk->area.height = pixel_height;
tsk->area.redraw = 1;
if (modulo_height) {
tsk->area.height++;
modulo_height--;
}
y += tsk->area.height + panel->g_taskbar.paddingx;
}
}
}

110
src/tint.c
View File

@@ -140,7 +140,7 @@ void event_button_press (XEvent *e)
if (!panel) return;
if (wm_menu) {
if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
if ((panel_horizontal && (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr || e->xbutton.y < panel->area.paddingy || e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) {
// forward the click to the desktop window (thanks conky)
XUngrabPointer(server.dsp, e->xbutton.time);
e->xbutton.window = server.root_win;
@@ -165,25 +165,44 @@ void event_button_press (XEvent *e)
GSList *l0;
Taskbar *tskbar;
int x = e->xbutton.x;
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
break;
}
if (l0) {
Task *tsk;
for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
task_drag = tsk;
break;
}
}
}
if (panel_horizontal) {
int x = e->xbutton.x;
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
break;
}
if (l0) {
Task *tsk;
for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
task_drag = tsk;
break;
}
}
}
}
else {
int y = e->xbutton.y;
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
break;
}
if (l0) {
Task *tsk;
for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
tsk = l0->data;
if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
task_drag = tsk;
break;
}
}
}
}
XLowerWindow (server.dsp, panel->main_win);
}
@@ -194,7 +213,7 @@ void event_button_release (XEvent *e)
if (!panel) return;
if (wm_menu) {
if ((e->xbutton.x < panel->area.paddingxlr) || (e->xbutton.x > panel->area.width-panel->area.paddingxlr) || (e->xbutton.y < panel->area.paddingy) || (e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) {
if ((panel_horizontal && (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr || e->xbutton.y < panel->area.paddingy || e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) {
// forward the click to the desktop window (thanks conky)
e->xbutton.window = server.root_win;
XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
@@ -204,7 +223,7 @@ void event_button_release (XEvent *e)
int action = TOGGLE_ICONIFY;
int x = e->xbutton.x;
//int y = e->xbutton.y; // unused
int y = e->xbutton.y;
switch (e->xbutton.button) {
case 2:
action = mouse_middle;
@@ -224,14 +243,28 @@ void event_button_release (XEvent *e)
Taskbar *tskbar;
GSList *l0;
Clock clk = panel->clock;
if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
clock_action(e->xbutton.button);
if (panel_horizontal) {
if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
clock_action(e->xbutton.button);
else {
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
goto suite;
}
}
}
else {
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
goto suite;
if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
clock_action(e->xbutton.button);
else {
for (l0 = panel->area.list; l0 ; l0 = l0->next) {
tskbar = l0->data;
if (!tskbar->area.on_screen) continue;
if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
goto suite;
}
}
}
@@ -265,10 +298,18 @@ suite:
GSList *l;
for (l = tskbar->area.list ; l ; l = l->next) {
tsk = l->data;
if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
window_action (tsk, action);
break;
}
if (panel_horizontal) {
if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
window_action (tsk, action);
break;
}
}
else {
if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
window_action (tsk, action);
break;
}
}
}
// to keep window below
@@ -545,11 +586,11 @@ int main (int argc, char *argv[])
Panel *panel;
GSList *it;
c = getopt (argc, argv, "c:");
init ();
load_config:
i = 0;
c = getopt (argc, argv, "c:");
init_config();
if (c != -1) {
i = config_read_file (optarg);
@@ -639,6 +680,7 @@ load_config:
switch (signal_pending) {
case SIGUSR1:
signal_pending = 0;
goto load_config;
case SIGINT:
case SIGTERM: