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.444 by sf-exg, Thu Apr 1 08:40:33 2010 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

… …
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 426
427 if (numlock_state || (ev.state & ModNumLockMask))
428 {
429 numlock_state = (ev.state & ModNumLockMask);
430 set_privmode (PrivMode_aplKP, !numlock_state);
431 }
432
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)
437 { 431 {
… …
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 ;
1443 1440
… …
1484 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1485 break; 1482 break;
1486 1483
1487 case MapNotify: 1484 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1489 /* 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
1490 * non-reparenting window manager. In those cases we never get first 1487 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1493 * reparenting. 1490 * reparenting.
1494 * We should not render background immidiately, as there could be several 1491 * 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 1492 * 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 1493 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive. 1494 * bit of time for ConfigureNotifies to arrive.
1498 * 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
1499 * of ConfigureNotifys for the best results. 1496 * of ConfigureNotifys for the best results.
… …
1870 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1874 { 1871 {
1875 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1876 MEvent.clicks++; 1873 MEvent.clicks++;
1877 1874
1878 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1879 { 1876 {
1880 /* only report double clicks */ 1877 /* only report double clicks */
… …
2151 selection_make (ev.time); 2148 selection_make (ev.time);
2152 break; 2149 break;
2153 2150
2154 case Button2: 2151 case Button2:
2155 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?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2154 break;
2158 2155
2159#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2160 case Button4: 2157 case Button4:
2161 case Button5: 2158 case Button5:
… …
3232 * 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)'
3233 */ 3230 */
3234void 3231void
3235rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3236{ 3233{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3234 /*
3241 * Not handled yet 3235 * Not handled yet
3242 */ 3236 */
3237
3238 unicode_t eh;
3243 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3244 if (s) 3240 if (s)
3245 free (s); 3241 free (s);
3246 3242
3247 return; 3243 return;
3248} 3244}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3249 */
3254void 3250void
3255rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3256{ 3252{
3257 unicode_t ch, eh;
3258 int arg; 3253 int arg;
3259 3254
3260 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3263 3258
3264 if (ch == ';') 3259 if (ch == ';')
3265 { 3260 {
3261 unicode_t eh;
3266 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3267 3263
3268 if (s) 3264 if (s)
3269 { 3265 {
3270 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3392 break;
3397 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3399 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
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#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: 3405 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3407 break; 3407 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3411 break; 3410 break;
3412 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
… …
3449 { 3448 {
3450 int changed = 0; 3449 int changed = 0;
3451 3450
3452 if (*str != ';') 3451 if (*str != ';')
3453 { 3452 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3453 if (bgPixmap.set_file (str)) /* change pixmap */
3457 changed++; 3454 changed++;
3458 str = strchr (str, ';'); 3455 str = strchr (str, ';');
3459 if (str == NULL) 3456 if (str == NULL)
3460 bgPixmap.set_defaultGeometry (); 3457 bgPixmap.set_defaultGeometry ();
3458 else
3459 bgPixmap.set_geometry (str+1);
3461 } 3460 }
3462 3461 else
3463 while (str)
3464 { 3462 {
3465 str++; 3463 str++;
3466 if (bgPixmap.set_geometry (str)) 3464 if (bgPixmap.set_geometry (str, true))
3467 changed++; 3465 changed++;
3468 str = strchr (str, ';');
3469 } 3466 }
3470 3467
3471 if (changed) 3468 if (changed)
3472 update_background (); 3469 update_background ();
3473 } 3470 }
… …
3580 { 3577 {
3581 if (mode == 'r') 3578 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3579 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3580 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3581 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3582
3585 set_privmode (bit, state); 3583 set_privmode (bit, state);
3586 } 3584 }
3587 3585
3588 return state; 3586 return state;
3589} 3587}
… …
3608 { 6, PrivMode_relOrigin }, // DECOM 3606 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3607 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3608 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3609 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3610 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3611 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3612 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3613#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3614 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3615#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3616 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

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