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.421 by root, Wed Oct 15 17:16:47 2008 UTC vs.
Revision 1.506 by sf-exg, Wed Apr 11 10:20:00 2012 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
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
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
1044 refresh_count = 0; 1015 refresh_count = 0;
1045 flush (); 1016 flush ();
1046} 1017}
1047 1018
1048#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1049void 1035void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1037{
1052 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1039 want_refresh = 1;
1072 1058
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1060void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1062{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1065 {
1080 want_refresh = 1; 1066 want_refresh = 1;
1081 refresh_check (); 1067 refresh_check ();
1082 } 1068 }
1083 else 1069 else
1128 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1115 // 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 1116 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1118 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1119 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1120 // we just nanosleep a bit and hope for the best.
1135 1121
1136 struct timespec ts = { 0, 1000 }; 1122 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1138 1124
1144 { 1130 {
1145 } 1131 }
1146} event_handler; 1132} event_handler;
1147#endif 1133#endif
1148 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1149bool 1168bool
1150rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1151{ 1170{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1153 1172
1154 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1174
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1157 n = 0;
1158 } 1176 {
1159 1177 // 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; 1178 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1163 1182
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1184
1166 if (r > 0) 1185 if (r > 0)
1167 { 1186 {
1168 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1169 return true; 1188 return true;
1191{ 1210{
1192 make_current (); 1211 make_current ();
1193 1212
1194 if (revents & ev::READ) 1213 if (revents & ev::READ)
1195 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1196 while (pty_fill ()) 1215 for (int i = CBUFCNT; i-- && pty_fill (); )
1197 if (cmd_parse ()) 1216 cmd_parse ();
1198 break;
1199 1217
1200 if (revents & ev::WRITE) 1218 if (revents & ev::WRITE)
1201 pty_write (); 1219 pty_write ();
1202 1220
1203 refresh_check (); 1221 refresh_check ();
1244{ 1262{
1245 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1246 int x, y; 1264 int x, y;
1247 int code = 32; 1265 int code = 32;
1248 1266
1249 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1250 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1251 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1252 { 1271 {
1253 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1254 return; 1273 return;
1274
1255 mouse_row = x; 1275 mouse_row = x;
1256 mouse_col = y; 1276 mouse_col = y;
1257 code += 32; 1277 code += 32;
1258 } 1278 }
1259 1279
1262 else 1282 else
1263 { 1283 {
1264 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1265 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1266 if (button_number >= 3) 1286 if (button_number >= 3)
1267 button_number += (64 - 3); 1287 button_number += 64 - 3;
1268 } 1288 }
1269 1289
1270 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1271 { 1291 {
1272 /* 1292 /*
1304 fputc ('A', stderr); 1324 fputc ('A', stderr);
1305 if (key_state & 32) 1325 if (key_state & 32)
1306 fputc ('2', stderr); 1326 fputc ('2', stderr);
1307 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1308 button_number, 1328 button_number,
1309 x + 1, 1329 x,
1310 y + 1); 1330 y);
1311#endif 1331#endif
1312 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1313 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1314 (code + button_number + key_state), 1347 code + button_number + key_state,
1315 (32 + x + 1), 1348 32 + x,
1316 (32 + y + 1)); 1349 32 + y);
1317} 1350}
1318 1351
1319/*{{{ process an X event */ 1352/*{{{ process an X event */
1320void 1353void
1321rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1423 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1424 focus_out (); 1457 focus_out ();
1425 break; 1458 break;
1426 1459
1427 case ConfigureNotify: 1460 case ConfigureNotify:
1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1430 szHint.width, szHint.height);*/
1431 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1432 { 1462 {
1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1434 ; 1464 ;
1465
1466#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ())
1469 {
1470 int x, y;
1471 if (ev.xconfigure.send_event)
1472 {
1473 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y;
1475 }
1476 else
1477 get_window_origin (x, y);
1478
1479 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID))
1481 moved = true;
1482 }
1483#endif
1435 1484
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1486 {
1438 seen_resize = 1; 1487 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1489 }
1441 else 1490 else
1442 { 1491 {
1443#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped) 1493 if (moved)
1447 update_background (); 1494 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif 1495#endif
1452 } 1496 }
1453 1497
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455 } 1499 }
1456 break; 1500 break;
1457 1501
1458 case PropertyNotify: 1502 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1461 && ev.xproperty.state == PropertyNewValue)
1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1463
1464 break; 1504 break;
1465 1505
1466 case SelectionClear: 1506 case SelectionClear:
1467 selection_clear (); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468 break;
1469
1470 case SelectionNotify:
1471 if (selection_wait == Sel_normal)
1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1473 break; 1508 break;
1474 1509
1475 case SelectionRequest: 1510 case SelectionRequest:
1476 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1477 break; 1512 break;
1478 1513
1479 case MapNotify: 1514 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1515#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a 1516 /* This is needed specifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first 1517 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1485 * reparenting. 1520 * reparenting.
1486 * We should not render background immidiately, as there could be several 1521 * We should not render background immediately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short 1523 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all 1525 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1492 */ 1527 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1528 if (!(bg_flags & BG_IS_VALID))
1494 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1495#endif 1530#endif
1496 mapped = 1; 1531 mapped = 1;
1497#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1498 text_blink_ev.start (); 1533 text_blink_ev.start ();
1513 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1514 { 1549 {
1515 do 1550 do
1516 { 1551 {
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1519 } 1554 }
1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521 1556
1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523 1558
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 { 1560 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1563 }
1529 1564
1530 want_refresh = 1; 1565 want_refresh = 1;
1531 } 1566 }
1532 else 1567 else
1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1539 ; 1574 ;
1540 1575
1541 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1542 { 1577 {
1543 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1544 scrollBar.show (0); 1579 scrollBar.show (0);
1545 } 1580 }
1546 } 1581 }
1547 break; 1582 break;
1548 1583
1614 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1615 } 1650 }
1616 else 1651 else
1617 { 1652 {
1618 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1619 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1620 } 1655 }
1621 1656
1622 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1623 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1624 + 1; 1659 + 1;
1636#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1637 } 1672 }
1638#endif 1673#endif
1639 } 1674 }
1640 } 1675 }
1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1642 { 1677 {
1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1644 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1645 ; 1680 ;
1646 1681
1647 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1648 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1649 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1650 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1651 &unused_mask); 1686 &unused_mask);
1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1653 scrollBar.size ()); 1688 scrollBar.size ());
1654 want_refresh = 1; 1689 want_refresh = 1;
1655 scrollBar.show (1); 1690 scrollBar.show (1);
1656 } 1691 }
1657 break; 1692 break;
1658 } 1693 }
1659 1694
1660#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1661 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1662 {
1663 if (hidden_cursor)
1664 {
1665 hidden_cursor = 0;
1666 want_refresh = 1;
1667 }
1668
1669 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1670 }
1671#endif 1698#endif
1672 1699
1673#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1675 { 1702 {
1685#endif 1712#endif
1686 1713
1687 refresh_check (); 1714 refresh_check ();
1688} 1715}
1689 1716
1717#if ENABLE_FRILLS
1690void 1718void
1691rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1692{ 1720{
1693 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1694 return; 1722 return;
1695 1723
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1697 { 1725 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1700 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1701 } 1730 }
1702} 1731}
1732#endif
1703 1733
1704void 1734void
1705rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1706{ 1736{
1707 if (!focus) 1737 if (!focus)
1710 want_refresh = 1; 1740 want_refresh = 1;
1711 1741
1712#if USE_XIM 1742#if USE_XIM
1713 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1714 { 1744 {
1715 IMSetPosition (); 1745 im_set_position ();
1716 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1717 } 1747 }
1718#endif 1748#endif
1719#if CURSOR_BLINK 1749#if CURSOR_BLINK
1720 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1811 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1812 */ 1842 */
1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815 { 1845 {
1816 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1817 update_background (); 1847 update_background ();
1818 } 1848 }
1819 1849
1820 break; 1850 break;
1821 } 1851 }
1860 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1861 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1862#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1863 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1864 { 1894 {
1865 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1866 MEvent.clicks++; 1896 MEvent.clicks++;
1867 1897
1868 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1869 { 1899 {
1870 /* only report double clicks */ 1900 /* only report double clicks */
1951 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */ 1982 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */ 1984 direction = DN; /* down */
1955 1985
1956 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1957 /* 1987 /*
1958 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 1989 * move up if mouse is above slider
1960 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1961 * 1991 *
2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 2031#endif
2002 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2003 { 2033 {
2004 if (direction == UP) 2034 if (direction == UP)
2005 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2006 else 2036 else
2007 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2008 } 2038 }
2009 } 2039 }
2010 else 2040 else
2011 switch (ev.button) 2041 switch (ev.button)
2012 { 2042 {
2013 case Button2: 2043 case Button2:
2014 switch (scrollBar.align) 2044 switch (scrollBar.align)
2015 { 2045 {
2016 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2017 csrO = 0; 2047 csrO = 0;
2018 break; 2048 break;
2019 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2020 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2021 break; 2051 break;
2022 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2023 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2024 break; 2054 break;
2025 } 2055 }
2026 2056
2027 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2028 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2031 2061
2032 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2033 break; 2063 break;
2034 2064
2035 case Button1: 2065 case Button1:
2036 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2039 2069
2040 case Button3: 2070 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2042 { 2072 {
2043 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2044# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2045 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2046# else 2076# else
2047 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2048# endif 2078# endif
2049 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2051 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2052# else 2082# else
2053 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2054# endif 2084# endif
2055 else 2085 else
2056 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2057 } 2087 }
2058 else 2088 else
2059 { 2089 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2091 (nrow
2062 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2063 / scrollBar.size ())); 2093 / scrollBar.size ()));
2064 } 2094 }
2065 2095
2066 break; 2096 break;
2067 } 2097 }
2078 2108
2079 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2110 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2112
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2084 { 2114 {
2085 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2086 scrollBar.show (0); 2116 scrollBar.show (0);
2087 } 2117 }
2088 2118
2089#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
2140 case Button3: 2170 case Button3:
2141 selection_make (ev.time); 2171 selection_make (ev.time);
2142 break; 2172 break;
2143 2173
2144 case Button2: 2174 case Button2:
2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2147 break; 2177 break;
2148 2178
2149#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2150 case Button4: 2180 case Button4:
2151 case Button5: 2181 case Button5:
2185 } 2215 }
2186} 2216}
2187 2217
2188/*}}} */ 2218/*}}} */
2189 2219
2190bool 2220void
2191rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2192{ 2222{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2196 2225
2197 for (;;) 2226 for (;;)
2198 { 2227 {
2199 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2200 { 2229 {
2201 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2231 ch = next_char ();
2203 2232
2204 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2205 break; 2234 break;
2206 } 2235 }
2207 2236
2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2238 {
2210 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2211 { 2240 {
2212 seen_input = 1; 2241 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
2228 wchar_t *str = buf; 2257 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2259
2231 for (;;) 2260 for (;;)
2232 { 2261 {
2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2263 break;
2235 2264
2236 *str++ = ch; 2265 *str++ = ch;
2237 2266
2238 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2239 { 2268 {
2240 if (ch == C0_LF) 2269 if (ch == C0_LF)
2241 nlines++; 2270 nlines++;
2242 2271
2243 refresh_count++; 2272 refresh_count++;
2292 * What the heck we'll cheat and only refresh less than every page-full. 2321 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2322 * if skipScroll is enabled.
2294 */ 2323 */
2295 if (refreshnow) 2324 if (refreshnow)
2296 { 2325 {
2297 flag = true;
2298 scr_refresh (); 2326 scr_refresh ();
2299 want_refresh = 1; 2327 want_refresh = 1;
2300 } 2328 }
2301
2302 } 2329 }
2303 else 2330 else
2304 { 2331 {
2305 try 2332 try
2306 { 2333 {
2314 } 2341 }
2315 2342
2316 ch = NOCHAR; 2343 ch = NOCHAR;
2317 } 2344 }
2318 } 2345 }
2319
2320 return flag;
2321} 2346}
2322 2347
2323// read the next character 2348// read the next character
2324wchar_t 2349wchar_t
2325rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2326{ 2351{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2353 {
2329 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2332 2357
2333 wchar_t wc; 2358 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2360
2340 break; 2365 break;
2341 } 2366 }
2342 2367
2343 if (len == (size_t)-1) 2368 if (len == (size_t)-1)
2344 { 2369 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2370 mbstate.reset (); // reset now undefined conversion state
2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 } 2372 }
2348 2373
2349 // assume wchar == unicode 2374 // assume wchar == unicode
2350 cmdbuf_ptr += len; 2375 cmdbuf_ptr += len;
2363 : NOCHAR; 2388 : NOCHAR;
2364} 2389}
2365 2390
2366static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2367 2392
2368/* rxvt_cmd_getc () - Return next input character */
2369/*
2370 * Return the next input character after first passing any keyboard input
2371 * to the command.
2372 */
2373wchar_t 2393wchar_t
2374rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2375{ 2395{
2376 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2377 2397
2470 pclose_printer (fd); 2490 pclose_printer (fd);
2471} 2491}
2472#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2473/*}}} */ 2493/*}}} */
2474 2494
2475/* *INDENT-OFF* */
2476enum { 2495enum {
2477 C1_40 = 0x40, 2496 C1_40 = 0x40,
2478 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2479 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2480 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2481 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2482}; 2501};
2483/* *INDENT-ON* */
2484 2502
2485/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2486void 2504void
2487rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2488{ 2506{
2581 break; 2599 break;
2582 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2584 break; 2602 break;
2585 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2586 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2587 break; 2605 break;
2588 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2589 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2590 /* unimplemented */ 2608 /* unimplemented */
2591 break; 2609 break;
2610 return; 2628 return;
2611 } 2629 }
2612 2630
2613 switch (ch) 2631 switch (ch)
2614 { 2632 {
2615 /* case 1: do_tek_mode (); break; */
2616 case '#': 2633 case '#':
2617 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2618 scr_E (); 2635 scr_E ();
2619 break; 2636 break;
2620 case '(': 2637 case '(':
2643#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2644 case '9': 2661 case '9':
2645 scr_forwardindex (); 2662 scr_forwardindex ();
2646 break; 2663 break;
2647#endif 2664#endif
2665 // DECPAM/DECPNM
2648 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2649 case '>': 2669 case '>':
2650 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2651 break; 2671 break;
2652 2672
2653 case C1_40: 2673 case C1_40:
2654 cmd_getc (); 2674 cmd_getc ();
2655 break; 2675 break;
2659 2679
2660 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2661 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2662 { 2682 {
2663 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2664 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2665 } 2685 }
2666 break; 2686 break;
2667 2687
2668 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2669 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2670 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2671 break; 2693 break;
2672 2694
2673 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2674 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2675 scr_set_tab (1); 2697 scr_set_tab (1);
2679 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2680 scr_index (DN); 2702 scr_index (DN);
2681 break; 2703 break;
2682 2704
2683 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2684 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2685 2707
2686 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2687 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2688 2710
2689 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2690 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2691 process_dcs_seq (); 2713 process_dcs_seq ();
2692 break; 2714 break;
2694 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2716 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2695 case C1_SCI: /* ESC Z */ 2717 case C1_SCI: /* ESC Z */
2696 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2718 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2697 break; /* steal obsolete ESC [ c */ 2719 break; /* steal obsolete ESC [ c */
2698 2720
2699 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2721 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2700 case C1_CSI: /* ESC [ */ 2722 case C1_CSI: /* ESC [ */
2701 process_csi_seq (); 2723 process_csi_seq ();
2702 break; 2724 break;
2703 2725
2704 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2726 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2705 case C1_OSC: /* ESC ] */ 2727 case C1_OSC: /* ESC ] */
2706 process_osc_seq (); 2728 process_osc_seq ();
2707 break; 2729 break;
2708 2730
2709 /* 8.3.106: RESET TO INITIAL STATE */ 2731 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2710 case 'c': 2732 case 'c':
2711 mbstate.reset (); 2733 mbstate.reset ();
2712 scr_poweron (); 2734 scr_poweron ();
2713 scrollBar.show (1); 2735 scrollBar.show (1);
2714 break; 2736 break;
2725 } 2747 }
2726} 2748}
2727/*}}} */ 2749/*}}} */
2728 2750
2729/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2730/* *INDENT-OFF* */
2731enum { 2752enum {
2732 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2733 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2734 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2735 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2738 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2739 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2740 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2741}; 2762};
2742 2763
2743#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2744 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2745 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2746#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2747 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2748 2769
2749const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2750 { 2771 {
2751 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2752 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2753 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2754 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2755 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2756 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2757 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2758 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2759 }; 2780 };
2760/* *INDENT-ON* */
2761 2781
2762void 2782void
2763rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2764{ 2784{
2765 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2769 2789
2770 nargs = 0; 2790 nargs = 0;
2771 2791
2772 priv = 0; 2792 priv = 0;
2773 ch = cmd_getc (); 2793 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2794 if ((ch >= '<' && ch <= '?') || ch == '!')
2775 { 2795 {
2776 /* '<' '=' '>' '?' */ 2796 /* '<' '=' '>' '?' '!' */
2777 priv = ch; 2797 priv = ch;
2778 ch = cmd_getc (); 2798 ch = cmd_getc ();
2779 } 2799 }
2780 2800
2781 /* read any numerical arguments */ 2801 /* read any numerical arguments */
2835 2855
2836 case '?': 2856 case '?':
2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2857 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2838 process_terminal_mode (ch, priv, nargs, arg); 2858 process_terminal_mode (ch, priv, nargs, arg);
2839 break; 2859 break;
2860
2861 case '!':
2862 if (ch == CSI_70)
2863 {
2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2865 scr_soft_reset ();
2866
2867 static const int pm_h[] = { 7, 25 };
2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2869
2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2840 } 2872 }
2873 break;
2874 }
2875
2841 return; 2876 return;
2842 } 2877 }
2843 2878
2844 switch (ch) 2879 switch (ch)
2845 { 2880 {
2859 } 2894 }
2860 break; 2895 break;
2861#endif 2896#endif
2862 2897
2863 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2864 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2865 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2866 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2867 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2868 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2869 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2870 break; 2905 break;
2871 2906
2872 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2873 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3060 } 3095 }
3061} 3096}
3062/*}}} */ 3097/*}}} */
3063 3098
3064#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3065/* ARGSUSED */
3066void 3100void
3067rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3068{ 3102{
3069 int x, y; 3103 int x, y;
3070 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
3079 { 3113 {
3080 /* 3114 /*
3081 * commands 3115 * commands
3082 */ 3116 */
3083 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3084 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3085 break; 3119 break;
3086 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3087 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3088 break; 3122 break;
3089 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3090 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3091 break; 3125 break;
3092 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3093 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3094 break; 3128 break;
3095 case 5: /* raise window */ 3129 case 5: /* raise window */
3096 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3097 break; 3131 break;
3098 case 6: /* lower window */ 3132 case 6: /* lower window */
3099 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3100 break; 3134 break;
3101 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3102 scr_touch (true); 3136 scr_touch (true);
3103 break; 3137 break;
3104 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
3107 break; 3141 break;
3108 3142
3109 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3110 default: 3144 default:
3111 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3112 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3113 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3114 break; 3148 break;
3115 3149
3116 /* 3150 /*
3117 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3118 */ 3152 */
3119 case 11: /* report window state */ 3153 case 11: /* report window state */
3120 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3121 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3122 break; 3156 break;
3123 case 13: /* report window position */ 3157 case 13: /* report window position */
3124 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3125 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3126 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3127 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3128 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3129 break; 3163 break;
3130 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3131 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3132 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3133 break; 3167 break;
3134 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3135 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3136 break; 3170 break;
3138 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3139 break; 3173 break;
3140 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3141 { 3175 {
3142 char *s; 3176 char *s;
3143 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3144 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3145 XFree (s); 3179 XFree (s);
3146 } 3180 }
3147 break; 3181 break;
3148 case 21: /* report window title */ 3182 case 21: /* report window title */
3149 { 3183 {
3150 char *s; 3184 char *s;
3151 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3152 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3153 XFree (s); 3187 XFree (s);
3154 } 3188 }
3155 break; 3189 break;
3156 } 3190 }
3212 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3213 */ 3247 */
3214void 3248void
3215rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3216{ 3250{
3217 char *s;
3218 unicode_t eh;
3219
3220 /* 3251 /*
3221 * Not handled yet 3252 * Not handled yet
3222 */ 3253 */
3254
3255 unicode_t eh;
3223 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3224 if (s) 3257 if (s)
3225 free (s); 3258 free (s);
3226 3259
3227 return; 3260 return;
3228} 3261}
3232 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3233 */ 3266 */
3234void 3267void
3235rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3236{ 3269{
3237 unicode_t ch, eh;
3238 int arg; 3270 int arg;
3239 3271
3240 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3241 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3242 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3243 3275
3244 if (ch == ';') 3276 if (ch == ';')
3245 { 3277 {
3278 unicode_t eh;
3246 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3247 3280
3248 if (s) 3281 if (s)
3249 { 3282 {
3250 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
3274 3307
3275/* 3308/*
3276 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3309 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3277 */ 3310 */
3278void 3311void
3279rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3312rxvt_term::process_xterm_seq (int op, char *str, char resp)
3280{ 3313{
3281 int color; 3314 int color;
3282 char *buf, *name; 3315 char *buf, *name;
3283 bool query = str[0] == '?' && !str[1]; 3316 bool query = str[0] == '?' && !str[1];
3284 int saveop = op; 3317 int saveop = op;
3311 unsigned long bytes_after; 3344 unsigned long bytes_after;
3312 unsigned char *value = 0; 3345 unsigned char *value = 0;
3313 const char *str = ""; 3346 const char *str = "";
3314 3347
3315 if (prop 3348 if (prop
3316 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3317 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3318 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3319 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3320 && actual_type != None 3353 && actual_type != None
3321 && actual_format == 8) 3354 && actual_format == 8)
3325 3358
3326 XFree (value); 3359 XFree (value);
3327 } 3360 }
3328 else 3361 else
3329 { 3362 {
3330 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3363 char *eq = strchr (str, '=');
3331 3364
3332 if (eq) 3365 if (eq)
3333 { 3366 {
3334 *eq = 0; 3367 *eq = 0;
3335 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3336 } 3369 }
3337 else 3370 else
3338 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3339 display->atom (str)); 3372 display->atom (str));
3340 } 3373 }
3341 break; 3374 break;
3342 3375
3343 case XTerm_Color: 3376 case XTerm_Color:
3375 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3376 break; 3409 break;
3377 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3378 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3379 break; 3412 break;
3413#ifdef OPTION_HC
3414 case XTerm_Color_HC:
3415 process_color_seq (op, Color_HC, str, resp);
3416 break;
3417 case XTerm_Color_HTC:
3418 process_color_seq (op, Color_HTC, str, resp);
3419 break;
3420#endif
3380#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3381 case XTerm_Color_RV:
3382 process_color_seq (op, Color_RV, str, resp);
3383 break;
3384 case Rxvt_Color_BD:
3385 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3386 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3387 break; 3424 break;
3388 case Rxvt_Color_UL:
3389 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3390 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3391 break; 3427 break;
3392 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3393 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
3394 break; 3430 break;
3395#endif 3431#endif
3432 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp);
3434 break;
3396#if ENABLE_TRANSPARENCY 3435#if ENABLE_TRANSPARENCY
3397 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3398 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3399 { 3438 {
3400 bool changed = false; 3439 bool changed = false;
3401 3440
3402 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3404 else
3405 changed = bgPixmap.unset_tint ();
3406 3443
3407 if (changed) 3444 if (changed)
3408 update_background (); 3445 update_background ();
3409 } 3446 }
3410 3447
3415 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3416 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3417 { 3454 {
3418 char str[256]; 3455 char str[256];
3419 3456
3420 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3457 sprintf (str, "[%dx%d+%d+%d]",
3421 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3458 min (h_scale, 32767), min (v_scale, 32767),
3422 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3459 min (h_align, 32767), min (v_align, 32767));
3423 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3424 } 3461 }
3425 else 3462 else
3426 { 3463 {
3427 int changed = 0; 3464 bool changed = false;
3428 3465
3429 if (*str != ';') 3466 if (*str != ';')
3430 { 3467 {
3431 /* reset to default scaling :*/
3432 bgPixmap.unset_geometry ();
3433 if (bgPixmap.set_file (str)) /* change pixmap */ 3468 if (bg_set_file (str)) /* change pixmap */
3434 changed++; 3469 changed = true;
3435 str = strchr (str, ';');
3436 if (str == NULL)
3437 bgPixmap.set_defaultGeometry ();
3438 } 3470 }
3439 3471 else
3440 while (str)
3441 { 3472 {
3442 str++; 3473 str++;
3443 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3444 changed++; 3475 changed = true;
3445 str = strchr (str, ';');
3446 } 3476 }
3447 3477
3448 if (changed) 3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3449 update_background (); 3486 update_background ();
3487 }
3450 } 3488 }
3451 break; 3489 break;
3452#endif 3490#endif
3453 3491
3454 case XTerm_logfile: 3492 case XTerm_logfile:
3557 { 3595 {
3558 if (mode == 'r') 3596 if (mode == 'r')
3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3560 else 3598 else
3561 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3562 set_privmode (bit, state); 3600
3601 if (state)
3602 priv_modes |= bit;
3603 else
3604 priv_modes &= ~bit;
3563 } 3605 }
3564 3606
3565 return state; 3607 return state;
3566} 3608}
3567 3609
3568/* we're not using priv _yet_ */ 3610/* we're not using priv _yet_ */
3569void 3611void
3570rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3612rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3571{ 3613{
3572 unsigned int i, j; 3614 unsigned int i, j;
3573 int state; 3615 int state;
3574 3616
3575 static const struct 3617 static const struct
3576 { 3618 {
3577 const int argval; 3619 const int argval;
3578 const unsigned long bit; 3620 const unsigned long bit;
3579 } argtopriv[] = { 3621 } argtopriv[] = {
3580 { 1, PrivMode_aplCUR }, 3622 { 1, PrivMode_aplCUR }, // DECCKM
3581 { 2, PrivMode_vt52 }, 3623 { 2, PrivMode_vt52 }, // DECANM
3582 { 3, PrivMode_132 }, 3624 { 3, PrivMode_132 }, // DECCOLM
3583 { 4, PrivMode_smoothScroll }, 3625 { 4, PrivMode_smoothScroll }, // DECSCLM
3584 { 5, PrivMode_rVideo }, 3626 { 5, PrivMode_rVideo }, // DECSCNM
3585 { 6, PrivMode_relOrigin }, 3627 { 6, PrivMode_relOrigin }, // DECOM
3586 { 7, PrivMode_Autowrap }, 3628 { 7, PrivMode_Autowrap }, // DECAWM
3587 // 8, bi-directional support mode 3629 // 8, auto-repeat keys // DECARM
3588 { 9, PrivMode_MouseX10 }, 3630 { 9, PrivMode_MouseX10 },
3589 // 18, 19 printing-related 3631 // 18 end FF to printer after print screen
3632 // 19 Print screen prints full screen/scroll region
3590 { 25, PrivMode_VisibleCursor }, 3633 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3591#ifdef scrollBar_esc 3634#ifdef scrollBar_esc
3592 { scrollBar_esc, PrivMode_scrollBar }, 3635 { scrollBar_esc, PrivMode_scrollBar },
3593#endif 3636#endif
3594 { 35, PrivMode_ShiftKeys }, // rxvt extension 3637 { 35, PrivMode_ShiftKeys }, // rxvt extension
3638 // 38, tektronix mode // DECTEK
3595 { 40, PrivMode_132OK }, 3639 { 40, PrivMode_132OK },
3596 // 41 xterm more fixes NYI 3640 // 41 xterm more fixes NYI
3597 // 45 margin bell NYI 3641 // 45 margin bell NYI
3598 // 46 start logging 3642 // 46 start logging
3599 { 47, PrivMode_Screen }, 3643 { 47, PrivMode_Screen },
3600 { 66, PrivMode_aplKP }, 3644 { 66, PrivMode_aplKP }, // DECNKM
3601#ifndef NO_BACKSPACE_KEY 3645#ifndef NO_BACKSPACE_KEY
3602 { 67, PrivMode_BackSpace }, 3646 { 67, PrivMode_BackSpace }, // DECBKM
3603#endif 3647#endif
3604 { 1000, PrivMode_MouseX11 }, 3648 { 1000, PrivMode_MouseX11 },
3605 { 1002, PrivMode_MouseBtnEvent }, 3649 { 1002, PrivMode_MouseBtnEvent },
3606 { 1003, PrivMode_MouseAnyEvent }, 3650 { 1003, PrivMode_MouseAnyEvent },
3651#if ENABLE_FRILLS
3652 { 1005, PrivMode_ExtModeMouse },
3653#endif
3607 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3654 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3608 { 1011, PrivMode_Keypress }, // rxvt extension 3655 { 1011, PrivMode_Keypress }, // rxvt extension
3656#if ENABLE_FRILLS
3657 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3658#endif
3609 // 1035 enable modifiers for alt, numlock NYI 3659 // 1035 enable modifiers for alt, numlock NYI
3610 // 1036 send ESC for meta keys NYI 3660 // 1036 send ESC for meta keys NYI
3611 // 1037 send DEL for keypad delete NYI 3661 // 1037 send DEL for keypad delete NYI
3612 { 1047, PrivMode_Screen }, 3662 { 1047, PrivMode_Screen },
3613 // 1048 save and restore cursor 3663 // 1048 save and restore cursor, implemented in code
3614 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3664 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3615 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3616 { 2004, PrivMode_BracketPaste }, 3666 { 2004, PrivMode_BracketPaste },
3617 }; 3667 };
3618 3668
3628 for (i = 0; i < nargs; i++) 3678 for (i = 0; i < nargs; i++)
3629 { 3679 {
3630 state = -1; 3680 state = -1;
3631 3681
3632 /* basic handling */ 3682 /* basic handling */
3633 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3683 for (j = 0; j < ecb_array_length (argtopriv); j++)
3634 if (argtopriv[j].argval == arg[i]) 3684 if (argtopriv[j].argval == arg[i])
3635 { 3685 {
3636 state = privcases (mode, argtopriv[j].bit); 3686 state = privcases (mode, argtopriv[j].bit);
3637 break; 3687 break;
3638 } 3688 }
3646 3696
3647 scr_touch (true); 3697 scr_touch (true);
3648 break; 3698 break;
3649#endif 3699#endif
3650 case 1048: /* alternative cursor save */ 3700 case 1048: /* alternative cursor save */
3651 case 1049:
3652 if (option (Opt_secondaryScreen)) 3701 if (option (Opt_secondaryScreen))
3653 if (mode == 0) 3702 if (mode == 0)
3654 scr_cursor (RESTORE); 3703 scr_cursor (RESTORE);
3655 else if (mode == 1) 3704 else if (mode == 1)
3656 scr_cursor (SAVE); 3705 scr_cursor (SAVE);
3665 case 2: /* VT52 mode */ 3714 case 2: /* VT52 mode */
3666 /* oddball mode. should be set regardless of set/reset 3715 /* oddball mode. should be set regardless of set/reset
3667 * parameter. Return from VT52 mode with an ESC < from 3716 * parameter. Return from VT52 mode with an ESC < from
3668 * within VT52 mode 3717 * within VT52 mode
3669 */ 3718 */
3670 set_privmode (PrivMode_vt52, 1); 3719 priv_modes |= PrivMode_vt52;
3671 break; 3720 break;
3672 case 3: /* 80/132 */ 3721 case 3: /* 80/132 */
3673 if (priv_modes & PrivMode_132OK) 3722 if (priv_modes & PrivMode_132OK)
3674 {
3675 scr_poweron ();
3676 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3723 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677 }
3678 break; 3724 break;
3679 case 4: /* smooth scrolling */ 3725 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3726 set_option (Opt_jumpScroll, !state);
3681 break; 3727 break;
3682 case 5: /* reverse video */ 3728 case 5: /* reverse video */
3693 if (state) /* orthogonal */ 3739 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3740 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3741 break;
3696#ifdef scrollBar_esc 3742#ifdef scrollBar_esc
3697 case scrollBar_esc: 3743 case scrollBar_esc:
3698 if (scrollBar.map (state)) 3744 scrollBar.map (state);
3699 {
3700 resize_all_windows (0, 0, 0); 3745 resize_all_windows (0, 0, 0);
3701 scr_touch (true); 3746 scr_touch (true);
3702 }
3703 break; 3747 break;
3704#endif 3748#endif
3705 case 25: /* visible/invisible cursor */ 3749 case 25: /* visible/invisible cursor */
3706 scr_cursor_visible (state); 3750 scr_cursor_visible (state);
3707 break; 3751 break;
3720 case 1003: 3764 case 1003:
3721 if (state) 3765 if (state)
3722 { 3766 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3767 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3768 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3769 mouse_row = mouse_col = 0;
3725 vt_emask_mouse = PointerMotionMask; 3770 vt_emask_mouse = PointerMotionMask;
3726 } 3771 }
3727 else 3772 else
3728 vt_emask_mouse = NoEventMask; 3773 vt_emask_mouse = NoEventMask;
3774
3729 vt_select_input (); 3775 vt_select_input ();
3730 break; 3776 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3777 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3778 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3779 break;
3734 case 1011: /* scroll to bottom on key press */ 3780 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3781 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3782 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3783 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3784 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3785 if (!state)
3740 scr_erase_screen (2); 3786 scr_erase_screen (2);
3787
3741 scr_change_screen (state); 3788 scr_change_screen (state);
3742 break; 3789 break;
3743 case 1049: /* secondary screen w/ clearing first */ 3790 case 1049: /* secondary screen w/ clearing first */
3791 if (option (Opt_secondaryScreen))
3792 if (state)
3793 scr_cursor (SAVE);
3794
3744 scr_change_screen (state); 3795 scr_change_screen (state);
3796
3745 if (option (Opt_secondaryScreen)) 3797 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3798 if (state)
3747 scr_erase_screen (2); 3799 scr_erase_screen (2);
3800 else
3801 scr_cursor (RESTORE);
3748 break; 3802 break;
3749 default: 3803 default:
3750 break; 3804 break;
3751 } 3805 }
3752 } 3806 }
3905 } 3959 }
3906 } 3960 }
3907} 3961}
3908/*}}} */ 3962/*}}} */
3909 3963
3910/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3911void
3912rxvt_term::process_graphics ()
3913{
3914 unicode_t ch, cmd = cmd_getc ();
3915
3916 if (cmd == 'Q')
3917 {
3918 /* query graphics */
3919 tt_printf ("\033G0\012"); /* no graphics */
3920 return;
3921 }
3922 /* swallow other graphics sequences until terminating ':' */
3923 do
3924 ch = cmd_getc ();
3925 while (ch != ':');
3926}
3927/*}}} */
3928
3929/* ------------------------------------------------------------------------- */ 3964/* ------------------------------------------------------------------------- */
3930 3965
3931/* 3966/*
3932 * Send printf () formatted output to the command. 3967 * Send printf () formatted output to the command.
3933 * Only use for small amounts of data. 3968 * Only use for small amounts of data.
3946 3981
3947/* ---------------------------------------------------------------------- */ 3982/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 3983/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 3984 * or generated by us in response to a query ESC sequence.
3950 */ 3985 */
3951const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3986static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3952 3987
3953void 3988void
3954rxvt_term::tt_write (const char *data, unsigned int len) 3989rxvt_term::tt_write (const char *data, unsigned int len)
3955{ 3990{
3956 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3991 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3961 3996
3962 if (v_buflen == 0) 3997 if (v_buflen == 0)
3963 { 3998 {
3964 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3999 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3965 4000
4001 max_it (written, 0);
4002
3966 if ((unsigned int)written == len) 4003 if (written == len)
3967 return; 4004 return;
3968 4005
3969 data += written; 4006 data += written;
3970 len -= written; 4007 len -= written;
3971 } 4008 }
3972 4009
3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4010 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3974 4011
3975 memcpy (v_buffer + v_buflen, data, len); 4012 memcpy (v_buffer + v_buflen, data, len);
3976 v_buflen += len; 4013 v_buflen += len;
3977 4014
3978 pty_ev.set (ev::READ | ev::WRITE); 4015 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines