mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-18 20:10:29 +01:00
Fixes from Alban and Pascal.
This commit is contained in:
@@ -50,7 +50,7 @@ wmquery_LDADD = libWINGs.a $(LIBLIST)
|
||||
|
||||
connect_SOURCES = connect.c
|
||||
|
||||
connect_LDADD = libWUtil.a @NETLIBS@ @LIBPL@
|
||||
connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
|
||||
|
||||
|
||||
EXTRA_DIST = logo.xpm BUGS
|
||||
|
||||
@@ -26,6 +26,10 @@ int main(int argc, char **argv)
|
||||
WMPixmap *pixmap;
|
||||
WMColorPanel *panel;
|
||||
|
||||
#if 0
|
||||
XSynchronize(dpy, True);
|
||||
fprintf(stderr, "...Running Synchronous...\n");
|
||||
#endif
|
||||
|
||||
WMInitializeApplication("WMColorPicker", &argc, argv);
|
||||
|
||||
@@ -38,9 +42,6 @@ int main(int argc, char **argv)
|
||||
|
||||
scr = WMCreateSimpleApplicationScreen(dpy);
|
||||
|
||||
|
||||
|
||||
|
||||
pixmap = WMCreatePixmapFromXPMData(scr, GNUSTEP_XPM);
|
||||
WMSetApplicationIconImage(scr, pixmap); WMReleasePixmap(pixmap);
|
||||
panel = WMGetColorPanel(scr);
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
|
||||
|
||||
|
||||
|
||||
#include "../src/config.h"
|
||||
#include "WINGsP.h"
|
||||
|
||||
#ifdef SHAPE
|
||||
#include <X11/extensions/shape.h>
|
||||
#endif
|
||||
|
||||
|
||||
typedef struct W_Balloon {
|
||||
@@ -434,8 +436,10 @@ showText(Balloon *bPtr, int x, int y, int h, int w, char *text)
|
||||
|
||||
XFreePixmap(dpy, pixmap);
|
||||
|
||||
#ifdef SHAPE
|
||||
XShapeCombineMask(dpy, bPtr->view->window, ShapeBounding, 0, 0, mask,
|
||||
ShapeSet);
|
||||
#endif
|
||||
XFreePixmap(dpy, mask);
|
||||
|
||||
W_MoveView(bPtr->view, bx, by);
|
||||
|
||||
1027
WINGs/wcolorpanel.c
1027
WINGs/wcolorpanel.c
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user