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.435 by sf-exg, Wed Jan 6 12:10:44 2010 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 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)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
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
250} 256}
251#endif 257#endif
252 258
253void 259void ecb_cold
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);
… …
279 } 282 }
280 283
281 iso14755buf = 0; 284 iso14755buf = 0;
282} 285}
283 286
284static int 287static int ecb_cold
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
… …
298 301
299 return -1; 302 return -1;
300} 303}
301#endif 304#endif
302 305
303static inline KeySym 306static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 307translate_keypad (KeySym keysym, bool kp)
305{ 308{
306#ifdef XK_KP_Home 309#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 310 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 311 XK_KP_7, // XK_KP_Home
… …
334# endif 337# endif
335#endif 338#endif
336 return keysym; 339 return keysym;
337} 340}
338 341
339static inline int 342static inline int ecb_cold
340map_function_key (KeySym keysym) 343map_function_key (KeySym keysym)
341{ 344{
342 int param = 0; 345 int param = 0;
343 346
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 396 break;
394 } 397 }
395 return param; 398 return param;
396} 399}
397 400
398void 401void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
400{ 403{
401 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
402 KeySym keysym; 405 KeySym keysym;
403 int valid_keysym; 406 int valid_keysym;
… …
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#if USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
432 Status status_return; 429 Status status_return;
433 430
434#if 0 431#if 0
… …
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 }
… …
645 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
646 { 643 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1; 645 unsigned int newlen = 1;
649 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
651 { 653 {
652#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace: 655 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
655 { 657 {
… …
774 } 776 }
775 777
776 if (newlen) 778 if (newlen)
777 len = strlen (kbuf); 779 len = strlen (kbuf);
778 780
781 if (len > 0)
782 {
779 /* 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 /*
780 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
781 */ 797 */
782#ifdef META8_OPTION 798#ifdef META8_OPTION
783 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
784 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
785#endif 801#endif
802 }
786 803
787 } 804 }
788 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
789 { 806 {
790 len = 1; 807 len = 1;
… …
824 { 841 {
825 view_start = 0; 842 view_start = 0;
826 want_refresh = 1; 843 want_refresh = 1;
827 } 844 }
828 845
829 /*
830 * these modifications only affect the static keybuffer
831 * pass Shift/Control indicators for function keys ending with `~'
832 *
833 * eg,
834 * Prior = "ESC[5~"
835 * Shift+Prior = "ESC[5$"
836 * Ctrl+Prior = "ESC[5^"
837 * Ctrl+Shift+Prior = "ESC[5@"
838 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
839 */
840 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
841 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
842
843 /* escape prefix */ 846 /* escape prefix */
844 if (meta 847 if (meta
845#ifdef META8_OPTION 848#ifdef META8_OPTION
846 && meta_char == C0_ESC 849 && meta_char == C0_ESC
847#endif 850#endif
… …
852 } 855 }
853 856
854 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
855} 858}
856 859
857void 860void ecb_cold
858rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
859{ 862{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym; 864 KeySym keysym;
862 865
… …
882 commit_iso14755 (); 885 commit_iso14755 ();
883 886
884 return; 887 return;
885 } 888 }
886 889
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
888 if (i[0] == keysym) 891 if (i[0] == keysym)
889 { 892 {
890 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 (); 894 commit_iso14755 ();
892 895
… …
929 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
931#endif 934#endif
932} 935}
933 936
934#if defined (KEYSYM_RESOURCE)
935unsigned int
936rxvt_term::cmd_write (const char *str, unsigned int count)
937{
938 unsigned int n, s;
939
940 n = cmdbuf_ptr - cmdbuf_base;
941 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
942
943 if (n > 0 && s < count)
944 {
945 memmove (cmdbuf_base, cmdbuf_ptr,
946 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
947 cmdbuf_ptr = cmdbuf_base;
948 cmdbuf_endp -= n;
949 s += n;
950 }
951
952 if (count > s)
953 {
954 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
955 count = s;
956 }
957
958 for (; count--;)
959 *cmdbuf_endp++ = *str++;
960
961 cmd_parse ();
962
963 return 0;
964}
965#endif
966
967void 937void
968rxvt_term::flush () 938rxvt_term::flush ()
969{ 939{
970 flush_ev.stop (); 940 flush_ev.stop ();
971 941
972#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
973 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
974 { 944 {
975// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
976 scr_touch (false); 946 scr_touch (false);
977 } 947 }
978#endif 948#endif
979 949
980 if (want_refresh) 950 if (want_refresh)
… …
1017 while (row < end_row); 987 while (row < end_row);
1018 } 988 }
1019 989
1020 scr_refresh (); 990 scr_refresh ();
1021 scrollBar.show (1); 991 scrollBar.show (1);
1022#ifdef USE_XIM 992#if USE_XIM
1023 IMSendSpot (); 993 im_send_spot ();
1024#endif 994#endif
1025 } 995 }
1026 996
1027 display->flush (); 997 display->flush ();
1028} 998}
1029 999
1030/* checks wether a refresh is requested and starts the refresh timer */ 1000/* checks whether a refresh is requested and starts the refresh timer */
1031void 1001void
1032rxvt_term::refresh_check () 1002rxvt_term::refresh_check ()
1033{ 1003{
1034 if (want_refresh && !flush_ev.is_active ()) 1004 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1005 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1045 refresh_count = 0; 1015 refresh_count = 0;
1046 flush (); 1016 flush ();
1047} 1017}
1048 1018
1049#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
1050void 1035void
1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1052{ 1037{
1053 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1054 want_refresh = 1; 1039 want_refresh = 1;
… …
1073 1058
1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1075void 1060void
1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1077{ 1062{
1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1080 { 1065 {
1081 want_refresh = 1; 1066 want_refresh = 1;
1082 refresh_check (); 1067 refresh_check ();
1083 } 1068 }
1084 else 1069 else
… …
1129 // this should really be sched_yield(), but the linux guys thought 1114 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1115 // that giving a process calling sched_yield () less cpu time than
1131 // 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
1132 // allowed by the sus... as is returning ENOSYS. 1117 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only 1118 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool, 1119 // known workaround against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best. 1120 // we just nanosleep a bit and hope for the best.
1136 1121
1137 struct timespec ts = { 0, 1000 }; 1122 struct timespec ts = { 0, 1000 };
1138 nanosleep (&ts, 0); 1123 nanosleep (&ts, 0);
1139 1124
… …
1145 { 1130 {
1146 } 1131 }
1147} event_handler; 1132} event_handler;
1148#endif 1133#endif
1149 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
1150bool 1168bool
1151rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1152{ 1170{
1153 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1154 1172
1155 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1156 { 1174
1157 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1158 n = 0;
1159 } 1176 {
1160 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1161 memmove (cmdbuf_base, cmdbuf_ptr, n);
1162 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1163 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1164 1182
1165 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1166 1184
1167 if (r > 0) 1185 if (r > 0)
1168 { 1186 {
1169 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1170 return true; 1188 return true;
… …
1201 pty_write (); 1219 pty_write ();
1202 1220
1203 refresh_check (); 1221 refresh_check ();
1204} 1222}
1205 1223
1206void 1224void ecb_cold
1207rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1208{ 1226{
1209 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1210 recolour_cursor (); 1228 recolour_cursor ();
1211 1229
… …
1216 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1217#endif 1235#endif
1218} 1236}
1219 1237
1220#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1221void 1239void ecb_cold
1222rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1223{ 1241{
1224 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1225 return; 1243 return;
1226 1244
… …
1228 XFlush (dpy); 1246 XFlush (dpy);
1229 1247
1230 hidden_pointer = 1; 1248 hidden_pointer = 1;
1231} 1249}
1232 1250
1233void 1251void ecb_cold
1234rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1235{ 1253{
1236 make_current (); 1254 make_current ();
1237 1255
1238 pointer_blank (); 1256 pointer_blank ();
… …
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 ecb_hot
1321rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1322{ 1355{
1323 make_current (); 1356 make_current ();
1324 1357
1325 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
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 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1473 bool moved = false;
1474
1475 if (want_position_change)
1476 {
1477 int x, y;
1478
1479 if (ev.xconfigure.send_event)
1480 {
1481 x = ev.xconfigure.x;
1482 y = ev.xconfigure.y;
1483 }
1484 else
1485 get_window_origin (x, y);
1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 }
1435 1498
1436 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1437 { 1500 {
1438 seen_resize = 1; 1501 seen_resize = 1;
1439 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1440 } 1503 }
1441 else 1504 else
1442 { 1505 {
1443#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped) 1507 if (moved)
1447 update_background (); 1508 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1451#endif 1509#endif
1452 } 1510 }
1453 1511
1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1455 } 1513 }
1456 break; 1514 break;
1457 1515
1458 case PropertyNotify: 1516 case PropertyNotify:
1459 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 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; 1518 break;
1465 1519
1466 case SelectionClear: 1520 case SelectionClear:
1467 selection_clear (); 1521 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; 1522 break;
1474 1523
1475 case SelectionRequest: 1524 case SelectionRequest:
1476 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1477 break; 1526 break;
1478 1527
1479 case MapNotify: 1528 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP 1529#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a 1530 /* 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 1531 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does 1533 * care of multiplicity of ConfigureNotify events arriving while WM does
1485 * reparenting. 1534 * reparenting.
1486 * We should not render background immidiately, as there could be several 1535 * 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 1536 * 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 1537 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all 1539 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1492 */ 1541 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1494 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1495#endif 1544#endif
1496 mapped = 1; 1545 mapped = 1;
1497#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1498 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1513 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1514 { 1563 {
1515 do 1564 do
1516 { 1565 {
1517 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1518 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1519 } 1568 }
1520 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1521 1570
1522 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1523 1572
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1525 { 1574 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1577 }
1529 1578
1530 want_refresh = 1; 1579 want_refresh = 1;
1531 } 1580 }
1532 else 1581 else
… …
1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1539 ; 1588 ;
1540 1589
1541 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1542 { 1591 {
1543 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1544 scrollBar.show (0); 1593 scrollBar.show (0);
1545 } 1594 }
1546 } 1595 }
1547 break; 1596 break;
1548 1597
… …
1614 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1615 } 1664 }
1616 else 1665 else
1617 { 1666 {
1618 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1619 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1620 } 1669 }
1621 1670
1622 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1623 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1624 + 1; 1673 + 1;
… …
1636#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1637 } 1686 }
1638#endif 1687#endif
1639 } 1688 }
1640 } 1689 }
1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1642 { 1691 {
1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1644 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1645 ; 1694 ;
1646 1695
1647 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1648 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1649 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1650 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1651 &unused_mask); 1700 &unused_mask);
1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1653 scrollBar.size ()); 1702 scrollBar.size ());
1654 want_refresh = 1; 1703 want_refresh = 1;
1655 scrollBar.show (1); 1704 scrollBar.show (1);
1656 } 1705 }
1657 break; 1706 break;
1658 } 1707 }
1659 1708
1660#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1661 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 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 (); 1711 cursor_blink_reset ();
1670 }
1671#endif 1712#endif
1672 1713
1673#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1675 { 1716 {
… …
1686 1727
1687 refresh_check (); 1728 refresh_check ();
1688} 1729}
1689 1730
1690#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1691void 1732void ecb_cold
1692rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1693{ 1734{
1694 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1695 return; 1736 return;
1696 1737
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1698 { 1739 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1701 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1702 } 1744 }
1703} 1745}
1704#endif 1746#endif
1705 1747
1706void 1748void ecb_cold
1707rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1708{ 1750{
1709 if (!focus) 1751 if (!focus)
1710 { 1752 {
1711 focus = 1; 1753 focus = 1;
1712 want_refresh = 1; 1754 want_refresh = 1;
1713 1755
1714#if USE_XIM 1756#if USE_XIM
1715 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1716 { 1758 {
1717 IMSetPosition (); 1759 im_set_position ();
1718 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1719 } 1761 }
1720#endif 1762#endif
1721#if CURSOR_BLINK 1763#if CURSOR_BLINK
1722 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1736 1778
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1738 } 1780 }
1739} 1781}
1740 1782
1741void 1783void ecb_cold
1742rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1743{ 1785{
1744 if (focus) 1786 if (focus)
1745 { 1787 {
1746 focus = 0; 1788 focus = 0;
… …
1779 1821
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1781 } 1823 }
1782} 1824}
1783 1825
1784void 1826void ecb_cold
1785rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1786{ 1828{
1787#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1789 { 1831 {
… …
1793 } 1835 }
1794#endif 1836#endif
1795} 1837}
1796 1838
1797#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1798void 1840void ecb_hot
1799rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1800{ 1842{
1801 make_current (); 1843 make_current ();
1802 1844
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return; 1847 return;
1806 1848
1807# if ENABLE_TRANSPARENCY
1808 switch (ev.type) 1849 switch (ev.type)
1809 { 1850 {
1810 case PropertyNotify: 1851 case PropertyNotify:
1811 /* 1852 /*
1812 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1813 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1814 */ 1855 */
1815 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1817 { 1858 {
1859# if ENABLE_TRANSPARENCY
1818 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1819 update_background (); 1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1820 } 1866 }
1821 1867
1822 break; 1868 break;
1823 } 1869 }
1824# endif
1825 1870
1826 refresh_check (); 1871 refresh_check ();
1827} 1872}
1828#endif 1873#endif
1829 1874
… …
1862 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1863 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1864#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1865 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1866 { 1911 {
1867 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1868 MEvent.clicks++; 1913 MEvent.clicks++;
1869 1914
1870 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1871 { 1916 {
1872 /* only report double clicks */ 1917 /* only report double clicks */
… …
1953 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */ 1999 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */ 2001 direction = DN; /* down */
1957 2002
1958 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1959 /* 2004 /*
1960 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1961 * move up if mouse is above slider 2006 * move up if mouse is above slider
1962 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1963 * 2008 *
… …
2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2003#endif 2048#endif
2004 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2005 { 2050 {
2006 if (direction == UP) 2051 if (direction == UP)
2007 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2008 else 2053 else
2009 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2010 } 2055 }
2011 } 2056 }
2012 else 2057 else
2013 switch (ev.button) 2058 switch (ev.button)
2014 { 2059 {
2015 case Button2: 2060 case Button2:
2016 switch (scrollBar.align) 2061 switch (scrollBar.align)
2017 { 2062 {
2018 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2019 csrO = 0; 2064 csrO = 0;
2020 break; 2065 break;
2021 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2022 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2023 break; 2068 break;
2024 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2025 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2026 break; 2071 break;
2027 } 2072 }
2028 2073
2029 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2030 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2031 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2033 2078
2034 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2035 break; 2080 break;
2036 2081
2037 case Button1: 2082 case Button1:
2038 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2039 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2040 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2041 2086
2042 case Button3: 2087 case Button3:
2043 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2044 { 2089 {
2045 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2046# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2047 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2048# else 2093# else
2049 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2050# endif 2095# endif
2051 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2052# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2053 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2054# else 2099# else
2055 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2056# endif 2101# endif
2057 else 2102 else
2058 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2059 } 2104 }
2060 else 2105 else
2061 { 2106 {
2062 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2063 (nrow 2108 (nrow
2064 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2065 / scrollBar.size ())); 2110 / scrollBar.size ()));
2066 } 2111 }
2067 2112
2068 break; 2113 break;
2069 } 2114 }
… …
2080 2125
2081 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2082 if (!bypass_keystate) 2127 if (!bypass_keystate)
2083 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2084 2129
2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2086 { 2131 {
2087 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2088 scrollBar.show (0); 2133 scrollBar.show (0);
2089 } 2134 }
2090 2135
2091#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2092 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2142 case Button3: 2187 case Button3:
2143 selection_make (ev.time); 2188 selection_make (ev.time);
2144 break; 2189 break;
2145 2190
2146 case Button2: 2191 case Button2:
2147 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2148 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2149 break; 2194 break;
2150 2195
2151#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2152 case Button4: 2197 case Button4:
2153 case Button5: 2198 case Button5:
… …
2187 } 2232 }
2188} 2233}
2189 2234
2190/*}}} */ 2235/*}}} */
2191 2236
2192void 2237void ecb_hot
2193rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2194{ 2239{
2195 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2197 2242
2198 for (;;) 2243 for (;;)
2199 { 2244 {
2200 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2201 { 2246 {
2202 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2203 ch = next_char (); 2248 ch = next_char ();
2204 2249
2205 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2206 break; 2251 break;
2207 } 2252 }
2208 2253
2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2210 { 2255 {
2211 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2212 { 2257 {
2213 seen_input = 1; 2258 seen_input = 1;
2214 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2229 wchar_t *str = buf; 2274 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231 2276
2232 for (;;) 2277 for (;;)
2233 { 2278 {
2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2235 break; 2280 break;
2236 2281
2237 *str++ = ch; 2282 *str++ = ch;
2238 2283
2239 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2240 { 2285 {
2241 if (ch == C0_LF) 2286 if (ch == C0_LF)
2242 nlines++; 2287 nlines++;
2243 2288
2244 refresh_count++; 2289 refresh_count++;
… …
2316 } 2361 }
2317 } 2362 }
2318} 2363}
2319 2364
2320// read the next character 2365// read the next character
2321wchar_t 2366wchar_t ecb_hot
2322rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2323{ 2368{
2324 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2325 { 2370 {
2326 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2328 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2329 2374
2330 wchar_t wc; 2375 wchar_t wc;
2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2332 2377
… …
2350 2395
2351 return NOCHAR; 2396 return NOCHAR;
2352} 2397}
2353 2398
2354// read the next octet 2399// read the next octet
2355uint32_t 2400uint32_t ecb_hot
2356rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2357{ 2402{
2358 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2359 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2360 : NOCHAR; 2405 : NOCHAR;
2361} 2406}
2362 2407
2363static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2364 2409
2365/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2366/*
2367 * Return the next input character after first passing any keyboard input
2368 * to the command.
2369 */
2370wchar_t
2371rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2372{ 2412{
2373 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2374 2414
2375 if (c == NOCHAR) 2415 if (c == NOCHAR)
2376 throw out_of_input; 2416 throw out_of_input;
2377 2417
2378 return c; 2418 return c;
2379} 2419}
2380 2420
2381uint32_t 2421uint32_t ecb_hot
2382rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2383{ 2423{
2384 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2385 2425
2386 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2390} 2430}
2391 2431
2392/*{{{ print pipe */ 2432/*{{{ print pipe */
2393/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2395FILE * 2435FILE * ecb_cold
2396rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2397{ 2437{
2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2439
2400 if (stream == NULL) 2440 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2442
2403 return stream; 2443 return stream;
2404} 2444}
2405 2445
2406int 2446int ecb_cold
2407rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2408{ 2448{
2409 fflush (stream); 2449 fflush (stream);
2410 return pclose (stream); 2450 return pclose (stream);
2411} 2451}
2412 2452
2413/* 2453/*
2414 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2415 */ 2455 */
2416void 2456void ecb_cold
2417rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2418{ 2458{
2419 FILE *fd = popen_printer (); 2459 FILE *fd = popen_printer ();
2420 2460
2421 if (!fd) 2461 if (!fd)
… …
2467 pclose_printer (fd); 2507 pclose_printer (fd);
2468} 2508}
2469#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2470/*}}} */ 2510/*}}} */
2471 2511
2472/* *INDENT-OFF* */
2473enum { 2512enum {
2474 C1_40 = 0x40, 2513 C1_40 = 0x40,
2475 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2476 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2477 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2478 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2479}; 2518};
2480/* *INDENT-ON* */
2481 2519
2482/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2483void 2521void ecb_hot
2484rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2485{ 2523{
2486 switch (ch) 2524 switch (ch)
2487 { 2525 {
2488 case C0_ESC: 2526 case C0_ESC:
… …
2534} 2572}
2535/*}}} */ 2573/*}}} */
2536 2574
2537 2575
2538/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2539void 2577void ecb_cold
2540rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2541{ 2579{
2542 int row, col; 2580 int row, col;
2543 2581
2544 switch (ch) 2582 switch (ch)
… …
2578 break; 2616 break;
2579 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2581 break; 2619 break;
2582 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2583 set_privmode (PrivMode_vt52, 0); 2621 priv_modes &= ~PrivMode_vt52;
2584 break; 2622 break;
2585 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2586 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2587 /* unimplemented */ 2625 /* unimplemented */
2588 break; 2626 break;
… …
2594} 2632}
2595/*}}} */ 2633/*}}} */
2596 2634
2597 2635
2598/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2599void 2637void ecb_hot
2600rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2601{ 2639{
2602 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2603 2641
2604 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
2607 return; 2645 return;
2608 } 2646 }
2609 2647
2610 switch (ch) 2648 switch (ch)
2611 { 2649 {
2612 /* case 1: do_tek_mode (); break; */
2613 case '#': 2650 case '#':
2614 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
2615 scr_E (); 2652 scr_E ();
2616 break; 2653 break;
2617 case '(': 2654 case '(':
… …
2640#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
2641 case '9': 2678 case '9':
2642 scr_forwardindex (); 2679 scr_forwardindex ();
2643 break; 2680 break;
2644#endif 2681#endif
2682 // DECPAM/DECPNM
2645 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
2646 case '>': 2686 case '>':
2647 set_privmode (PrivMode_aplKP, ch == '='); 2687 priv_modes &= ~PrivMode_aplKP;
2648 break; 2688 break;
2649 2689
2650 case C1_40: 2690 case C1_40:
2651 cmd_getc (); 2691 cmd_getc ();
2652 break; 2692 break;
… …
2656 2696
2657 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
2658 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
2659 { 2699 {
2660 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
2661 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2662 } 2702 }
2663 break; 2703 break;
2664 2704
2665 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
2666 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
2667 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2668 break; 2710 break;
2669 2711
2670 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
2671 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
2672 scr_set_tab (1); 2714 scr_set_tab (1);
… …
2676 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
2677 scr_index (DN); 2719 scr_index (DN);
2678 break; 2720 break;
2679 2721
2680 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
2681 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
2682 2724
2683 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
2684 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
2685 2727
2686 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
2687 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
2688 process_dcs_seq (); 2730 process_dcs_seq ();
2689 break; 2731 break;
… …
2722 } 2764 }
2723} 2765}
2724/*}}} */ 2766/*}}} */
2725 2767
2726/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2727/* *INDENT-OFF* */
2728enum { 2769enum {
2729 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
2730 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2731 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2732 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2735 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2736 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2737 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2738}; 2779};
2739 2780
2740#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2741 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2742 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2743#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
2744 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2745 2786
2746const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
2747 { 2788 {
2748 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2749 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2750 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2751 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2752 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2753 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2754 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2755 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2756 }; 2797 };
2757/* *INDENT-ON* */
2758 2798
2759void 2799void ecb_hot
2760rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
2761{ 2801{
2762 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
2763 unsigned int nargs, p; 2803 unsigned int nargs, p;
2764 int n, ndef; 2804 int n, ndef;
… …
2840 { 2880 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset (); 2882 scr_soft_reset ();
2843 2883
2844 static const int pm_h[] = { 7, 25 }; 2884 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2846 2886
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2849 } 2889 }
2850 break; 2890 break;
2851 } 2891 }
2852 2892
2853 return; 2893 return;
… …
2871 } 2911 }
2872 break; 2912 break;
2873#endif 2913#endif
2874 2914
2875 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2876 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2877 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2878 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
2879 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2880 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2881 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
2882 break; 2922 break;
2883 2923
2884 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2885 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3072 } 3112 }
3073} 3113}
3074/*}}} */ 3114/*}}} */
3075 3115
3076#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3077/* ARGSUSED */
3078void 3117void
3079rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3080{ 3119{
3081 int x, y; 3120 int x, y;
3082 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
… …
3091 { 3130 {
3092 /* 3131 /*
3093 * commands 3132 * commands
3094 */ 3133 */
3095 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3096 XMapWindow (dpy, parent[0]); 3135 XMapWindow (dpy, parent);
3097 break; 3136 break;
3098 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3099 XIconifyWindow (dpy, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3100 break; 3139 break;
3101 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3102 XMoveWindow (dpy, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3103 break; 3142 break;
3104 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3105 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3106 break; 3145 break;
3107 case 5: /* raise window */ 3146 case 5: /* raise window */
3108 XRaiseWindow (dpy, parent[0]); 3147 XRaiseWindow (dpy, parent);
3109 break; 3148 break;
3110 case 6: /* lower window */ 3149 case 6: /* lower window */
3111 XLowerWindow (dpy, parent[0]); 3150 XLowerWindow (dpy, parent);
3112 break; 3151 break;
3113 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3114 scr_touch (true); 3153 scr_touch (true);
3115 break; 3154 break;
3116 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3119 break; 3158 break;
3120 3159
3121 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3122 default: 3161 default:
3123 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3124 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3125 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3126 break; 3165 break;
3127 3166
3128 /* 3167 /*
3129 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3130 */ 3169 */
3131 case 11: /* report window state */ 3170 case 11: /* report window state */
3132 XGetWindowAttributes (dpy, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3133 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3134 break; 3173 break;
3135 case 13: /* report window position */ 3174 case 13: /* report window position */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3137 XTranslateCoordinates (dpy, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3138 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3139 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3140 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3141 break; 3180 break;
3142 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3145 break; 3184 break;
3146 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3147 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3148 break; 3187 break;
… …
3150 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3151 break; 3190 break;
3152 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3153 { 3192 {
3154 char *s; 3193 char *s;
3155 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3156 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3157 XFree (s); 3196 XFree (s);
3158 } 3197 }
3159 break; 3198 break;
3160 case 21: /* report window title */ 3199 case 21: /* report window title */
3161 { 3200 {
3162 char *s; 3201 char *s;
3163 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3164 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3165 XFree (s); 3204 XFree (s);
3166 } 3205 }
3167 break; 3206 break;
3168 } 3207 }
… …
3224 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3263 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3225 */ 3264 */
3226void 3265void
3227rxvt_term::process_dcs_seq () 3266rxvt_term::process_dcs_seq ()
3228{ 3267{
3229 char *s;
3230 unicode_t eh;
3231
3232 /* 3268 /*
3233 * Not handled yet 3269 * Not handled yet
3234 */ 3270 */
3271
3272 unicode_t eh;
3235 s = get_to_st (eh); 3273 char *s = get_to_st (eh);
3236 if (s) 3274 if (s)
3237 free (s); 3275 free (s);
3238 3276
3239 return; 3277 return;
3240} 3278}
… …
3244 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3282 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3245 */ 3283 */
3246void 3284void
3247rxvt_term::process_osc_seq () 3285rxvt_term::process_osc_seq ()
3248{ 3286{
3249 unicode_t ch, eh;
3250 int arg; 3287 int arg;
3251 3288
3252 ch = cmd_getc (); 3289 unicode_t ch = cmd_getc ();
3253 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3290 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3254 arg = arg * 10 + (ch - '0'); 3291 arg = arg * 10 + (ch - '0');
3255 3292
3256 if (ch == ';') 3293 if (ch == ';')
3257 { 3294 {
3295 unicode_t eh;
3258 char *s = get_to_st (eh); 3296 char *s = get_to_st (eh);
3259 3297
3260 if (s) 3298 if (s)
3261 { 3299 {
3262 process_xterm_seq (arg, s, eh); 3300 process_xterm_seq (arg, s, eh);
… …
3323 unsigned long bytes_after; 3361 unsigned long bytes_after;
3324 unsigned char *value = 0; 3362 unsigned char *value = 0;
3325 const char *str = ""; 3363 const char *str = "";
3326 3364
3327 if (prop 3365 if (prop
3328 && XGetWindowProperty (dpy, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3329 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3330 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3331 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3332 && actual_type != None 3370 && actual_type != None
3333 && actual_format == 8) 3371 && actual_format == 8)
… …
3345 { 3383 {
3346 *eq = 0; 3384 *eq = 0;
3347 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3348 } 3386 }
3349 else 3387 else
3350 XDeleteProperty (dpy, parent[0], 3388 XDeleteProperty (dpy, parent,
3351 display->atom (str)); 3389 display->atom (str));
3352 } 3390 }
3353 break; 3391 break;
3354 3392
3355 case XTerm_Color: 3393 case XTerm_Color:
… …
3387 process_color_seq (op, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3388 break; 3426 break;
3389 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3390 process_color_seq (op, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3391 break; 3429 break;
3430#ifdef OPTION_HC
3431 case XTerm_Color_HC:
3432 process_color_seq (op, Color_HC, str, resp);
3433 break;
3434 case XTerm_Color_HTC:
3435 process_color_seq (op, Color_HTC, str, resp);
3436 break;
3437#endif
3392#ifndef NO_BOLD_UNDERLINE_REVERSE 3438#ifndef NO_BOLD_UNDERLINE_REVERSE
3393 case XTerm_Color_RV:
3394 process_color_seq (op, Color_RV, str, resp);
3395 break;
3396 case Rxvt_Color_BD:
3397 case URxvt_Color_BD: 3439 case URxvt_Color_BD:
3398 process_color_seq (op, Color_BD, str, resp); 3440 process_color_seq (op, Color_BD, str, resp);
3399 break; 3441 break;
3400 case Rxvt_Color_UL:
3401 case URxvt_Color_UL: 3442 case URxvt_Color_UL:
3402 process_color_seq (op, Color_UL, str, resp); 3443 process_color_seq (op, Color_UL, str, resp);
3403 break; 3444 break;
3404 case URxvt_Color_IT: 3445 case URxvt_Color_IT:
3405 process_color_seq (op, Color_IT, str, resp); 3446 process_color_seq (op, Color_IT, str, resp);
… …
3413 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3414 { 3455 {
3415 bool changed = false; 3456 bool changed = false;
3416 3457
3417 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3419 else
3420 changed = bgPixmap.unset_tint ();
3421 3460
3422 if (changed) 3461 if (changed)
3423 update_background (); 3462 update_background ();
3424 } 3463 }
3425 3464
… …
3429#if BG_IMAGE_FROM_FILE 3468#if BG_IMAGE_FROM_FILE
3430 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3431 if (!strcmp (str, "?")) 3470 if (!strcmp (str, "?"))
3432 { 3471 {
3433 char str[256]; 3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3476 {
3477 h_scale = image_vec[0].h_scale;
3478 v_scale = image_vec[0].v_scale;
3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3434 3482
3435 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3483 sprintf (str, "[%dx%d+%d+%d]",
3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3484 h_scale, v_scale,
3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3485 h_align, v_align);
3438 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3439 } 3487 }
3440 else 3488 else
3441 { 3489 {
3442 int changed = 0; 3490 bool changed = false;
3443 3491
3444 if (*str != ';') 3492 if (*str != ';')
3445 { 3493 {
3446 /* reset to default scaling :*/ 3494 if (image_vec.size () > 0)
3447 bgPixmap.unset_geometry (); 3495 changed = image_vec[0].set_file_geometry (str);
3448 if (bgPixmap.set_file (str)) /* change pixmap */ 3496 else
3497 {
3498 rxvt_image *image = new_image ();
3499 if (!image->set_file_geometry (str))
3500 image_vec.pop_back ();
3501 else
3449 changed++; 3502 changed = true;
3450 str = strchr (str, ';'); 3503 }
3451 if (str == NULL)
3452 bgPixmap.set_defaultGeometry ();
3453 } 3504 }
3454 3505 else
3455 while (str)
3456 { 3506 {
3457 str++; 3507 str++;
3458 if (bgPixmap.set_geometry (str)) 3508 if (image_vec.size () > 0)
3459 changed++; 3509 changed = image_vec[0].set_geometry (str, true);
3460 str = strchr (str, ';');
3461 } 3510 }
3462 3511
3463 if (changed) 3512 if (changed)
3513 {
3514 if (bg_window_position_sensitive ())
3515 {
3516 int x, y;
3517 get_window_origin (x, y);
3518 bg_set_position (x, y);
3519 }
3464 update_background (); 3520 update_background ();
3521 }
3465 } 3522 }
3466 break; 3523 break;
3467#endif 3524#endif
3468 3525
3469 case XTerm_logfile: 3526 case XTerm_logfile:
… …
3556 * 's' = save 3613 * 's' = save
3557 * 'r' = restore 3614 * 'r' = restore
3558 * 't' = toggle 3615 * 't' = toggle
3559 * so no need for fancy checking 3616 * so no need for fancy checking
3560 */ 3617 */
3561int 3618int ecb_cold
3562rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3563{ 3620{
3564 int state; 3621 int state;
3565 3622
3566 if (mode == 's') 3623 if (mode == 's')
3567 { 3624 {
3568 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3569 return -1; 3629 return -1;
3570 } 3630 }
3571 else 3631 else
3572 { 3632 {
3573 if (mode == 'r') 3633 if (mode == 'r')
3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3575 else 3635 else
3576 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3577 set_privmode (bit, state); 3637
3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3578 } 3642 }
3579 3643
3580 return state; 3644 return state;
3581} 3645}
3582 3646
3583/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3584void 3648void
3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3586{ 3650{
3587 unsigned int i, j; 3651 unsigned int i, j;
3588 int state; 3652 int state;
3589 3653
3590 static const struct 3654 static const struct
3591 { 3655 {
3592 const int argval; 3656 const int argval;
3593 const unsigned long bit; 3657 const unsigned long bit;
3594 } argtopriv[] = { 3658 } argtopriv[] = {
3595 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3596 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3597 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3598 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3599 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3600 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3601 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3602 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3603 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3604 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region 3669 // 19 Print screen prints full screen/scroll region
3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3607#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3608 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3609#endif 3673#endif
3610 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3612 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3613 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3614 // 45 margin bell NYI 3678 // 45 margin bell NYI
3615 // 46 start logging 3679 // 46 start logging
3616 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3618#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3619 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3620#endif 3684#endif
3621 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3622 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
3623 { 1003, PrivMode_MouseAnyEvent }, 3687 { 1003, PrivMode_MouseAnyEvent },
3688#if ENABLE_FRILLS
3689 { 1005, PrivMode_ExtModeMouse },
3690#endif
3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3691 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3625 { 1011, PrivMode_Keypress }, // rxvt extension 3692 { 1011, PrivMode_Keypress }, // rxvt extension
3693#if ENABLE_FRILLS
3694 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3695#endif
3626 // 1035 enable modifiers for alt, numlock NYI 3696 // 1035 enable modifiers for alt, numlock NYI
3627 // 1036 send ESC for meta keys NYI 3697 // 1036 send ESC for meta keys NYI
3628 // 1037 send DEL for keypad delete NYI 3698 // 1037 send DEL for keypad delete NYI
3629 { 1047, PrivMode_Screen }, 3699 { 1047, PrivMode_Screen },
3630 // 1048 save and restore cursor 3700 // 1048 save and restore cursor, implemented in code
3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3701 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3702 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste }, 3703 { 2004, PrivMode_BracketPaste },
3634 }; 3704 };
3635 3705
… …
3645 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3646 { 3716 {
3647 state = -1; 3717 state = -1;
3648 3718
3649 /* basic handling */ 3719 /* basic handling */
3650 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3651 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3652 { 3722 {
3653 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3654 break; 3724 break;
3655 } 3725 }
… …
3681 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3682 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3683 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3684 * within VT52 mode 3754 * within VT52 mode
3685 */ 3755 */
3686 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3687 break; 3757 break;
3688 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3689 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3691 break; 3761 break;
… …
3706 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3708 break; 3778 break;
3709#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3710 case scrollBar_esc: 3780 case scrollBar_esc:
3711 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3712 {
3713 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3714 scr_touch (true); 3783 scr_touch (true);
3715 }
3716 break; 3784 break;
3717#endif 3785#endif
3718 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3719 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3720 break; 3788 break;
… …
3733 case 1003: 3801 case 1003:
3734 if (state) 3802 if (state)
3735 { 3803 {
3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3738 vt_emask_mouse = PointerMotionMask; 3807 vt_emask_mouse = PointerMotionMask;
3739 } 3808 }
3740 else 3809 else
3741 vt_emask_mouse = NoEventMask; 3810 vt_emask_mouse = NoEventMask;
3742 3811
… …
3774 } 3843 }
3775} 3844}
3776/*}}} */ 3845/*}}} */
3777 3846
3778/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3779void 3848void ecb_hot
3780rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3781{ 3850{
3782 unsigned int i; 3851 unsigned int i;
3783 short rendset; 3852 short rendset;
3784 int rendstyle; 3853 int rendstyle;
… …
3927 } 3996 }
3928 } 3997 }
3929} 3998}
3930/*}}} */ 3999/*}}} */
3931 4000
3932/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3933void
3934rxvt_term::process_graphics ()
3935{
3936 unicode_t ch, cmd = cmd_getc ();
3937
3938 if (cmd == 'Q')
3939 {
3940 /* query graphics */
3941 tt_printf ("\033G0\012"); /* no graphics */
3942 return;
3943 }
3944 /* swallow other graphics sequences until terminating ':' */
3945 do
3946 ch = cmd_getc ();
3947 while (ch != ':');
3948}
3949/*}}} */
3950
3951/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
3952 4002
3953/* 4003/*
3954 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
3955 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
3968 4018
3969/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
3970/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
3971 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
3972 */ 4022 */
3973const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3974 4024
3975void 4025void
3976rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
3977{ 4027{
3978 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3983 4033
3984 if (v_buflen == 0) 4034 if (v_buflen == 0)
3985 { 4035 {
3986 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3987 4037
4038 max_it (written, 0);
4039
3988 if ((unsigned int)written == len) 4040 if (written == len)
3989 return; 4041 return;
3990 4042
3991 data += written; 4043 data += written;
3992 len -= written; 4044 len -= written;
3993 } 4045 }
3994 4046
3995 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3996 4048
3997 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
3998 v_buflen += len; 4050 v_buflen += len;
3999 4051
4000 pty_ev.set (ev::READ | ev::WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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