… | |
… | |
63 | /* SWCH () - `-' flag */ |
63 | /* SWCH () - `-' flag */ |
64 | #define SWCH(opt, option, flag, desc) \ |
64 | #define SWCH(opt, option, flag, desc) \ |
65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
65 | { (option), (Optflag_Switch | (flag)), -1, NULL, (opt), NULL, (desc)} |
66 | |
66 | |
67 | /* convenient macros */ |
67 | /* convenient macros */ |
68 | #define optList_strlen(i) \ |
68 | #define optList_isString(i) \ |
69 | (optList[i].flag ? 0 : (optList[i].arg ? strlen (optList[i].arg) : 1)) |
69 | (optList[i].flag == 0) |
70 | #define optList_isBool(i) \ |
70 | #define optList_isBool(i) \ |
71 | (optList[i].flag & Optflag_Boolean) |
71 | (optList[i].flag & Optflag_Boolean) |
72 | #define optList_isReverse(i) \ |
72 | #define optList_isReverse(i) \ |
73 | (optList[i].flag & Optflag_Reverse) |
73 | (optList[i].flag & Optflag_Reverse) |
74 | #define optList_size \ |
74 | #define optList_size \ |
… | |
… | |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
91 | STRG (Rs_geometry, NULL, "g", NULL, NULL), /* short form */ |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
92 | STRG (Rs_geometry, "geometry", "geometry", "geometry", "size (in characters) and position"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
93 | SWCH ("C", Opt_console, 0, "intercept console messages"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
94 | SWCH ("iconic", Opt_iconic, 0, "start iconic"), |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
95 | SWCH ("ic", Opt_iconic, 0, NULL), /* short form */ |
|
|
96 | STRG (Rs_chdir, "chdir", "cd", "string", "start shell in this directory"), |
96 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, 0, "reverse video"), |
97 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, 0, "login shell"), |
98 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, 0, "jump scrolling"), |
99 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | BOOL (Rs_skipScroll, "skipScroll", "ss", Opt_skipScroll, 0, "skip scrolling"), |
100 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
101 | BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, 0, "tab characters are pastable"), |
101 | #if HAVE_SCROLLBARS |
|
|
102 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
102 | RSTRG (Rs_scrollstyle, "scrollstyle", "mode"), |
103 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
103 | BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, 0, "scrollbar"), |
104 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
104 | BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, 0, "scrollbar right"), |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
105 | BOOL (Rs_scrollBar_floating, "scrollBar_floating", "st", Opt_scrollBar_floating, 0, "scrollbar without a trough"), |
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
106 | RSTRG (Rs_scrollBar_align, "scrollBar_align", "mode"), |
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
107 | STRG (Rs_scrollBar_thickness, "thickness", "sbt", "number", "scrollbar thickness/width in pixels"), |
108 | #endif |
|
|
109 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
108 | BOOL (Rs_scrollTtyOutput, "scrollTtyOutput", NULL, Opt_scrollTtyOutput, 0, NULL), |
110 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
109 | BOOL (Rs_scrollTtyOutput, NULL, "si", Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"), |
111 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
110 | BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"), |
112 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
111 | BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"), |
113 | #if ENABLE_TRANSPARENCY |
112 | #if ENABLE_TRANSPARENCY |
… | |
… | |
172 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
171 | RSTRG (Rs_color + Color_RV, "colorRV", "color"), |
173 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
172 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
174 | #if ENABLE_FRILLS |
173 | #if ENABLE_FRILLS |
175 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
174 | RSTRG (Rs_color + Color_underline, "underlineColor", "color"), |
176 | #endif |
175 | #endif |
177 | #ifdef KEEP_SCROLLCOLOR |
|
|
178 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
176 | RSTRG (Rs_color + Color_scroll, "scrollColor", "color"), |
|
|
177 | #ifdef RXVT_SCROLLBAR |
179 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
178 | RSTRG (Rs_color + Color_trough, "troughColor", "color"), |
180 | #endif /* KEEP_SCROLLCOLOR */ |
179 | #endif |
181 | #ifdef OPTION_HC |
180 | #ifdef OPTION_HC |
182 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
181 | STRG (Rs_color + Color_HC, "highlightColor", "hc", "color", "highlight color"), |
|
|
182 | RSTRG (Rs_color + Color_HTC, "highlightTextColor", "color"), |
183 | #endif |
183 | #endif |
184 | #ifndef NO_CURSORCOLOR |
184 | #ifndef NO_CURSORCOLOR |
185 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
185 | STRG (Rs_color + Color_cursor, "cursorColor", "cr", "color", "cursor color"), |
186 | /* command-line option = resource name */ |
186 | /* command-line option = resource name */ |
187 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
187 | RSTRG (Rs_color + Color_cursor2, "cursorColor2", "color"), |
… | |
… | |
190 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
190 | STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"), |
191 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
191 | STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"), |
192 | #ifdef BG_IMAGE_FROM_FILE |
192 | #ifdef BG_IMAGE_FROM_FILE |
193 | RSTRG (Rs_path, "path", "search path"), |
193 | RSTRG (Rs_path, "path", "search path"), |
194 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
194 | STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"), |
|
|
195 | # if ENABLE_EWMH |
|
|
196 | STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"), |
|
|
197 | # endif |
195 | #endif |
198 | #endif |
196 | /* fonts: command-line option = resource name */ |
199 | /* fonts: command-line option = resource name */ |
197 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
200 | STRG (Rs_font, "font", "fn", "fontname", "normal text font"), |
198 | #if ENABLE_STYLES |
201 | #if ENABLE_STYLES |
199 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
202 | STRG (Rs_boldFont, "boldFont", "fb", "fontname", "bold font"), |
… | |
… | |
215 | #if ENABLE_XEMBED |
218 | #if ENABLE_XEMBED |
216 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
219 | STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"), |
217 | #endif |
220 | #endif |
218 | #if XFT |
221 | #if XFT |
219 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
222 | STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"), |
|
|
223 | BOOL (Rs_buffered, "buffered", NULL, Opt_buffered, 0, NULL), |
220 | #endif |
224 | #endif |
221 | #if ENABLE_FRILLS |
225 | #if ENABLE_FRILLS |
222 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
226 | RSTRG (Rs_transient_for, "transient-for", "windowid"), |
223 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
227 | BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, 0, "set override-redirect on the terminal window"), |
224 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
228 | STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"), |
… | |
… | |
227 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
231 | STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL), |
228 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
232 | STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL), |
229 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
233 | STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"), |
230 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
234 | BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"), |
231 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
235 | STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"), |
|
|
236 | STRG (Rs_letterSpace, "letterSpace", "letsp", "number", "letter spacing adjustment"), |
232 | #endif |
237 | #endif |
233 | #ifdef BUILTIN_GLYPHS |
238 | #ifdef BUILTIN_GLYPHS |
234 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
239 | BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"), |
235 | #endif |
240 | #endif |
236 | #ifdef POINTER_BLANK |
241 | #ifdef POINTER_BLANK |
… | |
… | |
244 | #endif |
249 | #endif |
245 | #ifdef PRINTPIPE |
250 | #ifdef PRINTPIPE |
246 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
251 | RSTRG (Rs_print_pipe, "print-pipe", "string"), |
247 | #endif |
252 | #endif |
248 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
253 | STRG (Rs_modifier, "modifier", "mod", "modifier", "meta modifier = alt|meta|hyper|super|mod1|...|mod5"), |
249 | #ifdef CUTCHAR_RESOURCE |
|
|
250 | RSTRG (Rs_cutchars, "cutchars", "string"), |
254 | RSTRG (Rs_cutchars, "cutchars", "string"), |
251 | #endif /* CUTCHAR_RESOURCE */ |
|
|
252 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
255 | RSTRG (Rs_answerbackstring, "answerbackString", "string"), |
253 | #ifndef NO_SECONDARY_SCREEN |
256 | #ifndef NO_SECONDARY_SCREEN |
254 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
257 | BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"), |
255 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
258 | BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"), |
256 | #endif |
259 | #endif |
… | |
… | |
259 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
262 | RSTRG (Rs_perl_eval, "perl-eval", "perl-eval"), // "string", "code to be evaluated after all extensions have been loaded"),TODO |
260 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
263 | RSTRG (Rs_perl_ext_1, "perl-ext-common", "string"), //, "colon-separated list of perl extensions to enable"),TODO |
261 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
264 | STRG (Rs_perl_ext_2, "perl-ext", "pe", "string", "colon-separated list of perl extensions to enable for this instance"), |
262 | #endif |
265 | #endif |
263 | #if ISO_14755 |
266 | #if ISO_14755 |
|
|
267 | BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL), |
264 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
268 | BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL), |
265 | #endif |
269 | #endif |
266 | #ifdef HAVE_AFTERIMAGE |
270 | #ifdef HAVE_AFTERIMAGE |
267 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
271 | STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."), |
268 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"), |
272 | STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "gaussian blur radii to apply to the root background"), |
269 | #endif |
273 | #endif |
270 | INFO ("e", "command arg ...", "command to execute") |
274 | INFO ("e", "command arg ...", "command to execute") |
271 | }; |
275 | }; |
272 | |
276 | |
273 | #undef INFO |
277 | #undef INFO |
… | |
… | |
360 | "pointerBlank," |
364 | "pointerBlank," |
361 | #endif |
365 | #endif |
362 | #if defined(NO_RESOURCES) |
366 | #if defined(NO_RESOURCES) |
363 | "NoResources," |
367 | "NoResources," |
364 | #endif |
368 | #endif |
365 | "scrollbars=" |
369 | "scrollbars=plain" |
366 | #if !defined(HAVE_SCROLLBARS) |
|
|
367 | "NONE" |
|
|
368 | #else |
|
|
369 | # if defined(PLAIN_SCROLLBAR) |
|
|
370 | "plain" |
|
|
371 | # if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
372 | "+" |
|
|
373 | # endif |
|
|
374 | # endif |
|
|
375 | # if defined(RXVT_SCROLLBAR) |
370 | #if defined(RXVT_SCROLLBAR) |
376 | "rxvt" |
371 | "+rxvt" |
377 | # if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) |
|
|
378 | "+" |
|
|
379 | # endif |
|
|
380 | # endif |
372 | #endif |
381 | # if defined(NEXT_SCROLLBAR) |
373 | #if defined(NEXT_SCROLLBAR) |
382 | "NeXT" |
374 | "+NeXT" |
383 | # if defined(XTERM_SCROLLBAR) |
|
|
384 | "+" |
|
|
385 | # endif |
|
|
386 | # endif |
375 | #endif |
387 | # if defined(XTERM_SCROLLBAR) |
376 | #if defined(XTERM_SCROLLBAR) |
388 | "xterm" |
377 | "+xterm" |
389 | # endif |
|
|
390 | #endif |
378 | #endif |
391 | "\nUsage: "; /* Usage */ |
379 | "\nUsage: "; /* Usage */ |
392 | |
380 | |
393 | #define INDENT 18 |
381 | #define INDENT 18 |
394 | |
382 | |
… | |
… | |
413 | for (col = 1, i = 0; i < optList_size; i++) |
401 | for (col = 1, i = 0; i < optList_size; i++) |
414 | if (optList[i].desc != NULL) |
402 | if (optList[i].desc != NULL) |
415 | { |
403 | { |
416 | int len = 0; |
404 | int len = 0; |
417 | |
405 | |
418 | if (!optList_isBool (i)) |
406 | if (optList[i].arg) |
419 | { |
407 | len = strlen (optList[i].arg) + 1; |
420 | len = optList_strlen (i); |
|
|
421 | if (len > 0) |
|
|
422 | len++; /* account for space */ |
|
|
423 | } |
|
|
424 | #ifdef DEBUG_STRICT |
|
|
425 | assert (optList[i].opt != NULL); |
408 | assert (optList[i].opt != NULL); |
426 | #endif |
|
|
427 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
409 | len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0); |
428 | col += len; |
410 | col += len; |
429 | if (col > 79) |
411 | if (col > 79) |
430 | { |
412 | { |
431 | /* assume regular width */ |
413 | /* assume regular width */ |
432 | rxvt_log ("\n"); |
414 | rxvt_log ("\n"); |
433 | col = 1 + len; |
415 | col = 1 + len; |
434 | } |
416 | } |
435 | |
417 | |
436 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
418 | rxvt_log (" [-%s%s", (optList_isBool (i) ? "/+" : ""), optList[i].opt); |
437 | if (optList_strlen (i)) |
419 | if (optList[i].arg) |
438 | rxvt_log (" %s]", optList[i].arg); |
420 | rxvt_log (" %s]", optList[i].arg); |
439 | else |
421 | else |
440 | rxvt_log ("]"); |
422 | rxvt_log ("]"); |
441 | } |
423 | } |
442 | break; |
424 | break; |
… | |
… | |
445 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
427 | rxvt_log (" [options] [-e command args]\n\nwhere options include:\n"); |
446 | |
428 | |
447 | for (i = 0; i < optList_size; i++) |
429 | for (i = 0; i < optList_size; i++) |
448 | if (optList[i].desc != NULL) |
430 | if (optList[i].desc != NULL) |
449 | { |
431 | { |
450 | #ifdef DEBUG_STRICT |
|
|
451 | assert (optList[i].opt != NULL); |
432 | assert (optList[i].opt != NULL); |
452 | #endif |
|
|
453 | rxvt_log (" %s%s %-*s%s%s\n", |
433 | rxvt_log (" %s%s %-*s%s%s\n", |
454 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
434 | (optList_isBool (i) ? "-/+" : "-"), optList[i].opt, |
455 | (INDENT - strlen (optList[i].opt) |
435 | (INDENT - strlen (optList[i].opt) |
456 | + (optList_isBool (i) ? 0 : 2)), |
436 | + (optList_isBool (i) ? 0 : 2)), |
457 | (optList[i].arg ? optList[i].arg : ""), |
437 | (optList[i].arg ? optList[i].arg : ""), |
… | |
… | |
538 | if (entry < optList_size) |
518 | if (entry < optList_size) |
539 | { |
519 | { |
540 | if (optList_isReverse (entry)) |
520 | if (optList_isReverse (entry)) |
541 | flag = !flag; |
521 | flag = !flag; |
542 | |
522 | |
543 | if (optList_strlen (entry)) |
523 | if (optList_isString (entry)) |
544 | { |
524 | { |
545 | /* |
525 | /* |
546 | * special cases are handled in main.c:main () to allow |
526 | * special cases are handled in main.c:main () to allow |
547 | * X resources to set these values before we settle for |
527 | * X resources to set these values before we settle for |
548 | * default values |
528 | * default values |
… | |
… | |
575 | #ifdef KEYSYM_RESOURCE |
555 | #ifdef KEYSYM_RESOURCE |
576 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
556 | else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) |
577 | { |
557 | { |
578 | if (i+1 < argc) |
558 | if (i+1 < argc) |
579 | { |
559 | { |
580 | char *res = (char *)malloc (strlen (opt) + strlen (argv[++i]) + 6); |
560 | char *res = rxvt_temp_buf<char> (strlen (opt) + strlen (argv[++i]) + 6); |
581 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
561 | sprintf (res, "*.%s: %s\n", opt, argv[i]); |
582 | XrmPutLineResource (&option_db, res); |
562 | XrmPutLineResource (&option_db, res); |
583 | free (res); |
|
|
584 | } |
563 | } |
585 | } |
564 | } |
586 | #endif |
565 | #endif |
587 | else |
566 | else |
588 | { |
567 | { |
… | |
… | |
710 | // fallback on hexadecimal parsing |
689 | // fallback on hexadecimal parsing |
711 | char *end; |
690 | char *end; |
712 | sym = strtol (str, &end, 16); |
691 | sym = strtol (str, &end, 16); |
713 | if (*end) |
692 | if (*end) |
714 | return -1; |
693 | return -1; |
715 | } |
694 | } |
716 | |
695 | |
717 | keyboard->register_user_translation (sym, state, arg); |
696 | keyboard->register_user_translation (sym, state, arg); |
718 | return 1; |
697 | return 1; |
719 | } |
698 | } |
720 | |
699 | |