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.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC vs.
Revision 1.459 by sf-exg, Thu Nov 18 17:28:31 2010 UTC

… …
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 650 unsigned int newlen = 1;
651 651
652 if (ev.state & ModNumLockMask) 652 if (ev.state & ModNumLockMask)
653 kp = false; 653 kp = false;
654
654 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
655 { 658 {
656#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace: 660 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
659 { 662 {
… …
972rxvt_term::flush () 975rxvt_term::flush ()
973{ 976{
974 flush_ev.stop (); 977 flush_ev.stop ();
975 978
976#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
977 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
978 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
979// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
980 scr_touch (false); 984 scr_touch (false);
981 } 985 }
982#endif 986#endif
983 987
… …
1427 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1432 focus_out ();
1429 break; 1433 break;
1430 1434
1431 case ConfigureNotify: 1435 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1436 { 1437 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1439 ;
1439 1440
… …
1480 selection_send (ev.xselectionrequest); 1481 selection_send (ev.xselectionrequest);
1481 break; 1482 break;
1482 1483
1483 case MapNotify: 1484 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1485#ifdef HAVE_BG_PIXMAP
1485 /* 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
1486 * non-reparenting window manager. In those cases we never get first 1487 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1489 * care of multiplicity of ConfigureNotify events arriving while WM does
1489 * reparenting. 1490 * reparenting.
1490 * We should not render background immidiately, as there could be several 1491 * We should not render background immediately, as there could be several
1491 * 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
1492 * 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
1493 * bit of time for ConfigureNotifies to arrive. 1494 * bit of time for ConfigureNotifies to arrive.
1494 * 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
1495 * of ConfigureNotifys for the best results. 1496 * of ConfigureNotifys for the best results.
… …
1866 /* save the xbutton state (for ButtonRelease) */ 1867 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1868 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1869#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1870 if (ev.button == MEvent.button && clickintime)
1870 { 1871 {
1871 /* same button, within alloted time */ 1872 /* same button, within allowed time */
1872 MEvent.clicks++; 1873 MEvent.clicks++;
1873 1874
1874 if (MEvent.clicks > 1) 1875 if (MEvent.clicks > 1)
1875 { 1876 {
1876 /* only report double clicks */ 1877 /* only report double clicks */
… …
2147 selection_make (ev.time); 2148 selection_make (ev.time);
2148 break; 2149 break;
2149 2150
2150 case Button2: 2151 case Button2:
2151 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?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2154 break;
2154 2155
2155#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2156 case Button4: 2157 case Button4:
2157 case Button5: 2158 case Button5:
… …
3228 * 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)'
3229 */ 3230 */
3230void 3231void
3231rxvt_term::process_dcs_seq () 3232rxvt_term::process_dcs_seq ()
3232{ 3233{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3234 /*
3237 * Not handled yet 3235 * Not handled yet
3238 */ 3236 */
3237
3238 unicode_t eh;
3239 s = get_to_st (eh); 3239 char *s = get_to_st (eh);
3240 if (s) 3240 if (s)
3241 free (s); 3241 free (s);
3242 3242
3243 return; 3243 return;
3244} 3244}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3249 */
3250void 3250void
3251rxvt_term::process_osc_seq () 3251rxvt_term::process_osc_seq ()
3252{ 3252{
3253 unicode_t ch, eh;
3254 int arg; 3253 int arg;
3255 3254
3256 ch = cmd_getc (); 3255 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3256 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3257 arg = arg * 10 + (ch - '0');
3259 3258
3260 if (ch == ';') 3259 if (ch == ';')
3261 { 3260 {
3261 unicode_t eh;
3262 char *s = get_to_st (eh); 3262 char *s = get_to_st (eh);
3263 3263
3264 if (s) 3264 if (s)
3265 { 3265 {
3266 process_xterm_seq (arg, s, eh); 3266 process_xterm_seq (arg, s, eh);
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3391 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3392 break;
3393 case XTerm_Color_pointer_bg: 3393 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3394 process_color_seq (op, Color_pointer_bg, str, resp);
3395 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
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3404#ifndef NO_BOLD_UNDERLINE_REVERSE
3397 case XTerm_Color_RV:
3398 process_color_seq (op, Color_RV, str, resp);
3399 break;
3400 case Rxvt_Color_BD:
3401 case URxvt_Color_BD: 3405 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3406 process_color_seq (op, Color_BD, str, resp);
3403 break; 3407 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3408 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3409 process_color_seq (op, Color_UL, str, resp);
3407 break; 3410 break;
3408 case URxvt_Color_IT: 3411 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3412 process_color_seq (op, Color_IT, str, resp);
… …
3445 { 3448 {
3446 int changed = 0; 3449 int changed = 0;
3447 3450
3448 if (*str != ';') 3451 if (*str != ';')
3449 { 3452 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 {
3453 changed++; 3455 changed++;
3454 str = strchr (str, ';'); 3456 str = strchr (str, ';');
3455 if (str == NULL) 3457 if (str == NULL)
3456 bgPixmap.set_defaultGeometry (); 3458 bgPixmap.set_defaultGeometry ();
3459 else
3460 bgPixmap.set_geometry (str+1);
3461 }
3457 } 3462 }
3458 3463 else
3459 while (str)
3460 { 3464 {
3461 str++; 3465 str++;
3462 if (bgPixmap.set_geometry (str)) 3466 if (bgPixmap.set_geometry (str, true))
3463 changed++; 3467 changed++;
3464 str = strchr (str, ';');
3465 } 3468 }
3466 3469
3467 if (changed) 3470 if (changed)
3468 update_background (); 3471 update_background ();
3469 } 3472 }
… …
3576 { 3579 {
3577 if (mode == 'r') 3580 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3582 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3583 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3584
3581 set_privmode (bit, state); 3585 set_privmode (bit, state);
3582 } 3586 }
3583 3587
3584 return state; 3588 return state;
3585} 3589}
… …
3604 { 6, PrivMode_relOrigin }, // DECOM 3608 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3609 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3610 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3611 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3612 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3613 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3615#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3616 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3617#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3618 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

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