diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2024-05-05 10:59:11 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-05-05 10:59:11 +0200 |
| commit | ed85f3d22352c8e469ed1e386af3926b4d63efcd (patch) | |
| tree | 2162ff552f17fdd9f6c6eba479fa1f2498f99d19 /src/screen.h | |
| parent | 1e866201f1ccf8fa3bb22c6f5fa723b26c86dbe1 (diff) | |
| parent | 79b0987e63daff97ce9ee1dce883df13668a80c6 (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Diffstat (limited to 'src/screen.h')
| -rw-r--r-- | src/screen.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/screen.h b/src/screen.h index 39603df..d8bf996 100644 --- a/src/screen.h +++ b/src/screen.h @@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group. * ***********************************************************************/ -#ifndef _SCREEN_ -#define _SCREEN_ +#ifndef SCREEN_H +#define SCREEN_H #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -56,7 +56,7 @@ typedef struct _TitlebarPixmaps { Pixmap resize; Pixmap question; Pixmap menu; - Pixmap delete; + Pixmap remove; } TitlebarPixmaps; typedef struct ScreenInfo { @@ -251,11 +251,9 @@ typedef struct ScreenInfo { FuncKey FuncKeyRoot; } ScreenInfo; -extern int MultiScreen; extern int NumScreens; extern ScreenInfo **ScreenList; extern ScreenInfo *Scr; -extern int FirstScreen; #define PPOS_OFF 0 #define PPOS_ON 1 @@ -263,4 +261,4 @@ extern int FirstScreen; /* may eventually want an option for having the PPosition be the initial location for the drag lines */ -#endif /* _SCREEN_ */ +#endif /* SCREEN_H */ |