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.431 by root, Tue Feb 24 11:51:51 2009 UTC vs.
Revision 1.501 by sf-exg, Fri Nov 25 09:00:40 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
251#endif 257#endif
252 258
253void 259void
254rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
255{ 261{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 263
261 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
262 { 265 {
263 char mb[16]; 266 char mb[MB_LEN_MAX];
264 int len; 267 int len;
265 268
266 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
269 else 272 else
270 { 273 {
271 mb[0] = ch[0]; 274 mb[0] = ch;
272 len = 1; 275 len = 1;
273 } 276 }
274 277
275 if (len > 0) 278 if (len > 0)
276 tt_write (mb, len); 279 tt_write (mb, len);
… …
282} 285}
283 286
284static int 287static int
285hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
286{ 289{
287 // check wether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
290 { 293 {
291 KeySym k = XLookupKeysym (&ev, index); 294 KeySym k = XLookupKeysym (&ev, index);
292 295
… …
416 */ 419 */
417 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
420 423
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#ifdef USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
… …
505#ifdef PAGING_CONTEXT_LINES 502#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 503 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 504#else
508 lnsppg = nrow * 4 / 5; 505 lnsppg = nrow * 4 / 5;
509#endif 506#endif
507 max_it (lnsppg, 1);
508
510 if (keysym == XK_Prior) 509 if (keysym == XK_Prior)
511 { 510 {
512 scr_page (UP, lnsppg); 511 scr_page (UP, lnsppg);
513 return; 512 return;
514 } 513 }
… …
567 selection_request (ev.time); 566 selection_request (ev.time);
568 return; 567 return;
569#if TODO 568#if TODO
570 /* rxvt extras */ 569 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 571 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 573 return;
577#endif 574#endif
578 } 575 }
579 } 576 }
580 } 577 }
581 578
582#if ENABLE_FRILLS || ISO_14755 579#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 580 // ISO 14755 support
584 if (shft && ctrl) 581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 582 {
586 int hv; 583 int hv;
587 584
588 if (iso14755buf & ISO_14755_51 585 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 586 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 616 scr_overlay_off ();
620# endif 617# endif
621 iso14755buf = 0; 618 iso14755buf = 0;
622 } 619 }
623 } 620 }
621 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 622 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 623 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 624 if (!(iso14755buf & ISO_14755_STARTED))
627 { 625 {
628 iso14755buf |= ISO_14755_STARTED; 626 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 627# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 628 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 643 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 645 unsigned int newlen = 1;
648 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
649 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
650 { 653 {
651#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 655 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
654 { 657 {
… …
773 } 776 }
774 777
775 if (newlen) 778 if (newlen)
776 len = strlen (kbuf); 779 len = strlen (kbuf);
777 780
781 if (len > 0)
782 {
778 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
779 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
780 */ 797 */
781#ifdef META8_OPTION 798#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
784#endif 801#endif
802 }
785 803
786 } 804 }
787 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
788 { 806 {
789 len = 1; 807 len = 1;
… …
822 if (view_start) 840 if (view_start)
823 { 841 {
824 view_start = 0; 842 view_start = 0;
825 want_refresh = 1; 843 want_refresh = 1;
826 } 844 }
827
828 /*
829 * these modifications only affect the static keybuffer
830 * pass Shift/Control indicators for function keys ending with `~'
831 *
832 * eg,
833 * Prior = "ESC[5~"
834 * Shift+Prior = "ESC[5$"
835 * Ctrl+Prior = "ESC[5^"
836 * Ctrl+Shift+Prior = "ESC[5@"
837 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
838 */
839 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
840 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
841 845
842 /* escape prefix */ 846 /* escape prefix */
843 if (meta 847 if (meta
844#ifdef META8_OPTION 848#ifdef META8_OPTION
845 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
881 commit_iso14755 (); 885 commit_iso14755 ();
882 886
883 return; 887 return;
884 } 888 }
885 889
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 891 if (i[0] == keysym)
888 { 892 {
889 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 894 commit_iso14755 ();
891 895
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
930#endif 934#endif
931} 935}
932 936
933#if defined (KEYSYM_RESOURCE)
934unsigned int
935rxvt_term::cmd_write (const char *str, unsigned int count)
936{
937 unsigned int n, s;
938
939 n = cmdbuf_ptr - cmdbuf_base;
940 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
941
942 if (n > 0 && s < count)
943 {
944 memmove (cmdbuf_base, cmdbuf_ptr,
945 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
946 cmdbuf_ptr = cmdbuf_base;
947 cmdbuf_endp -= n;
948 s += n;
949 }
950
951 if (count > s)
952 {
953 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
954 count = s;
955 }
956
957 for (; count--;)
958 *cmdbuf_endp++ = *str++;
959
960 cmd_parse ();
961
962 return 0;
963}
964#endif
965
966void 937void
967rxvt_term::flush () 938rxvt_term::flush ()
968{ 939{
969 flush_ev.stop (); 940 flush_ev.stop ();
970 941
971#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
972 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
973 { 944 {
974// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 946 scr_touch (false);
976 } 947 }
977#endif 948#endif
978 949
979 if (want_refresh) 950 if (want_refresh)
… …
1017 } 988 }
1018 989
1019 scr_refresh (); 990 scr_refresh ();
1020 scrollBar.show (1); 991 scrollBar.show (1);
1021#ifdef USE_XIM 992#ifdef USE_XIM
1022 IMSendSpot (); 993 im_send_spot ();
1023#endif 994#endif
1024 } 995 }
1025 996
1026 display->flush (); 997 display->flush ();
1027} 998}
1028 999
1029/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1030void 1001void
1031rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1032{ 1003{
1033 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1072 1043
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1045void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1047{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1050 {
1080 want_refresh = 1; 1051 want_refresh = 1;
1081 refresh_check (); 1052 refresh_check ();
1082 } 1053 }
1083 else 1054 else
… …
1128 // this should really be sched_yield(), but the linux guys thought 1099 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1100 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1101 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1102 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1103 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1104 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1105 // we just nanosleep a bit and hope for the best.
1135 1106
1136 struct timespec ts = { 0, 1000 }; 1107 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1108 nanosleep (&ts, 0);
1138 1109
… …
1144 { 1115 {
1145 } 1116 }
1146} event_handler; 1117} event_handler;
1147#endif 1118#endif
1148 1119
1120/* make sure all the cmd data is at beginning of cmdbuf */
1121void
1122rxvt_term::cmdbuf_reify ()
1123{
1124 if (cmdbuf_ptr == cmdbuf_base)
1125 return;
1126
1127 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1128
1129 memmove (cmdbuf_base, cmdbuf_ptr, used);
1130 cmdbuf_ptr = cmdbuf_base;
1131 cmdbuf_endp = cmdbuf_ptr + used;
1132
1133}
1134
1135#if defined (KEYSYM_RESOURCE)
1136void
1137rxvt_term::cmdbuf_append (const char *str, size_t count)
1138{
1139 cmdbuf_reify ();
1140
1141 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142
1143 if (count > avail)
1144 return;
1145
1146 memcpy (cmdbuf_endp, str, count);
1147 cmdbuf_endp += count;
1148
1149 cmd_parse ();
1150}
1151#endif
1152
1149bool 1153bool
1150rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1151{ 1155{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1153 1157
1154 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1159
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1160 if (!avail)
1157 n = 0;
1158 } 1161 {
1159 1162 // normally this indicates a "too long" command sequence - just drop the data we have
1160 memmove (cmdbuf_base, cmdbuf_ptr, n);
1161 cmdbuf_ptr = cmdbuf_base; 1163 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1163 1167
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1169
1166 if (r > 0) 1170 if (r > 0)
1167 { 1171 {
1168 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1169 return true; 1173 return true;
… …
1243{ 1247{
1244 int button_number, key_state = 0; 1248 int button_number, key_state = 0;
1245 int x, y; 1249 int x, y;
1246 int code = 32; 1250 int code = 32;
1247 1251
1248 x = Pixel2Col (ev.x); 1252 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1253 y = Pixel2Row (ev.y) + 1;
1254
1250 if (ev.type == MotionNotify) 1255 if (ev.type == MotionNotify)
1251 { 1256 {
1252 if (x == mouse_row && y == mouse_col) 1257 if (x == mouse_row && y == mouse_col)
1253 return; 1258 return;
1259
1254 mouse_row = x; 1260 mouse_row = x;
1255 mouse_col = y; 1261 mouse_col = y;
1256 code += 32; 1262 code += 32;
1257 } 1263 }
1258 1264
… …
1261 else 1267 else
1262 { 1268 {
1263 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1271 if (button_number >= 3)
1266 button_number += (64 - 3); 1272 button_number += 64 - 3;
1267 } 1273 }
1268 1274
1269 if (priv_modes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
1270 { 1276 {
1271 /* 1277 /*
… …
1303 fputc ('A', stderr); 1309 fputc ('A', stderr);
1304 if (key_state & 32) 1310 if (key_state & 32)
1305 fputc ('2', stderr); 1311 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1313 button_number,
1308 x + 1, 1314 x,
1309 y + 1); 1315 y);
1310#endif 1316#endif
1311 1317
1318#if ENABLE_FRILLS
1319 if (priv_modes & PrivMode_ExtMouseRight)
1320 tt_printf ("\033[%d;%d;%dM",
1321 code + button_number + key_state,
1322 x,
1323 y);
1324 else if (priv_modes & PrivMode_ExtModeMouse)
1325 tt_printf ("\033[M%c%lc%lc",
1326 code + button_number + key_state,
1327 wint_t (32 + x),
1328 wint_t (32 + y));
1329 else
1330#endif
1312 tt_printf ("\033[M%c%c%c", 1331 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1332 code + button_number + key_state,
1314 (32 + x + 1), 1333 32 + x,
1315 (32 + y + 1)); 1334 32 + y);
1316} 1335}
1317 1336
1318/*{{{ process an X event */ 1337/*{{{ process an X event */
1319void 1338void
1320rxvt_term::x_cb (XEvent &ev) 1339rxvt_term::x_cb (XEvent &ev)
… …
1422 && ev.xfocus.mode != NotifyGrab) 1441 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1442 focus_out ();
1424 break; 1443 break;
1425 1444
1426 case ConfigureNotify: 1445 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1431 { 1447 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1449 ;
1450
1451#ifdef HAVE_BG_PIXMAP
1452 bool moved = false;
1453 if (bg_window_position_sensitive ())
1454 {
1455 int x, y;
1456 if (ev.xconfigure.send_event)
1457 {
1458 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y;
1460 }
1461 else
1462 get_window_origin (x, y);
1463
1464 if (bg_set_position (x, y)
1465 || !(bg_flags & BG_IS_VALID))
1466 moved = true;
1467 }
1468#endif
1434 1469
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1471 {
1437 seen_resize = 1; 1472 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1474 }
1440 else 1475 else
1441 { 1476 {
1442#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1478 if (moved)
1446 update_background (); 1479 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1480#endif
1451 } 1481 }
1452 1482
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1484 }
1455 break; 1485 break;
1456 1486
1457 case PropertyNotify: 1487 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1488 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1489 break;
1464 1490
1465 case SelectionClear: 1491 case SelectionClear:
1466 selection_clear (); 1492 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1493 break;
1473 1494
1474 case SelectionRequest: 1495 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1496 selection_send (ev.xselectionrequest);
1476 break; 1497 break;
1477 1498
1478 case MapNotify: 1499 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1500#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1501 /* This is needed specifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first 1502 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1504 * care of multiplicity of ConfigureNotify events arriving while WM does
1484 * reparenting. 1505 * reparenting.
1485 * We should not render background immidiately, as there could be several 1506 * We should not render background immediately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short 1508 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive. 1509 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all 1510 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results. 1511 * of ConfigureNotifys for the best results.
1491 */ 1512 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1513 if (!(bg_flags & BG_IS_VALID))
1493 update_background_ev.start (0.025); 1514 update_background_ev.start (0.025);
1494#endif 1515#endif
1495 mapped = 1; 1516 mapped = 1;
1496#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1518 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1533 if (ev.xany.window == vt)
1513 { 1534 {
1514 do 1535 do
1515 { 1536 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1539 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1541
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1542 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1543
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1545 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1548 }
1528 1549
1529 want_refresh = 1; 1550 want_refresh = 1;
1530 } 1551 }
1531 else 1552 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1559 ;
1539 1560
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1562 {
1542 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1564 scrollBar.show (0);
1544 } 1565 }
1545 } 1566 }
1546 break; 1567 break;
1547 1568
… …
1635#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1636 } 1657 }
1637#endif 1658#endif
1638 } 1659 }
1639 } 1660 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1662 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1644 ; 1665 ;
1645 1666
1646 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1671 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1673 scrollBar.size ());
1653 want_refresh = 1; 1674 want_refresh = 1;
1654 scrollBar.show (1); 1675 scrollBar.show (1);
1655 } 1676 }
1656 break; 1677 break;
… …
1691rxvt_term::set_urgency (bool enable) 1712rxvt_term::set_urgency (bool enable)
1692{ 1713{
1693 if (enable == urgency_hint) 1714 if (enable == urgency_hint)
1694 return; 1715 return;
1695 1716
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1697 { 1718 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1720 XSetWMHints (dpy, parent, h);
1700 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1701 } 1723 }
1702} 1724}
1703#endif 1725#endif
1704 1726
1705void 1727void
… …
1711 want_refresh = 1; 1733 want_refresh = 1;
1712 1734
1713#if USE_XIM 1735#if USE_XIM
1714 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1715 { 1737 {
1716 IMSetPosition (); 1738 im_set_position ();
1717 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1718 } 1740 }
1719#endif 1741#endif
1720#if CURSOR_BLINK 1742#if CURSOR_BLINK
1721 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1812 * use the property to determine the pixmap. We use it later on. 1834 * use the property to determine the pixmap. We use it later on.
1813 */ 1835 */
1814 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1815 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1816 { 1838 {
1817 bgPixmap.set_root_pixmap (); 1839 bg_set_root_pixmap ();
1818 update_background (); 1840 update_background ();
1819 } 1841 }
1820 1842
1821 break; 1843 break;
1822 } 1844 }
… …
1861 /* save the xbutton state (for ButtonRelease) */ 1883 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1884 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1885#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1886 if (ev.button == MEvent.button && clickintime)
1865 { 1887 {
1866 /* same button, within alloted time */ 1888 /* same button, within allowed time */
1867 MEvent.clicks++; 1889 MEvent.clicks++;
1868 1890
1869 if (MEvent.clicks > 1) 1891 if (MEvent.clicks > 1)
1870 { 1892 {
1871 /* only report double clicks */ 1893 /* only report double clicks */
… …
1952 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1953 direction = UP; /* up */ 1975 direction = UP; /* up */
1954 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1955 direction = DN; /* down */ 1977 direction = DN; /* down */
1956 1978
1957 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1958 /* 1980 /*
1959 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1960 * move up if mouse is above slider 1982 * move up if mouse is above slider
1961 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1962 * 1984 *
… …
2001 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2002#endif 2024#endif
2003 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2004 { 2026 {
2005 if (direction == UP) 2027 if (direction == UP)
2006 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2007 else 2029 else
2008 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2009 } 2031 }
2010 } 2032 }
2011 else 2033 else
2012 switch (ev.button) 2034 switch (ev.button)
2013 { 2035 {
2014 case Button2: 2036 case Button2:
2015 switch (scrollBar.align) 2037 switch (scrollBar.align)
2016 { 2038 {
2017 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2018 csrO = 0; 2040 csrO = 0;
2019 break; 2041 break;
2020 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2021 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2022 break; 2044 break;
2023 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2024 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2025 break; 2047 break;
2026 } 2048 }
2027 2049
2028 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2029 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2030 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2032 2054
2033 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2034 break; 2056 break;
2035 2057
2036 case Button1: 2058 case Button1:
2037 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2038 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2039 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2040 2062
2041 case Button3: 2063 case Button3:
2042 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2043 { 2065 {
2044 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2045# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2046 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2047# else 2069# else
2048 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2049# endif 2071# endif
2050 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2052 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2053# else 2075# else
2054 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2055# endif 2077# endif
2056 else 2078 else
2057 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2058 } 2080 }
2059 else 2081 else
2060 { 2082 {
2061 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2062 (nrow 2084 (nrow
2063 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2064 / scrollBar.size ())); 2086 / scrollBar.size ()));
2065 } 2087 }
2066 2088
2067 break; 2089 break;
2068 } 2090 }
… …
2079 2101
2080 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2081 if (!bypass_keystate) 2103 if (!bypass_keystate)
2082 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2083 2105
2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2085 { 2107 {
2086 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2087 scrollBar.show (0); 2109 scrollBar.show (0);
2088 } 2110 }
2089 2111
2090#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2091 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2142 selection_make (ev.time); 2164 selection_make (ev.time);
2143 break; 2165 break;
2144 2166
2145 case Button2: 2167 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2170 break;
2149 2171
2150#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2151 case Button4: 2173 case Button4:
2152 case Button5: 2174 case Button5:
… …
2194 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2196 2218
2197 for (;;) 2219 for (;;)
2198 { 2220 {
2199 if (expect_false (ch == NOCHAR)) 2221 if (ecb_unlikely (ch == NOCHAR))
2200 { 2222 {
2201 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2224 ch = next_char ();
2203 2225
2204 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2205 break; 2227 break;
2206 } 2228 }
2207 2229
2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2231 {
2210 if (expect_false (!seen_input)) 2232 if (ecb_unlikely (!seen_input))
2211 { 2233 {
2212 seen_input = 1; 2234 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2250 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2252
2231 for (;;) 2253 for (;;)
2232 { 2254 {
2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2256 break;
2235 2257
2236 *str++ = ch; 2258 *str++ = ch;
2237 2259
2238 if (expect_false (ch == C0_LF || str >= eol)) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2261 {
2240 if (ch == C0_LF) 2262 if (ch == C0_LF)
2241 nlines++; 2263 nlines++;
2242 2264
2243 refresh_count++; 2265 refresh_count++;
… …
2321rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2322{ 2344{
2323 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2324 { 2346 {
2325 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2327 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2328 2350
2329 wchar_t wc; 2351 wchar_t wc;
2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2331 2353
… …
2359 : NOCHAR; 2381 : NOCHAR;
2360} 2382}
2361 2383
2362static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2363 2385
2364/* rxvt_cmd_getc () - Return next input character */
2365/*
2366 * Return the next input character after first passing any keyboard input
2367 * to the command.
2368 */
2369wchar_t 2386wchar_t
2370rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2371{ 2388{
2372 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2373 2390
… …
2466 pclose_printer (fd); 2483 pclose_printer (fd);
2467} 2484}
2468#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2469/*}}} */ 2486/*}}} */
2470 2487
2471/* *INDENT-OFF* */
2472enum { 2488enum {
2473 C1_40 = 0x40, 2489 C1_40 = 0x40,
2474 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2475 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2491 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2476 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2477 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2478}; 2494};
2479/* *INDENT-ON* */
2480 2495
2481/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2482void 2497void
2483rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2484{ 2499{
… …
2577 break; 2592 break;
2578 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2580 break; 2595 break;
2581 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2582 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2583 break; 2598 break;
2584 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2585 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2586 /* unimplemented */ 2601 /* unimplemented */
2587 break; 2602 break;
… …
2606 return; 2621 return;
2607 } 2622 }
2608 2623
2609 switch (ch) 2624 switch (ch)
2610 { 2625 {
2611 /* case 1: do_tek_mode (); break; */
2612 case '#': 2626 case '#':
2613 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2614 scr_E (); 2628 scr_E ();
2615 break; 2629 break;
2616 case '(': 2630 case '(':
… …
2639#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2640 case '9': 2654 case '9':
2641 scr_forwardindex (); 2655 scr_forwardindex ();
2642 break; 2656 break;
2643#endif 2657#endif
2658 // DECPAM/DECPNM
2644 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2645 case '>': 2662 case '>':
2646 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2647 break; 2664 break;
2648 2665
2649 case C1_40: 2666 case C1_40:
2650 cmd_getc (); 2667 cmd_getc ();
2651 break; 2668 break;
… …
2655 2672
2656 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2657 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2658 { 2675 {
2659 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2661 } 2678 }
2662 break; 2679 break;
2663 2680
2664 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2665 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2666 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2667 break; 2686 break;
2668 2687
2669 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2670 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2671 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2675 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2676 scr_index (DN); 2695 scr_index (DN);
2677 break; 2696 break;
2678 2697
2679 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2680 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2681 2700
2682 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2683 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2684 2703
2685 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2686 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2687 process_dcs_seq (); 2706 process_dcs_seq ();
2688 break; 2707 break;
… …
2721 } 2740 }
2722} 2741}
2723/*}}} */ 2742/*}}} */
2724 2743
2725/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2726/* *INDENT-OFF* */
2727enum { 2745enum {
2728 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2729 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2730 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2731 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2734 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2735 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2736 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2737}; 2755};
2738 2756
2739#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2740 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2741 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2742#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2743 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2744 2762
2745const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2746 { 2764 {
2747 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2748 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2749 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2750 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2751 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2752 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2753 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2754 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2755 }; 2773 };
2756/* *INDENT-ON* */
2757 2774
2758void 2775void
2759rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2760{ 2777{
2761 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2839 { 2856 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset (); 2858 scr_soft_reset ();
2842 2859
2843 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2845 2862
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2848 } 2865 }
2849 break; 2866 break;
2850 } 2867 }
2851 2868
2852 return; 2869 return;
… …
2870 } 2887 }
2871 break; 2888 break;
2872#endif 2889#endif
2873 2890
2874 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2875 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2876 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2877 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2878 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2879 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2880 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2881 break; 2898 break;
2882 2899
2883 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2884 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3071 } 3088 }
3072} 3089}
3073/*}}} */ 3090/*}}} */
3074 3091
3075#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3076/* ARGSUSED */
3077void 3093void
3078rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3079{ 3095{
3080 int x, y; 3096 int x, y;
3081 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3090 { 3106 {
3091 /* 3107 /*
3092 * commands 3108 * commands
3093 */ 3109 */
3094 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3095 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3096 break; 3112 break;
3097 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3098 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3099 break; 3115 break;
3100 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3101 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3102 break; 3118 break;
3103 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3104 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3105 break; 3121 break;
3106 case 5: /* raise window */ 3122 case 5: /* raise window */
3107 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3108 break; 3124 break;
3109 case 6: /* lower window */ 3125 case 6: /* lower window */
3110 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3111 break; 3127 break;
3112 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3113 scr_touch (true); 3129 scr_touch (true);
3114 break; 3130 break;
3115 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3126 3142
3127 /* 3143 /*
3128 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3129 */ 3145 */
3130 case 11: /* report window state */ 3146 case 11: /* report window state */
3131 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3132 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3133 break; 3149 break;
3134 case 13: /* report window position */ 3150 case 13: /* report window position */
3135 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3136 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3137 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3138 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3139 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3140 break; 3156 break;
3141 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3142 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3143 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3144 break; 3160 break;
3145 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3146 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3147 break; 3163 break;
… …
3149 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3150 break; 3166 break;
3151 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3152 { 3168 {
3153 char *s; 3169 char *s;
3154 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3155 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3156 XFree (s); 3172 XFree (s);
3157 } 3173 }
3158 break; 3174 break;
3159 case 21: /* report window title */ 3175 case 21: /* report window title */
3160 { 3176 {
3161 char *s; 3177 char *s;
3162 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3163 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3180 XFree (s);
3165 } 3181 }
3166 break; 3182 break;
3167 } 3183 }
… …
3223 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3224 */ 3240 */
3225void 3241void
3226rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3227{ 3243{
3228 char *s;
3229 unicode_t eh;
3230
3231 /* 3244 /*
3232 * Not handled yet 3245 * Not handled yet
3233 */ 3246 */
3247
3248 unicode_t eh;
3234 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3235 if (s) 3250 if (s)
3236 free (s); 3251 free (s);
3237 3252
3238 return; 3253 return;
3239} 3254}
… …
3243 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3244 */ 3259 */
3245void 3260void
3246rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3247{ 3262{
3248 unicode_t ch, eh;
3249 int arg; 3263 int arg;
3250 3264
3251 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3252 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3253 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3254 3268
3255 if (ch == ';') 3269 if (ch == ';')
3256 { 3270 {
3271 unicode_t eh;
3257 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3258 3273
3259 if (s) 3274 if (s)
3260 { 3275 {
3261 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
3285 3300
3286/* 3301/*
3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3288 */ 3303 */
3289void 3304void
3290rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3291{ 3306{
3292 int color; 3307 int color;
3293 char *buf, *name; 3308 char *buf, *name;
3294 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3295 int saveop = op; 3310 int saveop = op;
… …
3322 unsigned long bytes_after; 3337 unsigned long bytes_after;
3323 unsigned char *value = 0; 3338 unsigned char *value = 0;
3324 const char *str = ""; 3339 const char *str = "";
3325 3340
3326 if (prop 3341 if (prop
3327 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3328 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3329 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3330 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3331 && actual_type != None 3346 && actual_type != None
3332 && actual_format == 8) 3347 && actual_format == 8)
… …
3336 3351
3337 XFree (value); 3352 XFree (value);
3338 } 3353 }
3339 else 3354 else
3340 { 3355 {
3341 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3342 3357
3343 if (eq) 3358 if (eq)
3344 { 3359 {
3345 *eq = 0; 3360 *eq = 0;
3346 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3347 } 3362 }
3348 else 3363 else
3349 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3350 display->atom (str)); 3365 display->atom (str));
3351 } 3366 }
3352 break; 3367 break;
3353 3368
3354 case XTerm_Color: 3369 case XTerm_Color:
… …
3386 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3387 break; 3402 break;
3388 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3389 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3390 break; 3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3391#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3392 case XTerm_Color_RV:
3393 process_color_seq (op, Color_RV, str, resp);
3394 break;
3395 case Rxvt_Color_BD:
3396 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3397 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3398 break; 3417 break;
3399 case Rxvt_Color_UL:
3400 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3401 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3402 break; 3420 break;
3403 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3404 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
… …
3412 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3413 { 3431 {
3414 bool changed = false; 3432 bool changed = false;
3415 3433
3416 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3417 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3418 else
3419 changed = bgPixmap.unset_tint ();
3420 3436
3421 if (changed) 3437 if (changed)
3422 update_background (); 3438 update_background ();
3423 } 3439 }
3424 3440
… …
3429 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3430 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3431 { 3447 {
3432 char str[256]; 3448 char str[256];
3433 3449
3434 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3450 sprintf (str, "[%dx%d+%d+%d]",
3435 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3436 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3437 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3438 } 3454 }
3439 else 3455 else
3440 { 3456 {
3441 int changed = 0; 3457 bool changed = false;
3442 3458
3443 if (*str != ';') 3459 if (*str != ';')
3444 { 3460 {
3445 /* reset to default scaling :*/
3446 bgPixmap.unset_geometry ();
3447 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3448 changed++; 3462 changed = true;
3449 str = strchr (str, ';');
3450 if (str == NULL)
3451 bgPixmap.set_defaultGeometry ();
3452 } 3463 }
3453 3464 else
3454 while (str)
3455 { 3465 {
3456 str++; 3466 str++;
3457 if (bgPixmap.set_geometry (str)) 3467 if (bg_set_geometry (str, true))
3458 changed++; 3468 changed = true;
3459 str = strchr (str, ';');
3460 } 3469 }
3461 3470
3462 if (changed) 3471 if (changed)
3472 {
3473 if (bg_window_position_sensitive ())
3474 {
3475 int x, y;
3476 get_window_origin (x, y);
3477 bg_set_position (x, y);
3478 }
3463 update_background (); 3479 update_background ();
3480 }
3464 } 3481 }
3465 break; 3482 break;
3466#endif 3483#endif
3467 3484
3468 case XTerm_logfile: 3485 case XTerm_logfile:
… …
3571 { 3588 {
3572 if (mode == 'r') 3589 if (mode == 'r')
3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3574 else 3591 else
3575 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3576 set_privmode (bit, state); 3593
3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3577 } 3598 }
3578 3599
3579 return state; 3600 return state;
3580} 3601}
3581 3602
3582/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3583void 3604void
3584rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3585{ 3606{
3586 unsigned int i, j; 3607 unsigned int i, j;
3587 int state; 3608 int state;
3588 3609
3589 static const struct 3610 static const struct
3590 { 3611 {
3591 const int argval; 3612 const int argval;
3592 const unsigned long bit; 3613 const unsigned long bit;
3593 } argtopriv[] = { 3614 } argtopriv[] = {
3594 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3595 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3596 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3597 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3598 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3599 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3600 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3601 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3602 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3603 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region 3625 // 19 Print screen prints full screen/scroll region
3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3606#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3607 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3608#endif 3629#endif
3609 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3611 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3612 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3613 // 45 margin bell NYI 3634 // 45 margin bell NYI
3614 // 46 start logging 3635 // 46 start logging
3615 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3617#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3618 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3619#endif 3640#endif
3620 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3621 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
3622 { 1003, PrivMode_MouseAnyEvent }, 3643 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3624 { 1011, PrivMode_Keypress }, // rxvt extension 3648 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3651#endif
3625 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
3626 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
3627 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
3628 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
3629 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste }, 3659 { 2004, PrivMode_BracketPaste },
3633 }; 3660 };
3634 3661
… …
3644 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3645 { 3672 {
3646 state = -1; 3673 state = -1;
3647 3674
3648 /* basic handling */ 3675 /* basic handling */
3649 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3650 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3651 { 3678 {
3652 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3653 break; 3680 break;
3654 } 3681 }
… …
3680 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3710 * within VT52 mode
3684 */ 3711 */
3685 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3686 break; 3713 break;
3687 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3688 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3717 break;
… …
3705 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3707 break; 3734 break;
3708#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3709 case scrollBar_esc: 3736 case scrollBar_esc:
3710 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3711 {
3712 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3713 scr_touch (true); 3739 scr_touch (true);
3714 }
3715 break; 3740 break;
3716#endif 3741#endif
3717 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3718 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3719 break; 3744 break;
… …
3732 case 1003: 3757 case 1003:
3733 if (state) 3758 if (state)
3734 { 3759 {
3735 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3761 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3762 mouse_row = mouse_col = 0;
3737 vt_emask_mouse = PointerMotionMask; 3763 vt_emask_mouse = PointerMotionMask;
3738 } 3764 }
3739 else 3765 else
3740 vt_emask_mouse = NoEventMask; 3766 vt_emask_mouse = NoEventMask;
3741 3767
… …
3926 } 3952 }
3927 } 3953 }
3928} 3954}
3929/*}}} */ 3955/*}}} */
3930 3956
3931/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3932void
3933rxvt_term::process_graphics ()
3934{
3935 unicode_t ch, cmd = cmd_getc ();
3936
3937 if (cmd == 'Q')
3938 {
3939 /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */
3941 return;
3942 }
3943 /* swallow other graphics sequences until terminating ':' */
3944 do
3945 ch = cmd_getc ();
3946 while (ch != ':');
3947}
3948/*}}} */
3949
3950/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
3951 3958
3952/* 3959/*
3953 * Send printf () formatted output to the command. 3960 * Send printf () formatted output to the command.
3954 * Only use for small amounts of data. 3961 * Only use for small amounts of data.
… …
3967 3974
3968/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
3969/* Write data to the pty as typed by the user, pasted with the mouse, 3976/* Write data to the pty as typed by the user, pasted with the mouse,
3970 * or generated by us in response to a query ESC sequence. 3977 * or generated by us in response to a query ESC sequence.
3971 */ 3978 */
3972const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3973 3980
3974void 3981void
3975rxvt_term::tt_write (const char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
3976{ 3983{
3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3982 3989
3983 if (v_buflen == 0) 3990 if (v_buflen == 0)
3984 { 3991 {
3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3986 3993
3994 max_it (written, 0);
3995
3987 if ((unsigned int)written == len) 3996 if (written == len)
3988 return; 3997 return;
3989 3998
3990 data += written; 3999 data += written;
3991 len -= written; 4000 len -= written;
3992 } 4001 }
3993 4002
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3995 4004
3996 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 4006 v_buflen += len;
3998 4007
3999 pty_ev.set (ev::READ | ev::WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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