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.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

… …
771 771
772 default: 772 default:
773 { 773 {
774 int param = map_function_key (keysym); 774 int param = map_function_key (keysym);
775 if (param > 0) 775 if (param > 0)
776 {
777 int n = sprintf (kbuf,"\033[%d~", param); 776 sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
789 else 777 else
790 newlen = 0; 778 newlen = 0;
791 } 779 }
792 break; 780 break;
793 } 781 }
… …
844 view_start = 0; 832 view_start = 0;
845 want_refresh = 1; 833 want_refresh = 1;
846 } 834 }
847 835
848 /* 836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
850 */ 846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
851 849
852 /* escape prefix */ 850 /* escape prefix */
853 if (meta 851 if (meta
854#ifdef META8_OPTION 852#ifdef META8_OPTION
855 && meta_char == C0_ESC 853 && meta_char == C0_ESC
… …
977rxvt_term::flush () 975rxvt_term::flush ()
978{ 976{
979 flush_ev.stop (); 977 flush_ev.stop ();
980 978
981#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
982 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
983 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
984// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
985 scr_touch (false); 984 scr_touch (false);
986 } 985 }
987#endif 986#endif
988 987
… …
1432 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1432 focus_out ();
1434 break; 1433 break;
1435 1434
1436 case ConfigureNotify: 1435 case ConfigureNotify:
1437 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1438 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1439 szHint.width, szHint.height);*/
1440 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1441 { 1437 {
1442 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1443 ; 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
1444 1459
1445 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1446 { 1461 {
1447 seen_resize = 1; 1462 seen_resize = 1;
1448 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1449 } 1464 }
1450 else 1465 else
1451 { 1466 {
1452#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_BG_PIXMAP
1453 if (bgPixmap.window_position_sensitive ()) 1468 if (moved)
1454 { 1469 {
1455 if (mapped) 1470 if (mapped)
1456 update_background (); 1471 update_background ();
1457 else 1472 else
1458 bgPixmap.invalidate (); 1473 bgPixmap.invalidate ();
… …
3452 { 3467 {
3453 int changed = 0; 3468 int changed = 0;
3454 3469
3455 if (*str != ';') 3470 if (*str != ';')
3456 { 3471 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3460 changed++; 3474 changed++;
3461 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3462 if (str == NULL) 3476 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3464 } 3481 }
3465 3482 else
3466 while (str)
3467 { 3483 {
3468 str++; 3484 str++;
3469 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3470 changed++; 3486 changed++;
3471 str = strchr (str, ';');
3472 } 3487 }
3473 3488
3474 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 }
3475 update_background (); 3497 update_background ();
3498 }
3476 } 3499 }
3477 break; 3500 break;
3478#endif 3501#endif
3479 3502
3480 case XTerm_logfile: 3503 case XTerm_logfile:

Diff Legend

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