diff options
Diffstat (limited to 'vwm.h')
| -rw-r--r-- | vwm.h | 28 |
1 files changed, 15 insertions, 13 deletions
@@ -8,14 +8,14 @@ #include "list.h" -#define VWM_ERROR(fmt, args...) fprintf(stderr, "%s:%i\t%s() "fmt"\n", __FILE__, __LINE__, __FUNCTION__, ##args) -#define VWM_PERROR(fmt, args...) fprintf(stderr, "%s:%i\t%s() "fmt"; %s\n", __FILE__, __LINE__, __FUNCTION__, ##args, strerror(errno)) -#define VWM_BUG(fmt, args...) fprintf(stderr, "BUG %s:%i\t%s() "fmt"; %s\n", __FILE__, __LINE__, __FUNCTION__, ##args, strerror(errno)) +#define VWM_ERROR(fmt, args...) fprintf(stderr, "%s:%i\t%s() "fmt"\n", __FILE__, __LINE__, __FUNCTION__, ##args) +#define VWM_PERROR(fmt, args...) fprintf(stderr, "%s:%i\t%s() "fmt"; %s\n", __FILE__, __LINE__, __FUNCTION__, ##args, strerror(errno)) +#define VWM_BUG(fmt, args...) fprintf(stderr, "BUG %s:%i\t%s() "fmt"; %s\n", __FILE__, __LINE__, __FUNCTION__, ##args, strerror(errno)) #ifdef TRACE -#define VWM_TRACE(fmt, args...) fprintf(stderr, "%s:%i\t%s() "fmt"\n", __FILE__, __LINE__, __FUNCTION__, ##args) +#define VWM_TRACE(fmt, args...) fprintf(stderr, "%s:%i\t%s() "fmt"\n", __FILE__, __LINE__, __FUNCTION__, ##args) #else -#define VWM_TRACE(fmt, args...) +#define VWM_TRACE(fmt, args...) do { } while(0) #endif typedef struct _vwm_box_t { @@ -24,26 +24,28 @@ typedef struct _vwm_box_t { } vwm_box_t; typedef struct _vwm_desktop_t { - list_head_t desktops; /* global list of (virtual) desktops */ - list_head_t desktops_mru; /* global list of (virtual) desktops in MRU order */ - char *name; /* name of the desktop (TODO) */ - struct _vwm_window_t *focused_window; /* the focused window on this virtual desktop */ + list_head_t desktops; /* global list of (virtual) desktops */ + list_head_t desktops_mru; /* global list of (virtual) desktops in MRU order */ + char *name; /* name of the desktop (TODO) */ + struct _vwm_window_t *focused_window; /* the focused window on this virtual desktop */ } vwm_desktop_t; typedef struct _vwm_window_t { list_head_t windows; /* global list of managed client windows */ - struct _vwm_desktop_t *desktop; /* desktop this window belongs to currently */ + vwm_desktop_t *desktop; /* desktop this window belongs to currently */ char *name; /* client name */ - vwm_box_t client; /* box of the configured client window relative to the root */ + vwm_box_t client; /* box of the client-configured window relative to the root */ + vwm_box_t config; /* box for the current window configuration maintained in handling of ConfigureNotify events */ Window window; /* the X window being managed by vwm */ XSizeHints *hints; /* hints the client supplied */ long hints_supplied; /* bitfield reflecting the hints the client supplied */ - unsigned int fullscreened:2; /* is the window fullscreened (1)? is the window "allscreened" with the border obscured (2)? */ - unsigned int mapped:1; /* has mapping been requested on the window? */ + unsigned int autoconfigured:3; /* autoconfigured window states (none/quarter/half/full/all) */ + unsigned int unmapping:1; /* is the window being unmapped? (by vwm) */ + unsigned int configuring:1; /* is the window being configured/placed? (by vwm) */ unsigned int shelved:1; /* is the window shelved? */ } vwm_window_t; |