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.432 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 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 {
… …
967rxvt_term::flush () 975rxvt_term::flush ()
968{ 976{
969 flush_ev.stop (); 977 flush_ev.stop ();
970 978
971#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
973 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
974// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
975 scr_touch (false); 984 scr_touch (false);
976 } 985 }
977#endif 986#endif
978 987
… …
1024 } 1033 }
1025 1034
1026 display->flush (); 1035 display->flush ();
1027} 1036}
1028 1037
1029/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1030void 1039void
1031rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1032{ 1041{
1033 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1128 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1138 // 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 1139 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1141 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1142 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1143 // we just nanosleep a bit and hope for the best.
1135 1144
1136 struct timespec ts = { 0, 1000 }; 1145 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1138 1147
… …
1422 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1432 focus_out ();
1424 break; 1433 break;
1425 1434
1426 case ConfigureNotify: 1435 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1431 { 1437 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1439 ;
1434 1440
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1468
1463 break; 1469 break;
1464 1470
1465 case SelectionClear: 1471 case SelectionClear:
1466 selection_clear (); 1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1473 break;
1468 1474
1469 case SelectionNotify: 1475 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1476 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1475 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1476 break; 1482 break;
1477 1483
1478 case MapNotify: 1484 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1486 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1487 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1490 * reparenting.
1485 * We should not render background immidiately, as there could be several 1491 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1492 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1493 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1494 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1495 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1496 * of ConfigureNotifys for the best results.
… …
1861 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1865 { 1871 {
1866 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1867 MEvent.clicks++; 1873 MEvent.clicks++;
1868 1874
1869 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1870 { 1876 {
1871 /* only report double clicks */ 1877 /* only report double clicks */
… …
2142 selection_make (ev.time); 2148 selection_make (ev.time);
2143 break; 2149 break;
2144 2150
2145 case Button2: 2151 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2154 break;
2149 2155
2150#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2151 case Button4: 2157 case Button4:
2152 case Button5: 2158 case Button5:
… …
3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3229 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3224 */ 3230 */
3225void 3231void
3226rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3227{ 3233{
3228 char *s;
3229 unicode_t eh;
3230
3231 /* 3234 /*
3232 * Not handled yet 3235 * Not handled yet
3233 */ 3236 */
3237
3238 unicode_t eh;
3234 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3235 if (s) 3240 if (s)
3236 free (s); 3241 free (s);
3237 3242
3238 return; 3243 return;
3239} 3244}
… …
3243 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3244 */ 3249 */
3245void 3250void
3246rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3247{ 3252{
3248 unicode_t ch, eh;
3249 int arg; 3253 int arg;
3250 3254
3251 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3252 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3254 3258
3255 if (ch == ';') 3259 if (ch == ';')
3256 { 3260 {
3261 unicode_t eh;
3257 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3258 3263
3259 if (s) 3264 if (s)
3260 { 3265 {
3261 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
… …
3336 3341
3337 XFree (value); 3342 XFree (value);
3338 } 3343 }
3339 else 3344 else
3340 { 3345 {
3341 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3346 char *eq = strchr (str, '=');
3342 3347
3343 if (eq) 3348 if (eq)
3344 { 3349 {
3345 *eq = 0; 3350 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3392 break;
3388 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3395 break;
3396#ifdef OPTION_HC
3397 case XTerm_Color_HC:
3398 process_color_seq (op, Color_HC, str, resp);
3399 break;
3400 case XTerm_Color_HTC:
3401 process_color_seq (op, Color_HTC, str, resp);
3402 break;
3403#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3398 break; 3407 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3402 break; 3410 break;
3403 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
… …
3429 case Rxvt_Pixmap: 3437 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3438 if (!strcmp (str, "?"))
3431 { 3439 {
3432 char str[256]; 3440 char str[256];
3433 3441
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3442 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3445 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3446 }
3439 else 3447 else
3440 { 3448 {
3441 int changed = 0; 3449 int changed = 0;
3442 3450
3443 if (*str != ';') 3451 if (*str != ';')
3444 { 3452 {
3445 /* reset to default scaling :*/
3446 bgPixmap.unset_geometry ();
3447 if (bgPixmap.set_file (str)) /* change pixmap */ 3453 if (bgPixmap.set_file (str)) /* change pixmap */
3448 changed++; 3454 changed++;
3449 str = strchr (str, ';'); 3455 str = strchr (str, ';');
3450 if (str == NULL) 3456 if (str == NULL)
3451 bgPixmap.set_defaultGeometry (); 3457 bgPixmap.set_defaultGeometry ();
3458 else
3459 bgPixmap.set_geometry (str+1);
3452 } 3460 }
3453 3461 else
3454 while (str)
3455 { 3462 {
3456 str++; 3463 str++;
3457 if (bgPixmap.set_geometry (str)) 3464 if (bgPixmap.set_geometry (str, true))
3458 changed++; 3465 changed++;
3459 str = strchr (str, ';');
3460 } 3466 }
3461 3467
3462 if (changed) 3468 if (changed)
3463 update_background (); 3469 update_background ();
3464 } 3470 }
… …
3571 { 3577 {
3572 if (mode == 'r') 3578 if (mode == 'r')
3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3579 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574 else 3580 else
3575 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3581 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3582
3576 set_privmode (bit, state); 3583 set_privmode (bit, state);
3577 } 3584 }
3578 3585
3579 return state; 3586 return state;
3580} 3587}
… …
3599 { 6, PrivMode_relOrigin }, // DECOM 3606 { 6, PrivMode_relOrigin }, // DECOM
3600 { 7, PrivMode_Autowrap }, // DECAWM 3607 { 7, PrivMode_Autowrap }, // DECAWM
3601 // 8, auto-repeat keys // DECARM 3608 // 8, auto-repeat keys // DECARM
3602 { 9, PrivMode_MouseX10 }, 3609 { 9, PrivMode_MouseX10 },
3603 // 18 end FF to printer after print screen 3610 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region 3611 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3612 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3613#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3614 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3615#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

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