Mercurial > hg > xemacs-beta
comparison src/device-x.c @ 149:538048ae2ab8 r20-3b1
Import from CVS: tag r20-3b1
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:36:16 +0200 |
parents | 8619ce7e4c50 |
children | 6b37e6ddd302 |
comparison
equal
deleted
inserted
replaced
148:f659db2a1f73 | 149:538048ae2ab8 |
---|---|
161 } | 161 } |
162 | 162 |
163 static void | 163 static void |
164 Xatoms_of_device_x (struct device *d) | 164 Xatoms_of_device_x (struct device *d) |
165 { | 165 { |
166 Display *display = DEVICE_X_DISPLAY (d); | 166 Display *D = DEVICE_X_DISPLAY (d); |
167 #define ATOM(x) XInternAtom (display, (x), False) | 167 |
168 | 168 DEVICE_XATOM_WM_PROTOCOLS (d) = XInternAtom (D, "WM_PROTOCOLS", False); |
169 DEVICE_XATOM_WM_PROTOCOLS (d) = ATOM ("WM_PROTOCOLS"); | 169 DEVICE_XATOM_WM_DELETE_WINDOW(d) = XInternAtom (D, "WM_DELETE_WINDOW",False); |
170 DEVICE_XATOM_WM_DELETE_WINDOW (d) = ATOM ("WM_DELETE_WINDOW"); | 170 DEVICE_XATOM_WM_SAVE_YOURSELF(d) = XInternAtom (D, "WM_SAVE_YOURSELF",False); |
171 DEVICE_XATOM_WM_SAVE_YOURSELF (d) = ATOM ("WM_SAVE_YOURSELF"); | 171 DEVICE_XATOM_WM_TAKE_FOCUS (d) = XInternAtom (D, "WM_TAKE_FOCUS", False); |
172 DEVICE_XATOM_WM_TAKE_FOCUS (d) = ATOM ("WM_TAKE_FOCUS"); | 172 DEVICE_XATOM_WM_STATE (d) = XInternAtom (D, "WM_STATE", False); |
173 DEVICE_XATOM_WM_STATE (d) = ATOM ("WM_STATE"); | |
174 } | 173 } |
175 | 174 |
176 static void | 175 static void |
177 sanity_check_geometry_resource (Display *dpy) | 176 sanity_check_geometry_resource (Display *dpy) |
178 { | 177 { |
279 GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir); | 278 GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir); |
280 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); | 279 sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); |
281 if (!access (path, R_OK)) | 280 if (!access (path, R_OK)) |
282 XrmCombineFileDatabase (path, &db, False); | 281 XrmCombineFileDatabase (path, &db, False); |
283 } | 282 } |
284 #endif | 283 #endif /* MULE */ |
285 | 284 |
286 if (NILP (DEVICE_NAME (d))) | 285 if (NILP (DEVICE_NAME (d))) |
287 DEVICE_NAME (d) = display; | 286 DEVICE_NAME (d) = display; |
288 | 287 |
289 /* We're going to modify the string in-place, so be a nice XEmacs */ | 288 /* We're going to modify the string in-place, so be a nice XEmacs */ |