awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add Xinerama support to awesome-menu and fix a bug with wrong displaying when selecting an item

This commit is contained in:
Julien Danjou 2008-03-07 16:31:31 +01:00
parent 5084451dc9
commit e5069d1b8c
2 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -167,7 +167,7 @@ awesome_menu_SOURCES = \
common/xutil.h common/xutil.c \ common/xutil.h common/xutil.c \
awesome-menu.c awesome-menu.c
awesome_menu_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS) $(CONFUSE_LIBS) awesome_menu_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS) $(CONFUSE_LIBS) $(XINERAMA_LIBS)
if HAVE_XMLTO if HAVE_XMLTO
if HAVE_ASCIIDOC if HAVE_ASCIIDOC

41
awesome-menu.c
View File

@ -29,6 +29,7 @@
#include <confuse.h> #include <confuse.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/Xinerama.h>
#include "common/swindow.h" #include "common/swindow.h"
#include "common/util.h" #include "common/util.h"
@ -216,11 +217,14 @@ static void
redraw(void) redraw(void)
{ {
item_t *item; item_t *item;
Area geometry = globalconf.sw->geometry; Area geometry = { 0, 0, 0, 0, NULL };
unsigned int len; unsigned int len;
Bool selected_item_is_drawn = False; Bool selected_item_is_drawn = False;
int prompt_len, x_of_previous_item; int prompt_len, x_of_previous_item;
geometry.width = globalconf.sw->geometry.width;
geometry.height = globalconf.sw->geometry.height;
draw_text(globalconf.ctx, geometry, AlignLeft, draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN, globalconf.font, globalconf.prompt, globalconf.fg_focus, globalconf.bg_focus); MARGIN, globalconf.font, globalconf.prompt, globalconf.fg_focus, globalconf.bg_focus);
@ -259,9 +263,9 @@ redraw(void)
if(globalconf.item_selected && !selected_item_is_drawn) if(globalconf.item_selected && !selected_item_is_drawn)
{ {
geometry.x = globalconf.sw->geometry.width; geometry.x = globalconf.sw->geometry.width;
item = globalconf.item_selected;
while(item) for(item = globalconf.item_selected; item; item = item_list_prev(&globalconf.items, item))
if(item->match)
{ {
x_of_previous_item = geometry.x; x_of_previous_item = geometry.x;
geometry.width = MARGIN + draw_textwidth(globalconf.display, globalconf.font, item->data); geometry.width = MARGIN + draw_textwidth(globalconf.display, globalconf.font, item->data);
@ -270,6 +274,7 @@ redraw(void)
if(geometry.x < prompt_len) if(geometry.x < prompt_len)
break; break;
/* XXX need factorizing */
if(item == globalconf.item_selected) if(item == globalconf.item_selected)
draw_text(globalconf.ctx, geometry, AlignLeft, draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data, globalconf.fg_focus, globalconf.bg_focus); MARGIN / 2, globalconf.font, item->data, globalconf.fg_focus, globalconf.bg_focus);
@ -277,7 +282,6 @@ redraw(void)
draw_text(globalconf.ctx, geometry, AlignLeft, draw_text(globalconf.ctx, geometry, AlignLeft,
MARGIN / 2, globalconf.font, item->data, globalconf.fg, globalconf.bg); MARGIN / 2, globalconf.font, item->data, globalconf.fg, globalconf.bg);
item = item_list_prev(&globalconf.items, item);
} }
if(item) if(item)
@ -481,7 +485,34 @@ main(int argc, char **argv)
/* Init the geometry */ /* Init the geometry */
geometry.height = globalconf.font->height * 1.5; geometry.height = globalconf.font->height * 1.5;
geometry.width = DisplayWidth(globalconf.display, DefaultScreen(globalconf.display));
/* XXX this must be replace with a common/ infra */
if(XineramaIsActive(disp))
{
XineramaScreenInfo *si;
int xinerama_screen_number, i, x, y;
unsigned int ui;
Window dummy;
XQueryPointer(disp, RootWindow(disp, DefaultScreen(disp)),
&dummy, &dummy, &x, &y, &i, &i, &ui);
si = XineramaQueryScreens(disp, &xinerama_screen_number);
/* XXX use screen_get_bycoord() !!! */
for(i = 0; i < xinerama_screen_number; i++)
if((x < 0 || (x >= si[i].x_org && x < si[i].x_org + si[i].width))
&& (y < 0 || (y >= si[i].y_org && y < si[i].y_org + si[i].height)))
break;
geometry.x = si[i].x_org;
geometry.y = si[i].y_org;
geometry.width = si[i].width;
XFree(si);
}
else
geometry.width = DisplayWidth(disp, DefaultScreen(disp));
/* Create the window */ /* Create the window */
globalconf.sw = simplewindow_new(disp, DefaultScreen(disp), globalconf.sw = simplewindow_new(disp, DefaultScreen(disp),