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.425 by root, Wed Nov 5 12:28:15 2008 UTC vs.
Revision 1.451 by root, Sun May 23 00:37:19 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_idx (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
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420 426
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
431 { 431 {
… …
505#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 507#else
508 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
509#endif 509#endif
510 max_it (lnsppg, 1);
511
510 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
511 { 513 {
512 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
513 return; 515 return;
514 } 516 }
… …
579 } 581 }
580 } 582 }
581 583
582#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 585 // ISO 14755 support
584 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 587 {
586 int hv; 588 int hv;
587 589
588 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 621 scr_overlay_off ();
620# endif 622# endif
621 iso14755buf = 0; 623 iso14755buf = 0;
622 } 624 }
623 } 625 }
626 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
627 { 630 {
628 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 632# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 648 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 650 unsigned int newlen = 1;
648 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
649 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
650 { 658 {
651#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 660 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
654 { 662 {
… …
1024 } 1032 }
1025 1033
1026 display->flush (); 1034 display->flush ();
1027} 1035}
1028 1036
1029/* checks wether a refresh is requested and starts the refresh timer */ 1037/* checks whether a refresh is requested and starts the refresh timer */
1030void 1038void
1031rxvt_term::refresh_check () 1039rxvt_term::refresh_check ()
1032{ 1040{
1033 if (want_refresh && !flush_ev.is_active ()) 1041 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1042 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1136 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1137 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1138 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1139 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1140 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1141 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1142 // we just nanosleep a bit and hope for the best.
1135 1143
1136 struct timespec ts = { 0, 1000 }; 1144 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1145 nanosleep (&ts, 0);
1138 1146
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1470
1463 break; 1471 break;
1464 1472
1465 case SelectionClear: 1473 case SelectionClear:
1466 selection_clear (); 1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1475 break;
1468 1476
1469 case SelectionNotify: 1477 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1478 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1684#endif 1692#endif
1685 1693
1686 refresh_check (); 1694 refresh_check ();
1687} 1695}
1688 1696
1697#if ENABLE_FRILLS
1689void 1698void
1690rxvt_term::set_urgency (bool enable) 1699rxvt_term::set_urgency (bool enable)
1691{ 1700{
1692 if (enable == urgency_hint) 1701 if (enable == urgency_hint)
1693 return; 1702 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1707 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1708 urgency_hint = enable;
1700 } 1709 }
1701} 1710}
1711#endif
1702 1712
1703void 1713void
1704rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1705{ 1715{
1706 if (!focus) 1716 if (!focus)
… …
2140 selection_make (ev.time); 2150 selection_make (ev.time);
2141 break; 2151 break;
2142 2152
2143 case Button2: 2153 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2156 break;
2147 2157
2148#ifdef MOUSE_WHEEL 2158#ifdef MOUSE_WHEEL
2149 case Button4: 2159 case Button4:
2150 case Button5: 2160 case Button5:
… …
2334 break; 2344 break;
2335 } 2345 }
2336 2346
2337 if (len == (size_t)-1) 2347 if (len == (size_t)-1)
2338 { 2348 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2349 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2350 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2351 }
2342 2352
2343 // assume wchar == unicode 2353 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2354 cmdbuf_ptr += len;
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3231 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3232 */
3223void 3233void
3224rxvt_term::process_dcs_seq () 3234rxvt_term::process_dcs_seq ()
3225{ 3235{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3236 /*
3230 * Not handled yet 3237 * Not handled yet
3231 */ 3238 */
3239
3240 unicode_t eh;
3232 s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3233 if (s) 3242 if (s)
3234 free (s); 3243 free (s);
3235 3244
3236 return; 3245 return;
3237} 3246}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3250 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3251 */
3243void 3252void
3244rxvt_term::process_osc_seq () 3253rxvt_term::process_osc_seq ()
3245{ 3254{
3246 unicode_t ch, eh;
3247 int arg; 3255 int arg;
3248 3256
3249 ch = cmd_getc (); 3257 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3258 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3259 arg = arg * 10 + (ch - '0');
3252 3260
3253 if (ch == ';') 3261 if (ch == ';')
3254 { 3262 {
3263 unicode_t eh;
3255 char *s = get_to_st (eh); 3264 char *s = get_to_st (eh);
3256 3265
3257 if (s) 3266 if (s)
3258 { 3267 {
3259 process_xterm_seq (arg, s, eh); 3268 process_xterm_seq (arg, s, eh);
… …
3283 3292
3284/* 3293/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3294 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3295 */
3287void 3296void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3297rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3298{
3290 int color; 3299 int color;
3291 char *buf, *name; 3300 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3302 int saveop = op;
… …
3334 3343
3335 XFree (value); 3344 XFree (value);
3336 } 3345 }
3337 else 3346 else
3338 { 3347 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3348 char *eq = strchr (str, '=');
3340 3349
3341 if (eq) 3350 if (eq)
3342 { 3351 {
3343 *eq = 0; 3352 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3394 break;
3386 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3397 break;
3398#ifdef OPTION_HC
3399 case XTerm_Color_HC:
3400 process_color_seq (op, Color_HC, str, resp);
3401 break;
3402 case XTerm_Color_HTC:
3403 process_color_seq (op, Color_HTC, str, resp);
3404 break;
3405#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3406#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3396 break; 3409 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3410 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3411 process_color_seq (op, Color_UL, str, resp);
3400 break; 3412 break;
3401 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3403 break; 3415 break;
3404#endif 3416#endif
3417 case URxvt_Color_border:
3418 process_color_seq (op, Color_border, str, resp);
3419 break;
3405#if ENABLE_TRANSPARENCY 3420#if ENABLE_TRANSPARENCY
3406 case URxvt_Color_tint: 3421 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3422 process_color_seq (op, Color_tint, str, resp);
3408 { 3423 {
3409 bool changed = false; 3424 bool changed = false;
… …
3424 case Rxvt_Pixmap: 3439 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3440 if (!strcmp (str, "?"))
3426 { 3441 {
3427 char str[256]; 3442 char str[256];
3428 3443
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3444 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3447 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3448 }
3434 else 3449 else
… …
3566 { 3581 {
3567 if (mode == 'r') 3582 if (mode == 'r')
3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3569 else 3584 else
3570 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3585 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3586
3571 set_privmode (bit, state); 3587 set_privmode (bit, state);
3572 } 3588 }
3573 3589
3574 return state; 3590 return state;
3575} 3591}
… …
3593 { 5, PrivMode_rVideo }, // DECSCNM 3609 { 5, PrivMode_rVideo }, // DECSCNM
3594 { 6, PrivMode_relOrigin }, // DECOM 3610 { 6, PrivMode_relOrigin }, // DECOM
3595 { 7, PrivMode_Autowrap }, // DECAWM 3611 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, auto-repeat keys // DECARM 3612 // 8, auto-repeat keys // DECARM
3597 { 9, PrivMode_MouseX10 }, 3613 { 9, PrivMode_MouseX10 },
3598 // 18, 19 printing-related 3614 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region
3599 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3600#ifdef scrollBar_esc 3617#ifdef scrollBar_esc
3601 { scrollBar_esc, PrivMode_scrollBar }, 3618 { scrollBar_esc, PrivMode_scrollBar },
3602#endif 3619#endif
3603 { 35, PrivMode_ShiftKeys }, // rxvt extension 3620 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3656 3673
3657 scr_touch (true); 3674 scr_touch (true);
3658 break; 3675 break;
3659#endif 3676#endif
3660 case 1048: /* alternative cursor save */ 3677 case 1048: /* alternative cursor save */
3661 case 1049:
3662 if (option (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
3663 if (mode == 0) 3679 if (mode == 0)
3664 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
3665 else if (mode == 1) 3681 else if (mode == 1)
3666 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
… …
3742 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
3743 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
3744 break; 3760 break;
3745 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
3746 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3747 if (current_screen != PRIMARY) 3763 if (!state)
3748 scr_erase_screen (2); 3764 scr_erase_screen (2);
3749 3765
3750 scr_change_screen (state); 3766 scr_change_screen (state);
3751 break; 3767 break;
3752 case 1049: /* secondary screen w/ clearing first */ 3768 case 1049: /* secondary screen w/ clearing first */
3769 if (option (Opt_secondaryScreen))
3770 if (state)
3771 scr_cursor (SAVE);
3772
3753 scr_change_screen (state); 3773 scr_change_screen (state);
3774
3754 if (option (Opt_secondaryScreen)) 3775 if (option (Opt_secondaryScreen))
3755 if (current_screen != PRIMARY) 3776 if (state)
3756 scr_erase_screen (2); 3777 scr_erase_screen (2);
3778 else
3779 scr_cursor (RESTORE);
3757 break; 3780 break;
3758 default: 3781 default:
3759 break; 3782 break;
3760 } 3783 }
3761 } 3784 }

Diff Legend

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