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.443 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs.
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

… …
198 198
199 int width = 0; 199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len); 200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++) 201 for (int i = 0; i < len; i++)
202 { 202 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])]; 203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 204 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 206 }
207 207
208 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
… …
421 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
422 */ 422 */
423 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
424 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
426
427 if (numlock_state || (ev.state & ModNumLockMask))
428 {
429 numlock_state = (ev.state & ModNumLockMask);
430 set_privmode (PrivMode_aplKP, !numlock_state);
431 }
432 426
433 kbuf[0] = 0; 427 kbuf[0] = 0;
434 428
435#ifdef USE_XIM 429#ifdef USE_XIM
436 if (Input_Context) 430 if (Input_Context)
… …
653 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
654 { 648 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1; 650 unsigned int newlen = 1;
657 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
658 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
659 { 658 {
660#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace: 660 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
663 { 662 {
… …
976rxvt_term::flush () 975rxvt_term::flush ()
977{ 976{
978 flush_ev.stop (); 977 flush_ev.stop ();
979 978
980#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
981 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
982 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
983// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 984 scr_touch (false);
985 } 985 }
986#endif 986#endif
987 987
… …
1431 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1432 focus_out ();
1433 break; 1433 break;
1434 1434
1435 case ConfigureNotify: 1435 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1439 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1440 { 1437 {
1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1442 ; 1439 ;
1440
1441#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 int x, y;
1446 if (ev.xconfigure.send_event)
1447 {
1448 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y;
1450 }
1451 else
1452 get_window_origin (x, y);
1453
1454 if (bgPixmap.set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1456 moved = true;
1457 }
1458#endif
1443 1459
1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1461 {
1446 seen_resize = 1; 1462 seen_resize = 1;
1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1464 }
1449 else 1465 else
1450 { 1466 {
1451#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ()) 1468 if (moved)
1453 { 1469 {
1454 if (mapped) 1470 if (mapped)
1455 update_background (); 1471 update_background ();
1456 else 1472 else
1457 bgPixmap.invalidate (); 1473 bgPixmap.invalidate ();
… …
1484 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1485 break; 1501 break;
1486 1502
1487 case MapNotify: 1503 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a 1505 /* This is needed specifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1493 * reparenting. 1509 * reparenting.
1494 * We should not render background immidiately, as there could be several 1510 * We should not render background immediately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short 1512 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
… …
1870 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1874 { 1890 {
1875 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1876 MEvent.clicks++; 1892 MEvent.clicks++;
1877 1893
1878 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1879 { 1895 {
1880 /* only report double clicks */ 1896 /* only report double clicks */
… …
2151 selection_make (ev.time); 2167 selection_make (ev.time);
2152 break; 2168 break;
2153 2169
2154 case Button2: 2170 case Button2:
2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2173 break;
2158 2174
2159#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2160 case Button4: 2176 case Button4:
2161 case Button5: 2177 case Button5:
… …
3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3233 */ 3249 */
3234void 3250void
3235rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3236{ 3252{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3253 /*
3241 * Not handled yet 3254 * Not handled yet
3242 */ 3255 */
3256
3257 unicode_t eh;
3243 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3244 if (s) 3259 if (s)
3245 free (s); 3260 free (s);
3246 3261
3247 return; 3262 return;
3248} 3263}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3268 */
3254void 3269void
3255rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3256{ 3271{
3257 unicode_t ch, eh;
3258 int arg; 3272 int arg;
3259 3273
3260 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3263 3277
3264 if (ch == ';') 3278 if (ch == ';')
3265 { 3279 {
3280 unicode_t eh;
3266 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3267 3282
3268 if (s) 3283 if (s)
3269 { 3284 {
3270 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3411 break;
3397 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3399 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3401 case XTerm_Color_RV:
3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3407 break; 3426 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3411 break; 3429 break;
3412 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
… …
3449 { 3467 {
3450 int changed = 0; 3468 int changed = 0;
3451 3469
3452 if (*str != ';') 3470 if (*str != ';')
3453 { 3471 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3457 changed++; 3474 changed++;
3458 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3459 if (str == NULL) 3476 if (str == NULL)
3460 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3461 } 3481 }
3462 3482 else
3463 while (str)
3464 { 3483 {
3465 str++; 3484 str++;
3466 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3467 changed++; 3486 changed++;
3468 str = strchr (str, ';');
3469 } 3487 }
3470 3488
3471 if (changed) 3489 if (changed)
3490 {
3491 if (bgPixmap.window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y);
3496 }
3472 update_background (); 3497 update_background ();
3498 }
3473 } 3499 }
3474 break; 3500 break;
3475#endif 3501#endif
3476 3502
3477 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3580 { 3606 {
3581 if (mode == 'r') 3607 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3609 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3585 set_privmode (bit, state); 3612 set_privmode (bit, state);
3586 } 3613 }
3587 3614
3588 return state; 3615 return state;
3589} 3616}
… …
3608 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3644#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

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