diff options
| author | Dave Davenport <qball@gmpclient.org> | 2016-02-09 22:35:03 +0100 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2016-02-09 22:35:03 +0100 |
| commit | 2cd8888d2cd4e9f2aaa605c025d63344757ee563 (patch) | |
| tree | dd54696a80bde92d06b0245c6b04577d1e3d244e /include | |
| parent | f7e26326249a485cdeac82581a3d79fadac2e29e (diff) | |
| parent | 289795b22a2ab0bf3f24e514c50f43df860f2690 (diff) | |
Merge remote-tracking branch 'origin/master' into glib-loop
Diffstat (limited to 'include')
| -rw-r--r-- | include/textbox.h | 18 | ||||
| -rw-r--r-- | include/x11-helper.h | 1 |
2 files changed, 10 insertions, 9 deletions
diff --git a/include/textbox.h b/include/textbox.h index c321eb47..757b1c62 100644 --- a/include/textbox.h +++ b/include/textbox.h @@ -42,15 +42,15 @@ typedef struct typedef enum { - TB_AUTOHEIGHT = 1 << 0, - TB_AUTOWIDTH = 1 << 1, - TB_LEFT = 1 << 16, - TB_RIGHT = 1 << 17, - TB_CENTER = 1 << 18, - TB_EDITABLE = 1 << 19, - TB_MARKUP = 1 << 20, - TB_WRAP = 1 << 21, - TB_PASSWORD = 1 << 22, + TB_AUTOHEIGHT = 1 << 0, + TB_AUTOWIDTH = 1 << 1, + TB_LEFT = 1 << 16, + TB_RIGHT = 1 << 17, + TB_CENTER = 1 << 18, + TB_EDITABLE = 1 << 19, + TB_MARKUP = 1 << 20, + TB_WRAP = 1 << 21, + TB_PASSWORD = 1 << 22, } TextboxFlags; typedef enum diff --git a/include/x11-helper.h b/include/x11-helper.h index b075feeb..a3647b71 100644 --- a/include/x11-helper.h +++ b/include/x11-helper.h @@ -55,6 +55,7 @@ int window_get_cardinal_prop ( Display *display, Window w, Atom atom, unsigned l X ( _NET_WM_WINDOW_TYPE_NORMAL ), \ X ( _NET_WM_STATE_FULLSCREEN ), \ X ( _NET_WM_DESKTOP ), \ + X ( _NET_DESKTOP_VIEWPORT ), \ X ( CLIPBOARD ), \ X ( UTF8_STRING ), \ X ( _NET_WM_WINDOW_OPACITY ) |