gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-21 13:28:05 +01:00
Code Issues Projects Releases Wiki Activity

fix drawstring plugin support

Browse Source
This commit is contained in:
id
2000-12-06 22:49:11 +00:00
parent 756ab2c019
commit aa280f3925
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/menu.c
View File

@@ -759,6 +759,17 @@ paintEntry(WMenu *menu, int index, int selected)
if (scr->menu_item_texture->any.type == WTEX_SOLID) if (scr->menu_item_texture->any.type == WTEX_SOLID)
drawFrame(scr, win, y, w, h, type); drawFrame(scr, win, y, w, h, type);
} else { } else {
#ifdef DRAWSTRING_PLUGIN
if (scr->menu_item_texture->any.type == WTEX_SOLID) {
XClearArea(dpy, win, 0, y + 1, w - 1, h - 3, False);
/* draw the frame */
drawFrame(scr, win, y, w, h, type);
} else {
/* if the function is there, it responses for clearing area */
if (!scr->drawstring_func[W_STRING_MTEXT])
XClearArea(dpy, win, 0, y, w, h, False);
}
#else
if (scr->menu_item_texture->any.type == WTEX_SOLID) { if (scr->menu_item_texture->any.type == WTEX_SOLID) {
XClearArea(dpy, win, 0, y + 1, w - 1, h - 3, False); XClearArea(dpy, win, 0, y + 1, w - 1, h - 3, False);
/* draw the frame */ /* draw the frame */
@@ -766,6 +777,7 @@ paintEntry(WMenu *menu, int index, int selected)
} else { } else {
XClearArea(dpy, win, 0, y, w, h, False); XClearArea(dpy, win, 0, y, w, h, False);
} }
#endif
} }
if (selected) { if (selected) {
@@ -789,7 +801,26 @@ paintEntry(WMenu *menu, int index, int selected)
Pixmap tmp_bg; Pixmap tmp_bg;
void **p; void **p;
tmp_bg = XCreatePixmap(dpy, win, w, menu->entry_height, DefaultDepth(dpy, DefaultScreen(dpy))); tmp_bg = XCreatePixmap(dpy, win, w, menu->entry_height, DefaultDepth(dpy, DefaultScreen(dpy)));
XCopyArea(dpy, win, tmp_bg, textGC, 0, y, w, menu->entry_height, 0, 0); if (selected) {
if (menu->flags.brother) {
XCopyArea(dpy, menu->brother->menu_texture_data, tmp_bg, textGC,
0, y, w, menu->entry_height, 0, 0);
} else
XCopyArea(dpy, menu->menu_texture_data, tmp_bg, textGC,
0, y, w, menu->entry_height, 0, 0);
XSetForeground(dpy, scr->select_menu_gc, scr->select_pixel);
XFillRectangle(dpy, tmp_bg, scr->select_menu_gc, 1, 1, w-2, h-3);
} else {
if (menu->flags.brother) {
XCopyArea(dpy, menu->brother->menu_texture_data, tmp_bg, textGC,
0, y, w, menu->entry_height, 0, 0);
}
else
XCopyArea(dpy, menu->menu_texture_data, tmp_bg, textGC,
0, y, w, menu->entry_height, 0, 0);
}
p = wPluginPackData(4, p = wPluginPackData(4,
textGC, textGC,
scr->menu_entry_font, scr->menu_entry_font,
@@ -801,11 +832,10 @@ paintEntry(WMenu *menu, int index, int selected)
scr->drawstring_func[W_STRING_MTEXT]->arg, scr->drawstring_func[W_STRING_MTEXT]->arg,
win, win,
x, y, x, y,
menu->frame->titlebar->width, menu->entry_height, menu->frame->core->width, menu->entry_height,
entry->text, p); entry->text, p);
XFreePixmap(dpy, tmp_bg); XFreePixmap(dpy, tmp_bg);
free(p); free(p);
#undef DRAWSTRING_CURRENT_STATE
} else { } else {
WMDrawString(scr->wmscreen, win, textGC, scr->menu_entry_font, WMDrawString(scr->wmscreen, win, textGC, scr->menu_entry_font,
x, 3 + y + wPreferences.menu_text_clearance, entry->text, strlen(entry->text)); x, 3 + y + wPreferences.menu_text_clearance, entry->text, strlen(entry->text));