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.388 by ayin, Mon Dec 31 01:16:47 2007 UTC vs.
Revision 1.397 by root, Sat Jan 26 11:40:47 2008 UTC

… …
1079{ 1079{
1080 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1081 { 1081 {
1082 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1083 want_refresh = 1; 1083 want_refresh = 1;
1084 refresh_check (); 1084 refresh_check ();
1085 } 1085 }
1086 else 1086 else
1087 w.stop (); 1087 w.stop ();
1088} 1088}
1089#endif 1089#endif
… …
1438 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1439 focus_out ();
1440 break; 1440 break;
1441 1441
1442 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1443 fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);
1446 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1447 { 1447 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 //while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1449 ;
1450 1450
1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1452 { 1452 {
1453 seen_resize = 1; 1453 seen_resize = 1;
… …
1455 } 1455 }
1456 else 1456 else
1457 { 1457 {
1458#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1460 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1461#endif 1466#endif
1462 } 1467 }
1463 1468
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 } 1470 }
… …
1485 case SelectionRequest: 1490 case SelectionRequest:
1486 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1487 break; 1492 break;
1488 1493
1489 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1490 mapped = 1; 1511 mapped = 1;
1491#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1492 text_blink_ev.start (); 1513 text_blink_ev.start ();
1493#endif 1514#endif
1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1531 ; 1552 ;
1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533 ; 1554 ;
1534 1555
1535 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1536 { 1557 {
1537 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1538 scrollbar_show (0); 1559 scrollbar_show (0);
1539 } 1560 }
1540 } 1561 }
… …
1630#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1631 } 1652 }
1632#endif 1653#endif
1633 } 1654 }
1634 } 1655 }
1635 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1636 { 1657 {
1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1639 ; 1660 ;
1640 1661
… …
1924 } 1945 }
1925 1946
1926 /* 1947 /*
1927 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1928 */ 1949 */
1929 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1951 {
1931 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1932 /* 1953 /*
1933 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
2170 2191
2171 if (!slip_wheel_ev.is_active ()) 2192 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2194 }
2174 else 2195 else
2196# endif
2175 { 2197 {
2176# endif
2177 scr_page (v, i); 2198 scr_page (v, i);
2178 scrollbar_show (1); 2199 scrollbar_show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2200 }
2181# endif
2182 } 2201 }
2183 break; 2202 break;
2184#endif 2203#endif
2185 } 2204 }
2186 } 2205 }
… …
2829 // versions. 2848 // versions.
2830 // 2849 //
2831 tt_printf ("\033[>%d;95;0c", 'U'); 2850 tt_printf ("\033[>%d;95;0c", 'U');
2832 } 2851 }
2833 break; 2852 break;
2853
2834 case '?': 2854 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2856 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2857 break;
2838 } 2858 }
… …
3354 *buf++ = '\0'; 3374 *buf++ = '\0';
3355 3375
3356 process_color_seq (op, color, name, resp); 3376 process_color_seq (op, color, name, resp);
3357 } 3377 }
3358 break; 3378 break;
3379 case Rxvt_restoreFG:
3359 case XTerm_Color00: 3380 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3361 break; 3382 break;
3383 case Rxvt_restoreBG:
3362 case XTerm_Color01: 3384 case XTerm_Color01:
3363 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3364 break; 3386 break;
3365#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3366 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3444 if (changed) 3466 if (changed)
3445 update_background (); 3467 update_background ();
3446 } 3468 }
3447 break; 3469 break;
3448#endif 3470#endif
3449
3450 case Rxvt_restoreFG:
3451 set_window_color (Color_fg, str);
3452 break;
3453 case Rxvt_restoreBG:
3454 set_window_color (Color_bg, str);
3455 break;
3456 3471
3457 case XTerm_logfile: 3472 case XTerm_logfile:
3458 // TODO, when secure mode? 3473 // TODO, when secure mode?
3459 break; 3474 break;
3460 3475
… …
3615 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
3616 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
3617 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
3618 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3619 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
3620 }; 3636 };
3621 3637
3622 if (nargs == 0) 3638 if (nargs == 0)
3623 return; 3639 return;
3624 3640
… …
3672 */ 3688 */
3673 PrivMode (1, PrivMode_vt52); 3689 PrivMode (1, PrivMode_vt52);
3674 break; 3690 break;
3675 case 3: /* 80/132 */ 3691 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3692 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
3677 set_widthheight (((state ? 132 : 80) * fwidth), height); 3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3696 }
3678 break; 3697 break;
3679 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
3681 break; 3700 break;
3682 case 5: /* reverse video */ 3701 case 5: /* reverse video */

Diff Legend

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