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.446 by root, Fri Apr 2 19:27:38 2010 UTC vs.
Revision 1.458 by sf-exg, Thu Nov 18 17:28:12 2010 UTC

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

Diff Legend

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