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.423 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
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, int y2)
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);
… …
184 181
185 alloc = 0; 182 alloc = 0;
186 chr = &ch2; 183 chr = &ch2;
187 len = 1; 184 len = 1;
188 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
189 189
190 char attr[80]; // plenty 190 char attr[80]; // plenty
191 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r, 193 (int)r,
… …
197 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
203 210
204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
206 212
207 if (y >= 0) 213 if (y >= 0)
208 { 214 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 216 x = 0;
211 } 217 }
212 218
213 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
214 222
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 224
217 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
218 { 226 {
219 char buf[9]; 227 char buf[9];
220 228
221 ch = *chr++; 229 ch = *chr++;
222 230
223 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
225 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
226# if !UNICODE_3 234# if !UNICODE_3
227 if (ch >= 0x10000) 235 if (ch >= 0x10000)
228 ch = 0xfffd; 236 ch = 0xfffd;
229# endif 237# endif
230 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
231 239
232 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 242 }
235 243
236// { 244// {
237// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
240// } 248// }
241 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
242 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
243
244 free (fname); 253 free (fname[i]);
254 }
245 255
246# if ENABLE_COMBINING 256# if ENABLE_COMBINING
247 if (alloc) 257 if (alloc)
248 delete [] alloc; 258 delete [] alloc;
249# endif 259# endif
250} 260}
251#endif 261#endif
252 262
253void 263void ecb_cold
254rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
255{ 265{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260 267
261 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
262 { 269 {
263 char mb[16]; 270 char mb[MB_LEN_MAX];
264 int len; 271 int len;
265 272
266 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
268 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
269 else 276 else
270 { 277 {
271 mb[0] = ch[0]; 278 mb[0] = ch;
272 len = 1; 279 len = 1;
273 } 280 }
274 281
275 if (len > 0) 282 if (len > 0)
276 tt_write (mb, len); 283 tt_write (mb, len);
… …
279 } 286 }
280 287
281 iso14755buf = 0; 288 iso14755buf = 0;
282} 289}
283 290
284static int 291static int ecb_cold
285hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
286{ 293{
287 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
290 { 297 {
291 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
292 299
… …
298 305
299 return -1; 306 return -1;
300} 307}
301#endif 308#endif
302 309
303static inline KeySym 310static inline KeySym ecb_cold
304translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
305{ 312{
306#ifdef XK_KP_Home 313#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
334# endif 341# endif
335#endif 342#endif
336 return keysym; 343 return keysym;
337} 344}
338 345
339static inline int 346static inline int ecb_cold
340map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
341{ 348{
342 int param = 0; 349 int param = 0;
343 350
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
393 break; 400 break;
394 } 401 }
395 return param; 402 return param;
396} 403}
397 404
398void 405void ecb_cold
399rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
400{ 407{
401 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
402 KeySym keysym; 409 KeySym keysym;
403 int valid_keysym; 410 int valid_keysym;
… …
416 */ 423 */
417 shft = ev.state & ShiftMask; 424 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
420 427
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; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
… …
505#ifdef PAGING_CONTEXT_LINES 506#ifdef PAGING_CONTEXT_LINES
506 lnsppg = nrow - PAGING_CONTEXT_LINES; 507 lnsppg = nrow - PAGING_CONTEXT_LINES;
507#else 508#else
508 lnsppg = nrow * 4 / 5; 509 lnsppg = nrow * 4 / 5;
509#endif 510#endif
511 max_it (lnsppg, 1);
512
510 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
511 { 514 {
512 scr_page (UP, lnsppg); 515 scr_page (UP, lnsppg);
513 return; 516 return;
514 } 517 }
… …
567 selection_request (ev.time); 570 selection_request (ev.time);
568 return; 571 return;
569#if TODO 572#if TODO
570 /* rxvt extras */ 573 /* rxvt extras */
571 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
572 change_font (FONT_UP);
573 return; 575 return;
574 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
575 change_font (FONT_DN);
576 return; 577 return;
577#endif 578#endif
578 } 579 }
579 } 580 }
580 } 581 }
581 582
582#if ENABLE_FRILLS || ISO_14755 583#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 584 // ISO 14755 support
584 if (shft && ctrl) 585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 586 {
586 int hv; 587 int hv;
587 588
588 if (iso14755buf & ISO_14755_51 589 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 590 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 620 scr_overlay_off ();
620# endif 621# endif
621 iso14755buf = 0; 622 iso14755buf = 0;
622 } 623 }
623 } 624 }
625 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 626 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 627 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 628 if (!(iso14755buf & ISO_14755_STARTED))
627 { 629 {
628 iso14755buf |= ISO_14755_STARTED; 630 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 631# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 632 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 647 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 649 unsigned int newlen = 1;
648 650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
649 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
650 { 657 {
651#ifndef NO_BACKSPACE_KEY 658#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace: 659 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace) 660 if (priv_modes & PrivMode_HaveBackSpace)
654 { 661 {
… …
773 } 780 }
774 781
775 if (newlen) 782 if (newlen)
776 len = strlen (kbuf); 783 len = strlen (kbuf);
777 784
785 if (len > 0)
786 {
778 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
779 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
780 */ 801 */
781#ifdef META8_OPTION 802#ifdef META8_OPTION
782 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
783 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
784#endif 805#endif
806 }
785 807
786 } 808 }
787 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
788 { 810 {
789 len = 1; 811 len = 1;
… …
823 { 845 {
824 view_start = 0; 846 view_start = 0;
825 want_refresh = 1; 847 want_refresh = 1;
826 } 848 }
827 849
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
842 /* escape prefix */ 850 /* escape prefix */
843 if (meta 851 if (meta
844#ifdef META8_OPTION 852#ifdef META8_OPTION
845 && meta_char == C0_ESC 853 && meta_char == C0_ESC
846#endif 854#endif
… …
851 } 859 }
852 860
853 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
854} 862}
855 863
856void 864void ecb_cold
857rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
858{ 866{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym; 868 KeySym keysym;
861 869
… …
881 commit_iso14755 (); 889 commit_iso14755 ();
882 890
883 return; 891 return;
884 } 892 }
885 893
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
887 if (i[0] == keysym) 895 if (i[0] == keysym)
888 { 896 {
889 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 (); 898 commit_iso14755 ();
891 899
… …
928 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
930#endif 938#endif
931} 939}
932 940
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 941void
967rxvt_term::flush () 942rxvt_term::flush ()
968{ 943{
969 flush_ev.stop (); 944 flush_ev.stop ();
970 945
971#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
972 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
973 { 948 {
974// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
975 scr_touch (false); 950 scr_touch (false);
976 } 951 }
977#endif 952#endif
978 953
979 if (want_refresh) 954 if (want_refresh)
… …
1016 while (row < end_row); 991 while (row < end_row);
1017 } 992 }
1018 993
1019 scr_refresh (); 994 scr_refresh ();
1020 scrollBar.show (1); 995 scrollBar.show (1);
1021#ifdef USE_XIM 996#if USE_XIM
1022 IMSendSpot (); 997 im_send_spot ();
1023#endif 998#endif
1024 } 999 }
1025 1000
1026 display->flush (); 1001 display->flush ();
1027} 1002}
1028 1003
1029/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1030void 1005void
1031rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1032{ 1007{
1033 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1044 refresh_count = 0; 1019 refresh_count = 0;
1045 flush (); 1020 flush ();
1046} 1021}
1047 1022
1048#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1049void 1039void
1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1051{ 1041{
1052 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1043 want_refresh = 1;
… …
1072 1062
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void 1064void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{ 1066{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1079 { 1069 {
1080 want_refresh = 1; 1070 want_refresh = 1;
1081 refresh_check (); 1071 refresh_check ();
1082 } 1072 }
1083 else 1073 else
… …
1128 // this should really be sched_yield(), but the linux guys thought 1118 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1119 // 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 1120 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1121 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only 1122 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool, 1123 // known workaround against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best. 1124 // we just nanosleep a bit and hope for the best.
1135 1125
1136 struct timespec ts = { 0, 1000 }; 1126 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0); 1127 nanosleep (&ts, 0);
1138 1128
… …
1144 { 1134 {
1145 } 1135 }
1146} event_handler; 1136} event_handler;
1147#endif 1137#endif
1148 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1149bool 1172bool
1150rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1151{ 1174{
1152 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1153 1176
1154 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1155 { 1178
1156 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1157 n = 0;
1158 } 1180 {
1159 1181 // 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; 1182 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1163 1186
1164 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1165 1188
1166 if (r > 0) 1189 if (r > 0)
1167 { 1190 {
1168 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1169 return true; 1192 return true;
… …
1200 pty_write (); 1223 pty_write ();
1201 1224
1202 refresh_check (); 1225 refresh_check ();
1203} 1226}
1204 1227
1205void 1228void ecb_cold
1206rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1207{ 1230{
1208 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1209 recolour_cursor (); 1232 recolour_cursor ();
1210 1233
… …
1215 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1216#endif 1239#endif
1217} 1240}
1218 1241
1219#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1220void 1243void ecb_cold
1221rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1222{ 1245{
1223 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1224 return; 1247 return;
1225 1248
… …
1227 XFlush (dpy); 1250 XFlush (dpy);
1228 1251
1229 hidden_pointer = 1; 1252 hidden_pointer = 1;
1230} 1253}
1231 1254
1232void 1255void ecb_cold
1233rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1234{ 1257{
1235 make_current (); 1258 make_current ();
1236 1259
1237 pointer_blank (); 1260 pointer_blank ();
… …
1243{ 1266{
1244 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1245 int x, y; 1268 int x, y;
1246 int code = 32; 1269 int code = 32;
1247 1270
1248 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1249 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1250 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1251 { 1275 {
1252 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1253 return; 1277 return;
1278
1254 mouse_row = x; 1279 mouse_row = x;
1255 mouse_col = y; 1280 mouse_col = y;
1256 code += 32; 1281 code += 32;
1257 } 1282 }
1258 1283
… …
1261 else 1286 else
1262 { 1287 {
1263 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1264 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1265 if (button_number >= 3) 1290 if (button_number >= 3)
1266 button_number += (64 - 3); 1291 button_number += 64 - 3;
1267 } 1292 }
1268 1293
1269 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1270 { 1295 {
1271 /* 1296 /*
… …
1303 fputc ('A', stderr); 1328 fputc ('A', stderr);
1304 if (key_state & 32) 1329 if (key_state & 32)
1305 fputc ('2', stderr); 1330 fputc ('2', stderr);
1306 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1307 button_number, 1332 button_number,
1308 x + 1, 1333 x,
1309 y + 1); 1334 y);
1310#endif 1335#endif
1311 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1312 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1313 (code + button_number + key_state), 1351 code + button_number + key_state,
1314 (32 + x + 1), 1352 32 + x,
1315 (32 + y + 1)); 1353 32 + y);
1316} 1354}
1317 1355
1318/*{{{ process an X event */ 1356/*{{{ process an X event */
1319void 1357void ecb_hot
1320rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1321{ 1359{
1322 make_current (); 1360 make_current ();
1323 1361
1324 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1422 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1461 focus_out ();
1424 break; 1462 break;
1425 1463
1426 case ConfigureNotify: 1464 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1430 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1431 { 1466 {
1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1433 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID))
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1434 1502
1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1436 { 1504 {
1437 seen_resize = 1; 1505 seen_resize = 1;
1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1439 } 1507 }
1440 else 1508 else
1441 { 1509 {
1442#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped) 1511 if (moved)
1446 update_background (); 1512 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif 1513#endif
1451 } 1514 }
1452 1515
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1517 }
1455 break; 1518 break;
1456 1519
1457 case PropertyNotify: 1520 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462
1463 break; 1522 break;
1464 1523
1465 case SelectionClear: 1524 case SelectionClear:
1466 selection_clear (); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break;
1468
1469 case SelectionNotify:
1470 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1472 break; 1526 break;
1473 1527
1474 case SelectionRequest: 1528 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1476 break; 1530 break;
1477 1531
1478 case MapNotify: 1532 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1481 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1484 * reparenting. 1538 // events at startup when the window manager reparents the
1485 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1487 * by scheduling background redraw as soon as we can, but giving a short 1541 if (!(bg_flags & BG_IS_VALID))
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1494#endif 1543#endif
1495 mapped = 1; 1544 mapped = 1;
1496#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1497 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1512 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1513 { 1562 {
1514 do 1563 do
1515 { 1564 {
1516 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1517 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1518 } 1567 }
1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1520 1569
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522 1571
1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 { 1573 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1576 }
1528 1577
1529 want_refresh = 1; 1578 want_refresh = 1;
1530 } 1579 }
1531 else 1580 else
… …
1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1538 ; 1587 ;
1539 1588
1540 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1541 { 1590 {
1542 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1543 scrollBar.show (0); 1592 scrollBar.show (0);
1544 } 1593 }
1545 } 1594 }
1546 break; 1595 break;
1547 1596
… …
1613 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1614 } 1663 }
1615 else 1664 else
1616 { 1665 {
1617 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1618 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1619 } 1668 }
1620 1669
1621 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1622 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1623 + 1; 1672 + 1;
… …
1635#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1636 } 1685 }
1637#endif 1686#endif
1638 } 1687 }
1639 } 1688 }
1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1641 { 1690 {
1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1643 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1644 ; 1693 ;
1645 1694
1646 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1647 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1648 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1649 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1650 &unused_mask); 1699 &unused_mask);
1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1652 scrollBar.size ()); 1701 scrollBar.size ());
1653 want_refresh = 1; 1702 want_refresh = 1;
1654 scrollBar.show (1); 1703 scrollBar.show (1);
1655 } 1704 }
1656 break; 1705 break;
1657 } 1706 }
1658 1707
1659#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1660 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1661 {
1662 if (hidden_cursor)
1663 {
1664 hidden_cursor = 0;
1665 want_refresh = 1;
1666 }
1667
1668 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1669 }
1670#endif 1711#endif
1671 1712
1672#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1674 { 1715 {
… …
1684#endif 1725#endif
1685 1726
1686 refresh_check (); 1727 refresh_check ();
1687} 1728}
1688 1729
1689void 1730#if ENABLE_FRILLS
1731void ecb_cold
1690rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1691{ 1733{
1692 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1693 return; 1735 return;
1694 1736
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1696 { 1738 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1740 XSetWMHints (dpy, parent, h);
1699 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1700 } 1743 }
1701} 1744}
1745#endif
1702 1746
1703void 1747void ecb_cold
1704rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1705{ 1749{
1706 if (!focus) 1750 if (!focus)
1707 { 1751 {
1708 focus = 1; 1752 focus = 1;
1709 want_refresh = 1; 1753 want_refresh = 1;
1710 1754
1711#if USE_XIM 1755#if USE_XIM
1712 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1713 { 1757 {
1714 IMSetPosition (); 1758 im_set_position ();
1715 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1716 } 1760 }
1717#endif 1761#endif
1718#if CURSOR_BLINK 1762#if CURSOR_BLINK
1719 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1733 1777
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735 } 1779 }
1736} 1780}
1737 1781
1738void 1782void ecb_cold
1739rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1740{ 1784{
1741 if (focus) 1785 if (focus)
1742 { 1786 {
1743 focus = 0; 1787 focus = 0;
… …
1776 1820
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 } 1822 }
1779} 1823}
1780 1824
1781void 1825void ecb_cold
1782rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1783{ 1827{
1784#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1786 { 1830 {
… …
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 } 1834 }
1791#endif 1835#endif
1792} 1836}
1793 1837
1794#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1795void 1839void ecb_hot
1796rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1797{ 1841{
1798 make_current (); 1842 make_current ();
1799 1843
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return; 1846 return;
1803 1847
1804# if ENABLE_TRANSPARENCY
1805 switch (ev.type) 1848 switch (ev.type)
1806 { 1849 {
1807 case PropertyNotify: 1850 case PropertyNotify:
1808 /* 1851 /*
1809 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1810 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1811 */ 1854 */
1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1814 { 1857 {
1858#if BG_IMAGE_FROM_ROOT
1815 bgPixmap.set_root_pixmap (); 1859 bg_set_root_pixmap ();
1816 update_background (); 1860 update_background ();
1861#endif
1862#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif
1817 } 1865 }
1818 1866
1819 break; 1867 break;
1820 } 1868 }
1821# endif
1822 1869
1823 refresh_check (); 1870 refresh_check ();
1824} 1871}
1825#endif 1872#endif
1826 1873
… …
1859 /* save the xbutton state (for ButtonRelease) */ 1906 /* save the xbutton state (for ButtonRelease) */
1860 MEvent.state = ev.state; 1907 MEvent.state = ev.state;
1861#ifdef MOUSE_REPORT_DOUBLECLICK 1908#ifdef MOUSE_REPORT_DOUBLECLICK
1862 if (ev.button == MEvent.button && clickintime) 1909 if (ev.button == MEvent.button && clickintime)
1863 { 1910 {
1864 /* same button, within alloted time */ 1911 /* same button, within allowed time */
1865 MEvent.clicks++; 1912 MEvent.clicks++;
1866 1913
1867 if (MEvent.clicks > 1) 1914 if (MEvent.clicks > 1)
1868 { 1915 {
1869 /* only report double clicks */ 1916 /* only report double clicks */
… …
1950 if (scrollBar.upButton (ev.y)) 1997 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */ 1998 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y)) 1999 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */ 2000 direction = DN; /* down */
1954 2001
1955 scrollBar.state = STATE_IDLE; 2002 scrollBar.state = SB_STATE_IDLE;
1956 /* 2003 /*
1957 * Rxvt-style scrollbar: 2004 * Rxvt-style scrollbar:
1958 * move up if mouse is above slider 2005 * move up if mouse is above slider
1959 * move dn if mouse is below slider 2006 * move dn if mouse is below slider
1960 * 2007 *
… …
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2046 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2047#endif
2001 if (scr_page (direction, 1)) 2048 if (scr_page (direction, 1))
2002 { 2049 {
2003 if (direction == UP) 2050 if (direction == UP)
2004 scrollBar.state = STATE_UP; 2051 scrollBar.state = SB_STATE_UP;
2005 else 2052 else
2006 scrollBar.state = STATE_DOWN; 2053 scrollBar.state = SB_STATE_DOWN;
2007 } 2054 }
2008 } 2055 }
2009 else 2056 else
2010 switch (ev.button) 2057 switch (ev.button)
2011 { 2058 {
2012 case Button2: 2059 case Button2:
2013 switch (scrollBar.align) 2060 switch (scrollBar.align)
2014 { 2061 {
2015 case R_SB_ALIGN_TOP: 2062 case SB_ALIGN_TOP:
2016 csrO = 0; 2063 csrO = 0;
2017 break; 2064 break;
2018 case R_SB_ALIGN_CENTRE: 2065 case SB_ALIGN_CENTRE:
2019 csrO = (scrollBar.bot - scrollBar.top) / 2; 2066 csrO = (scrollBar.bot - scrollBar.top) / 2;
2020 break; 2067 break;
2021 case R_SB_ALIGN_BOTTOM: 2068 case SB_ALIGN_BOTTOM:
2022 csrO = scrollBar.bot - scrollBar.top; 2069 csrO = scrollBar.bot - scrollBar.top;
2023 break; 2070 break;
2024 } 2071 }
2025 2072
2026 if (scrollBar.style == R_SB_XTERM 2073 if (scrollBar.style == SB_STYLE_XTERM
2027 || scrollbar_above_slider (ev.y) 2074 || scrollBar.above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2075 || scrollBar.below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2076 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2030 2077
2031 scrollBar.state = STATE_MOTION; 2078 scrollBar.state = SB_STATE_MOTION;
2032 break; 2079 break;
2033 2080
2034 case Button1: 2081 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2082 if (scrollBar.align == SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2083 csrO = ev.y - scrollBar.top;
2037 /* FALLTHROUGH */ 2084 /* FALLTHROUGH */
2038 2085
2039 case Button3: 2086 case Button3:
2040 if (scrollBar.style != R_SB_XTERM) 2087 if (scrollBar.style != SB_STYLE_XTERM)
2041 { 2088 {
2042 if (scrollbar_above_slider (ev.y)) 2089 if (scrollBar.above_slider (ev.y))
2043# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
2044 scr_page (UP, nrow - 1); 2091 scr_page (UP, nrow - 1);
2045# else 2092# else
2046 scr_page (UP, nrow / 4); 2093 scr_page (UP, nrow / 4);
2047# endif 2094# endif
2048 else if (scrollbar_below_slider (ev.y)) 2095 else if (scrollBar.below_slider (ev.y))
2049# ifdef RXVT_SCROLL_FULL 2096# ifdef RXVT_SCROLL_FULL
2050 scr_page (DN, nrow - 1); 2097 scr_page (DN, nrow - 1);
2051# else 2098# else
2052 scr_page (DN, nrow / 4); 2099 scr_page (DN, nrow / 4);
2053# endif 2100# endif
2054 else 2101 else
2055 scrollBar.state = STATE_MOTION; 2102 scrollBar.state = SB_STATE_MOTION;
2056 } 2103 }
2057 else 2104 else
2058 { 2105 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2106 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2107 (nrow
2061 * scrollbar_position (ev.y) 2108 * scrollBar.position (ev.y)
2062 / scrollBar.size ())); 2109 / scrollBar.size ()));
2063 } 2110 }
2064 2111
2065 break; 2112 break;
2066 } 2113 }
… …
2077 2124
2078 csrO = 0; /* reset csr Offset */ 2125 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2126 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2127 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2128
2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2129 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2083 { 2130 {
2084 scrollBar.state = STATE_IDLE; 2131 scrollBar.state = SB_STATE_IDLE;
2085 scrollBar.show (0); 2132 scrollBar.show (0);
2086 } 2133 }
2087 2134
2088#ifdef SELECTION_SCROLLING 2135#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2136 sel_scroll_ev.stop();
… …
2139 case Button3: 2186 case Button3:
2140 selection_make (ev.time); 2187 selection_make (ev.time);
2141 break; 2188 break;
2142 2189
2143 case Button2: 2190 case Button2:
2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2191 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2192 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2146 break; 2193 break;
2147 2194
2148#ifdef MOUSE_WHEEL 2195#ifdef MOUSE_WHEEL
2149 case Button4: 2196 case Button4:
2150 case Button5: 2197 case Button5:
… …
2184 } 2231 }
2185} 2232}
2186 2233
2187/*}}} */ 2234/*}}} */
2188 2235
2189void 2236void ecb_hot
2190rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2191{ 2238{
2192 wchar_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2193 char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2194 2241
2195 for (;;) 2242 for (;;)
2196 { 2243 {
2197 if (expect_false (ch == NOCHAR)) 2244 if (ecb_unlikely (ch == NOCHAR))
2198 { 2245 {
2199 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2200 ch = next_char (); 2247 ch = next_char ();
2201 2248
2202 if (ch == NOCHAR) 2249 if (ch == NOCHAR)
2203 break; 2250 break;
2204 } 2251 }
2205 2252
2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2253 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2207 { 2254 {
2208 if (expect_false (!seen_input)) 2255 if (ecb_unlikely (!seen_input))
2209 { 2256 {
2210 seen_input = 1; 2257 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition: 2258 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler. 2259 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs 2260 // some window managers resize the window early, and these programs
… …
2226 wchar_t *str = buf; 2273 wchar_t *str = buf;
2227 wchar_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2228 2275
2229 for (;;) 2276 for (;;)
2230 { 2277 {
2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2278 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2232 break; 2279 break;
2233 2280
2234 *str++ = ch; 2281 *str++ = ch;
2235 2282
2236 if (expect_false (ch == C0_LF || str >= eol)) 2283 if (ecb_unlikely (ch == C0_LF || str >= eol))
2237 { 2284 {
2238 if (ch == C0_LF) 2285 if (ch == C0_LF)
2239 nlines++; 2286 nlines++;
2240 2287
2241 refresh_count++; 2288 refresh_count++;
… …
2313 } 2360 }
2314 } 2361 }
2315} 2362}
2316 2363
2317// read the next character 2364// read the next character
2318wchar_t 2365wchar_t ecb_hot
2319rxvt_term::next_char () NOTHROW 2366rxvt_term::next_char () NOTHROW
2320{ 2367{
2321 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2322 { 2369 {
2323 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2325 return *cmdbuf_ptr++; 2372 return *cmdbuf_ptr++;
2326 2373
2327 wchar_t wc; 2374 wchar_t wc;
2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2375 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2329 2376
… …
2334 break; 2381 break;
2335 } 2382 }
2336 2383
2337 if (len == (size_t)-1) 2384 if (len == (size_t)-1)
2338 { 2385 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2386 mbstate.reset (); // reset now undefined conversion state
2387 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2388 // in which case we "erroneously" return the next byte which might be valid.
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2390 }
2342 2391
2343 // assume wchar == unicode 2392 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
… …
2347 2396
2348 return NOCHAR; 2397 return NOCHAR;
2349} 2398}
2350 2399
2351// read the next octet 2400// read the next octet
2352uint32_t 2401uint32_t ecb_hot
2353rxvt_term::next_octet () NOTHROW 2402rxvt_term::next_octet () NOTHROW
2354{ 2403{
2355 return cmdbuf_ptr < cmdbuf_endp 2404 return cmdbuf_ptr < cmdbuf_endp
2356 ? (unsigned char)*cmdbuf_ptr++ 2405 ? (unsigned char)*cmdbuf_ptr++
2357 : NOCHAR; 2406 : NOCHAR;
2358} 2407}
2359 2408
2360static class out_of_input out_of_input; 2409static class out_of_input out_of_input;
2361 2410
2362/* rxvt_cmd_getc () - Return next input character */ 2411wchar_t ecb_hot
2363/*
2364 * Return the next input character after first passing any keyboard input
2365 * to the command.
2366 */
2367wchar_t
2368rxvt_term::cmd_getc () THROW ((class out_of_input)) 2412rxvt_term::cmd_getc () THROW ((class out_of_input))
2369{ 2413{
2370 wchar_t c = next_char (); 2414 wchar_t c = next_char ();
2371 2415
2372 if (c == NOCHAR) 2416 if (c == NOCHAR)
2373 throw out_of_input; 2417 throw out_of_input;
2374 2418
2375 return c; 2419 return c;
2376} 2420}
2377 2421
2378uint32_t 2422uint32_t ecb_hot
2379rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2380{ 2424{
2381 uint32_t c = next_octet (); 2425 uint32_t c = next_octet ();
2382 2426
2383 if (c == NOCHAR) 2427 if (c == NOCHAR)
… …
2387} 2431}
2388 2432
2389/*{{{ print pipe */ 2433/*{{{ print pipe */
2390/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2391#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2392FILE * 2436FILE * ecb_cold
2393rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2394{ 2438{
2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2396 2440
2397 if (stream == NULL) 2441 if (stream == NULL)
2398 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2399 2443
2400 return stream; 2444 return stream;
2401} 2445}
2402 2446
2403int 2447int ecb_cold
2404rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2405{ 2449{
2406 fflush (stream); 2450 fflush (stream);
2407 return pclose (stream); 2451 return pclose (stream);
2408} 2452}
2409 2453
2410/* 2454/*
2411 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2412 */ 2456 */
2413void 2457void ecb_cold
2414rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2415{ 2459{
2416 FILE *fd = popen_printer (); 2460 FILE *fd = popen_printer ();
2417 2461
2418 if (!fd) 2462 if (!fd)
… …
2464 pclose_printer (fd); 2508 pclose_printer (fd);
2465} 2509}
2466#endif /* PRINTPIPE */ 2510#endif /* PRINTPIPE */
2467/*}}} */ 2511/*}}} */
2468 2512
2469/* *INDENT-OFF* */
2470enum { 2513enum {
2471 C1_40 = 0x40, 2514 C1_40 = 0x40,
2472 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2515 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2473 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2516 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2474 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2475 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2476}; 2519};
2477/* *INDENT-ON* */
2478 2520
2479/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2480void 2522void ecb_hot
2481rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2482{ 2524{
2483 switch (ch) 2525 switch (ch)
2484 { 2526 {
2485 case C0_ESC: 2527 case C0_ESC:
… …
2531} 2573}
2532/*}}} */ 2574/*}}} */
2533 2575
2534 2576
2535/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2536void 2578void ecb_cold
2537rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2538{ 2580{
2539 int row, col; 2581 int row, col;
2540 2582
2541 switch (ch) 2583 switch (ch)
… …
2575 break; 2617 break;
2576 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2578 break; 2620 break;
2579 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2580 set_privmode (PrivMode_vt52, 0); 2622 priv_modes &= ~PrivMode_vt52;
2581 break; 2623 break;
2582 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2583 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2584 /* unimplemented */ 2626 /* unimplemented */
2585 break; 2627 break;
… …
2591} 2633}
2592/*}}} */ 2634/*}}} */
2593 2635
2594 2636
2595/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2596void 2638void ecb_hot
2597rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2598{ 2640{
2599 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2600 2642
2601 if (priv_modes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
… …
2604 return; 2646 return;
2605 } 2647 }
2606 2648
2607 switch (ch) 2649 switch (ch)
2608 { 2650 {
2609 /* case 1: do_tek_mode (); break; */
2610 case '#': 2651 case '#':
2611 if (cmd_getc () == '8') 2652 if (cmd_getc () == '8')
2612 scr_E (); 2653 scr_E ();
2613 break; 2654 break;
2614 case '(': 2655 case '(':
… …
2637#if !ENABLE_MINIMAL 2678#if !ENABLE_MINIMAL
2638 case '9': 2679 case '9':
2639 scr_forwardindex (); 2680 scr_forwardindex ();
2640 break; 2681 break;
2641#endif 2682#endif
2683 // DECPAM/DECPNM
2642 case '=': 2684 case '=':
2685 priv_modes |= PrivMode_aplKP;
2686 break;
2643 case '>': 2687 case '>':
2644 set_privmode (PrivMode_aplKP, ch == '='); 2688 priv_modes &= ~PrivMode_aplKP;
2645 break; 2689 break;
2646 2690
2647 case C1_40: 2691 case C1_40:
2648 cmd_getc (); 2692 cmd_getc ();
2649 break; 2693 break;
… …
2653 2697
2654 /* 8.3.87: NEXT LINE */ 2698 /* 8.3.87: NEXT LINE */
2655 case C1_NEL: /* ESC E */ 2699 case C1_NEL: /* ESC E */
2656 { 2700 {
2657 wchar_t nlcr[] = { C0_LF, C0_CR }; 2701 wchar_t nlcr[] = { C0_LF, C0_CR };
2658 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2659 } 2703 }
2660 break; 2704 break;
2661 2705
2662 /* kidnapped escape sequence: Should be 8.3.48 */ 2706 /* kidnapped escape sequence: Should be 8.3.48 */
2663 case C1_ESA: /* ESC G */ 2707 case C1_ESA: /* ESC G */
2664 process_graphics (); 2708 // used by original rxvt for rob nations own graphics mode
2709 if (cmd_getc () == 'Q')
2710 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2665 break; 2711 break;
2666 2712
2667 /* 8.3.63: CHARACTER TABULATION SET */ 2713 /* 8.3.63: CHARACTER TABULATION SET */
2668 case C1_HTS: /* ESC H */ 2714 case C1_HTS: /* ESC H */
2669 scr_set_tab (1); 2715 scr_set_tab (1);
… …
2673 case C1_RI: /* ESC M */ 2719 case C1_RI: /* ESC M */
2674 scr_index (DN); 2720 scr_index (DN);
2675 break; 2721 break;
2676 2722
2677 /* 8.3.142: SINGLE-SHIFT TWO */ 2723 /* 8.3.142: SINGLE-SHIFT TWO */
2678 /*case C1_SS2: scr_single_shift (2); break; */ 2724 /* case C1_SS2: break; */
2679 2725
2680 /* 8.3.143: SINGLE-SHIFT THREE */ 2726 /* 8.3.143: SINGLE-SHIFT THREE */
2681 /*case C1_SS3: scr_single_shift (3); break; */ 2727 /* case C1_SS3: break; */
2682 2728
2683 /* 8.3.27: DEVICE CONTROL STRING */ 2729 /* 8.3.27: DEVICE CONTROL STRING */
2684 case C1_DCS: /* ESC P */ 2730 case C1_DCS: /* ESC P */
2685 process_dcs_seq (); 2731 process_dcs_seq ();
2686 break; 2732 break;
… …
2719 } 2765 }
2720} 2766}
2721/*}}} */ 2767/*}}} */
2722 2768
2723/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2769/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2724/* *INDENT-OFF* */
2725enum { 2770enum {
2726 CSI_ICH = 0x40, 2771 CSI_ICH = 0x40,
2727 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2772 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2728 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2773 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2729 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2774 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2732 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2777 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2733 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2778 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2734 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2779 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2735}; 2780};
2736 2781
2737#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2782#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2738 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2783 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2739 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2784 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2740#define get_byte_array_bit(array, bit) \ 2785#define get_byte_array_bit(array, bit) \
2741 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2786 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2742 2787
2743const unsigned char csi_defaults[] = 2788static const unsigned char csi_defaults[] =
2744 { 2789 {
2745 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2790 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2746 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2791 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2747 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2792 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2748 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2793 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2749 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2794 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2750 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2795 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2751 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2752 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2753 }; 2798 };
2754/* *INDENT-ON* */
2755 2799
2756void 2800void ecb_hot
2757rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2758{ 2802{
2759 unicode_t ch, priv, i; 2803 unicode_t ch, priv, i;
2760 unsigned int nargs, p; 2804 unsigned int nargs, p;
2761 int n, ndef; 2805 int n, ndef;
… …
2837 { 2881 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2882 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset (); 2883 scr_soft_reset ();
2840 2884
2841 static const int pm_h[] = { 7, 25 }; 2885 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 7, 9, 66, 1000, 1001, 1049 }; 2886 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2843 2887
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2888 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2889 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2846 } 2890 }
2847 break; 2891 break;
2848 } 2892 }
2849 2893
2850 return; 2894 return;
… …
2868 } 2912 }
2869 break; 2913 break;
2870#endif 2914#endif
2871 2915
2872 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2916 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2873 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2917 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2874 arg[0] = -arg[0]; 2918 arg[0] = -arg[0];
2875 /* FALLTHROUGH */ 2919 /* FALLTHROUGH */
2876 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2920 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2877 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2921 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2878 scr_gotorc (arg[0], 0, RELATIVE); 2922 scr_gotorc (arg[0], 0, RELATIVE);
2879 break; 2923 break;
2880 2924
2881 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2925 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2882 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2926 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3069 } 3113 }
3070} 3114}
3071/*}}} */ 3115/*}}} */
3072 3116
3073#if !ENABLE_MINIMAL 3117#if !ENABLE_MINIMAL
3074/* ARGSUSED */
3075void 3118void
3076rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3077{ 3120{
3078 int x, y; 3121 int x, y;
3079 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
… …
3088 { 3131 {
3089 /* 3132 /*
3090 * commands 3133 * commands
3091 */ 3134 */
3092 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3093 XMapWindow (dpy, parent[0]); 3136 XMapWindow (dpy, parent);
3094 break; 3137 break;
3095 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3096 XIconifyWindow (dpy, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent, display->screen);
3097 break; 3140 break;
3098 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3099 XMoveWindow (dpy, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent, args[1], args[2]);
3100 break; 3143 break;
3101 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3102 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3103 break; 3146 break;
3104 case 5: /* raise window */ 3147 case 5: /* raise window */
3105 XRaiseWindow (dpy, parent[0]); 3148 XRaiseWindow (dpy, parent);
3106 break; 3149 break;
3107 case 6: /* lower window */ 3150 case 6: /* lower window */
3108 XLowerWindow (dpy, parent[0]); 3151 XLowerWindow (dpy, parent);
3109 break; 3152 break;
3110 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3111 scr_touch (true); 3154 scr_touch (true);
3112 break; 3155 break;
3113 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3116 break; 3159 break;
3117 3160
3118 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3119 default: 3162 default:
3120 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3121 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)vt_width,
3122 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3123 break; 3166 break;
3124 3167
3125 /* 3168 /*
3126 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3127 */ 3170 */
3128 case 11: /* report window state */ 3171 case 11: /* report window state */
3129 XGetWindowAttributes (dpy, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3130 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3131 break; 3174 break;
3132 case 13: /* report window position */ 3175 case 13: /* report window position */
3133 XGetWindowAttributes (dpy, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent, &wattr);
3134 XTranslateCoordinates (dpy, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent, wattr.root,
3135 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3136 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3137 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3138 break; 3181 break;
3139 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3142 break; 3185 break;
3143 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3144 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3145 break; 3188 break;
… …
3147 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3148 break; 3191 break;
3149 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3150 { 3193 {
3151 char *s; 3194 char *s;
3152 XGetIconName (dpy, parent[0], &s); 3195 XGetIconName (dpy, parent, &s);
3153 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3154 XFree (s); 3197 XFree (s);
3155 } 3198 }
3156 break; 3199 break;
3157 case 21: /* report window title */ 3200 case 21: /* report window title */
3158 { 3201 {
3159 char *s; 3202 char *s;
3160 XFetchName (dpy, parent[0], &s); 3203 XFetchName (dpy, parent, &s);
3161 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3205 XFree (s);
3163 } 3206 }
3164 break; 3207 break;
3165 } 3208 }
… …
3221 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3222 */ 3265 */
3223void 3266void
3224rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3225{ 3268{
3226 char *s;
3227 unicode_t eh;
3228
3229 /* 3269 /*
3230 * Not handled yet 3270 * Not handled yet
3231 */ 3271 */
3272
3273 unicode_t eh;
3232 s = get_to_st (eh); 3274 char *s = get_to_st (eh);
3233 if (s) 3275 if (s)
3234 free (s); 3276 free (s);
3235 3277
3236 return; 3278 return;
3237} 3279}
… …
3241 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3283 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3242 */ 3284 */
3243void 3285void
3244rxvt_term::process_osc_seq () 3286rxvt_term::process_osc_seq ()
3245{ 3287{
3246 unicode_t ch, eh;
3247 int arg; 3288 int arg;
3248 3289
3249 ch = cmd_getc (); 3290 unicode_t ch = cmd_getc ();
3250 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3291 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3251 arg = arg * 10 + (ch - '0'); 3292 arg = arg * 10 + (ch - '0');
3252 3293
3253 if (ch == ';') 3294 if (ch == ';')
3254 { 3295 {
3296 unicode_t eh;
3255 char *s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3256 3298
3257 if (s) 3299 if (s)
3258 { 3300 {
3259 process_xterm_seq (arg, s, eh); 3301 process_xterm_seq (arg, s, eh);
… …
3283 3325
3284/* 3326/*
3285 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3327 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3286 */ 3328 */
3287void 3329void
3288rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3330rxvt_term::process_xterm_seq (int op, char *str, char resp)
3289{ 3331{
3290 int color; 3332 int color;
3291 char *buf, *name; 3333 char *buf, *name;
3292 bool query = str[0] == '?' && !str[1]; 3334 bool query = str[0] == '?' && !str[1];
3293 int saveop = op; 3335 int saveop = op;
… …
3320 unsigned long bytes_after; 3362 unsigned long bytes_after;
3321 unsigned char *value = 0; 3363 unsigned char *value = 0;
3322 const char *str = ""; 3364 const char *str = "";
3323 3365
3324 if (prop 3366 if (prop
3325 && XGetWindowProperty (dpy, parent[0], 3367 && XGetWindowProperty (dpy, parent,
3326 prop, 0, 1<<16, 0, AnyPropertyType, 3368 prop, 0, 1<<16, 0, AnyPropertyType,
3327 &actual_type, &actual_format, 3369 &actual_type, &actual_format,
3328 &nitems, &bytes_after, &value) == Success 3370 &nitems, &bytes_after, &value) == Success
3329 && actual_type != None 3371 && actual_type != None
3330 && actual_format == 8) 3372 && actual_format == 8)
… …
3334 3376
3335 XFree (value); 3377 XFree (value);
3336 } 3378 }
3337 else 3379 else
3338 { 3380 {
3339 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3381 char *eq = strchr (str, '=');
3340 3382
3341 if (eq) 3383 if (eq)
3342 { 3384 {
3343 *eq = 0; 3385 *eq = 0;
3344 set_utf8_property (display->atom (str), eq + 1); 3386 set_utf8_property (display->atom (str), eq + 1);
3345 } 3387 }
3346 else 3388 else
3347 XDeleteProperty (dpy, parent[0], 3389 XDeleteProperty (dpy, parent,
3348 display->atom (str)); 3390 display->atom (str));
3349 } 3391 }
3350 break; 3392 break;
3351 3393
3352 case XTerm_Color: 3394 case XTerm_Color:
… …
3384 process_color_seq (op, Color_pointer_fg, str, resp); 3426 process_color_seq (op, Color_pointer_fg, str, resp);
3385 break; 3427 break;
3386 case XTerm_Color_pointer_bg: 3428 case XTerm_Color_pointer_bg:
3387 process_color_seq (op, Color_pointer_bg, str, resp); 3429 process_color_seq (op, Color_pointer_bg, str, resp);
3388 break; 3430 break;
3431#ifdef OPTION_HC
3432 case XTerm_Color_HC:
3433 process_color_seq (op, Color_HC, str, resp);
3434 break;
3435 case XTerm_Color_HTC:
3436 process_color_seq (op, Color_HTC, str, resp);
3437 break;
3438#endif
3389#ifndef NO_BOLD_UNDERLINE_REVERSE 3439#ifndef NO_BOLD_UNDERLINE_REVERSE
3390 case XTerm_Color_RV:
3391 process_color_seq (op, Color_RV, str, resp);
3392 break;
3393 case Rxvt_Color_BD:
3394 case URxvt_Color_BD: 3440 case URxvt_Color_BD:
3395 process_color_seq (op, Color_BD, str, resp); 3441 process_color_seq (op, Color_BD, str, resp);
3396 break; 3442 break;
3397 case Rxvt_Color_UL:
3398 case URxvt_Color_UL: 3443 case URxvt_Color_UL:
3399 process_color_seq (op, Color_UL, str, resp); 3444 process_color_seq (op, Color_UL, str, resp);
3400 break; 3445 break;
3401 case URxvt_Color_IT: 3446 case URxvt_Color_IT:
3402 process_color_seq (op, Color_IT, str, resp); 3447 process_color_seq (op, Color_IT, str, resp);
3403 break; 3448 break;
3404#endif 3449#endif
3405#if ENABLE_TRANSPARENCY 3450 case URxvt_Color_border:
3451 process_color_seq (op, Color_border, str, resp);
3452 break;
3453
3454#if BG_IMAGE_FROM_ROOT
3406 case URxvt_Color_tint: 3455 case URxvt_Color_tint:
3407 process_color_seq (op, Color_tint, str, resp); 3456 process_color_seq (op, Color_tint, str, resp);
3408 { 3457 {
3409 bool changed = false; 3458 bool changed = false;
3410 3459
3411 if (ISSET_PIXCOLOR (Color_tint)) 3460 if (ISSET_PIXCOLOR (Color_tint))
3412 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3461 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3413 else
3414 changed = bgPixmap.unset_tint ();
3415 3462
3416 if (changed) 3463 if (changed)
3417 update_background (); 3464 update_background ();
3418 } 3465 }
3419 3466
… …
3423#if BG_IMAGE_FROM_FILE 3470#if BG_IMAGE_FROM_FILE
3424 case Rxvt_Pixmap: 3471 case Rxvt_Pixmap:
3425 if (!strcmp (str, "?")) 3472 if (!strcmp (str, "?"))
3426 { 3473 {
3427 char str[256]; 3474 char str[256];
3475 int h_scale = fimage.h_scale;
3476 int v_scale = fimage.v_scale;
3477 int h_align = fimage.h_align;
3478 int v_align = fimage.v_align;
3428 3479
3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3480 sprintf (str, "[%dx%d+%d+%d]",
3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3481 h_scale, v_scale,
3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3482 h_align, v_align);
3432 process_xterm_seq (XTerm_title, str, CHAR_ST); 3483 process_xterm_seq (XTerm_title, str, CHAR_ST);
3433 } 3484 }
3434 else 3485 else
3435 { 3486 {
3436 int changed = 0; 3487 bool changed = false;
3437 3488
3438 if (*str != ';') 3489 if (*str != ';')
3439 { 3490 {
3440 /* reset to default scaling :*/ 3491 try
3441 bgPixmap.unset_geometry (); 3492 {
3442 if (bgPixmap.set_file (str)) /* change pixmap */ 3493 fimage.set_file_geometry (this, str);
3443 changed++; 3494 changed = true;
3444 str = strchr (str, ';'); 3495 }
3445 if (str == NULL) 3496 catch (const class rxvt_failure_exception &e)
3446 bgPixmap.set_defaultGeometry (); 3497 {
3498 }
3447 } 3499 }
3448 3500 else
3449 while (str)
3450 { 3501 {
3451 str++; 3502 str++;
3452 if (bgPixmap.set_geometry (str)) 3503 if (fimage.set_geometry (str, true))
3453 changed++; 3504 changed = true;
3454 str = strchr (str, ';');
3455 } 3505 }
3456 3506
3457 if (changed) 3507 if (changed)
3508 {
3509 if (bg_window_position_sensitive ())
3510 {
3511 int x, y;
3512 get_window_origin (x, y);
3513 parent_x = x;
3514 parent_y = y;
3515 }
3458 update_background (); 3516 update_background ();
3517 }
3459 } 3518 }
3460 break; 3519 break;
3461#endif 3520#endif
3462 3521
3463 case XTerm_logfile: 3522 case XTerm_logfile:
… …
3550 * 's' = save 3609 * 's' = save
3551 * 'r' = restore 3610 * 'r' = restore
3552 * 't' = toggle 3611 * 't' = toggle
3553 * so no need for fancy checking 3612 * so no need for fancy checking
3554 */ 3613 */
3555int 3614int ecb_cold
3556rxvt_term::privcases (int mode, unsigned long bit) 3615rxvt_term::privcases (int mode, unsigned long bit)
3557{ 3616{
3558 int state; 3617 int state;
3559 3618
3560 if (mode == 's') 3619 if (mode == 's')
3561 { 3620 {
3562 SavedModes |= (priv_modes & bit); 3621 if (priv_modes & bit)
3622 SavedModes |= bit;
3623 else
3624 SavedModes &= ~bit;
3563 return -1; 3625 return -1;
3564 } 3626 }
3565 else 3627 else
3566 { 3628 {
3567 if (mode == 'r') 3629 if (mode == 'r')
3568 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3630 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3569 else 3631 else
3570 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3632 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3571 set_privmode (bit, state); 3633
3634 if (state)
3635 priv_modes |= bit;
3636 else
3637 priv_modes &= ~bit;
3572 } 3638 }
3573 3639
3574 return state; 3640 return state;
3575} 3641}
3576 3642
3577/* we're not using priv _yet_ */ 3643/* we're not using priv _yet_ */
3578void 3644void
3579rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3645rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3580{ 3646{
3581 unsigned int i, j; 3647 unsigned int i, j;
3582 int state; 3648 int state;
3583 3649
3584 static const struct 3650 static const struct
3585 { 3651 {
3586 const int argval; 3652 const int argval;
3587 const unsigned long bit; 3653 const unsigned long bit;
3588 } argtopriv[] = { 3654 } argtopriv[] = {
3589 { 1, PrivMode_aplCUR }, 3655 { 1, PrivMode_aplCUR }, // DECCKM
3590 { 2, PrivMode_vt52 }, 3656 { 2, PrivMode_vt52 }, // DECANM
3591 { 3, PrivMode_132 }, 3657 { 3, PrivMode_132 }, // DECCOLM
3592 { 4, PrivMode_smoothScroll }, 3658 { 4, PrivMode_smoothScroll }, // DECSCLM
3593 { 5, PrivMode_rVideo }, 3659 { 5, PrivMode_rVideo }, // DECSCNM
3594 { 6, PrivMode_relOrigin }, 3660 { 6, PrivMode_relOrigin }, // DECOM
3595 { 7, PrivMode_Autowrap }, 3661 { 7, PrivMode_Autowrap }, // DECAWM
3596 // 8, bi-directional support mode 3662 // 8, auto-repeat keys // DECARM
3597 { 9, PrivMode_MouseX10 }, 3663 { 9, PrivMode_MouseX10 },
3598 // 18, 19 printing-related 3664 // 18 end FF to printer after print screen
3665 // 19 Print screen prints full screen/scroll region
3599 { 25, PrivMode_VisibleCursor }, 3666 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3600#ifdef scrollBar_esc 3667#ifdef scrollBar_esc
3601 { scrollBar_esc, PrivMode_scrollBar }, 3668 { scrollBar_esc, PrivMode_scrollBar },
3602#endif 3669#endif
3603 { 35, PrivMode_ShiftKeys }, // rxvt extension 3670 { 35, PrivMode_ShiftKeys }, // rxvt extension
3671 // 38, tektronix mode // DECTEK
3604 { 40, PrivMode_132OK }, 3672 { 40, PrivMode_132OK },
3605 // 41 xterm more fixes NYI 3673 // 41 xterm more fixes NYI
3606 // 45 margin bell NYI 3674 // 45 margin bell NYI
3607 // 46 start logging 3675 // 46 start logging
3608 { 47, PrivMode_Screen }, 3676 { 47, PrivMode_Screen },
3609 { 66, PrivMode_aplKP }, 3677 { 66, PrivMode_aplKP }, // DECNKM
3610#ifndef NO_BACKSPACE_KEY 3678#ifndef NO_BACKSPACE_KEY
3611 { 67, PrivMode_BackSpace }, 3679 { 67, PrivMode_BackSpace }, // DECBKM
3612#endif 3680#endif
3613 { 1000, PrivMode_MouseX11 }, 3681 { 1000, PrivMode_MouseX11 },
3614 { 1002, PrivMode_MouseBtnEvent }, 3682 { 1002, PrivMode_MouseBtnEvent },
3615 { 1003, PrivMode_MouseAnyEvent }, 3683 { 1003, PrivMode_MouseAnyEvent },
3684#if ENABLE_FRILLS
3685 { 1005, PrivMode_ExtModeMouse },
3686#endif
3616 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3687 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3617 { 1011, PrivMode_Keypress }, // rxvt extension 3688 { 1011, PrivMode_Keypress }, // rxvt extension
3689#if ENABLE_FRILLS
3690 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3691#endif
3618 // 1035 enable modifiers for alt, numlock NYI 3692 // 1035 enable modifiers for alt, numlock NYI
3619 // 1036 send ESC for meta keys NYI 3693 // 1036 send ESC for meta keys NYI
3620 // 1037 send DEL for keypad delete NYI 3694 // 1037 send DEL for keypad delete NYI
3621 { 1047, PrivMode_Screen }, 3695 { 1047, PrivMode_Screen },
3622 // 1048 save and restore cursor 3696 // 1048 save and restore cursor, implemented in code
3623 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3697 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3624 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3698 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3625 { 2004, PrivMode_BracketPaste }, 3699 { 2004, PrivMode_BracketPaste },
3626 }; 3700 };
3627 3701
… …
3637 for (i = 0; i < nargs; i++) 3711 for (i = 0; i < nargs; i++)
3638 { 3712 {
3639 state = -1; 3713 state = -1;
3640 3714
3641 /* basic handling */ 3715 /* basic handling */
3642 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3716 for (j = 0; j < ecb_array_length (argtopriv); j++)
3643 if (argtopriv[j].argval == arg[i]) 3717 if (argtopriv[j].argval == arg[i])
3644 { 3718 {
3645 state = privcases (mode, argtopriv[j].bit); 3719 state = privcases (mode, argtopriv[j].bit);
3646 break; 3720 break;
3647 } 3721 }
… …
3655 3729
3656 scr_touch (true); 3730 scr_touch (true);
3657 break; 3731 break;
3658#endif 3732#endif
3659 case 1048: /* alternative cursor save */ 3733 case 1048: /* alternative cursor save */
3660 case 1049:
3661 if (option (Opt_secondaryScreen)) 3734 if (option (Opt_secondaryScreen))
3662 if (mode == 0) 3735 if (mode == 0)
3663 scr_cursor (RESTORE); 3736 scr_cursor (RESTORE);
3664 else if (mode == 1) 3737 else if (mode == 1)
3665 scr_cursor (SAVE); 3738 scr_cursor (SAVE);
… …
3674 case 2: /* VT52 mode */ 3747 case 2: /* VT52 mode */
3675 /* oddball mode. should be set regardless of set/reset 3748 /* oddball mode. should be set regardless of set/reset
3676 * parameter. Return from VT52 mode with an ESC < from 3749 * parameter. Return from VT52 mode with an ESC < from
3677 * within VT52 mode 3750 * within VT52 mode
3678 */ 3751 */
3679 set_privmode (PrivMode_vt52, 1); 3752 priv_modes |= PrivMode_vt52;
3680 break; 3753 break;
3681 case 3: /* 80/132 */ 3754 case 3: /* 80/132 */
3682 if (priv_modes & PrivMode_132OK) 3755 if (priv_modes & PrivMode_132OK)
3683 {
3684 scr_poweron ();
3685 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3756 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3686 }
3687 break; 3757 break;
3688 case 4: /* smooth scrolling */ 3758 case 4: /* smooth scrolling */
3689 set_option (Opt_jumpScroll, !state); 3759 set_option (Opt_jumpScroll, !state);
3690 break; 3760 break;
3691 case 5: /* reverse video */ 3761 case 5: /* reverse video */
… …
3702 if (state) /* orthogonal */ 3772 if (state) /* orthogonal */
3703 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3773 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3704 break; 3774 break;
3705#ifdef scrollBar_esc 3775#ifdef scrollBar_esc
3706 case scrollBar_esc: 3776 case scrollBar_esc:
3707 if (scrollBar.map (state)) 3777 scrollBar.map (state);
3708 {
3709 resize_all_windows (0, 0, 0); 3778 resize_all_windows (0, 0, 0);
3710 scr_touch (true); 3779 scr_touch (true);
3711 }
3712 break; 3780 break;
3713#endif 3781#endif
3714 case 25: /* visible/invisible cursor */ 3782 case 25: /* visible/invisible cursor */
3715 scr_cursor_visible (state); 3783 scr_cursor_visible (state);
3716 break; 3784 break;
… …
3729 case 1003: 3797 case 1003:
3730 if (state) 3798 if (state)
3731 { 3799 {
3732 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3800 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3733 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3801 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3802 mouse_row = mouse_col = 0;
3734 vt_emask_mouse = PointerMotionMask; 3803 vt_emask_mouse = PointerMotionMask;
3735 } 3804 }
3736 else 3805 else
3737 vt_emask_mouse = NoEventMask; 3806 vt_emask_mouse = NoEventMask;
3807
3738 vt_select_input (); 3808 vt_select_input ();
3739 break; 3809 break;
3740 case 1010: /* scroll to bottom on TTY output inhibit */ 3810 case 1010: /* scroll to bottom on TTY output inhibit */
3741 set_option (Opt_scrollTtyOutput, !state); 3811 set_option (Opt_scrollTtyOutput, !state);
3742 break; 3812 break;
3743 case 1011: /* scroll to bottom on key press */ 3813 case 1011: /* scroll to bottom on key press */
3744 set_option (Opt_scrollTtyKeypress, state); 3814 set_option (Opt_scrollTtyKeypress, state);
3745 break; 3815 break;
3746 case 1047: /* secondary screen w/ clearing last */ 3816 case 1047: /* secondary screen w/ clearing last */
3747 if (option (Opt_secondaryScreen)) 3817 if (option (Opt_secondaryScreen))
3748 if (current_screen != PRIMARY) 3818 if (!state)
3749 scr_erase_screen (2); 3819 scr_erase_screen (2);
3820
3750 scr_change_screen (state); 3821 scr_change_screen (state);
3751 break; 3822 break;
3752 case 1049: /* secondary screen w/ clearing first */ 3823 case 1049: /* secondary screen w/ clearing first */
3824 if (option (Opt_secondaryScreen))
3825 if (state)
3826 scr_cursor (SAVE);
3827
3753 scr_change_screen (state); 3828 scr_change_screen (state);
3829
3754 if (option (Opt_secondaryScreen)) 3830 if (option (Opt_secondaryScreen))
3755 if (current_screen != PRIMARY) 3831 if (state)
3756 scr_erase_screen (2); 3832 scr_erase_screen (2);
3833 else
3834 scr_cursor (RESTORE);
3757 break; 3835 break;
3758 default: 3836 default:
3759 break; 3837 break;
3760 } 3838 }
3761 } 3839 }
3762} 3840}
3763/*}}} */ 3841/*}}} */
3764 3842
3765/*{{{ process sgr sequences */ 3843/*{{{ process sgr sequences */
3766void 3844void ecb_hot
3767rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3845rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3768{ 3846{
3769 unsigned int i; 3847 unsigned int i;
3770 short rendset; 3848 short rendset;
3771 int rendstyle; 3849 int rendstyle;
… …
3914 } 3992 }
3915 } 3993 }
3916} 3994}
3917/*}}} */ 3995/*}}} */
3918 3996
3919/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3920void
3921rxvt_term::process_graphics ()
3922{
3923 unicode_t ch, cmd = cmd_getc ();
3924
3925 if (cmd == 'Q')
3926 {
3927 /* query graphics */
3928 tt_printf ("\033G0\012"); /* no graphics */
3929 return;
3930 }
3931 /* swallow other graphics sequences until terminating ':' */
3932 do
3933 ch = cmd_getc ();
3934 while (ch != ':');
3935}
3936/*}}} */
3937
3938/* ------------------------------------------------------------------------- */ 3997/* ------------------------------------------------------------------------- */
3939 3998
3940/* 3999/*
3941 * Send printf () formatted output to the command. 4000 * Send printf () formatted output to the command.
3942 * Only use for small amounts of data. 4001 * Only use for small amounts of data.
… …
3955 4014
3956/* ---------------------------------------------------------------------- */ 4015/* ---------------------------------------------------------------------- */
3957/* Write data to the pty as typed by the user, pasted with the mouse, 4016/* Write data to the pty as typed by the user, pasted with the mouse,
3958 * or generated by us in response to a query ESC sequence. 4017 * or generated by us in response to a query ESC sequence.
3959 */ 4018 */
3960const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4019static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3961 4020
3962void 4021void
3963rxvt_term::tt_write (const char *data, unsigned int len) 4022rxvt_term::tt_write (const char *data, unsigned int len)
3964{ 4023{
3965 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4024 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3970 4029
3971 if (v_buflen == 0) 4030 if (v_buflen == 0)
3972 { 4031 {
3973 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4032 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3974 4033
4034 max_it (written, 0);
4035
3975 if ((unsigned int)written == len) 4036 if (written == len)
3976 return; 4037 return;
3977 4038
3978 data += written; 4039 data += written;
3979 len -= written; 4040 len -= written;
3980 } 4041 }
3981 4042
3982 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4043 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3983 4044
3984 memcpy (v_buffer + v_buflen, data, len); 4045 memcpy (v_buffer + v_buflen, data, len);
3985 v_buflen += len; 4046 v_buflen += len;
3986 4047
3987 pty_ev.set (ev::READ | ev::WRITE); 4048 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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