← Back to branch summary

~ctwm/ctwm/trunk

« back to all changes in this revision

Viewing changes to vscreen.c

  • Committer: Olaf 'Rhialto' Seibert
  • Date: 2014-09-18 21:47:53 UTC
  • mfrom: (335.1.9 smallbeer)
  • Revision ID: rhialto@falu.nl-20140918214753-agxgkfep0g0vag7q
Replace lots of calls to XInternAtom with a single XInternAtoms,
using the mk_atoms.sh generator.

Show diffs side-by-side

added added

removed removed

Lines of Context:
vscreen.c
27
27
#include <X11/Xatom.h>
28
28
#include <stdio.h>
29
29
#include "ctwm.h"
 
30
#include "ctwm_atoms.h"
30
31
#include "cursor.h"
31
32
#include "screen.h"
32
33
 
38
39
        unsigned long valuemask, attrmask;
39
40
        XSetWindowAttributes attributes;
40
41
        name_list *nptr;
41
 
        Atom _XA_WM_VIRTUALROOT = XInternAtom(dpy, "WM_VIRTUALROOT", False);
42
42
        Bool userealroot = True;
43
43
        VirtualScreen *vs00 = NULL;
44
44
 
108
108
 
109
109
                XSync(dpy, 0);
110
110
                XMapWindow(dpy, vs->window);
111
 
                XChangeProperty(dpy, vs->window, _XA_WM_VIRTUALROOT, XA_STRING, 8,
 
111
                XChangeProperty(dpy, vs->window, XA_WM_VIRTUALROOT, XA_STRING, 8,
112
112
                                PropModeReplace, (unsigned char *) "Yes", 4);
113
113
 
114
114
                vs->next = scr->vScreenList;
180
180
        Atom                actual_type;
181
181
        int                 actual_format;
182
182
 
183
 
        if(_XA_WM_CTWM_VSCREENMAP == None) {
 
183
        if(XA_WM_CTWM_VSCREENMAP == None) {
184
184
                return (False);
185
185
        }
186
 
        if(XGetWindowProperty(display, rootw, _XA_WM_CTWM_VSCREENMAP, 0L, 512,
 
186
        if(XGetWindowProperty(display, rootw, XA_WM_CTWM_VSCREENMAP, 0L, 512,
187
187
                              False, XA_STRING, &actual_type, &actual_format, &len,
188
188
                              &bytesafter, &prop) != Success) {
189
189
                return (False);
205
205
        int                         tally = 0;
206
206
        struct VirtualScreen        *vs;
207
207
 
208
 
        if(_XA_WM_CTWM_VSCREENMAP == None) {
 
208
        if(XA_WM_CTWM_VSCREENMAP == None) {
209
209
                return(False);
210
210
        }
211
211
 
224
224
                return(False);
225
225
        }
226
226
 
227
 
        XChangeProperty(display, rootw, _XA_WM_CTWM_VSCREENMAP, XA_STRING, 8,
 
227
        XChangeProperty(display, rootw, XA_WM_CTWM_VSCREENMAP, XA_STRING, 8,
228
228
                        PropModeReplace, (unsigned char *)buf, strlen(buf));
229
229
        return(True);
230
230
}