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.451 by root, Sun May 23 00:37:19 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 */
3450 { 3467 {
3451 int changed = 0; 3468 int changed = 0;
3452 3469
3453 if (*str != ';') 3470 if (*str != ';')
3454 { 3471 {
3455 /* reset to default scaling :*/
3456 bgPixmap.unset_geometry ();
3457 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3458 changed++; 3474 changed++;
3459 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3460 if (str == NULL) 3476 if (str == NULL)
3461 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3462 } 3481 }
3463 3482 else
3464 while (str)
3465 { 3483 {
3466 str++; 3484 str++;
3467 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3468 changed++; 3486 changed++;
3469 str = strchr (str, ';');
3470 } 3487 }
3471 3488
3472 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 }
3473 update_background (); 3497 update_background ();
3498 }
3474 } 3499 }
3475 break; 3500 break;
3476#endif 3501#endif
3477 3502
3478 case XTerm_logfile: 3503 case XTerm_logfile:
3610 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3614 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3644#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines