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.449 by sf-exg, Sun Apr 18 11:06:46 2010 UTC vs.
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 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 ;
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
1442 1459
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1461 {
1445 seen_resize = 1; 1462 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1464 }
1448 else 1465 else
1449 { 1466 {
1450#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1468 if (moved)
1452 { 1469 {
1453 if (mapped) 1470 if (mapped)
1454 update_background (); 1471 update_background ();
1455 else 1472 else
1456 bgPixmap.invalidate (); 1473 bgPixmap.invalidate ();
… …
1483 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1484 break; 1501 break;
1485 1502
1486 case MapNotify: 1503 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1488 /* 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
1489 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1509 * reparenting.
1493 * We should not render background immidiately, as there could be several 1510 * 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 1511 * 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 1512 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1497 * 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
1498 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1873 { 1890 {
1874 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1875 MEvent.clicks++; 1892 MEvent.clicks++;
1876 1893
1877 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1878 { 1895 {
1879 /* only report double clicks */ 1896 /* only report double clicks */
… …
3231 * 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)'
3232 */ 3249 */
3233void 3250void
3234rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3235{ 3252{
3236 char *s;
3237 unicode_t eh;
3238
3239 /* 3253 /*
3240 * Not handled yet 3254 * Not handled yet
3241 */ 3255 */
3256
3257 unicode_t eh;
3242 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3243 if (s) 3259 if (s)
3244 free (s); 3260 free (s);
3245 3261
3246 return; 3262 return;
3247} 3263}
… …
3251 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3252 */ 3268 */
3253void 3269void
3254rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3255{ 3271{
3256 unicode_t ch, eh;
3257 int arg; 3272 int arg;
3258 3273
3259 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3260 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3261 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3262 3277
3263 if (ch == ';') 3278 if (ch == ';')
3264 { 3279 {
3280 unicode_t eh;
3265 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3266 3282
3267 if (s) 3283 if (s)
3268 { 3284 {
3269 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3398 break; 3414 break;
3399#ifdef OPTION_HC 3415#ifdef OPTION_HC
3400 case XTerm_Color_HC: 3416 case XTerm_Color_HC:
3401 process_color_seq (op, Color_HC, str, resp); 3417 process_color_seq (op, Color_HC, str, resp);
3402 break; 3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3403#endif 3422#endif
3404#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
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;
… …
3448 { 3467 {
3449 int changed = 0; 3468 int changed = 0;
3450 3469
3451 if (*str != ';') 3470 if (*str != ';')
3452 { 3471 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3456 changed++; 3474 changed++;
3457 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3458 if (str == NULL) 3476 if (str == NULL)
3459 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3460 } 3481 }
3461 3482 else
3462 while (str)
3463 { 3483 {
3464 str++; 3484 str++;
3465 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3466 changed++; 3486 changed++;
3467 str = strchr (str, ';');
3468 } 3487 }
3469 3488
3470 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 }
3471 update_background (); 3497 update_background ();
3498 }
3472 } 3499 }
3473 break; 3500 break;
3474#endif 3501#endif
3475 3502
3476 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3579 { 3606 {
3580 if (mode == 'r') 3607 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3609 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3584 set_privmode (bit, state); 3612 set_privmode (bit, state);
3585 } 3613 }
3586 3614
3587 return state; 3615 return state;
3588} 3616}
… …
3607 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3608 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3609 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3610 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3611 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3612 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3613 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3614#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3615 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3616#endif 3644#endif
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

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