Mercurial > mplayer.hg
comparison gui/wm/ws.h @ 33529:276eef06fb3d
Store icon data in a struct variable.
This is a preparation for differently sized icons to come.
author | ib |
---|---|
date | Tue, 14 Jun 2011 18:55:04 +0000 |
parents | 47b5846b20b6 |
children | 5bdc088113f7 |
comparison
equal
deleted
inserted
replaced
33528:6f20f2a42b76 | 33529:276eef06fb3d |
---|---|
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
20 */ | 20 */ |
21 | 21 |
22 #ifndef MPLAYER_GUI_WS_H | 22 #ifndef MPLAYER_GUI_WS_H |
23 #define MPLAYER_GUI_WS_H | 23 #define MPLAYER_GUI_WS_H |
24 | |
25 #include "gui/mplayer/widgets.h" | |
24 | 26 |
25 #include <X11/Xlib.h> | 27 #include <X11/Xlib.h> |
26 #include <X11/Xutil.h> | 28 #include <X11/Xutil.h> |
27 #include <X11/keysym.h> | 29 #include <X11/keysym.h> |
28 #include <X11/Xatom.h> | 30 #include <X11/Xatom.h> |
241 void wsWindowDecoration( wsTWindow * win, long d ); | 243 void wsWindowDecoration( wsTWindow * win, long d ); |
242 void wsSetLayer( Display * wsDisplay, Window win, int layer ); | 244 void wsSetLayer( Display * wsDisplay, Window win, int layer ); |
243 void wsFullScreen( wsTWindow * win ); | 245 void wsFullScreen( wsTWindow * win ); |
244 void wsPostRedisplay( wsTWindow * win ); | 246 void wsPostRedisplay( wsTWindow * win ); |
245 void wsSetShape( wsTWindow * win, char * data ); | 247 void wsSetShape( wsTWindow * win, char * data ); |
246 void wsSetIcon( Display * dsp, Window win, Pixmap icon, Pixmap mask ); | 248 void wsSetIcon( Display * dsp, Window win, guiIcon_t * icon ); |
247 | 249 |
248 // ---------------------------------------------------------------------------------------------- | 250 // ---------------------------------------------------------------------------------------------- |
249 // Draw string at x,y with fc ( foreground color ) and bc ( background color ). | 251 // Draw string at x,y with fc ( foreground color ) and bc ( background color ). |
250 // ---------------------------------------------------------------------------------------------- | 252 // ---------------------------------------------------------------------------------------------- |
251 void wsDrawString( wsTWindow win, int x, int y, char * str, int fc, int bc ); | 253 void wsDrawString( wsTWindow win, int x, int y, char * str, int fc, int bc ); |