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.317 by root, Sat Jan 13 15:06:54 2007 UTC vs.
Revision 1.360 by ayin, Wed Oct 24 10:39:57 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
… …
1295void 1301void
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;
1306 int code = 32;
1300 1307
1301 x = ev.x; 1308 x = Pixel2Col (ev.x);
1302 y = ev.y; 1309 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1310 if (ev.type == MotionNotify) {
1311 if (x == mouse_row && y == mouse_col)
1312 return;
1313 mouse_row = x;
1314 mouse_col = y;
1315 code += 32;
1316 }
1304 1317
1305 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1306 button_number = 3; 1319 button_number = 3;
1307 else 1320 else
1308 { 1321 {
… …
1354 x + 1, 1367 x + 1,
1355 y + 1); 1368 y + 1);
1356#endif 1369#endif
1357 1370
1358 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1360 (32 + x + 1), 1373 (32 + x + 1),
1361 (32 + y + 1)); 1374 (32 + y + 1));
1362} 1375}
1363 1376
1364/*{{{ process an X event */ 1377/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1440 focus_out ();
1428 } 1441 }
1429#endif 1442#endif
1430 } 1443 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1444 break;
1436 1445
1437 /* 1446 /*
1438 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1458 break; 1467 break;
1459 } 1468 }
1460 break; 1469 break;
1461 1470
1462 case FocusIn: 1471 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1475 focus_in ();
1465 break; 1476 break;
1466 1477
1467 case FocusOut: 1478 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1482 focus_out ();
1470 break; 1483 break;
1471 1484
1472 case ConfigureNotify: 1485 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1473 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1474 { 1490 {
1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476 ; 1492 ;
1477 1493
1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1479 { 1495 {
1480 seen_resize = 1; 1496 seen_resize = 1;
1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482 } 1498 }
1483 1499 else
1500 {
1501#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1504#endif
1505 }
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1488 if (OPTION (Opt_transparent))
1489 check_our_parents ();
1490#endif
1491#endif
1492 } 1507 }
1493 break; 1508 break;
1494 1509
1495 case PropertyNotify: 1510 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1527 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1528#endif 1543#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1545 break;
1531 1546
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537
1538 case GraphicsExpose: 1547 case GraphicsExpose:
1539 case Expose: 1548 case Expose:
1540 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1541 { 1550 {
1542 do 1551 do
1552 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1557
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1559
1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1552 1564 }
1553 want_refresh = 1; 1565 want_refresh = 1;
1554 } 1566 }
1555 else 1567 else
1556 { 1568 {
1557 XEvent unused_event; 1569 XEvent unused_event;
… …
1564 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1565 { 1577 {
1566 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1567 scrollbar_show (0); 1579 scrollbar_show (0);
1568 } 1580 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (dpy, ev.xany.window);
1573#endif
1574 } 1581 }
1575 break; 1582 break;
1576 1583
1577 case MotionNotify: 1584 case MotionNotify:
1578#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1586 if (hidden_pointer)
1580 pointer_unblank (); 1587 pointer_unblank ();
1581#endif 1588#endif
1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 || priv_modes & PrivMode_MouseAnyEvent)
1591 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1593 break;
1584 1594
1585 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1586 { 1596 {
… …
1676 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1687 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1689 scrollbar_size ());
1680 want_refresh = 1; 1690 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1691 scrollbar_show (1);
1683 } 1692 }
1684 break; 1693 break;
1685 } 1694 }
1686 1695
1687#if defined(CURSOR_BLINK) 1696#if defined(CURSOR_BLINK)
1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1697 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1689 { 1698 {
1690 if (hidden_cursor) 1699 if (hidden_cursor)
1691 { 1700 {
1692 hidden_cursor = 0; 1701 hidden_cursor = 0;
1693 want_refresh = 1; 1702 want_refresh = 1;
… …
1696 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1697 } 1706 }
1698#endif 1707#endif
1699 1708
1700#if defined(POINTER_BLANK) 1709#if defined(POINTER_BLANK)
1701 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1711 {
1703 if (ev.type == MotionNotify 1712 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress 1713 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease) 1714 || ev.type == ButtonRelease)
1706 if (hidden_pointer) 1715 if (hidden_pointer)
… …
1728 IMSetPosition (); 1737 IMSetPosition ();
1729 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1730 } 1739 }
1731#endif 1740#endif
1732#if CURSOR_BLINK 1741#if CURSOR_BLINK
1733 if (OPTION (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
1734 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1735#endif 1744#endif
1736#if OFF_FOCUS_FADING 1745#if OFF_FOCUS_FADING
1737 if (rs[Rs_fade]) 1746 if (rs[Rs_fade])
1738 { 1747 {
1739 pix_colors = pix_colors_focused; 1748 pix_colors = pix_colors_focused;
1740 scr_recolour (); 1749 scr_recolour ();
1741 } 1750 }
1742#endif 1751#endif
1752#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell))
1754 {
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif
1743 } 1762 }
1744} 1763}
1745 1764
1746void 1765void
1747rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1755 1774
1756#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1776 if (iso14755buf)
1758 { 1777 {
1759 iso14755buf = 0; 1778 iso14755buf = 0;
1760# if ENABLE_OVERLAY 1779# if ISO_14755
1761 scr_overlay_off (); 1780 scr_overlay_off ();
1762# endif 1781# endif
1763 } 1782 }
1764#endif 1783#endif
1765#if USE_XIM 1784#if USE_XIM
1766 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1767 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1768#endif 1787#endif
1769#if CURSOR_BLINK 1788#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
1771 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1772 hidden_cursor = 0; 1791 hidden_cursor = 0;
1773#endif 1792#endif
1774#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1775 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
… …
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 } 1812 }
1794#endif 1813#endif
1795} 1814}
1796 1815
1797#if TRANSPARENT || ENABLE_PERL 1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1798void 1817void
1799rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1800{ 1819{
1801 make_current (); 1820 make_current ();
1802 1821
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return; 1824 return;
1806 1825
1807# if TRANSPARENT 1826# if ENABLE_TRANSPARENCY
1808 switch (ev.type) 1827 switch (ev.type)
1809 { 1828 {
1810 case PropertyNotify: 1829 case PropertyNotify:
1811 /* 1830 /*
1812 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1813 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1814 */ 1833 */
1815 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 return; 1836 {
1818 1837 bgPixmap.set_root_pixmap ();
1819 /* FALLTHROUGH */ 1838 update_background ();
1820 case ReparentNotify: 1839 }
1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1822 want_refresh = want_full_refresh = 1;
1823 break; 1840 break;
1824 } 1841 }
1825# endif 1842# endif
1826} 1843}
1827#endif 1844#endif
… …
2158 selection_make (ev.time); 2175 selection_make (ev.time);
2159 break; 2176 break;
2160 2177
2161 case Button2: 2178 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 break; 2181 break;
2165 2182
2166#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2167 case Button4: 2184 case Button4:
2168 case Button5: 2185 case Button5:
… …
2172 2189
2173 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2174 2191
2175 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2176 i = 1; 2193 i = 1;
2177 else if (OPTION (Opt_mouseWheelScrollPage)) 2194 else if (option (Opt_mouseWheelScrollPage))
2178 i = nrow - 1; 2195 i = nrow - 1;
2179 else 2196 else
2180 i = 5; 2197 i = 5;
2181 2198
2182# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
… …
2203 break; 2220 break;
2204#endif 2221#endif
2205 } 2222 }
2206 } 2223 }
2207} 2224}
2208
2209#ifdef TRANSPARENT
2210#if TINTING
2211/* taken from aterm-0.4.2 */
2212
2213typedef uint32_t RUINT32T;
2214
2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2216{
2217 int sh_r, sh_g, sh_b;
2218 RUINT32T mask_r, mask_g, mask_b;
2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2222 int i;
2223
2224 Visual *visual = term->visual;
2225
2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2227
2228 /* for convenience */
2229 mask_r = visual->red_mask;
2230 mask_g = visual->green_mask;
2231 mask_b = visual->blue_mask;
2232
2233 /* boring lookup table pre-initialization */
2234 switch (srcImage->bits_per_pixel) {
2235 case 15:
2236 if ((mask_r != 0x7c00) ||
2237 (mask_g != 0x03e0) ||
2238 (mask_b != 0x001f))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2241 lookup_r = lookup;
2242 lookup_g = lookup+32;
2243 lookup_b = lookup+32+32;
2244 sh_r = 10;
2245 sh_g = 5;
2246 sh_b = 0;
2247 break;
2248 case 16:
2249 if ((mask_r != 0xf800) ||
2250 (mask_g != 0x07e0) ||
2251 (mask_b != 0x001f))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2254 lookup_r = lookup;
2255 lookup_g = lookup+32;
2256 lookup_b = lookup+32+64;
2257 sh_r = 11;
2258 sh_g = 5;
2259 sh_b = 0;
2260 break;
2261 case 24:
2262 if ((mask_r != 0xff0000) ||
2263 (mask_g != 0x00ff00) ||
2264 (mask_b != 0x0000ff))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2267 lookup_r = lookup;
2268 lookup_g = lookup+256;
2269 lookup_b = lookup+256+256;
2270 sh_r = 16;
2271 sh_g = 8;
2272 sh_b = 0;
2273 break;
2274 case 32:
2275 if ((mask_r != 0xff0000) ||
2276 (mask_g != 0x00ff00) ||
2277 (mask_b != 0x0000ff))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2280 lookup_r = lookup;
2281 lookup_g = lookup+256;
2282 lookup_b = lookup+256+256;
2283 sh_r = 16;
2284 sh_g = 8;
2285 sh_b = 0;
2286 break;
2287 default:
2288 return; /* we do not support this color depth */
2289 }
2290
2291 /* prepare limits for color transformation (each channel is handled separately) */
2292 if (shade < 0) {
2293 shade = -shade;
2294 if (shade < 0) shade = 0;
2295 if (shade > 100) shade = 100;
2296
2297 lower_lim_r = 65535-rm;
2298 lower_lim_g = 65535-gm;
2299 lower_lim_b = 65535-bm;
2300
2301 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2302 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2303 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2304
2305 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2306 } else {
2307 if (shade < 0) shade = 0;
2308 if (shade > 100) shade = 100;
2309
2310 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2311
2312 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2313 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2314 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2315 }
2316
2317 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2318 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2319 {
2320 unsigned int tmp;
2321
2322 tmp = lower_lim_r;
2323 lower_lim_r = lower_lim_b;
2324 lower_lim_b = tmp;
2325
2326 tmp = upper_lim_r;
2327 upper_lim_r = upper_lim_b;
2328 upper_lim_b = tmp;
2329 }
2330
2331 /* fill our lookup tables */
2332 for (i = 0; i <= mask_r>>sh_r; i++)
2333 {
2334 RUINT32T tmp;
2335 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2336 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2337 lookup_r[i] = (tmp/65535)<<sh_r;
2338 }
2339 for (i = 0; i <= mask_g>>sh_g; i++)
2340 {
2341 RUINT32T tmp;
2342 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2343 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2344 lookup_g[i] = (tmp/65535)<<sh_g;
2345 }
2346 for (i = 0; i <= mask_b>>sh_b; i++)
2347 {
2348 RUINT32T tmp;
2349 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2350 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2351 lookup_b[i] = (tmp/65535)<<sh_b;
2352 }
2353
2354 /* apply table to input image (replacing colors by newly calculated ones) */
2355 switch (srcImage->bits_per_pixel)
2356 {
2357 case 15:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0x7c00)>>10] |
2369 lookup_g[(*p & 0x03e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 16:
2377 {
2378 unsigned short *p1, *pf, *p, *pl;
2379 p1 = (unsigned short *) srcImage->data;
2380 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xf800)>>11] |
2388 lookup_g[(*p & 0x07e0)>> 5] |
2389 lookup_b[(*p & 0x001f)];
2390 }
2391 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 24:
2396 {
2397 unsigned char *p1, *pf, *p, *pl;
2398 p1 = (unsigned char *) srcImage->data;
2399 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width * 3;
2404 for (; p < pl; p += 3)
2405 {
2406 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2407 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2408 p[2] = lookup_r[(p[2] & 0x0000ff)];
2409 }
2410 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2411 }
2412 break;
2413 }
2414 case 32:
2415 {
2416 RUINT32T *p1, *pf, *p, *pl;
2417 p1 = (RUINT32T *) srcImage->data;
2418 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2419
2420 while (p1 < pf)
2421 {
2422 p = p1;
2423 pl = p1 + srcImage->width;
2424 for (; p < pl; p++)
2425 {
2426 *p = lookup_r[(*p & 0xff0000)>>16] |
2427 lookup_g[(*p & 0x00ff00)>> 8] |
2428 lookup_b[(*p & 0x0000ff)] |
2429 (*p & ~0xffffff);
2430 }
2431 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2432 }
2433 break;
2434 }
2435 }
2436
2437 free (lookup);
2438}
2439#endif
2440
2441/*
2442 * Check our parents are still who we think they are.
2443 * Do transparency updates if required
2444 */
2445int
2446rxvt_term::check_our_parents ()
2447{
2448 int i, pchanged, aformat, have_pixmap, rootdepth;
2449 unsigned long nitems, bytes_after;
2450 Atom atype;
2451 unsigned char *prop = NULL;
2452 Window root, oldp, *list;
2453 Pixmap rootpixmap = None;
2454 XWindowAttributes wattr, wrootattr;
2455
2456 pchanged = 0;
2457
2458 if (!OPTION (Opt_transparent))
2459 return pchanged; /* Don't try any more */
2460
2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
2462 rootdepth = wrootattr.depth;
2463
2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2465
2466 if (rootdepth != wattr.depth)
2467 {
2468 if (am_transparent)
2469 {
2470 pchanged = 1;
2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2472 am_transparent = am_pixmap_trans = 0;
2473 }
2474
2475 return pchanged; /* Don't try any more */
2476 }
2477
2478 /* Get all X ops out of the queue so that our information is up-to-date. */
2479 XSync (dpy, False);
2480
2481 /*
2482 * Make the frame window set by the window manager have
2483 * the root background. Some window managers put multiple nested frame
2484 * windows for each client, so we have to take care about that.
2485 */
2486 i = (xa[XA_XROOTPMAP_ID]
2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2489 &nitems, &bytes_after, &prop) == Success);
2490
2491 if (!i || prop == NULL)
2492 i = (xa[XA_ESETROOT_PMAP_ID]
2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2495 &nitems, &bytes_after, &prop) == Success);
2496
2497 if (!i || prop == NULL
2498#if TINTING
2499 || !ISSET_PIXCOLOR (Color_tint)
2500#endif
2501 )
2502 have_pixmap = 0;
2503 else
2504 {
2505 have_pixmap = 1;
2506 rootpixmap = *(Pixmap *)prop;
2507 XFree (prop);
2508 }
2509
2510 if (have_pixmap)
2511 {
2512 /*
2513 * Copy display->root pixmap transparency
2514 */
2515 int sx, sy, nx, ny;
2516 unsigned int nw, nh;
2517 Window cr;
2518 XImage *image;
2519 GC gc;
2520 XGCValues gcvalue;
2521
2522 XTranslateCoordinates (dpy, parent[0], display->root,
2523 0, 0, &sx, &sy, &cr);
2524 nw = (unsigned int)szHint.width;
2525 nh = (unsigned int)szHint.height;
2526 nx = ny = 0;
2527
2528 if (sx < 0)
2529 {
2530 nw += sx;
2531 nx = -sx;
2532 sx = 0;
2533 }
2534
2535 if (sy < 0)
2536 {
2537 nh += sy;
2538 ny = -sy;
2539 sy = 0;
2540 }
2541
2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2544
2545 XSync (dpy, False);
2546 allowedxerror = -1;
2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2548
2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2550 /* XXX: may need a delay here? */
2551 allowedxerror = 0;
2552
2553 if (image == NULL)
2554 {
2555 if (am_transparent && am_pixmap_trans)
2556 {
2557 pchanged = 1;
2558 if (pixmap != None)
2559 {
2560 XFreePixmap (dpy, pixmap);
2561 pixmap = None;
2562 }
2563 }
2564
2565 am_pixmap_trans = 0;
2566 }
2567 else
2568 {
2569 if (pixmap != None)
2570 XFreePixmap (dpy, pixmap);
2571
2572#if TINTING
2573 if (ISSET_PIXCOLOR (Color_tint))
2574 {
2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2576
2577 rgba c;
2578 pix_colors_focused [Color_tint].get (c);
2579
2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2581 }
2582#endif
2583
2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
2587 nx, ny, image->width, image->height);
2588 XFreeGC (dpy, gc);
2589 XDestroyImage (image);
2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2591 XClearWindow (dpy, parent[0]);
2592
2593 if (!am_transparent || !am_pixmap_trans)
2594 pchanged = 1;
2595
2596 am_transparent = am_pixmap_trans = 1;
2597 }
2598 }
2599
2600 if (am_pixmap_trans)
2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2602 else
2603 {
2604 unsigned int n;
2605 /*
2606 * InheritPixmap transparency
2607 */
2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2609 {
2610 oldp = parent[i];
2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 for (; n < (unsigned int)i; n++)
2630 {
2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639
2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2641 {
2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2644 am_transparent = 0;
2645 /* XXX: also turn off Opt_transparent? */
2646 }
2647 else
2648 {
2649 for (n = 0; n < (unsigned int)i; n++)
2650 {
2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2652 XClearWindow (dpy, parent[n]);
2653 }
2654
2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2656 am_transparent = 1;
2657 }
2658
2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2660 parent[i] = None;
2661 }
2662
2663 if (scrollBar.win)
2664 {
2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2666 scrollBar.setIdle ();
2667 scrollbar_show (0);
2668 }
2669
2670 if (am_transparent)
2671 {
2672 want_refresh = want_full_refresh = 1;
2673 if (am_pixmap_trans)
2674 flush ();
2675 }
2676
2677 return pchanged;
2678}
2679#endif
2680 2225
2681/*}}} */ 2226/*}}} */
2682 2227
2683bool 2228bool
2684rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
… …
2733 if (ch == C0_LF) 2278 if (ch == C0_LF)
2734 nlines++; 2279 nlines++;
2735 2280
2736 refresh_count++; 2281 refresh_count++;
2737 2282
2738 if (!OPTION (Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2739 || (refresh_count >= refresh_limit * (nrow - 1)))
2740 { 2284 {
2741 refreshnow = true;
2742 refresh_count = 0; 2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2289 refreshnow = true;
2743 ch = NOCHAR; 2290 ch = NOCHAR;
2744 break; 2291 break;
2292 }
2745 } 2293 }
2746 2294
2747 // scr_add_lines only works for nlines <= nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2748 if (nlines >= nrow - 1) 2296 if (nlines >= nrow - 1)
2749 { 2297 {
… …
2777 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778 scr_add_lines (buf, str - buf, nlines); 2326 scr_add_lines (buf, str - buf, nlines);
2779 2327
2780 /* 2328 /*
2781 * If there have been a lot of new lines, then update the screen 2329 * If there have been a lot of new lines, then update the screen
2782 * What the heck I'll cheat and only refresh less than every page-full. 2330 * What the heck we'll cheat and only refresh less than every page-full.
2783 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2784 * is incremented here because we must be doing flat-out scrolling.
2785 */ 2332 */
2786 if (refreshnow) 2333 if (refreshnow)
2787 { 2334 {
2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2789 refresh_limit++;
2790 else
2791 {
2792 flag = true; 2335 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2794 scr_refresh (); 2336 scr_refresh ();
2795 want_refresh = 1; 2337 want_refresh = 1;
2796 }
2797 } 2338 }
2798 2339
2799 } 2340 }
2800 else 2341 else
2801 { 2342 {
… …
2950 { 2491 {
2951 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2952 break; /* done = 1 */ 2493 break; /* done = 1 */
2953 } 2494 }
2954 } 2495 }
2955 2496
2956 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2957 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2958 { 2499 {
2959 done = 1; 2500 done = 1;
2960 break; 2501 break;
… …
3022 process_dcs_seq (); 2563 process_dcs_seq ();
3023 break; 2564 break;
3024 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
3025 process_csi_seq (); 2566 process_csi_seq ();
3026 break; 2567 break;
3027 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3028 process_osc_seq (); 2569 process_osc_seq ();
3029 break; 2570 break;
3030#endif 2571#endif
3031 } 2572 }
3032} 2573}
… …
3258rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3259{ 2800{
3260 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3261 unsigned int nargs, p; 2802 unsigned int nargs, p;
3262 int n, ndef; 2803 int n, ndef;
3263 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3264 2805
3265 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3266 arg[--nargs] = 0;
3267 2807
3268 priv = 0; 2808 priv = 0;
3269 ch = cmd_getc (); 2809 ch = cmd_getc ();
3270 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
3271 { /* '<' '=' '>' '?' */ 2811 { /* '<' '=' '>' '?' */
… …
3315 switch (priv) 2855 switch (priv)
3316 { 2856 {
3317 case '>': 2857 case '>':
3318 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3319 { 2859 {
3320 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 // 2862 //
3323 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3324 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3325 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
3326 // 2866 //
3327 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
3328 } 2868 }
3329 break; 2869 break;
3330 case '?': 2870 case '?':
3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3332 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
… …
3459 break; 2999 break;
3460 case 6: /* CPR requested */ 3000 case 6: /* CPR requested */
3461 scr_report_position (); 3001 scr_report_position ();
3462 break; 3002 break;
3463 case 7: /* unofficial extension */ 3003 case 7: /* unofficial extension */
3464 if (OPTION (Opt_insecure)) 3004 if (option (Opt_insecure))
3465 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3005 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3466 break; 3006 break;
3467 case 8: /* unofficial extension */ 3007 case 8: /* unofficial extension */
3468 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3008 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3469 break; 3009 break;
… …
3633 break; 3173 break;
3634 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3635 { 3175 {
3636 char *s; 3176 char *s;
3637 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent[0], &s);
3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3639 XFree (s); 3179 XFree (s);
3640 } 3180 }
3641 break; 3181 break;
3642 case 21: /* report window title */ 3182 case 21: /* report window title */
3643 { 3183 {
3644 char *s; 3184 char *s;
3645 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent[0], &s);
3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3647 XFree (s); 3187 XFree (s);
3648 } 3188 }
3649 break; 3189 break;
3650 } 3190 }
3651} 3191}
… …
3778 int saveop = op; 3318 int saveop = op;
3779 3319
3780 dLocal (Display *, dpy); 3320 dLocal (Display *, dpy);
3781 3321
3782 assert (str != NULL); 3322 assert (str != NULL);
3783 3323
3784 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3324 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3785 return; 3325 return;
3786 3326
3787 switch (op) 3327 switch (op)
3788 { 3328 {
… …
3883 break; 3423 break;
3884 case URxvt_Color_IT: 3424 case URxvt_Color_IT:
3885 process_color_seq (op, Color_IT, str, resp); 3425 process_color_seq (op, Color_IT, str, resp);
3886 break; 3426 break;
3887#endif 3427#endif
3888#if TRANSPARENT && TINTING 3428#if ENABLE_TRANSPARENCY
3889 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3890 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3431 {
3432 bool changed = false;
3433 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3435 else
3436 changed = bgPixmap.unset_tint ();
3437 if (changed)
3438 update_background ();
3439 }
3891 3440
3892 check_our_parents ();
3893
3894 if (am_transparent)
3895 want_full_refresh = want_refresh = 1;
3896
3897 break; 3441 break;
3898#endif 3442#endif
3899 3443
3444#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3901 { 3446 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3447 {
3904#if XPM_BACKGROUND 3448 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3449
3906 set_bgPixmap (str); /* change pixmap */ 3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3454 }
3910 3455 else
3456 {
3911 int changed = 0; 3457 int changed = 0;
3912 3458
3913 while ((str = strchr (str, ';')) != NULL) 3459 if (*str != ';')
3914 { 3460 {
3461 /* reset to default scaling :*/
3462 bgPixmap.unset_geometry ();
3463 if (bgPixmap.set_file (str)) /* change pixmap */
3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bgPixmap.set_defaultGeometry ();
3468 }
3469 while (str)
3470 {
3915 str++; 3471 str++;
3916#if XPM_BACKGROUND 3472 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3473 changed++;
3918#endif 3474 str = strchr (str, ';');
3919 } 3475 }
3920
3921 if (changed) 3476 if (changed)
3922 { 3477 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3478 }
3928 }
3929 break; 3479 break;
3480#endif
3930 3481
3931 case Rxvt_restoreFG: 3482 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3483 set_window_color (Color_fg, str);
3933 break; 3484 break;
3934 case Rxvt_restoreBG: 3485 case Rxvt_restoreBG:
… …
3959 case URxvt_italicFont: 3510 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3511 case URxvt_boldItalicFont:
3961#endif 3512#endif
3962 if (query) 3513 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3514 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3515 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3516 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3517 resp);
3967 else 3518 else
3968 { 3519 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3520 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3983 break; 3534 break;
3984 3535
3985#if !ENABLE_MINIMAL 3536#if !ENABLE_MINIMAL
3986 case URxvt_locale: 3537 case URxvt_locale:
3987 if (query) 3538 if (query)
3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3539 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3989 else 3540 else
3990 { 3541 {
3991 set_locale (str); 3542 set_locale (str);
3992 pty->set_utf8_mode (enc_utf8); 3543 pty->set_utf8_mode (enc_utf8);
3993 init_xlocale (); 3544 init_xlocale ();
… …
4056{ 3607{
4057 unsigned int i, j; 3608 unsigned int i, j;
4058 int state; 3609 int state;
4059 3610
4060 static const struct 3611 static const struct
4061 { 3612 {
4062 const int argval; 3613 const int argval;
4063 const unsigned long bit; 3614 const unsigned long bit;
4064 }
4065
4066 argtopriv[] = { 3615 } argtopriv[] = {
4067 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
4068 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
4069 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
4070 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
4071 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
… …
4088#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
4089 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
4090#endif 3639#endif
4091 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
4092 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4093 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
4094 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
4095 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4096 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
4097 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
4098 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
4099 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
4134 scr_touch (true); 3683 scr_touch (true);
4135 break; 3684 break;
4136#endif 3685#endif
4137 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4138 case 1049: 3687 case 1049:
4139 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4140 if (mode == 0) 3689 if (mode == 0)
4141 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4142 else if (mode == 1) 3691 else if (mode == 1)
4143 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4144 break; 3693 break;
… …
4173 scr_autowrap (state); 3722 scr_autowrap (state);
4174 break; 3723 break;
4175 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4176 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4177 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4178 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4179 break; 3728 break;
4180#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4181 case scrollBar_esc: 3730 case scrollBar_esc:
4182 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4183 { 3732 {
… …
4196 break; 3745 break;
4197 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
4198 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
4199 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
4200 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4201 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4202 break; 3751 break;
4203#if 0 3752#if 0
4204 case 1001: 3753 case 1001:
4205 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4206#endif 3755#endif
3756 case 1002:
3757 case 1003:
3758 if (state) {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask;
3762 } else
3763 vt_emask_mouse = NoEventMask;
3764 vt_select_input ();
3765 break;
4207 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
4208 set_option (Opt_scrollTtyOutput, !state); 3767 set_option (Opt_scrollTtyOutput, !state);
4209 break; 3768 break;
4210 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
4211 set_option (Opt_scrollTtyKeypress, state); 3770 set_option (Opt_scrollTtyKeypress, state);
4212 break; 3771 break;
4213 case 1047: /* secondary screen w/ clearing last */ 3772 case 1047: /* secondary screen w/ clearing last */
4214 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4215 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4216 scr_erase_screen (2); 3775 scr_erase_screen (2);
4217 scr_change_screen (state); 3776 scr_change_screen (state);
4218 break; 3777 break;
4219 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
4220 scr_change_screen (state); 3779 scr_change_screen (state);
4221 if (OPTION (Opt_secondaryScreen)) 3780 if (option (Opt_secondaryScreen))
4222 if (current_screen != PRIMARY) 3781 if (current_screen != PRIMARY)
4223 scr_erase_screen (2); 3782 scr_erase_screen (2);
4224 break; 3783 break;
4225 default: 3784 default:
4226 break; 3785 break;
… …
4463 4022
4464 if (v_buflen == 0) 4023 if (v_buflen == 0)
4465 { 4024 {
4466 free (v_buffer); 4025 free (v_buffer);
4467 v_buffer = 0; 4026 v_buffer = 0;
4468 v_buflen = 0;
4469 4027
4470 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4471 return; 4029 return;
4472 } 4030 }
4473 4031

Diff Legend

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