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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
227# if !UNICODE3 225# if !UNICODE3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 550 {
534 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 newlen = 1; 553 newlen = 1;
536 switch (keysym) 554 switch (keysym)
537 { 555 {
538#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 557 case XK_BackSpace:
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
545 } 563 }
546 else 564 else
547 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 566 break;
549#endif 567#endif
550#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
552 case XK_KP_Delete: 570 case XK_KP_Delete:
553 /* allow shift to override */ 571 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
555 { 573 {
556 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
557 break; 575 break;
558 } 576 }
559 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
560# endif 578# endif
561 case XK_Delete: 579 case XK_Delete:
562 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 581 break;
564#endif 582#endif
565 case XK_Tab: 583 case XK_Tab:
566 if (shft) 584 if (shft)
567 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
582#ifdef XK_KP_Left 600#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
588 { 606 {
589 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break; 609 break;
592 } 610 }
615 633
616#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
618 case XK_KP_Prior: 636 case XK_KP_Prior:
619 /* allow shift to override */ 637 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
621 { 639 {
622 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
623 break; 641 break;
624 } 642 }
625 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
628 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
629 break; 647 break;
630# ifdef XK_KP_Next 648# ifdef XK_KP_Next
631 case XK_KP_Next: 649 case XK_KP_Next:
632 /* allow shift to override */ 650 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
634 { 652 {
635 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
636 break; 654 break;
637 } 655 }
638 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
641 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
642 break; 660 break;
643#endif 661#endif
644 case XK_KP_Enter: 662 case XK_KP_Enter:
645 /* allow shift to override */ 663 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
647 { 665 {
648 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
649 break; 667 break;
650 } 668 }
651 669
694 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 716 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
700 { 718 {
701 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 721 }
704 else 722 else
710 728
711 case XK_Find: 729 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
713 break; 731 break;
714 732
715#ifdef XK_KP_End 733#ifdef XK_KP_Insert
716 case XK_KP_Insert: 734 case XK_KP_Insert:
717 /* allow shift to override */ 735 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
719 { 737 {
720 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
721 break; 739 break;
722 } 740 }
723 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
736 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
737 break; 755 break;
738#ifdef XK_KP_End 756#ifdef XK_KP_End
739 case XK_KP_End: 757 case XK_KP_End:
740 /* allow shift to override */ 758 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
742 { 760 {
743 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
744 break; 762 break;
745 } 763 }
746 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
749 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
750 break; 768 break;
751#ifdef XK_KP_Home 769#ifdef XK_KP_Home
752 case XK_KP_Home: 770 case XK_KP_Home:
753 /* allow shift to override */ 771 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
755 { 773 {
756 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
757 break; 775 break;
758 } 776 }
759 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
941void 1035void
942rxvt_term::flush () 1036rxvt_term::flush ()
943{ 1037{
944 flush_ev.stop (); 1038 flush_ev.stop ();
945 1039
946#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
947 if (want_full_refresh) 1041 if (want_full_refresh)
948 { 1042 {
949 want_full_refresh = 0; 1043 want_full_refresh = 0;
950 scr_clear (); 1044 scr_clear ();
951 scr_touch (false); 1045 scr_touch (false);
1016void 1110void
1017rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1018{ 1112{
1019 make_current (); 1113 make_current ();
1020 1114
1021 refresh_limit = 1;
1022 refresh_count = 0; 1115 refresh_count = 0;
1023 flush (); 1116 flush ();
1024} 1117}
1025 1118
1026#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1182 }
1090} 1183}
1091#endif 1184#endif
1092 1185
1093#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1094static struct event_handler 1187static struct event_handler
1095{ 1188{
1096 check_watcher cw_yield; 1189 check_watcher yield_ev;
1097 1190
1098 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1099 { 1192 {
1100 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1101 w.stop (); 1201 w.stop ();
1102 } 1202 }
1103 1203
1104 event_handler () 1204 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1106 { 1206 {
1107 } 1207 }
1108} event_handler; 1208} event_handler;
1109#endif 1209#endif
1110 1210
1130 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1131 return true; 1231 return true;
1132 } 1232 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1234 {
1135#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1136 if (display->is_local) 1236 if (display->is_local)
1137 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1138#endif 1238#endif
1139 } 1239 }
1140 else 1240 else
1141 { 1241 {
1142 pty_ev.stop (); 1242 pty_ev.stop ();
1143 1243
1144 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1145 destroy (); 1245 destroy ();
1146 } 1246 }
1147 1247
1148 return false; 1248 return false;
1149} 1249}
1150 1250
1151void 1251void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1164} 1264}
1165 1265
1166void 1266void
1167rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1168{ 1268{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1270 recolour_cursor ();
1171 1271
1172#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1273 hidden_pointer = 0;
1174 1274
1175 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1277#endif
1178} 1278}
1179 1279
1180#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1181void 1281void
1182rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1183{ 1283{
1184 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1185 return; 1285 return;
1186 1286
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1288 XFlush (dpy);
1189 1289
1190 hidden_pointer = 1; 1290 hidden_pointer = 1;
1191} 1291}
1192 1292
1193void 1293void
1266 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1267 (32 + x + 1), 1367 (32 + x + 1),
1268 (32 + y + 1)); 1368 (32 + y + 1));
1269} 1369}
1270 1370
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280
1281/*{{{ process an X event */ 1371/*{{{ process an X event */
1282void 1372void
1283rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1284{ 1374{
1285 make_current (); 1375 make_current ();
1286 1376
1287 dDisp; 1377 dLocal (Display *, dpy);
1288 1378
1289 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1382 return;
1297 unsigned int unused_mask; 1387 unsigned int unused_mask;
1298 1388
1299 switch (ev.type) 1389 switch (ev.type)
1300 { 1390 {
1301 case KeyPress: 1391 case KeyPress:
1302#if ISO_14755 1392 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1393 break;
1308 1394
1309 case KeyRelease: 1395 case KeyRelease:
1310 { 1396 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1397 break;
1382 }
1383 1398
1384 case ButtonPress: 1399 case ButtonPress:
1385 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1386 break; 1401 break;
1387 1402
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1418 destroy ();
1404 } 1419 }
1405#if ENABLE_EWMH 1420#if ENABLE_EWMH
1406 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1424 &ev);
1410#endif 1425#endif
1411 } 1426 }
1412 } 1427 }
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1434 focus_out ();
1420 } 1435 }
1421#endif 1436#endif
1422 } 1437 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1438 break;
1428 1439
1429 /* 1440 /*
1430 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1442 * Here's my conclusion:
1450 break; 1461 break;
1451 } 1462 }
1452 break; 1463 break;
1453 1464
1454 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1469 focus_in ();
1456 break; 1470 break;
1457 1471
1458 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1476 focus_out ();
1460 break; 1477 break;
1461 1478
1462 case ConfigureNotify: 1479 case ConfigureNotify:
1480/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1481 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482 szHint.width, szHint.height);*/
1463 if (ev.xconfigure.window == parent[0]) 1483 if (ev.xconfigure.window == parent[0])
1464 { 1484 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1485 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1486 ;
1467 1487
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1489 {
1470 seen_resize = 1; 1490 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1492 }
1473 1493 else
1494 {
1495#ifdef ENABLE_TRANSPARENCY
1496 if (option (Opt_transparent))
1497 update_background ();
1498#endif
1499 }
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1501 }
1481 break; 1502 break;
1482 1503
1483 case PropertyNotify: 1504 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1505 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 text_blink_ev.stop (); 1536 text_blink_ev.stop ();
1516#endif 1537#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1538 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1539 break;
1519 1540
1520#ifdef TRANSPARENT 1541#ifdef ENABLE_TRANSPARENCY
1521 case ReparentNotify: 1542 case ReparentNotify:
1522 rootwin_cb (ev); 1543 rootwin_cb (ev);
1523 break; 1544 break;
1524#endif /* TRANSPARENT */ 1545#endif /* ENABLE_TRANSPARENCY */
1525 1546
1526 case GraphicsExpose: 1547 case GraphicsExpose:
1527 case Expose: 1548 case Expose:
1528 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1529 { 1550 {
1530 do 1551 do
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1555
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1557
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1540 1561
1541 want_refresh = 1; 1562 want_refresh = 1;
1542 } 1563 }
1543 else 1564 else
1544 { 1565 {
1545 XEvent unused_event; 1566 XEvent unused_event;
1546 1567
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1568 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1569 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1571 ;
1551 1572
1552 if (isScrollbarWindow (ev.xany.window)) 1573 if (isScrollbarWindow (ev.xany.window))
1553 { 1574 {
1554 scrollBar.setIdle (); 1575 scrollBar.setIdle ();
1555 scrollbar_show (0); 1576 scrollbar_show (0);
1556 } 1577 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1578 }
1563 break; 1579 break;
1564 1580
1565 case MotionNotify: 1581 case MotionNotify:
1566#ifdef POINTER_BLANK 1582#ifdef POINTER_BLANK
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1591 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1592 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1593 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1594 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1595 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1597 ;
1582 1598
1583 XQueryPointer (disp, vt, 1599 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1600 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1601 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1602 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1603 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1604#ifdef MOUSE_THRESHOLD
1652#endif 1668#endif
1653 } 1669 }
1654 } 1670 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1671 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1656 { 1672 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1673 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1674 MotionNotify, &ev))
1659 ; 1675 ;
1660 1676
1661 XQueryPointer (disp, scrollBar.win, 1677 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1678 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1679 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1680 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1681 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1682 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1683 scrollbar_size ());
1668 want_refresh = 1; 1684 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1685 scrollbar_show (1);
1671 } 1686 }
1672 break; 1687 break;
1673 } 1688 }
1674 1689
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1690#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1691 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1692 {
1680 if (hidden_cursor) 1693 if (hidden_cursor)
1681 { 1694 {
1682 hidden_cursor = 0; 1695 hidden_cursor = 0;
1683 want_refresh = 1; 1696 want_refresh = 1;
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687 } 1700 }
1688#endif 1701#endif
1689 1702
1690#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1705 {
1693 if (ev.type == MotionNotify 1706 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1707 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1708 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1709 if (hidden_pointer)
1708 if (!focus) 1721 if (!focus)
1709 { 1722 {
1710 focus = 1; 1723 focus = 1;
1711 want_refresh = 1; 1724 want_refresh = 1;
1712 1725
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1726 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1727
1715#if USE_XIM 1728#if USE_XIM
1716 if (Input_Context != NULL) 1729 if (Input_Context != NULL)
1717 { 1730 {
1718 IMSetStatusPosition (); 1731 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1720 } 1733 }
1721#endif 1734#endif
1722#if CURSOR_BLINK 1735#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1725#endif 1738#endif
1726#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1728 { 1741 {
1729 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1743 scr_recolour ();
1731 } 1744 }
1732#endif 1745#endif
1746#if ENABLE_FRILLS
1747 if (option (Opt_urgentOnBell))
1748 {
1749 XWMHints *h;
1750
1751 h = XGetWMHints(dpy, parent[0]);
1752 if (h != NULL)
1753 {
1754 h->flags &= ~XUrgencyHint;
1755 XSetWMHints(dpy, parent[0], h);
1756 }
1757 }
1758#endif
1733 } 1759 }
1734} 1760}
1735 1761
1736void 1762void
1737rxvt_term::focus_out () 1763rxvt_term::focus_out ()
1745 1771
1746#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1773 if (iso14755buf)
1748 { 1774 {
1749 iso14755buf = 0; 1775 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1776# if ISO_14755
1751 scr_overlay_off (); 1777 scr_overlay_off ();
1752# endif 1778# endif
1753 } 1779 }
1754#endif 1780#endif
1755#if USE_XIM 1781#if USE_XIM
1756 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1758#endif 1784#endif
1759#if CURSOR_BLINK 1785#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1762 hidden_cursor = 0; 1788 hidden_cursor = 0;
1763#endif 1789#endif
1764#if OFF_FOCUS_FADING 1790#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1791 if (rs[Rs_fade])
1769 } 1795 }
1770#endif 1796#endif
1771 } 1797 }
1772} 1798}
1773 1799
1774#if TRANSPARENT 1800void
1801rxvt_term::update_fade_color (unsigned int idx)
1802{
1803#if OFF_FOCUS_FADING
1804 if (rs[Rs_fade])
1805 {
1806 rgba c;
1807 pix_colors [Color_fade].get (c);
1808 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1809 }
1810#endif
1811}
1812
1813#if ENABLE_TRANSPARENCY || ENABLE_PERL
1775void 1814void
1776rxvt_term::rootwin_cb (XEvent &ev) 1815rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1816{
1778 make_current (); 1817 make_current ();
1779 1818
1819 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1820 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1821 return;
1822
1823# if ENABLE_TRANSPARENCY
1780 switch (ev.type) 1824 switch (ev.type)
1781 { 1825 {
1782 case PropertyNotify: 1826 case PropertyNotify:
1783 /* 1827 /*
1784 * if user used some Esetroot compatible prog to set the root bg, 1828 * if user used some Esetroot compatible prog to set the root bg,
1785 * use the property to determine the pixmap. We use it later on. 1829 * use the property to determine the pixmap. We use it later on.
1786 */ 1830 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1831 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1832 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1833 {
1790 1834 bgPixmap.set_root_pixmap ();
1791 /* FALLTHROUGH */ 1835 update_background ();
1792 case ReparentNotify: 1836 }
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1837 break;
1796 } 1838 }
1839# endif
1797} 1840}
1798#endif 1841#endif
1799 1842
1800void 1843void
1801rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
2129 selection_make (ev.time); 2172 selection_make (ev.time);
2130 break; 2173 break;
2131 2174
2132 case Button2: 2175 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2178 break;
2136 2179
2137#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2138 case Button4: 2181 case Button4:
2139 case Button5: 2182 case Button5:
2143 2186
2144 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2145 2188
2146 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2147 i = 1; 2190 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2192 i = nrow - 1;
2150 else 2193 else
2151 i = 5; 2194 i = 5;
2152 2195
2153# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2174 break; 2217 break;
2175#endif 2218#endif
2176 } 2219 }
2177 } 2220 }
2178} 2221}
2179
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655 2222
2656/*}}} */ 2223/*}}} */
2657 2224
2658bool 2225bool
2659rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
2708 if (ch == C0_LF) 2275 if (ch == C0_LF)
2709 nlines++; 2276 nlines++;
2710 2277
2711 refresh_count++; 2278 refresh_count++;
2712 2279
2713 if (!OPTION (Opt_jumpScroll) 2280 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2281 {
2716 refreshnow = true;
2717 refresh_count = 0; 2282 refresh_count = 0;
2283
2284 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2285 {
2286 refreshnow = true;
2718 ch = NOCHAR; 2287 ch = NOCHAR;
2719 break; 2288 break;
2289 }
2720 } 2290 }
2721 2291
2722 // scr_add_lines only works for nlines <= nrow - 1. 2292 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2293 if (nlines >= nrow - 1)
2724 { 2294 {
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2322 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines); 2323 scr_add_lines (buf, str - buf, nlines);
2754 2324
2755 /* 2325 /*
2756 * If there have been a lot of new lines, then update the screen 2326 * If there have been a lot of new lines, then update the screen
2757 * What the heck I'll cheat and only refresh less than every page-full. 2327 * What the heck we'll cheat and only refresh less than every page-full.
2758 * the number of pages between refreshes is refresh_limit, which 2328 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2329 */
2761 if (refreshnow) 2330 if (refreshnow)
2762 { 2331 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true; 2332 flag = true;
2768 scr_refresh (); 2333 scr_refresh ();
2769 want_refresh = 1; 2334 want_refresh = 1;
2770 }
2771 } 2335 }
2772 2336
2773 } 2337 }
2774 else 2338 else
2775 { 2339 {
2924 { 2488 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2489 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2490 break; /* done = 1 */
2927 } 2491 }
2928 } 2492 }
2929 2493
2930 for (i = 0; i < len; i++) 2494 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2495 if (putc (buf[i], fd) == EOF)
2932 { 2496 {
2933 done = 1; 2497 done = 1;
2934 break; 2498 break;
2996 process_dcs_seq (); 2560 process_dcs_seq ();
2997 break; 2561 break;
2998 case 0x9b: /* CSI */ 2562 case 0x9b: /* CSI */
2999 process_csi_seq (); 2563 process_csi_seq ();
3000 break; 2564 break;
3001 case 0x9d: /* CSI */ 2565 case 0x9d: /* OSC */
3002 process_osc_seq (); 2566 process_osc_seq ();
3003 break; 2567 break;
3004#endif 2568#endif
3005 } 2569 }
3006} 2570}
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2660 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2661 break;
3098 case '+': 2662 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2663 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2664 break;
3101#if ENABLE_FRILLS 2665#if !ENABLE_MINIMAL
3102 case '6': 2666 case '6':
3103 scr_backindex (); 2667 scr_backindex ();
3104 break; 2668 break;
3105#endif 2669#endif
3106 case '7': 2670 case '7':
3107 scr_cursor (SAVE); 2671 scr_cursor (SAVE);
3108 break; 2672 break;
3109 case '8': 2673 case '8':
3110 scr_cursor (RESTORE); 2674 scr_cursor (RESTORE);
3111 break; 2675 break;
3112#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3113 case '9': 2677 case '9':
3114 scr_forwardindex (); 2678 scr_forwardindex ();
3115 break; 2679 break;
3116#endif 2680#endif
3117 case '=': 2681 case '=':
3232rxvt_term::process_csi_seq () 2796rxvt_term::process_csi_seq ()
3233{ 2797{
3234 unicode_t ch, priv, i; 2798 unicode_t ch, priv, i;
3235 unsigned int nargs, p; 2799 unsigned int nargs, p;
3236 int n, ndef; 2800 int n, ndef;
3237 int arg[ESC_ARGS]; 2801 int arg[ESC_ARGS] = { };
3238 2802
3239 for (nargs = ESC_ARGS; nargs > 0;) 2803 nargs = 0;
3240 arg[--nargs] = 0;
3241 2804
3242 priv = 0; 2805 priv = 0;
3243 ch = cmd_getc (); 2806 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3245 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
3289 switch (priv) 2852 switch (priv)
3290 { 2853 {
3291 case '>': 2854 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2856 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2859 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2862 // that we do not support xterm mouse reporting (should be 95 when we do).
3300 // 2863 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2864 tt_printf ("\033[>%d;94;0c", 'U');
3302 } 2865 }
3303 break; 2866 break;
3304 case '?': 2867 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3433 break; 2996 break;
3434 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3435 scr_report_position (); 2998 scr_report_position ();
3436 break; 2999 break;
3437 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 3003 break;
3441 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 3006 break;
3510 break; 3073 break;
3511 case CSI_75: 3074 case CSI_75:
3512 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3513 break; 3076 break;
3514 3077
3515#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3516 case CSI_74: 3079 case CSI_74:
3517 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3518 break; 3081 break;
3519#endif 3082#endif
3520 3083
3527 break; 3090 break;
3528 } 3091 }
3529} 3092}
3530/*}}} */ 3093/*}}} */
3531 3094
3532#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3096/* ARGSUSED */
3534void 3097void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3099{
3537 int x, y; 3100 int x, y;
3538 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3539 Window wdummy; 3102 Window wdummy;
3540 dDisp; 3103
3104 dLocal (Display *, dpy);
3541 3105
3542 if (nargs == 0) 3106 if (nargs == 0)
3543 return; 3107 return;
3544 3108
3545 switch (args[0]) 3109 switch (args[0])
3546 { 3110 {
3547 /* 3111 /*
3548 * commands 3112 * commands
3549 */ 3113 */
3550 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3552 break; 3116 break;
3553 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3119 break;
3556 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3122 break;
3559 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3125 break;
3562 case 5: /* raise window */ 3126 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3564 break; 3128 break;
3565 case 6: /* lower window */ 3129 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3567 break; 3131 break;
3568 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3569 scr_touch (true); 3133 scr_touch (true);
3570 break; 3134 break;
3571 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
3578 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3581 break; 3145 break;
3582 3146
3583
3584 /* 3147 /*
3585 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3586 */ 3149 */
3587 case 11: /* report window state */ 3150 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3153 break;
3591 case 13: /* report window position */ 3154 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3160 break;
3598 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3164 break;
3602 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3167 break;
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3170 break;
3608 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3609 { 3172 {
3610 char *s; 3173 char *s;
3611 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3612 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 */
3613 XFree (s); 3176 XFree (s);
3614 } 3177 }
3615 break; 3178 break;
3616 case 21: /* report window title */ 3179 case 21: /* report window title */
3617 { 3180 {
3618 char *s; 3181 char *s;
3619 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3184 XFree (s);
3622 } 3185 }
3623 break; 3186 break;
3624 } 3187 }
3625} 3188}
3652 seen_esc = true; 3215 seen_esc = true;
3653 continue; 3216 continue;
3654 } 3217 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3222 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3659 3224
3660 seen_esc = false; 3225 seen_esc = false;
3661 3226
3662 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3228 // stop at some sane length
3664 return NULL; 3229 return NULL;
3665 3230
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3231 string[n++] = ch;
3670 } 3232 }
3671 3233
3672 string[n++] = '\0'; 3234 string[n++] = '\0';
3673 3235
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3725void 3287void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3289{
3728 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3729 { 3291 {
3730 unsigned short r, g, b; 3292 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3301 }
3734 else 3302 else
3735 set_window_color (color, str); 3303 set_window_color (color, str);
3736} 3304}
3737 3305
3743{ 3311{
3744 int color; 3312 int color;
3745 char *buf, *name; 3313 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3315 int saveop = op;
3748 dDisp; 3316
3317 dLocal (Display *, dpy);
3749 3318
3750 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3751 switch (op) 3324 switch (op)
3752 { 3325 {
3753 case XTerm_name: 3326 case XTerm_name:
3754 set_title (str); 3327 set_title (str);
3755 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
3769 unsigned long bytes_after; 3342 unsigned long bytes_after;
3770 unsigned char *value = 0; 3343 unsigned char *value = 0;
3771 const char *str = ""; 3344 const char *str = "";
3772 3345
3773 if (prop 3346 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3351 && actual_type != None
3779 && actual_format == 8) 3352 && actual_format == 8)
3780 str = (const char *)(value); 3353 str = (const char *)(value);
3781 3354
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3356
3784 XFree (value); 3357 XFree (value);
3785 } 3358 }
3786 else 3359 else
3787 { 3360 {
3791 { 3364 {
3792 *eq = 0; 3365 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3794 } 3367 }
3795 else 3368 else
3796 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3370 display->atom (str));
3798 } 3371 }
3799 break; 3372 break;
3800 3373
3801 case XTerm_Color: 3374 case XTerm_Color:
3811 break; 3384 break;
3812 3385
3813 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3387 *buf++ = '\0';
3815 3388
3816 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3390 }
3825 break; 3391 break;
3826 case XTerm_Color00: 3392 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3828 break; 3394 break;
3829 case XTerm_Color01: 3395 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3831 break; 3397 break;
3832#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3401 break;
3836#endif 3402#endif
3837 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3405 break;
3840 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3408 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3846 break; 3412 break;
3847 case Rxvt_Color_BD: 3413 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3850 break; 3416 break;
3851 case Rxvt_Color_UL: 3417 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3854 break; 3420 break;
3855 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3857 break; 3423 break;
3858#endif 3424#endif
3859#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3860 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3862 check_our_parents (); 3428 {
3863 if (am_transparent) 3429 bool changed = false;
3864 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3865 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3866#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3867 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3868 case Rxvt_Pixmap: 3442 case Rxvt_Pixmap:
3869 { 3443 if (!strcmp (str, "?"))
3870 if (*str != ';')
3871 { 3444 {
3872#if XPM_BACKGROUND 3445 char str[256];
3873 scale_pixmap (""); /* reset to default scaling */ 3446
3874 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3875 scr_touch (true); 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3876#endif 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3877 } 3451 }
3878 3452 else
3453 {
3879 int changed = 0; 3454 int changed = 0;
3880 3455
3881 while ((str = strchr (str, ';')) != NULL) 3456 if (*str != ';')
3882 { 3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3883 str++; 3468 str++;
3884#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3885 changed += scale_pixmap (str); 3470 changed++;
3886#endif 3471 str = strchr (str, ';');
3887 } 3472 }
3888
3889 if (changed) 3473 if (changed)
3890 { 3474 update_background ();
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 } 3475 }
3896 }
3897 break; 3476 break;
3477#endif
3898 3478
3899 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3901 break; 3481 break;
3902 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:
3927 case URxvt_italicFont: 3507 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3929#endif 3509#endif
3930 if (query) 3510 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3514 resp);
3935 else 3515 else
3936 { 3516 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
3940 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3941 set_fonts (); 3521 set_fonts ();
3942 } 3522 }
3943 break; 3523 break;
3944 3524
3945#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3534 case URxvt_locale:
3947 if (query) 3535 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3537 else
3950 { 3538 {
3951 set_locale (str); 3539 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3541 init_xlocale ();
3968 break; 3556 break;
3969#endif 3557#endif
3970 3558
3971#if ENABLE_PERL 3559#if ENABLE_PERL
3972 case URxvt_perl: 3560 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974 ; // no responses yet 3562 ; // no responses yet
3975 break; 3563 break;
3976#endif 3564#endif
3977 } 3565 }
3978} 3566}
4016{ 3604{
4017 unsigned int i, j; 3605 unsigned int i, j;
4018 int state; 3606 int state;
4019 3607
4020 static const struct 3608 static const struct
4021 { 3609 {
4022 const int argval; 3610 const int argval;
4023 const unsigned long bit; 3611 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3612 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4028 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4030 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4031 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4094 scr_touch (true); 3680 scr_touch (true);
4095 break; 3681 break;
4096#endif 3682#endif
4097 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4098 case 1049: 3684 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3686 if (mode == 0)
4101 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4102 else if (mode == 1) 3688 else if (mode == 1)
4103 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4104 break; 3690 break;
4169 break; 3755 break;
4170 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3758 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4176 scr_erase_screen (2); 3762 scr_erase_screen (2);
4177 scr_change_screen (state); 3763 scr_change_screen (state);
4178 break; 3764 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state); 3766 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4183 scr_erase_screen (2); 3769 scr_erase_screen (2);
4184 break; 3770 break;
4185 default: 3771 default:
4186 break; 3772 break;
4314 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4315 break; 3901 break;
4316 3902
4317 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4318 3904
4319#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4320 case 90: 3906 case 90:
4321 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4322 case 92: 3908 case 92:
4323 case 93: 3909 case 93:
4324 case 94: 3910 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines