X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=sys.h;h=8a21aef6f8315ccc27fd35ec84e24dde33e76cea;hp=0c6dfe609b59475749f9f2c83f01819f05c0de9b;hb=20508b0053a5925ca15f17813ca9176659d06ae1;hpb=eefa2034ad0f5c2ef5eb478984cfc53a6a40c6b7 diff --git a/sys.h b/sys.h index 0c6dfe6..8a21aef 100644 --- a/sys.h +++ b/sys.h @@ -1,18 +1,16 @@ /* - * Copyright (C) 2011 Andy Spencer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * Copyright (c) 2011, Andy Spencer + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF */ /* Windowing system interface: @@ -26,41 +24,53 @@ * and control windows. */ +/* Window states */ +typedef enum { + ST_SHOW, // show as regular window + ST_FULL, // fullscreen/maximized + ST_SHADE, // show titlebar only + ST_ICON, // iconified/minimized + ST_HIDE, // completely hidden + ST_CLOSE, // close the window +} state_t; + /* Basic window type */ typedef struct win_sys win_sys_t; typedef struct win_wm win_wm_t; typedef struct { int x, y, z; int w, h; + state_t state; win_sys_t *sys; win_wm_t *wm; } win_t; /* Generic key codes, also used for some other events * Keys map to their Unicode value */ -typedef enum { - key_alert = '\a', - key_backspace = '\b', - key_formfeed = '\f', - key_newline = '\n', - key_return = '\r', - key_tab = '\t', - key_vtab = '\v', - key_singlequote = '\'', - key_doublequote = '\"', - key_backslash = '\\', - key_question = '\?', - key_none = 0xF0000, // unused Unicode space - key_mouse0, key_mouse1, key_mouse2, key_mouse3, - key_mouse4, key_mouse5, key_mouse6, key_mouse7, - key_left, key_right, key_up, key_down, - key_home, key_end, key_pageup, key_pagedown, - key_f1, key_f2, key_f3, key_f4, - key_f5, key_f6, key_f7, key_f8, - key_f9, key_f10, key_f11, key_f12, - key_alt, key_ctrl, key_shift, key_win, - key_enter, key_leave, key_focus, key_unfocus, -} Key_t; +typedef int event_t; +enum { + EV_ALERT = '\a', + EV_BACKSPACE = '\b', + EV_FORMFEED = '\f', + EV_NEWLINE = '\n', + EV_RETURN = '\r', + EV_TAB = '\t', + EV_VTAB = '\v', + EV_SINGLEQUOTE = '\'', + EV_DOUBLEQUOTE = '\"', + EV_BACKSLASH = '\\', + EV_QUESTION = '\?', + EV_NONE = 0xF0000, // unused Unicode space + EV_MOUSE0, EV_MOUSE1, EV_MOUSE2, EV_MOUSE3, + EV_MOUSE4, EV_MOUSE5, EV_MOUSE6, EV_MOUSE7, + EV_LEFT, EV_RIGHT, EV_UP, EV_DOWN, + EV_HOME, EV_END, EV_PAGEUP, EV_PAGEDOWN, + EV_F1, EV_F2, EV_F3, EV_F4, + EV_F5, EV_F6, EV_F7, EV_F8, + EV_F9, EV_F10, EV_F11, EV_F12, + EV_ALT, EV_CTRL, EV_SHIFT, EV_WIN, + EV_ENTER, EV_LEAVE, EV_FOCUS, EV_UNFOCUS, +}; /* Key modifiers, up is for button release */ typedef struct { @@ -80,15 +90,6 @@ typedef struct { } ptr_t; #define PTR(...) ((ptr_t){__VA_ARGS__}) -/* Window states */ -typedef enum { - st_show, // show as regular window - st_full, // fullscreen/maximized - st_shade, // show titlebar only - st_icon, // iconified/minimized - st_hide, // completely hidden -} state_t; - /* Move the window to the specified location and set it's * geometry. The position and size include borders and @@ -105,12 +106,12 @@ void sys_focus(win_t *win); /* Set the windows drawing state */ void sys_show(win_t *win, state_t st); -/* Start watching for a key events. The sys subsequently - * calls wm_handle_key whenever the event occurs. */ -void sys_watch(win_t *win, Key_t key, mod_t mod); +/* Start watching for an event. The sys subsequently + * calls wm_handle_event whenever the event occurs. */ +void sys_watch(win_t *win, event_t ev, mod_t mod); -/* Stop watching a key event */ -void sys_unwatch(win_t *win, Key_t key, mod_t mod); +/* Stop watching an event */ +void sys_unwatch(win_t *win, event_t event, mod_t mod); /* Return a list of windows representing the geometry of the * physical displays attached to the computer. */ @@ -121,3 +122,9 @@ win_t *sys_init(void); /* Starts the main loop */ void sys_run(win_t *root); + +/* Exit main loop */ +void sys_exit(void); + +/* Free all static data, for memory debugging */ +void sys_free(win_t *root);