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.422 by root, Tue Oct 28 04:45:59 2008 UTC vs.
Revision 1.439 by sf-exg, Wed Feb 10 16:05:42 2010 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
505#ifdef PAGING_CONTEXT_LINES 511#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 512 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 513#else
508 lnsppg = nrow * 4 / 5; 514 lnsppg = nrow * 4 / 5;
509#endif 515#endif
516 max_it (lnsppg, 1);
517
510 if (keysym == XK_Prior) 518 if (keysym == XK_Prior)
511 { 519 {
512 scr_page (UP, lnsppg); 520 scr_page (UP, lnsppg);
513 return; 521 return;
514 } 522 }
… …
579 } 587 }
580 } 588 }
581 589
582#if ENABLE_FRILLS || ISO_14755 590#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 591 // ISO 14755 support
584 if (shft && ctrl) 592 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 593 {
586 int hv; 594 int hv;
587 595
588 if (iso14755buf & ISO_14755_51 596 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 597 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 627 scr_overlay_off ();
620# endif 628# endif
621 iso14755buf = 0; 629 iso14755buf = 0;
622 } 630 }
623 } 631 }
632 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 633 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 634 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 635 if (!(iso14755buf & ISO_14755_STARTED))
627 { 636 {
628 iso14755buf |= ISO_14755_STARTED; 637 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 638# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 639 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1471
1463 break; 1472 break;
1464 1473
1465 case SelectionClear: 1474 case SelectionClear:
1466 selection_clear (); 1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1476 break;
1468 1477
1469 case SelectionNotify: 1478 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1684#endif 1693#endif
1685 1694
1686 refresh_check (); 1695 refresh_check ();
1687} 1696}
1688 1697
1698#if ENABLE_FRILLS
1689void 1699void
1690rxvt_term::set_urgency (bool enable) 1700rxvt_term::set_urgency (bool enable)
1691{ 1701{
1692 if (enable == urgency_hint) 1702 if (enable == urgency_hint)
1693 return; 1703 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1708 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1709 urgency_hint = enable;
1700 } 1710 }
1701} 1711}
1712#endif
1702 1713
1703void 1714void
1704rxvt_term::focus_in () 1715rxvt_term::focus_in ()
1705{ 1716{
1706 if (!focus) 1717 if (!focus)
… …
2334 break; 2345 break;
2335 } 2346 }
2336 2347
2337 if (len == (size_t)-1) 2348 if (len == (size_t)-1)
2338 { 2349 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2350 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2351 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2352 }
2342 2353
2343 // assume wchar == unicode 2354 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2355 cmdbuf_ptr += len;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2700 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2702 break; /* steal obsolete ESC [ c */
2692 2703
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2705 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2706 process_csi_seq ();
2696 break; 2707 break;
2697 2708
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2709 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2710 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2711 process_osc_seq ();
2701 break; 2712 break;
2702 2713
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2714 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2715 case 'c':
2705 mbstate.reset (); 2716 mbstate.reset ();
2706 scr_poweron (); 2717 scr_poweron ();
2707 scrollBar.show (1); 2718 scrollBar.show (1);
2708 break; 2719 break;
… …
2763 2774
2764 nargs = 0; 2775 nargs = 0;
2765 2776
2766 priv = 0; 2777 priv = 0;
2767 ch = cmd_getc (); 2778 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2779 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2780 {
2770 /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2782 priv = ch;
2772 ch = cmd_getc (); 2783 ch = cmd_getc ();
2773 } 2784 }
2774 2785
2775 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
2829 2840
2830 case '?': 2841 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2844 break;
2845
2846 case '!':
2847 if (ch == CSI_70)
2848 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset ();
2851
2852 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2854
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2834 } 2857 }
2858 break;
2859 }
2860
2835 return; 2861 return;
2836 } 2862 }
2837 2863
2838 switch (ch) 2864 switch (ch)
2839 { 2865 {
… …
3268 3294
3269/* 3295/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3297 */
3272void 3298void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3299rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3300{
3275 int color; 3301 int color;
3276 char *buf, *name; 3302 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3303 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3304 int saveop = op;
… …
3319 3345
3320 XFree (value); 3346 XFree (value);
3321 } 3347 }
3322 else 3348 else
3323 { 3349 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3350 char *eq = strchr (str, '=');
3325 3351
3326 if (eq) 3352 if (eq)
3327 { 3353 {
3328 *eq = 0; 3354 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3355 set_utf8_property (display->atom (str), eq + 1);
… …
3385 break; 3411 break;
3386 case URxvt_Color_IT: 3412 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3413 process_color_seq (op, Color_IT, str, resp);
3388 break; 3414 break;
3389#endif 3415#endif
3416 case URxvt_Color_border:
3417 process_color_seq (op, Color_border, str, resp);
3418 break;
3390#if ENABLE_TRANSPARENCY 3419#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3420 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3421 process_color_seq (op, Color_tint, str, resp);
3393 { 3422 {
3394 bool changed = false; 3423 bool changed = false;
… …
3409 case Rxvt_Pixmap: 3438 case Rxvt_Pixmap:
3410 if (!strcmp (str, "?")) 3439 if (!strcmp (str, "?"))
3411 { 3440 {
3412 char str[256]; 3441 char str[256];
3413 3442
3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3443 sprintf (str, "[%dx%d+%d+%d]",
3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST); 3446 process_xterm_seq (XTerm_title, str, CHAR_ST);
3418 } 3447 }
3419 else 3448 else
… …
3569 static const struct 3598 static const struct
3570 { 3599 {
3571 const int argval; 3600 const int argval;
3572 const unsigned long bit; 3601 const unsigned long bit;
3573 } argtopriv[] = { 3602 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3603 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3604 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3605 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3606 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3607 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3608 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3609 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3610 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3612 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region
3584 { 25, PrivMode_VisibleCursor }, 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3617#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3620 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3621 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3622 // 45 margin bell NYI
3592 // 46 start logging 3623 // 46 start logging
3593 { 47, PrivMode_Screen }, 3624 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3626#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3627 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3628#endif
3598 { 1000, PrivMode_MouseX11 }, 3629 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3630 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3631 { 1003, PrivMode_MouseAnyEvent },
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3640 3671
3641 scr_touch (true); 3672 scr_touch (true);
3642 break; 3673 break;
3643#endif 3674#endif
3644 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3676 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3677 if (mode == 0)
3648 scr_cursor (RESTORE); 3678 scr_cursor (RESTORE);
3649 else if (mode == 1) 3679 else if (mode == 1)
3650 scr_cursor (SAVE); 3680 scr_cursor (SAVE);
… …
3663 */ 3693 */
3664 set_privmode (PrivMode_vt52, 1); 3694 set_privmode (PrivMode_vt52, 1);
3665 break; 3695 break;
3666 case 3: /* 80/132 */ 3696 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3697 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3699 break;
3673 case 4: /* smooth scrolling */ 3700 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3701 set_option (Opt_jumpScroll, !state);
3675 break; 3702 break;
3676 case 5: /* reverse video */ 3703 case 5: /* reverse video */
… …
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask; 3746 vt_emask_mouse = PointerMotionMask;
3720 } 3747 }
3721 else 3748 else
3722 vt_emask_mouse = NoEventMask; 3749 vt_emask_mouse = NoEventMask;
3750
3723 vt_select_input (); 3751 vt_select_input ();
3724 break; 3752 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3753 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3754 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3755 break;
3728 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3758 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3761 if (!state)
3734 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763
3735 scr_change_screen (state); 3764 scr_change_screen (state);
3736 break; 3765 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3766 case 1049: /* secondary screen w/ clearing first */
3767 if (option (Opt_secondaryScreen))
3768 if (state)
3769 scr_cursor (SAVE);
3770
3738 scr_change_screen (state); 3771 scr_change_screen (state);
3772
3739 if (option (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3774 if (state)
3741 scr_erase_screen (2); 3775 scr_erase_screen (2);
3776 else
3777 scr_cursor (RESTORE);
3742 break; 3778 break;
3743 default: 3779 default:
3744 break; 3780 break;
3745 } 3781 }
3746 } 3782 }

Diff Legend

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