comparison src/device-x.c @ 2:ac2d302a0011 r19-15b2

Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 27bc7f280385
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
60 60
61 Lisp_Object Vx_initial_argv_list; /* #### ugh! */ 61 Lisp_Object Vx_initial_argv_list; /* #### ugh! */
62 62
63 static XrmOptionDescRec emacs_options[] = 63 static XrmOptionDescRec emacs_options[] =
64 { 64 {
65 {"-geometry", ".geometry", XrmoptionSepArg, NULL}, 65 {(String)"-geometry", (String)".geometry", XrmoptionSepArg, NULL},
66 {"-iconic", ".iconic", XrmoptionNoArg, (XtPointer) "yes"}, 66 {(String)"-iconic", (String)".iconic", XrmoptionNoArg, (XtPointer) "yes"},
67 67
68 {"-internal-border-width", "*EmacsFrame.internalBorderWidth", XrmoptionSepArg, NULL}, 68 {(String)"-internal-border-width", (String)"*EmacsFrame.internalBorderWidth",
69 {"-ib", "*EmacsFrame.internalBorderWidth", XrmoptionSepArg, NULL}, 69 XrmoptionSepArg, NULL},
70 {"-scrollbar-width", "*EmacsFrame.scrollBarWidth", XrmoptionSepArg, NULL}, 70 {(String)"-ib", (String)"*EmacsFrame.internalBorderWidth", XrmoptionSepArg,
71 {"-scrollbar-height", "*EmacsFrame.scrollBarHeight", XrmoptionSepArg, NULL}, 71 NULL},
72 {(String)"-scrollbar-width", (String)"*EmacsFrame.scrollBarWidth",
73 XrmoptionSepArg, NULL},
74 {(String)"-scrollbar-height", (String)"*EmacsFrame.scrollBarHeight",
75 XrmoptionSepArg, NULL},
72 76
73 /* #### Beware! If the type of the shell changes, update this. */ 77 /* #### Beware! If the type of the shell changes, update this. */
74 {"-T", "*TopLevelEmacsShell.title", XrmoptionSepArg, NULL}, 78 {(String)"-T", (String)"*TopLevelEmacsShell.title", XrmoptionSepArg, NULL},
75 {"-wn", "*TopLevelEmacsShell.title", XrmoptionSepArg, NULL}, 79 {(String)"-wn", (String)"*TopLevelEmacsShell.title", XrmoptionSepArg, NULL},
76 {"-title", "*TopLevelEmacsShell.title", XrmoptionSepArg, NULL}, 80 {(String)"-title", (String)"*TopLevelEmacsShell.title", XrmoptionSepArg,
77 {"-iconname", "*TopLevelEmacsShell.iconName", XrmoptionSepArg, NULL}, 81 NULL},
78 {"-in", "*TopLevelEmacsShell.iconName", XrmoptionSepArg, NULL}, 82 {(String)"-iconname", (String)"*TopLevelEmacsShell.iconName",
79 {"-mc", "*pointerColor", XrmoptionSepArg, NULL}, 83 XrmoptionSepArg, NULL},
80 {"-cr", "*cursorColor", XrmoptionSepArg, NULL}, 84 {(String)"-in", (String)"*TopLevelEmacsShell.iconName", XrmoptionSepArg,
81 {"-fontset", "*FontSet", XrmoptionSepArg, NULL}, 85 NULL},
86 {(String)"-mc", (String)"*pointerColor", XrmoptionSepArg, NULL},
87 {(String)"-cr", (String)"*cursorColor", XrmoptionSepArg, NULL},
88 {(String)"-fontset", (String)"*FontSet", XrmoptionSepArg, NULL},
82 }; 89 };
83 90
84 static void validify_resource_string (char *str); 91 static void validify_resource_string (char *str);
85 92
86 /* Functions to synchronize mirroring resources and specifiers */ 93 /* Functions to synchronize mirroring resources and specifiers */
276 Xatoms_of_device_x (d); 283 Xatoms_of_device_x (d);
277 Xatoms_of_xselect (d); 284 Xatoms_of_xselect (d);
278 Xatoms_of_objects_x (d); 285 Xatoms_of_objects_x (d);
279 x_init_device_class (d); 286 x_init_device_class (d);
280 287
281 /* Run the the elisp side of the X device initialization. */ 288 /* Run the elisp side of the X device initialization. */
282 call0 (Qinit_pre_x_win); 289 call0 (Qinit_pre_x_win);
283 } 290 }
284 291
285 static void 292 static void
286 x_finish_init_device (struct device *d, Lisp_Object props) 293 x_finish_init_device (struct device *d, Lisp_Object props)
1185 { 1192 {
1186 struct device *d = decode_device(device); 1193 struct device *d = decode_device(device);
1187 CONST char *keysym_string; 1194 CONST char *keysym_string;
1188 KeySym keysym_KeySym; 1195 KeySym keysym_KeySym;
1189 KeySym *keysym_ptr, *keysym_last; 1196 KeySym *keysym_ptr, *keysym_last;
1190 int code, min_code, max_code, keysyms_per_code; 1197 int min_code, max_code, keysyms_per_code;
1191 1198
1192 if (!DEVICE_X_P (d)) 1199 if (!DEVICE_X_P (d))
1193 signal_simple_error ("Not an X device", device); 1200 signal_simple_error ("Not an X device", device);
1194 CHECK_STRING (keysym); 1201 CHECK_STRING (keysym);
1195 GET_C_STRING_CTEXT_DATA_ALLOCA (keysym, keysym_string); 1202 GET_C_STRING_CTEXT_DATA_ALLOCA (keysym, keysym_string);