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.315 by root, Tue Aug 22 13:07:17 2006 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC

… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
500# if ISO_14755 499# if ISO_14755
501 iso14755_51 (0); 500 iso14755_51 (0);
502# endif 501# endif
503 return; 502 return;
504 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
505 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
506 { 513 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
509# if ISO_14755 516# if ISO_14755
… …
511# endif 518# endif
512 return; 519 return;
513 } 520 }
514 else 521 else
515 { 522 {
516# if ENABLE_OVERLAY 523# if ISO_14755
517 scr_overlay_off (); 524 scr_overlay_off ();
518# endif 525# endif
519 iso14755buf = 0; 526 iso14755buf = 0;
520 } 527 }
521 } 528 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
525 { 532 {
526 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 534# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 537# endif
531 } 538 }
532#endif 539#endif
533 540
534#ifdef PRINTPIPE 541#ifdef PRINTPIPE
535 if (keysym == XK_Print) 542 if (keysym == XK_Print)
536 { 543 {
537 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
538 return; 545 return;
… …
540#endif 547#endif
541 548
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 550 {
544 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 553 newlen = 1;
546 switch (keysym) 554 switch (keysym)
547 { 555 {
548#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 557 case XK_BackSpace:
… …
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
555 } 563 }
556 else 564 else
557 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 566 break;
559#endif 567#endif
560#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
562 case XK_KP_Delete: 570 case XK_KP_Delete:
563 /* allow shift to override */ 571 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
565 { 573 {
566 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
567 break; 575 break;
568 } 576 }
569 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
570# endif 578# endif
571 case XK_Delete: 579 case XK_Delete:
572 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 581 break;
574#endif 582#endif
575 case XK_Tab: 583 case XK_Tab:
576 if (shft) 584 if (shft)
577 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
592#ifdef XK_KP_Left 600#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
598 { 606 {
599 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break; 609 break;
602 } 610 }
… …
625 633
626#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
628 case XK_KP_Prior: 636 case XK_KP_Prior:
629 /* allow shift to override */ 637 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
631 { 639 {
632 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
633 break; 641 break;
634 } 642 }
635 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
638 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
639 break; 647 break;
640# ifdef XK_KP_Next 648# ifdef XK_KP_Next
641 case XK_KP_Next: 649 case XK_KP_Next:
642 /* allow shift to override */ 650 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
644 { 652 {
645 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
646 break; 654 break;
647 } 655 }
648 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
651 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
652 break; 660 break;
653#endif 661#endif
654 case XK_KP_Enter: 662 case XK_KP_Enter:
655 /* allow shift to override */ 663 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
657 { 665 {
658 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
659 break; 667 break;
660 } 668 }
661 669
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 716 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
710 { 718 {
711 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 721 }
714 else 722 else
… …
720 728
721 case XK_Find: 729 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
723 break; 731 break;
724 732
725#ifdef XK_KP_End 733#ifdef XK_KP_Insert
726 case XK_KP_Insert: 734 case XK_KP_Insert:
727 /* allow shift to override */ 735 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
729 { 737 {
730 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
731 break; 739 break;
732 } 740 }
733 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
746 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
747 break; 755 break;
748#ifdef XK_KP_End 756#ifdef XK_KP_End
749 case XK_KP_End: 757 case XK_KP_End:
750 /* allow shift to override */ 758 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
752 { 760 {
753 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
754 break; 762 break;
755 } 763 }
756 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
759 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
760 break; 768 break;
761#ifdef XK_KP_Home 769#ifdef XK_KP_Home
762 case XK_KP_Home: 770 case XK_KP_Home:
763 /* allow shift to override */ 771 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
765 { 773 {
766 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
767 break; 775 break;
768 } 776 }
769 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
877 return; 885 return;
878 886
879 if (len <= 0) 887 if (len <= 0)
880 return; /* not mapped */ 888 return; /* not mapped */
881 889
882 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 891 if (view_start)
884 { 892 {
885 view_start = 0; 893 view_start = 0;
886 want_refresh = 1; 894 want_refresh = 1;
887 } 895 }
… …
926#if ENABLE_FRILLS || ISO_14755 934#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 935 // ISO 14755 support
928 if (iso14755buf) 936 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 937 if (iso14755buf & ISO_14755_52)
930 { 938 {
931# if ENABLE_OVERLAY 939# if ISO_14755
932 scr_overlay_off (); 940 scr_overlay_off ();
933# endif 941# endif
934# if ISO_14755 942# if ISO_14755
935 // iso14755 part 5.2 handling: release time 943 // iso14755 part 5.2 handling: release time
936 // first: controls 944 // first: controls
… …
959 967
960 return; 968 return;
961 } 969 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 971 {
964# if ENABLE_OVERLAY 972# if ISO_14755
965 scr_overlay_off (); 973 scr_overlay_off ();
966# endif 974# endif
967 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 976 commit_iso14755 ();
969#if ISO_14755 977#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 979 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 981
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1026 1034
1027void 1035void
1028rxvt_term::flush () 1036rxvt_term::flush ()
1029{ 1037{
1030 flush_ev.stop (); 1038 flush_ev.stop ();
1031 1039
1032#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1034 { 1042 {
1035 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 1044 scr_touch (false);
1038 } 1045 }
1039#endif 1046#endif
1040 1047
1041 if (want_refresh) 1048 if (want_refresh)
… …
1102void 1109void
1103rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1104{ 1111{
1105 make_current (); 1112 make_current ();
1106 1113
1107 refresh_limit = 1;
1108 refresh_count = 0; 1114 refresh_count = 0;
1109 flush (); 1115 flush ();
1110} 1116}
1111 1117
1112#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1178 1184
1179#if LINUX_YIELD_HACK 1185#if LINUX_YIELD_HACK
1180static struct event_handler 1186static struct event_handler
1181{ 1187{
1182 check_watcher yield_ev; 1188 check_watcher yield_ev;
1183 1189
1184 void yield_cb (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1185 { 1191 {
1186 // this should really be sched_yield(), but the linux guys thought 1192 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1193 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1194 // ones with high nice levels is a useful thing to do. It surely is is
… …
1232 } 1238 }
1233 else 1239 else
1234 { 1240 {
1235 pty_ev.stop (); 1241 pty_ev.stop ();
1236 1242
1237 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1238 destroy (); 1244 destroy ();
1239 } 1245 }
1240 1246
1241 return false; 1247 return false;
1242} 1248}
1243 1249
1244void 1250void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1263 recolour_cursor (); 1269 recolour_cursor ();
1264 1270
1265#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1272 hidden_pointer = 0;
1267 1273
1268 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1276#endif
1271} 1277}
1272 1278
1273#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1274void 1280void
1275rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1276{ 1282{
1277 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1278 return; 1284 return;
1279 1285
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1287 XFlush (dpy);
1282 1288
… …
1296rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1303{
1298 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1299 int x, y; 1305 int x, y;
1300 1306
1301 x = ev.x; 1307 x = Pixel2Col (ev.x);
1302 y = ev.y; 1308 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y);
1304 1309
1305 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1306 button_number = 3; 1311 button_number = 3;
1307 else 1312 else
1308 { 1313 {
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1432 focus_out ();
1428 } 1433 }
1429#endif 1434#endif
1430 } 1435 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1436 break;
1436 1437
1437 /* 1438 /*
1438 * XXX: this is not the _current_ arrangement 1439 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1440 * Here's my conclusion:
… …
1458 break; 1459 break;
1459 } 1460 }
1460 break; 1461 break;
1461 1462
1462 case FocusIn: 1463 case FocusIn:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1467 focus_in ();
1464 break; 1468 break;
1465 1469
1466 case FocusOut: 1470 case FocusOut:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1474 focus_out ();
1468 break; 1475 break;
1469 1476
1470 case ConfigureNotify: 1477 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1472 { 1482 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1484 ;
1475 1485
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1487 {
1478 seen_resize = 1; 1488 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1490 }
1481 1491 else
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1496#endif
1497 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1499 }
1489 break; 1500 break;
1490 1501
1491 case PropertyNotify: 1502 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1523 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1524#endif 1535#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1537 break;
1527 1538
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533
1534 case GraphicsExpose: 1539 case GraphicsExpose:
1535 case Expose: 1540 case Expose:
1536 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1537 { 1542 {
1538 do 1543 do
1544 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1549
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1551
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1548 1556 }
1549 want_refresh = 1; 1557 want_refresh = 1;
1550 } 1558 }
1551 else 1559 else
1552 { 1560 {
1553 XEvent unused_event; 1561 XEvent unused_event;
… …
1560 if (isScrollbarWindow (ev.xany.window)) 1568 if (isScrollbarWindow (ev.xany.window))
1561 { 1569 {
1562 scrollBar.setIdle (); 1570 scrollBar.setIdle ();
1563 scrollbar_show (0); 1571 scrollbar_show (0);
1564 } 1572 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1573 }
1571 break; 1574 break;
1572 1575
1573 case MotionNotify: 1576 case MotionNotify:
1574#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1675 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1676 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1678 scrollbar_size ());
1676 want_refresh = 1; 1679 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1680 scrollbar_show (1);
1679 } 1681 }
1680 break; 1682 break;
1681 } 1683 }
1682 1684
1683#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1687 {
1686 if (hidden_cursor) 1688 if (hidden_cursor)
1687 { 1689 {
1688 hidden_cursor = 0; 1690 hidden_cursor = 0;
1689 want_refresh = 1; 1691 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1695 }
1694#endif 1696#endif
1695 1697
1696#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1700 {
1699 if (ev.type == MotionNotify 1701 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1702 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1703 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1704 if (hidden_pointer)
… …
1724 IMSetPosition (); 1726 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1726 } 1728 }
1727#endif 1729#endif
1728#if CURSOR_BLINK 1730#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1731 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1733#endif
1732#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1734 { 1736 {
1735 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1738 scr_recolour ();
1737 } 1739 }
1738#endif 1740#endif
1741#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell))
1743 {
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif
1739 } 1751 }
1740} 1752}
1741 1753
1742void 1754void
1743rxvt_term::focus_out () 1755rxvt_term::focus_out ()
… …
1751 1763
1752#if ENABLE_FRILLS || ISO_14755 1764#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1765 if (iso14755buf)
1754 { 1766 {
1755 iso14755buf = 0; 1767 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1768# if ISO_14755
1757 scr_overlay_off (); 1769 scr_overlay_off ();
1758# endif 1770# endif
1759 } 1771 }
1760#endif 1772#endif
1761#if USE_XIM 1773#if USE_XIM
1762 if (Input_Context != NULL) 1774 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1775 XUnsetICFocus (Input_Context);
1764#endif 1776#endif
1765#if CURSOR_BLINK 1777#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1778 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1779 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1780 hidden_cursor = 0;
1769#endif 1781#endif
1770#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1801 }
1790#endif 1802#endif
1791} 1803}
1792 1804
1793#if TRANSPARENT || ENABLE_PERL 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1806void
1795rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1808{
1797 make_current (); 1809 make_current ();
1798 1810
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1813 return;
1802 1814
1803# if TRANSPARENT 1815# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1816 switch (ev.type)
1805 { 1817 {
1806 case PropertyNotify: 1818 case PropertyNotify:
1807 /* 1819 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1810 */ 1822 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1825 {
1814 1826 bgPixmap.set_root_pixmap ();
1815 /* FALLTHROUGH */ 1827 update_background ();
1816 case ReparentNotify: 1828 }
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1829 break;
1820 } 1830 }
1821# endif 1831# endif
1822} 1832}
1823#endif 1833#endif
… …
2154 selection_make (ev.time); 2164 selection_make (ev.time);
2155 break; 2165 break;
2156 2166
2157 case Button2: 2167 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2170 break;
2161 2171
2162#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2163 case Button4: 2173 case Button4:
2164 case Button5: 2174 case Button5:
… …
2168 2178
2169 v = ev.button == Button4 ? UP : DN; 2179 v = ev.button == Button4 ? UP : DN;
2170 2180
2171 if (ev.state & ShiftMask) 2181 if (ev.state & ShiftMask)
2172 i = 1; 2182 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2183 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2184 i = nrow - 1;
2175 else 2185 else
2176 i = 5; 2186 i = 5;
2177 2187
2178# ifdef MOUSE_SLIP_WHEELING 2188# ifdef MOUSE_SLIP_WHEELING
… …
2199 break; 2209 break;
2200#endif 2210#endif
2201 } 2211 }
2202 } 2212 }
2203} 2213}
2204
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676 2214
2677/*}}} */ 2215/*}}} */
2678 2216
2679bool 2217bool
2680rxvt_term::cmd_parse () 2218rxvt_term::cmd_parse ()
… …
2729 if (ch == C0_LF) 2267 if (ch == C0_LF)
2730 nlines++; 2268 nlines++;
2731 2269
2732 refresh_count++; 2270 refresh_count++;
2733 2271
2734 if (!OPTION (Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2273 {
2737 refreshnow = true;
2738 refresh_count = 0; 2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2277 {
2278 refreshnow = true;
2739 ch = NOCHAR; 2279 ch = NOCHAR;
2740 break; 2280 break;
2281 }
2741 } 2282 }
2742 2283
2743 // scr_add_lines only works for nlines <= nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2285 if (nlines >= nrow - 1)
2745 { 2286 {
… …
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2774 scr_add_lines (buf, str - buf, nlines); 2315 scr_add_lines (buf, str - buf, nlines);
2775 2316
2776 /* 2317 /*
2777 * If there have been a lot of new lines, then update the screen 2318 * If there have been a lot of new lines, then update the screen
2778 * What the heck I'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2779 * the number of pages between refreshes is refresh_limit, which 2320 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2321 */
2782 if (refreshnow) 2322 if (refreshnow)
2783 { 2323 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true; 2324 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2325 scr_refresh ();
2791 want_refresh = 1; 2326 want_refresh = 1;
2792 }
2793 } 2327 }
2794 2328
2795 } 2329 }
2796 else 2330 else
2797 { 2331 {
… …
2946 { 2480 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2481 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2482 break; /* done = 1 */
2949 } 2483 }
2950 } 2484 }
2951 2485
2952 for (i = 0; i < len; i++) 2486 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2487 if (putc (buf[i], fd) == EOF)
2954 { 2488 {
2955 done = 1; 2489 done = 1;
2956 break; 2490 break;
… …
3018 process_dcs_seq (); 2552 process_dcs_seq ();
3019 break; 2553 break;
3020 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
3021 process_csi_seq (); 2555 process_csi_seq ();
3022 break; 2556 break;
3023 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
3024 process_osc_seq (); 2558 process_osc_seq ();
3025 break; 2559 break;
3026#endif 2560#endif
3027 } 2561 }
3028} 2562}
… …
3254rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
3255{ 2789{
3256 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2791 unsigned int nargs, p;
3258 int n, ndef; 2792 int n, ndef;
3259 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
3260 2794
3261 for (nargs = ESC_ARGS; nargs > 0;) 2795 nargs = 0;
3262 arg[--nargs] = 0;
3263 2796
3264 priv = 0; 2797 priv = 0;
3265 ch = cmd_getc (); 2798 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2799 if (ch >= '<' && ch <= '?')
3267 { /* '<' '=' '>' '?' */ 2800 { /* '<' '=' '>' '?' */
… …
3311 switch (priv) 2844 switch (priv)
3312 { 2845 {
3313 case '>': 2846 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2847 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2848 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2851 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2854 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3455 break; 2988 break;
3456 case 6: /* CPR requested */ 2989 case 6: /* CPR requested */
3457 scr_report_position (); 2990 scr_report_position ();
3458 break; 2991 break;
3459 case 7: /* unofficial extension */ 2992 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 2993 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2994 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 2995 break;
3463 case 8: /* unofficial extension */ 2996 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2997 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 2998 break;
… …
3629 break; 3162 break;
3630 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3631 { 3164 {
3632 char *s; 3165 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3166 XGetIconName (dpy, parent[0], &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3168 XFree (s);
3636 } 3169 }
3637 break; 3170 break;
3638 case 21: /* report window title */ 3171 case 21: /* report window title */
3639 { 3172 {
3640 char *s; 3173 char *s;
3641 XFetchName (dpy, parent[0], &s); 3174 XFetchName (dpy, parent[0], &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3176 XFree (s);
3644 } 3177 }
3645 break; 3178 break;
3646 } 3179 }
3647} 3180}
… …
3774 int saveop = op; 3307 int saveop = op;
3775 3308
3776 dLocal (Display *, dpy); 3309 dLocal (Display *, dpy);
3777 3310
3778 assert (str != NULL); 3311 assert (str != NULL);
3779 3312
3780 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3313 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3781 return; 3314 return;
3782 3315
3783 switch (op) 3316 switch (op)
3784 { 3317 {
… …
3879 break; 3412 break;
3880 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3881 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3882 break; 3415 break;
3883#endif 3416#endif
3884#if TRANSPARENT && TINTING 3417#if ENABLE_TRANSPARENCY
3885 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3886 process_color_seq (op, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3420 {
3421 bool changed = false;
3422 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424 else
3425 changed = bgPixmap.unset_tint ();
3426 if (changed)
3427 update_background ();
3428 }
3887 3429
3888 check_our_parents ();
3889
3890 if (am_transparent)
3891 want_full_refresh = want_refresh = 1;
3892
3893 break; 3430 break;
3894#endif 3431#endif
3895 3432
3433#if BG_IMAGE_FROM_FILE
3896 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3897 { 3435 if (!strcmp (str, "?"))
3898 if (*str != ';')
3899 { 3436 {
3900#if XPM_BACKGROUND 3437 char str[256];
3901 scale_pixmap (""); /* reset to default scaling */ 3438
3902 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3903 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3904#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3905 } 3443 }
3906 3444 else
3445 {
3907 int changed = 0; 3446 int changed = 0;
3908 3447
3909 while ((str = strchr (str, ';')) != NULL) 3448 if (*str != ';')
3910 { 3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458 while (str)
3459 {
3911 str++; 3460 str++;
3912#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3913 changed += scale_pixmap (str); 3462 changed++;
3914#endif 3463 str = strchr (str, ';');
3915 } 3464 }
3916
3917 if (changed) 3465 if (changed)
3918 { 3466 update_background ();
3919#ifdef XPM_BACKGROUND
3920 resize_pixmap ();
3921 scr_touch (true);
3922#endif
3923 } 3467 }
3924 }
3925 break; 3468 break;
3469#endif
3926 3470
3927 case Rxvt_restoreFG: 3471 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3472 set_window_color (Color_fg, str);
3929 break; 3473 break;
3930 case Rxvt_restoreBG: 3474 case Rxvt_restoreBG:
… …
3955 case URxvt_italicFont: 3499 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 3500 case URxvt_boldItalicFont:
3957#endif 3501#endif
3958 if (query) 3502 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 3505 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 3506 resp);
3963 else 3507 else
3964 { 3508 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3979 break; 3523 break;
3980 3524
3981#if !ENABLE_MINIMAL 3525#if !ENABLE_MINIMAL
3982 case URxvt_locale: 3526 case URxvt_locale:
3983 if (query) 3527 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 3529 else
3986 { 3530 {
3987 set_locale (str); 3531 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 3532 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 3533 init_xlocale ();
… …
4052{ 3596{
4053 unsigned int i, j; 3597 unsigned int i, j;
4054 int state; 3598 int state;
4055 3599
4056 static const struct 3600 static const struct
4057 { 3601 {
4058 const int argval; 3602 const int argval;
4059 const unsigned long bit; 3603 const unsigned long bit;
4060 }
4061
4062 argtopriv[] = { 3604 } argtopriv[] = {
4063 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR },
4064 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
4065 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 },
4066 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll },
4067 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo },
… …
4130 scr_touch (true); 3672 scr_touch (true);
4131 break; 3673 break;
4132#endif 3674#endif
4133 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4134 case 1049: 3676 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 3677 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 3678 if (mode == 0)
4137 scr_cursor (RESTORE); 3679 scr_cursor (RESTORE);
4138 else if (mode == 1) 3680 else if (mode == 1)
4139 scr_cursor (SAVE); 3681 scr_cursor (SAVE);
4140 break; 3682 break;
… …
4205 break; 3747 break;
4206 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4208 break; 3750 break;
4209 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3754 scr_erase_screen (2);
4213 scr_change_screen (state); 3755 scr_change_screen (state);
4214 break; 3756 break;
4215 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 3758 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 3760 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 3761 scr_erase_screen (2);
4220 break; 3762 break;
4221 default: 3763 default:
4222 break; 3764 break;
… …
4459 4001
4460 if (v_buflen == 0) 4002 if (v_buflen == 0)
4461 { 4003 {
4462 free (v_buffer); 4004 free (v_buffer);
4463 v_buffer = 0; 4005 v_buffer = 0;
4464 v_buflen = 0;
4465 4006
4466 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4467 return; 4008 return;
4468 } 4009 }
4469 4010

Diff Legend

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