ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.204 by root, Wed Jul 13 02:47:02 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
52 52
53#ifdef KEYSYM_RESOURCE 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 54# include "keyboard.h"
55#endif 55#endif
56 56
57#include <cwchar>
58#include <csignal> 57#include <csignal>
59 58
60/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
61 60
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 119 XK_Print, 0x2399,
121 120
122 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
124 0, 131 0,
125}; 132};
126 133
127void 134void
128rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
156void 163void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
158{ 165{
159 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
163 172
164#if ENABLE_COMBINING 173#if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
166 { 175 {
167 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
176 alloc = 0; 185 alloc = 0;
177 chr = &ch2; 186 chr = &ch2;
178 len = 1; 187 len = 1;
179 } 188 }
180 189
181 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
182 191
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
184 193
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 195
… …
199#endif 208#endif
200 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
202 } 211 }
203 212
204 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
205 216
206#if ENABLE_COMBINING 217#if ENABLE_COMBINING
207 if (alloc) 218 if (alloc)
208 delete [] alloc; 219 delete [] alloc;
209#endif 220#endif
… …
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
279 * 290 *
280 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
281 */ 292 */
282 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
285 296
286 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
287 { 298 {
288 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
309 320
310 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
314 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
317 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 331 SET_LOCALE (locale);
319 332
320 if (status_return == XLookupChars 333 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
513 else 526 else
514 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
515 break; 528 break;
516#endif 529#endif
517#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
518 case XK_Delete: 541 case XK_Delete:
519 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
520 break; 543 break;
521#endif 544#endif
522 case XK_Tab: 545 case XK_Tab:
… …
625#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
626 case XK_KP_Begin: 649 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
628 break; 651 break;
629 652
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 653#endif
638 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
673 break; 689 break;
674 690
675 case XK_Find: 691 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
677 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
678 case XK_Insert: 705 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
680 break; 707 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 709 case DXK_Remove:
… …
1309 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1310 break; 1337 break;
1311 1338
1312 case ClientMessage: 1339 case ClientMessage:
1313 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1314 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1315 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1316#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1317 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1318 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1320 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1321 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1322 { 1367 {
1323 /* Get Dnd data */ 1368 /* Get Dnd data */
1324 Atom ActualType; 1369 Atom ActualType;
1325 int ActualFormat; 1370 int ActualFormat;
1326 unsigned char *data; 1371 unsigned char *data;
… …
1369 break; 1414 break;
1370 } 1415 }
1371 break; 1416 break;
1372 1417
1373 case FocusIn: 1418 case FocusIn:
1374 if (!TermWin.focus) 1419 focus_in ();
1375 {
1376 TermWin.focus = 1;
1377 want_refresh = 1;
1378#ifdef USE_XIM
1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1382 XSetICFocus (Input_Context);
1383 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1395#endif
1396
1397 }
1398 break; 1420 break;
1399 1421
1400 case FocusOut: 1422 case FocusOut:
1401 if (TermWin.focus) 1423 focus_out ();
1402 {
1403 TermWin.focus = 0;
1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1412#ifdef USE_XIM
1413 if (Input_Context != NULL)
1414 XUnsetICFocus (Input_Context);
1415#endif
1416#ifdef CURSOR_BLINK
1417 if (options & Opt_cursorBlink)
1418 cursor_blink_ev.stop ();
1419 hidden_cursor = 0;
1420#endif
1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1428 }
1429 break; 1424 break;
1430 1425
1431 case ConfigureNotify: 1426 case ConfigureNotify:
1432 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1433 { 1428 {
… …
1647 scr_refresh (refresh_type); 1642 scr_refresh (refresh_type);
1648 refresh_limit = 0; 1643 refresh_limit = 0;
1649 scrollbar_show (1); 1644 scrollbar_show (1);
1650 } 1645 }
1651 break; 1646 break;
1647 }
1648}
1649
1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#ifdef USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#ifdef CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#ifdef OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#ifdef USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#ifdef CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#ifdef OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1652 } 1708 }
1653} 1709}
1654 1710
1655#if TRANSPARENT 1711#if TRANSPARENT
1656void 1712void
… …
2581 // some window managers resize the window early, and these programs 2637 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2638 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2639 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2640 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2641 // resized.
2586 if (seen_resize) 2642 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2643 kill (-cmd_pid, SIGWINCH);
2588 } 2644 }
2589 2645
2590 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2648 bool refreshnow = false;
2593 int nlines = 0; 2649 int nlines = 0;
2594 unicode_t *str = buf; 2650 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2595 2652
2596 for (;;) 2653 for (;;)
2597 { 2654 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2656 break;
2600 2657
2601 *str++ = ch; 2658 *str++ = ch;
2602 2659
2603 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2604 { 2661 {
2605 nlines++; 2662 nlines++;
2606 refresh_count++; 2663 refresh_count++;
2607 2664
2608 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
… …
2617 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= TermWin.nrow - 1)
2618 { 2675 {
2619 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2620 nlines = 0; 2677 nlines = 0;
2621 str = buf; 2678 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ);
2622 } 2680 }
2623 }
2624 2681
2625 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2626 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2627 ch = NOCHAR; 2686 ch = NOCHAR;
2628 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2691 }
2692
2629 } 2693 }
2630 2694
2631 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2696 ch = next_char ();
2633 } 2697 }
… …
3177 { 3241 {
3178 switch (priv) 3242 switch (priv)
3179 { 3243 {
3180 case '>': 3244 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3245 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3247 break;
3184 case '?': 3248 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3250 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3251 break;
… …
3538 else if (ch < 0x20) 3602 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3540 3604
3541 seen_esc = false; 3605 seen_esc = false;
3542 3606
3543 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3608 // stop at some sane length
3545 return NULL; 3609 return NULL;
3546 3610
3547 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3616 set_window_color (color, str); 3680 set_window_color (color, str);
3617} 3681}
3618 3682
3619/* 3683/*
3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3621 * 0 = change iconName/title
3622 * 1 = change iconName
3623 * 2 = change title
3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
3627 * 12 = change text color
3628 * 13 = change mouse foreground color
3629 * 17 = change highlight character colour
3630 * 18 = change bold character color
3631 * 19 = change underlined character color
3632 * 46 = change logfile (not implemented)
3633 * 50 = change font
3634 *
3635 * rxvt extensions:
3636 * 20 = bg pixmap
3637 * 39 = change default fg color
3638 * 49 = change default bg color
3639 * 55 = dump scrollback buffer and all of screen
3640 * 701 = change locale
3641 * 702 = find font
3642 * 703 = menu
3643 */ 3685 */
3644void 3686void
3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3646{ 3688{
3647 int changed = 0; 3689 int changed = 0;
… …
3746 break; 3788 break;
3747#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3748 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break; 3792 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3754 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756 break; 3795 break;
3757 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3760#endif 3802#endif
3761#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764 check_our_parents (); 3806 check_our_parents ();
3765 if (am_transparent) 3807 if (am_transparent)
3766 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3767 break; 3809 break;
3768#endif 3810#endif
… …
3802 3844
3803 case XTerm_logfile: 3845 case XTerm_logfile:
3804 // TODO, when secure mode? 3846 // TODO, when secure mode?
3805 break; 3847 break;
3806 3848
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 {
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break;
3866#endif
3807 case XTerm_font: 3867 case XTerm_font:
3808 op = URxvt_font; 3868 op = URxvt_font;
3809 case URxvt_font: 3869 case URxvt_font:
3810#if ENABLE_STYLES 3870#if ENABLE_STYLES
3811 case URxvt_boldFont: 3871 case URxvt_boldFont:
… …
3826 set_fonts (); 3886 set_fonts ();
3827 } 3887 }
3828 break; 3888 break;
3829 3889
3830#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3831 case XTerm_locale: 3891 case URxvt_locale:
3832 if (query) 3892 if (query)
3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3834 else 3894 else
3835 { 3895 {
3836 set_locale (str); 3896 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8); 3897 pty.set_utf8_mode (enc_utf8);
3838# ifdef USE_XIM
3839 im_cb (); 3898 init_xlocale ();
3840# endif
3841 } 3899 }
3842 break; 3900 break;
3843#endif
3844 3901
3845#ifdef MENUBAR 3902 case URxvt_view_up:
3846 case XTerm_Menu: 3903 case URxvt_view_down:
3847 if (options & Opt_insecure) 3904 int lines = atoi (str);
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3849 break; 3906 if (lines)
3850#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 { 3908 else
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3909 {
3857 scr_dump (fd); 3910 scr_erase_savelines ();
3858 close (fd);
3859 } 3911 }
3860 } 3912
3861 break; 3913 break;
3862#endif 3914#endif
3863 } 3915 }
3864} 3916}
3865/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines