summaryrefslogtreecommitdiff
path: root/app/cwm/calmwm.h
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2013-06-17 17:11:11 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2013-06-17 17:11:11 +0000
commitf232ddb8880b9776320a2e9ac2c6175930fd5ae2 (patch)
tree12afe12a84b0cc0221883c31199e3f789b363d10 /app/cwm/calmwm.h
parent60019f896f7f417f8280eaeb9045d7e03fafa75e (diff)
move Cursors into conf.
Diffstat (limited to 'app/cwm/calmwm.h')
-rw-r--r--app/cwm/calmwm.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 70ed03a0c..d3398d9c9 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: calmwm.h,v 1.212 2013/06/10 21:37:30 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.213 2013/06/17 17:11:10 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -85,6 +85,15 @@ union arg {
int i;
};
+enum cursor_font {
+ CF_DEFAULT,
+ CF_MOVE,
+ CF_NORMAL,
+ CF_QUESTION,
+ CF_RESIZE,
+ CF_NITEMS
+};
+
enum color {
CWM_COLOR_BORDER_ACTIVE,
CWM_COLOR_BORDER_INACTIVE,
@@ -294,6 +303,7 @@ struct conf {
char known_hosts[MAXPATHLEN];
#define CONF_FONT "sans-serif:pixelsize=14:bold"
char *font;
+ Cursor cursor[CF_NITEMS];
};
/* MWM hints */
@@ -437,6 +447,7 @@ void conf_bindname(struct conf *, char *, char *);
void conf_clear(struct conf *);
void conf_client(struct client_ctx *);
void conf_cmd_add(struct conf *, char *, char *);
+void conf_cursor(struct conf *);
void conf_grab_kbd(Window);
void conf_grab_mouse(Window);
void conf_init(struct conf *);
@@ -498,12 +509,6 @@ int xasprintf(char **, const char *, ...)
/* Externs */
extern Display *X_Dpy;
-extern Cursor Cursor_default;
-extern Cursor Cursor_move;
-extern Cursor Cursor_normal;
-extern Cursor Cursor_question;
-extern Cursor Cursor_resize;
-
extern struct screen_ctx_q Screenq;
extern struct client_ctx_q Clientq;
extern struct conf Conf;