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.145 by root, Mon Aug 16 12:04:57 2004 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 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-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
53#include <wchar.h> 54# include <sched.h>
55#endif
56
57#ifdef KEYSYM_RESOURCE
58# include "keyboard.h"
59#endif
60
61#include <csignal>
54 62
55/*----------------------------------------------------------------------*/ 63/*----------------------------------------------------------------------*/
56 64
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 65#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 66
… …
113 XK_Escape, 0x238b, 121 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 122 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 123 XK_Print, 0x2399,
116 124
117 XK_space, 0x2423, 125 XK_space, 0x2423,
126
127#ifdef XK_KP_Begin
128 XK_KP_Prior, 0x21de,
129 XK_KP_Next, 0x21df,
130 XK_KP_Begin, 0x2320,
131 XK_KP_Insert, 0x2380,
132 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
134#endif
119 0, 135 0,
120}; 136};
121 137
122void 138void
123rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
124{ 140{
125 x = Pixel2Col (x); 141 x = Pixel2Col (x);
126 y = Pixel2Row (y); 142 y = Pixel2Row (y);
127 143
128 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
129 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
130 return; 146 return;
131 147
132 for (;;) 148 for (;;)
133 { 149 {
134 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
135 153
136 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
137 { 155 {
138 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x]); 156 iso14755_51 (l.t[x], l.r[x], x, y);
139 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
140 break; 158 break;
141 } 159 }
142 160
143 x--; 161 x--;
144 } 162 }
145
146} 163}
147#endif
148 164
149#if ENABLE_OVERLAY
150void 165void
151rxvt_term::iso14755_51 (wchar_t ch) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
152{ 167{
168 rxvt_fontset *fs = FONTSET (r);
169 rxvt_font *f = (*fs)[fs->find_font (ch)];
153 wchar_t *chr, *alloc; 170 wchar_t *chr, *alloc, ch2, *fname;
154 int len; 171 int len;
155 172
173 fname = rxvt_utf8towcs (f->name);
174
156#if ENABLE_COMBINING 175# if ENABLE_COMBINING
157 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
158 { 177 {
159 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
162 } 181 }
163 else 182 else
164#endif 183# endif
165 { 184 {
185 ch2 = ch;
186
166 alloc = 0; 187 alloc = 0;
167 chr = &ch; 188 chr = &ch2;
168 len = 1; 189 len = 1;
169 } 190 }
170 191
192 char attr[80]; // plenty
193
194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = wcswidth (fname, wcslen (fname));
205
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
171 scr_overlay_new (0, -1, 8 + 5, len); 215 scr_overlay_new (x, y, width, len + 2);
216
217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
172 218
173 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
174 { 220 {
175 char buf[9]; 221 char buf[9];
176 222
177 ch = *chr++; 223 ch = *chr++;
178 224
179 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
182#if !UNICODE3 228# if !UNICODE3
183 if (ch >= 0x10000) 229 if (ch >= 0x10000)
184 ch = 0xfffd; 230 ch = 0xfffd;
185#endif 231# endif
186 scr_overlay_set (11, y, ch); 232 scr_overlay_set (11, y, ch, r);
187 scr_overlay_set (12, y, NOCHAR); 233 scr_overlay_set (12, y, NOCHAR, r);
188 } 234 }
189 235
236 scr_overlay_set (0, len , attr);
237 scr_overlay_set (0, len + 1, fname);
238
239 free (fname);
240
190#if ENABLE_COMBINING 241# if ENABLE_COMBINING
191 if (alloc) 242 if (alloc)
192 delete [] alloc; 243 delete [] alloc;
193#endif 244# endif
194} 245}
195#endif 246#endif
196 247
197void 248void
198rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
261 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 312 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
262 * escape sequence to toggle the Keypad. 313 * escape sequence to toggle the Keypad.
263 * 314 *
264 * Always permit `shift' to override the current setting 315 * Always permit `shift' to override the current setting
265 */ 316 */
266 shft = (ev.state & ShiftMask); 317 shft = ev.state & ShiftMask;
267 ctrl = (ev.state & ControlMask); 318 ctrl = ev.state & ControlMask;
268 meta = (ev.state & ModMetaMask); 319 meta = ev.state & ModMetaMask;
269 320
270 if (numlock_state || (ev.state & ModNumLockMask)) 321 if (numlock_state || (ev.state & ModNumLockMask))
271 { 322 {
272 numlock_state = (ev.state & ModNumLockMask); 323 numlock_state = (ev.state & ModNumLockMask);
273 PrivMode ((!numlock_state), PrivMode_aplKP); 324 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 344
294 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
295 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
296 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
297 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
298 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
299 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
300 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
301 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
302 SET_LOCALE (locale); 355 SET_LOCALE (locale);
303 356
304 if (status_return == XLookupChars 357 if (status_return == XLookupChars
305 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
… …
332 valid_keysym = keysym != NoSymbol; 385 valid_keysym = keysym != NoSymbol;
333 } 386 }
334 387
335 if (valid_keysym) 388 if (valid_keysym)
336 { 389 {
390#ifdef KEYSYM_RESOURCE
391 if (keyboard->dispatch (this, keysym, ev.state))
392 return;
393#endif
394
337 if (TermWin.saveLines) 395 if (saveLines)
338 { 396 {
339#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
340 if (!ctrl && !meta) 398 if (!ctrl && !meta)
341#else 399#else
342 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
343#endif 401#endif
344 { 402 {
345 int lnsppg; 403 int lnsppg;
346 404
347#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
349#else 407#else
350 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
351#endif 409#endif
352 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
353 { 411 {
354 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
355 return; 413 return;
… …
406 { 464 {
407 /* normal XTerm key bindings */ 465 /* normal XTerm key bindings */
408 case XK_Insert: /* Shift+Insert = paste mouse selection */ 466 case XK_Insert: /* Shift+Insert = paste mouse selection */
409 selection_request (ev.time, 0, 0); 467 selection_request (ev.time, 0, 0);
410 return; 468 return;
411#if TODO // TODO 469#if TODO
412 /* rxvt extras */ 470 /* rxvt extras */
413 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 471 case XK_KP_Add: /* Shift+KP_Add = bigger font */
414 change_font (FONT_UP); 472 change_font (FONT_UP);
415 return; 473 return;
416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 474 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
475 } 533 }
476#endif 534#endif
477 535
478 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 536 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
479 { 537 {
480#ifdef KEYSYM_RESOURCE
481 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
482 {
483 unsigned int l;
484 const unsigned char *kbuf0;
485
486 kbuf0 = (Keysym_map[keysym & 0xFF]);
487 l = (unsigned int)*kbuf0++;
488
489 /* escape prefix */
490 if (meta
491# ifdef META8_OPTION
492 && meta_char == C0_ESC
493# endif
494 )
495 {
496 const unsigned char ch = C0_ESC;
497 tt_write (&ch, 1);
498 }
499
500 tt_write (kbuf0, l);
501 return;
502 }
503 else
504#endif
505 { 538 {
506 newlen = 1; 539 newlen = 1;
507 switch (keysym) 540 switch (keysym)
508 { 541 {
509#ifndef NO_BACKSPACE_KEY 542#ifndef NO_BACKSPACE_KEY
… …
517 else 550 else
518 strcpy (kbuf, key_backspace); 551 strcpy (kbuf, key_backspace);
519 break; 552 break;
520#endif 553#endif
521#ifndef NO_DELETE_KEY 554#ifndef NO_DELETE_KEY
555# ifdef XK_KP_Prior
556 case XK_KP_Delete:
557 /* allow shift to override */
558 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
559 {
560 strcpy (kbuf, "\033On");
561 break;
562 }
563 /* FALLTHROUGH */
564# endif
522 case XK_Delete: 565 case XK_Delete:
523 strcpy (kbuf, key_delete); 566 strcpy (kbuf, key_delete);
524 break; 567 break;
525#endif 568#endif
526 case XK_Tab: 569 case XK_Tab:
… …
629#ifdef XK_KP_Begin 672#ifdef XK_KP_Begin
630 case XK_KP_Begin: 673 case XK_KP_Begin:
631 strcpy (kbuf, "\033Ou"); 674 strcpy (kbuf, "\033Ou");
632 break; 675 break;
633 676
634 case XK_KP_Insert:
635 strcpy (kbuf, "\033Op");
636 break;
637
638 case XK_KP_Delete:
639 strcpy (kbuf, "\033On");
640 break;
641#endif 677#endif
642 case XK_KP_F1: /* "\033OP" */ 678 case XK_KP_F1: /* "\033OP" */
643 case XK_KP_F2: /* "\033OQ" */ 679 case XK_KP_F2: /* "\033OQ" */
644 case XK_KP_F3: /* "\033OR" */ 680 case XK_KP_F3: /* "\033OR" */
645 case XK_KP_F4: /* "\033OS" */ 681 case XK_KP_F4: /* "\033OS" */
… …
677 break; 713 break;
678 714
679 case XK_Find: 715 case XK_Find:
680 strcpy (kbuf, "\033[1~"); 716 strcpy (kbuf, "\033[1~");
681 break; 717 break;
718
719#ifdef XK_KP_End
720 case XK_KP_Insert:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Op");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
682 case XK_Insert: 729 case XK_Insert:
683 strcpy (kbuf, "\033[2~"); 730 strcpy (kbuf, "\033[2~");
684 break; 731 break;
685#ifdef DXK_Remove /* support for DEC remove like key */ 732#ifdef DXK_Remove /* support for DEC remove like key */
686 case DXK_Remove: 733 case DXK_Remove:
… …
776#undef FKEY 823#undef FKEY
777 default: 824 default:
778 newlen = 0; 825 newlen = 0;
779 break; 826 break;
780 } 827 }
828
781 if (newlen) 829 if (newlen)
782 len = strlen (kbuf); 830 len = strlen (kbuf);
783 } 831 }
784 832
785 /* 833 /*
… …
794 else if (ctrl && keysym == XK_minus) 842 else if (ctrl && keysym == XK_minus)
795 { 843 {
796 len = 1; 844 len = 1;
797 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 845 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
798 } 846 }
847 else if (keysym == XK_ISO_Left_Tab)
848 {
849 strcpy (kbuf, "\033[Z");
850 len = 3;
851 }
799 else 852 else
800 { 853 {
801#ifdef META8_OPTION 854#ifdef META8_OPTION
802 /* set 8-bit on */ 855 /* set 8-bit on */
803 if (meta && (meta_char == 0x80)) 856 if (meta && (meta_char == 0x80))
… …
815 } 868 }
816 869
817 if (len <= 0) 870 if (len <= 0)
818 return; /* not mapped */ 871 return; /* not mapped */
819 872
820 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
821 if (TermWin.view_start) 874 if (view_start)
822 { 875 {
823 TermWin.view_start = 0; 876 view_start = 0;
824 want_refresh = 1; 877 want_refresh = 1;
825 } 878 }
826 879
827 /* 880 /*
828 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
861#endif /* DEBUG_CMD */ 914#endif /* DEBUG_CMD */
862 tt_write (kbuf, (unsigned int)len); 915 tt_write (kbuf, (unsigned int)len);
863} 916}
864/*}}} */ 917/*}}} */
865 918
866#if (MENUBAR_MAX) 919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
867/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
868/* attempt to `write' count to the input buffer */ 921/* attempt to `write' count to the input buffer */
869unsigned int 922unsigned int
870rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
871{ 924{
… …
894 947
895 cmd_parse (); 948 cmd_parse ();
896 949
897 return 0; 950 return 0;
898} 951}
899#endif /* MENUBAR_MAX */ 952#endif
900 953
901void 954void
902rxvt_term::flush () 955rxvt_term::flush ()
903{ 956{
957 flush_ev.stop ();
958
904#ifdef TRANSPARENT 959#ifdef TRANSPARENT
905 if (want_full_refresh) 960 if (want_full_refresh)
906 { 961 {
907 want_full_refresh = 0; 962 want_full_refresh = 0;
908 scr_clear (); 963 scr_clear ();
… …
918 IMSendSpot (); 973 IMSendSpot ();
919#endif 974#endif
920 } 975 }
921 976
922 display->flush (); 977 display->flush ();
923
924 flush_ev.stop ();
925} 978}
926 979
927void 980void
928rxvt_term::check_cb (check_watcher &w) 981rxvt_term::check_cb (check_watcher &w)
929{ 982{
… …
1005{ 1058{
1006 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1007 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1008 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1009 { 1062 {
1063 if (view_start == nsaved ||
1064 view_start == 0)
1065 mouse_slip_wheel_speed = 0;
1066
1010 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1011 want_refresh = 1; 1068 want_refresh = 1;
1012 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1013 } 1070 }
1014} 1071}
… …
1027 1084
1028 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1029 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1030 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1031 1088
1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1033 1090
1034 if (n > 0) 1091 if (r > 0)
1035 { 1092 {
1036 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1037 return true; 1094 return true;
1038 } 1095 }
1039 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
1040 destroy (); 1107 destroy ();
1108 }
1041 1109
1042 return false; 1110 return false;
1043} 1111}
1044 1112
1045void 1113void
1046rxvt_term::pty_cb (io_watcher &w, short revents) 1114rxvt_term::pty_cb (io_watcher &w, short revents)
1047{ 1115{
1048 SET_R (this); 1116 SET_R (this);
1049 SET_LOCALE (locale); 1117 SET_LOCALE (locale);
1050 1118
1051 if (revents & EVENT_WRITE)
1052 tt_write (0, 0);
1053 else if (revents & EVENT_READ) 1119 if (revents & EVENT_READ)
1054 // loop, but don't allow a single term to monopolize us 1120 // loop, but don't allow a single term to monopolize us
1055 while (pty_fill ()) 1121 while (pty_fill ())
1056 if (cmd_parse ()) 1122 if (cmd_parse ())
1057 break; 1123 break;
1124
1125 if (revents & EVENT_WRITE)
1126 pty_write ();
1058} 1127}
1059 1128
1060void 1129void
1061rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1062{ 1131{
1063 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1064 recolour_cursor (); 1133 recolour_cursor ();
1065 1134
1066#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1067 hidden_pointer = 0; 1136 hidden_pointer = 0;
1068 1137
1069 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1070 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1071#endif 1140#endif
1072} 1141}
1073 1142
1074#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1075void 1144void
1076rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1077{ 1146{
1078 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1079 return; 1148 return;
1080 1149
1081 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1082 XFlush (display->display); 1151 XFlush (display->display);
1083 1152
1084 hidden_pointer = 1; 1153 hidden_pointer = 1;
1085} 1154}
1086 1155
… …
1137 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1206 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1138 + ((MEvent.state & ControlMask) ? 16 : 0); 1207 + ((MEvent.state & ControlMask) ? 16 : 0);
1139#ifdef MOUSE_REPORT_DOUBLECLICK 1208#ifdef MOUSE_REPORT_DOUBLECLICK
1140 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1209 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1141#endif 1210#endif
1142
1143 } 1211 }
1144 1212
1145#ifdef DEBUG_MOUSEREPORT 1213#if DEBUG_MOUSEREPORT
1146 fprintf (stderr, "Mouse ["); 1214 fprintf (stderr, "Mouse [");
1147 if (key_state & 16) 1215 if (key_state & 16)
1148 fputc ('C', stderr); 1216 fputc ('C', stderr);
1149 if (key_state & 4) 1217 if (key_state & 4)
1150 fputc ('S', stderr); 1218 fputc ('S', stderr);
… …
1154 fputc ('2', stderr); 1222 fputc ('2', stderr);
1155 fprintf (stderr, "]: <%d>, %d/%d\n", 1223 fprintf (stderr, "]: <%d>, %d/%d\n",
1156 button_number, 1224 button_number,
1157 x + 1, 1225 x + 1,
1158 y + 1); 1226 y + 1);
1159#else 1227#endif
1228
1160 tt_printf ("\033[M%c%c%c", 1229 tt_printf ("\033[M%c%c%c",
1161 (32 + button_number + key_state), 1230 (32 + button_number + key_state),
1162 (32 + x + 1), 1231 (32 + x + 1),
1163 (32 + y + 1)); 1232 (32 + y + 1));
1164#endif
1165} 1233}
1166 1234
1167#ifdef USING_W11LIB 1235#ifdef USING_W11LIB
1168void 1236void
1169rxvt_W11_process_x_event (XEvent *ev) 1237rxvt_W11_process_x_event (XEvent *ev)
… …
1176 1244
1177/*{{{ process an X event */ 1245/*{{{ process an X event */
1178void 1246void
1179rxvt_term::x_cb (XEvent &ev) 1247rxvt_term::x_cb (XEvent &ev)
1180{ 1248{
1249 dDisp;
1250
1181 SET_R (this); 1251 SET_R (this);
1182 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1183 1253
1184#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1186 { 1256 {
1187 if (hidden_cursor) 1257 if (hidden_cursor)
1188 { 1258 {
1189 hidden_cursor = 0; 1259 hidden_cursor = 0;
1190 want_refresh = 1; 1260 want_refresh = 1;
… …
1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1194 } 1264 }
1195#endif 1265#endif
1196 1266
1197#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1199 { 1269 {
1200 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1201 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1202 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1203 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1206 if (ev.type == KeyPress && hidden_pointer == 0) 1276 if (ev.type == KeyPress && hidden_pointer == 0)
1207 pointer_blank (); 1277 pointer_blank ();
1208 } 1278 }
1209#endif 1279#endif
1210 1280
1211#ifdef USE_XIM
1212 if (XFilterEvent (&ev, None))
1213 return;
1214#endif
1215
1216 Window unused_root, unused_child; 1281 Window unused_root, unused_child;
1217 int unused_root_x, unused_root_y; 1282 int unused_root_x, unused_root_y;
1218 unsigned int unused_mask; 1283 unsigned int unused_mask;
1219 1284
1220 switch (ev.type) 1285 switch (ev.type)
1221 { 1286 {
1222 case KeyPress: 1287 case KeyPress:
1223#if ISO_14755 1288#if ISO_14755
… …
1227 1292
1228 break; 1293 break;
1229 1294
1230 case KeyRelease: 1295 case KeyRelease:
1231 { 1296 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS) 1297#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1233 KeySym ks; 1298 KeySym ks;
1234 1299
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1300 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif 1301#endif
1237 1302
… …
1306 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1307 break; 1372 break;
1308 1373
1309 case ClientMessage: 1374 case ClientMessage:
1310 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1311 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1312 destroy (); 1379 destroy ();
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1313#ifdef OFFIX_DND 1396#ifdef OFFIX_DND
1314 /* OffiX Dnd (drag 'n' drop) protocol */ 1397 /* OffiX Dnd (drag 'n' drop) protocol */
1315 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1316 && (ev.xclient.data.l[0] == DndFile 1399 && (ev.xclient.data.l[0] == DndFile
1317 || ev.xclient.data.l[0] == DndDir 1400 || ev.xclient.data.l[0] == DndDir
1318 || ev.xclient.data.l[0] == DndLink)) 1401 || ev.xclient.data.l[0] == DndLink))
1319 { 1402 {
1320 /* Get Dnd data */ 1403 /* Get Dnd data */
1321 Atom ActualType; 1404 Atom ActualType;
1322 int ActualFormat; 1405 int ActualFormat;
1323 unsigned char *data; 1406 unsigned char *data;
1324 unsigned long Size, RemainingBytes; 1407 unsigned long Size, RemainingBytes;
1325 1408
1326 XGetWindowProperty (display->display, display->root, 1409 XGetWindowProperty (disp, display->root,
1327 xa[XA_DNDSELECTION], 1410 xa[XA_DNDSELECTION],
1328 0L, 1000000L, 1411 0L, 1000000L,
1329 False, AnyPropertyType, 1412 False, AnyPropertyType,
1330 &ActualType, &ActualFormat, 1413 &ActualType, &ActualFormat,
1331 &Size, &RemainingBytes, 1414 &Size, &RemainingBytes,
1332 &data); 1415 &data);
1333 XChangeProperty (display->display, display->root, 1416 set_string_property (XA_CUT_BUFFER0, data);
1334 XA_CUT_BUFFER0, XA_STRING,
1335 8, PropModeReplace,
1336 data, strlen (data));
1337 XFree (data); 1417 XFree (data);
1338 selection_paste (display->root, XA_CUT_BUFFER0, True); 1418 selection_paste (display->root, XA_CUT_BUFFER0, true);
1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1419 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1340 } 1420 }
1341#endif /* OFFIX_DND */ 1421#endif /* OFFIX_DND */
1342 break; 1422 break;
1343 1423
1344 case MappingNotify: 1424 case MappingNotify:
… …
1369 break; 1449 break;
1370 } 1450 }
1371 break; 1451 break;
1372 1452
1373 case FocusIn: 1453 case FocusIn:
1374 if (!TermWin.focus) 1454 focus_in ();
1455 break;
1456
1457 case FocusOut:
1458 focus_out ();
1459 break;
1460
1461 case ConfigureNotify:
1462 if (ev.xconfigure.window == parent[0])
1375 { 1463 {
1376 TermWin.focus = 1; 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1377 want_refresh = 1; 1465 ;
1378#ifdef USE_XIM 1466
1379 if (Input_Context != NULL) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1380 { 1468 {
1381 IMSetStatusPosition (); 1469 seen_resize = 1;
1382 XSetICFocus (Input_Context); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1383 } 1471 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 set_colorfgbg ();
1394 scr_clear ();
1395 scr_touch (true);
1396 }
1397#endif
1398
1399 }
1400 break;
1401
1402 case FocusOut:
1403 if (TermWin.focus)
1404 {
1405 TermWin.focus = 0;
1406 want_refresh = 1;
1407#ifdef USE_XIM
1408 if (Input_Context != NULL)
1409 XUnsetICFocus (Input_Context);
1410#endif
1411#ifdef CURSOR_BLINK
1412 if (options & Opt_cursorBlink)
1413 cursor_blink_ev.stop ();
1414 hidden_cursor = 0;
1415#endif
1416#ifdef OFF_FOCUS_FADING
1417 if (rs[Rs_fade])
1418 {
1419 pix_colors = pix_colors_unfocused;
1420 set_colorfgbg ();
1421 scr_clear ();
1422 scr_touch (true);
1423 }
1424#endif
1425
1426 }
1427 break;
1428
1429 case ConfigureNotify:
1430 if (ev.xconfigure.window == TermWin.parent[0])
1431 {
1432 int height, width;
1433
1434 do
1435 { /* Wrap lots of configures into one */
1436 width = ev.xconfigure.width;
1437 height = ev.xconfigure.height;
1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1439 }
1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1441
1442 if (szHint.width != width || szHint.height != height)
1443 resize_all_windows (width, height, 1);
1444 1472
1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1446 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1447 {
1448 check_our_parents (); 1475 check_our_parents ();
1449 if (am_transparent)
1450 want_refresh = want_full_refresh = 1;
1451 }
1452#endif 1476#endif
1453 } 1477 }
1454 break; 1478 break;
1455 1479
1456 case PropertyNotify: 1480 case PropertyNotify:
… …
1464 selection_clear (); 1488 selection_clear ();
1465 break; 1489 break;
1466 1490
1467 case SelectionNotify: 1491 case SelectionNotify:
1468 if (selection_wait == Sel_normal) 1492 if (selection_wait == Sel_normal)
1469 selection_paste (ev.xselection.requestor, 1493 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1470 ev.xselection.property, True);
1471 break; 1494 break;
1472 1495
1473 case SelectionRequest: 1496 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1475 break; 1498 break;
1476 1499
1477 case UnmapNotify: 1500 case UnmapNotify:
1478 TermWin.mapped = 0; 1501 mapped = 0;
1479#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1481#endif 1504#endif
1482 break; 1505 break;
1483 1506
1484 case MapNotify: 1507 case MapNotify:
1485 TermWin.mapped = 1; 1508 mapped = 1;
1486#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1511#endif
1489 break; 1512 break;
1490 1513
… …
1494 break; 1517 break;
1495#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1496 1519
1497 case GraphicsExpose: 1520 case GraphicsExpose:
1498 case Expose: 1521 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1500 { 1523 {
1501 do 1524 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1528
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1530
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1511 1534
1512 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1513 } 1536 }
1514 else 1537 else
1515 { 1538 {
1516 XEvent unused_event; 1539 XEvent unused_event;
1517 1540
1518 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1519 ; 1542 ;
1520 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1544 ;
1522 1545
1523 if (isScrollbarWindow (ev.xany.window)) 1546 if (isScrollbarWindow (ev.xany.window))
1524 { 1547 {
1525 scrollBar.setIdle (); 1548 scrollBar.setIdle ();
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1553 menubar_expose ();
1531#endif 1554#endif
1532 1555
1533#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (display->display, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1536#endif 1559#endif
1537 } 1560 }
1538 break; 1561 break;
1539 1562
1540 case MotionNotify: 1563 case MotionNotify:
… …
1547 { 1570 {
1548 menubar_control (ev.xbutton); 1571 menubar_control (ev.xbutton);
1549 break; 1572 break;
1550 } 1573 }
1551#endif 1574#endif
1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1576 break;
1554 1577
1555 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1556 { 1579 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1581 {
1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1583 ;
1561 1584
1562 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1565 & (ev.xbutton.x), & (ev.xbutton.y), 1588 &ev.xbutton.x, &ev.xbutton.y,
1566 &unused_mask); 1589 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
1568 /* deal with a `jumpy' mouse */ 1591 /* deal with a `jumpy' mouse */
1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1570 { 1593 {
1571#endif 1594#endif
… …
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break; 1600 break;
1578 } 1601 }
1579#endif 1602#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1605
1582#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1609 {
1586 int dist; 1610 int dist;
1587 1611
1588 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1624
1601 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1602 if (ev.xbutton.y<TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1603 { 1627 {
1604 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1606 } 1630 }
1607 else 1631 else
1608 { 1632 {
1609 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1635 }
1612 1636
1613 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1639 + 1;
1616 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1618 } 1642 }
1619 else 1643 else
1620 { 1644 {
1621 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1630#endif 1654#endif
1631 } 1655 }
1632 } 1656 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1634 { 1658 {
1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1659 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1636 MotionNotify, &ev)) ; 1660 MotionNotify, &ev))
1661 ;
1662
1637 XQueryPointer (display->display, scrollBar.win, 1663 XQueryPointer (disp, scrollBar.win,
1638 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1639 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1640 & (ev.xbutton.x), & (ev.xbutton.y), 1666 &ev.xbutton.x, &ev.xbutton.y,
1641 &unused_mask); 1667 &unused_mask);
1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1643 scrollbar_size ()); 1669 scrollbar_size ());
1644 scr_refresh (refresh_type); 1670 scr_refresh (refresh_type);
1645 refresh_limit = 0; 1671 refresh_limit = 0;
… …
1647 } 1673 }
1648 break; 1674 break;
1649 } 1675 }
1650} 1676}
1651 1677
1678void
1679rxvt_term::focus_in ()
1680{
1681 if (!focus)
1682 {
1683 focus = 1;
1684 want_refresh = 1;
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 {
1688 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context);
1690 }
1691#endif
1692#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1695#endif
1696#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade])
1698 {
1699 pix_colors = pix_colors_focused;
1700 scr_recolour ();
1701 }
1702#endif
1703 }
1704}
1705
1706void
1707rxvt_term::focus_out ()
1708{
1709 if (focus)
1710 {
1711 focus = 0;
1712 want_refresh = 1;
1713
1714#if ENABLE_FRILLS || ISO_14755
1715 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY
1718 scr_overlay_off ();
1719#endif
1720#if USE_XIM
1721 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context);
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.stop ();
1727 hidden_cursor = 0;
1728#endif
1729#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade])
1731 {
1732 pix_colors = pix_colors_unfocused;
1733 scr_recolour ();
1734 }
1735#endif
1736 }
1737}
1738
1652#if TRANSPARENT 1739#if TRANSPARENT
1653void 1740void
1654rxvt_term::rootwin_cb (XEvent &ev) 1741rxvt_term::rootwin_cb (XEvent &ev)
1655{ 1742{
1656 SET_R (this); 1743 SET_R (this);
… …
1661 case PropertyNotify: 1748 case PropertyNotify:
1662 /* 1749 /*
1663 * if user used some Esetroot compatible prog to set the root bg, 1750 * if user used some Esetroot compatible prog to set the root bg,
1664 * use the property to determine the pixmap. We use it later on. 1751 * use the property to determine the pixmap. We use it later on.
1665 */ 1752 */
1666 if (xa[XA_XROOTPMAPID] == 0)
1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1668
1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1753 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1670 return; 1755 return;
1671 1756
1672 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1673 case ReparentNotify: 1758 case ReparentNotify:
1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1675 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1676 break; 1761 break;
1677 } 1762 }
1678} 1763}
1679#endif 1764#endif
… …
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1774
1690 /* 1775 /*
1691 * VT window processing of button press 1776 * VT window processing of button press
1692 */ 1777 */
1693 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1694 { 1779 {
1695#if ISO_14755 1780#if ISO_14755
1696 // 5.4 1781 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1783 {
… …
1700 return; 1785 return;
1701 } 1786 }
1702#endif 1787#endif
1703 1788
1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1789 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1790
1705 if (reportmode) 1791 if (reportmode)
1706 { 1792 {
1707 /* mouse report from vt window */ 1793 /* mouse report from vt window */
1708 /* save the xbutton state (for ButtonRelease) */ 1794 /* save the xbutton state (for ButtonRelease) */
1709 MEvent.state = ev.state; 1795 MEvent.state = ev.state;
… …
1738 } 1824 }
1739 else 1825 else
1740 { 1826 {
1741 if (ev.button != MEvent.button) 1827 if (ev.button != MEvent.button)
1742 MEvent.clicks = 0; 1828 MEvent.clicks = 0;
1829
1743 switch (ev.button) 1830 switch (ev.button)
1744 { 1831 {
1745 case Button1: 1832 case Button1:
1833 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */
1835#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask);
1837#else
1838 selection.rect = false;
1839#endif
1840
1746 /* allow shift+left click to extend selection */ 1841 /* allow shift+left click to extend selection */
1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1748 { 1843 {
1749 if (MEvent.button == Button1 && clickintime) 1844 if (MEvent.button == Button1 && clickintime)
1750 selection_rotate (ev.x, ev.y); 1845 selection_rotate (ev.x, ev.y);
… …
1893 case Button3: 1988 case Button3:
1894 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1895 { 1990 {
1896 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1897# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1898 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1899# else 1994# else
1900 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1901# endif 1996# endif
1902 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1903# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1904 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1905# else 2000# else
1906 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1907# endif 2002# endif
1908 else 2003 else
1909 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1910 } 2005 }
1911 else 2006 else
1912 { 2007 {
1913 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1914 (TermWin.nrow 2009 (nrow
1915 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1916 / scrollbar_size ())); 2011 / scrollbar_size ()));
1917 } 2012 }
1918 2013
1919 break; 2014 break;
… …
1951#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
1952 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
1953 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
1954#endif 2049#endif
1955 2050
1956 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
1957 { 2052 {
1958#if ISO_14755 2053#if ISO_14755
1959 // 5.4 2054 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return; 2056 return;
… …
2011 2106
2012 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2013 2108
2014 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2015 i = 1; 2110 i = 1;
2016 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2017 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2018 else 2113 else
2019 i = 5; 2114 i = 5;
2020 2115
2021# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2022 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2023 { 2118 {
2024 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2025 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2026 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2027 2122
2028 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2029 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2030 2125
2031 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
… …
2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2167 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2168 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2169 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i; 2170 int i;
2076 2171
2077 Visual* visual = display->visual; 2172 Visual *visual = display->visual;
2078 2173
2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2174 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2080 2175
2081 /* for convenience */ 2176 /* for convenience */
2082 mask_r = visual->red_mask; 2177 mask_r = visual->red_mask;
… …
2303 Atom atype; 2398 Atom atype;
2304 unsigned char *prop = NULL; 2399 unsigned char *prop = NULL;
2305 Window root, oldp, *list; 2400 Window root, oldp, *list;
2306 Pixmap rootpixmap = None; 2401 Pixmap rootpixmap = None;
2307 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2403 dDisp;
2308 2404
2309 pchanged = 0; 2405 pchanged = 0;
2310 2406
2311 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2312 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2313 2409
2314 XGetWindowAttributes (display->display, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2315 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2316 2412
2317 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2318 2414
2319 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2320 { 2416 {
2321 if (am_transparent) 2417 if (am_transparent)
2322 { 2418 {
2323 pchanged = 1; 2419 pchanged = 1;
2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2325 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2326 } 2422 }
2327 2423
2328 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2329 } 2425 }
2330 2426
2331 /* Get all X ops out of the queue so that our information is up-to-date. */ 2427 /* Get all X ops out of the queue so that our information is up-to-date. */
2332 XSync (display->display, False); 2428 XSync (disp, False);
2333 2429
2334 /* 2430 /*
2335 * Make the frame window set by the window manager have 2431 * Make the frame window set by the window manager have
2336 * the root background. Some window managers put multiple nested frame 2432 * the root background. Some window managers put multiple nested frame
2337 * windows for each client, so we have to take care about that. 2433 * windows for each client, so we have to take care about that.
2338 */ 2434 */
2339 i = (xa[XA_XROOTPMAPID] 2435 i = (xa[XA_XROOTPMAP_ID]
2340 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2436 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2341 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2437 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2342 &nitems, &bytes_after, &prop) == Success); 2438 &nitems, &bytes_after, &prop) == Success);
2343 2439
2344 if (!i || prop == NULL) 2440 if (!i || prop == NULL)
2345 i = (xa[XA_XSETROOTID] 2441 i = (xa[XA_ESETROOT_PMAP_ID]
2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2442 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2443 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2348 &nitems, &bytes_after, &prop) == Success); 2444 &nitems, &bytes_after, &prop) == Success);
2349 2445
2350 if (!i || prop == NULL 2446 if (!i || prop == NULL
2351#if TINTING 2447#if TINTING
… …
2370 Window cr; 2466 Window cr;
2371 XImage *image; 2467 XImage *image;
2372 GC gc; 2468 GC gc;
2373 XGCValues gcvalue; 2469 XGCValues gcvalue;
2374 2470
2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2376 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2377 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2378 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2379 nx = ny = 0; 2475 nx = ny = 0;
2380 2476
… …
2390 nh += sy; 2486 nh += sy;
2391 ny = -sy; 2487 ny = -sy;
2392 sy = 0; 2488 sy = 0;
2393 } 2489 }
2394 2490
2395 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2396 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2493
2494 XSync (disp, False);
2397 allowedxerror = -1; 2495 allowedxerror = -1;
2398 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2399 2497
2400 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2498 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2401 /* XXX: may need a delay here? */ 2499 /* XXX: may need a delay here? */
2402 allowedxerror = 0; 2500 allowedxerror = 0;
2403 2501
2404 if (image == NULL) 2502 if (image == NULL)
2405 { 2503 {
2406 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2407 { 2505 {
2408 pchanged = 1; 2506 pchanged = 1;
2409 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2410 { 2508 {
2411 XFreePixmap (display->display, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2412 TermWin.pixmap = None; 2510 pixmap = None;
2413 } 2511 }
2414 } 2512 }
2415 2513
2416 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2417 } 2515 }
2418 else 2516 else
2419 { 2517 {
2420 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2421 XFreePixmap (display->display, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2422 2520
2423#if TINTING 2521#if TINTING
2424 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2425 { 2523 {
2426 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
… …
2430 2528
2431 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2432 } 2530 }
2433#endif 2531#endif
2434 2532
2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2436 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2439 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2440 XFreeGC (display->display, gc); 2538 XFreeGC (disp, gc);
2441 XDestroyImage (image); 2539 XDestroyImage (image);
2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2444 2542
2445 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2446 pchanged = 1; 2544 pchanged = 1;
2447 2545
2448 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2449 } 2547 }
2450 } 2548 }
2451 2549
2452 if (!am_pixmap_trans) 2550 if (am_pixmap_trans)
2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2552 else
2453 { 2553 {
2454 unsigned int n; 2554 unsigned int n;
2455 /* 2555 /*
2456 * InheritPixmap transparency 2556 * InheritPixmap transparency
2457 */ 2557 */
2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2459 { 2559 {
2460 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2461 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2462 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2463 XFree (list); 2563 XFree (list);
2464 2564
2465 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2466 { 2566 {
2467 if (oldp != None) 2567 if (oldp != None)
2468 pchanged = 1; 2568 pchanged = 1;
2469 2569
2470 break; 2570 break;
2471 } 2571 }
2472 2572
2473 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2474 pchanged = 1; 2574 pchanged = 1;
2475 } 2575 }
2476 2576
2477 n = 0; 2577 n = 0;
2478 2578
2479 if (pchanged) 2579 if (pchanged)
2480 { 2580 {
2481 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2482 { 2582 {
2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2485 { 2585 {
2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2487 break; 2587 break;
2488 } 2588 }
2489 } 2589 }
2490 } 2590 }
2491 2591
2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2493 { 2593 {
2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2496 am_transparent = 0; 2596 am_transparent = 0;
2497 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2498 } 2598 }
2499 else 2599 else
2500 { 2600 {
… …
2503 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2504 sleep (1); 2604 sleep (1);
2505#endif 2605#endif
2506 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2507 { 2607 {
2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2510 } 2610 }
2511 2611
2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2513 am_transparent = 1; 2613 am_transparent = 1;
2514 } 2614 }
2515 2615
2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2517 TermWin.parent[i] = None; 2617 parent[i] = None;
2518 } 2618 }
2519 2619
2520 // this is experimental
2521 if (scrollBar.win) 2620 if (scrollBar.win)
2522 { 2621 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle (); 2623 scrollBar.setIdle ();
2526 scrollbar_show (0); 2624 scrollbar_show (0);
2625 }
2626
2627 if (am_transparent)
2628 {
2629 want_refresh = want_full_refresh = 1;
2630 if (am_pixmap_trans)
2631 flush ();
2527 } 2632 }
2528 2633
2529 return pchanged; 2634 return pchanged;
2530} 2635}
2531#endif 2636#endif
… …
2557 seen_input = 1; 2662 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition: 2663 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler. 2664 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs 2665 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong. 2666 // then sometimes get the size wrong.
2667 // unfortunately other programs are even more buggy and dislike
2668 // being sent SIGWINCH, so only do it when we were in fact being
2669 // resized.
2670 if (seen_resize && cmd_pid)
2562 kill (-cmd_pid, SIGWINCH); 2671 kill (-cmd_pid, SIGWINCH);
2563 } 2672 }
2564 2673
2565 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2566 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2567 bool refreshnow = false; 2676 bool refreshnow = false;
2568 int nlines = 0; 2677 int nlines = 0;
2569 unicode_t *str = buf; 2678 unicode_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2570 2680
2571 for (;;) 2681 for (;;)
2572 { 2682 {
2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2574 break; 2684 break;
2575 2685
2576 *str++ = ch; 2686 *str++ = ch;
2577 2687
2578 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2579 { 2689 {
2690 if (ch == C0_LF)
2580 nlines++; 2691 nlines++;
2692
2581 refresh_count++; 2693 refresh_count++;
2582 2694
2583 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2585 { 2697 {
2586 refreshnow = true; 2698 refreshnow = true;
2587 ch = NOCHAR; 2699 ch = NOCHAR;
2588 break; 2700 break;
2589 } 2701 }
2590 2702
2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2703 // scr_add_lines only works for nlines <= nrow - 1.
2592 if (nlines >= TermWin.nrow - 1) 2704 if (nlines >= nrow - 1)
2593 { 2705 {
2594 scr_add_lines (buf, nlines, str - buf); 2706 scr_add_lines (buf, nlines, str - buf);
2595 nlines = 0; 2707 nlines = 0;
2596 str = buf; 2708 str = buf;
2709 eol = str + min (ncol, UBUFSIZ);
2597 } 2710 }
2598 }
2599 2711
2600 if (str >= buf + UBUFSIZ) 2712 if (str >= eol)
2601 { 2713 {
2714 if (eol >= buf + UBUFSIZ)
2715 {
2602 ch = NOCHAR; 2716 ch = NOCHAR;
2603 break; 2717 break;
2718 }
2719 else
2720 eol = min (eol + ncol, buf + UBUFSIZ);
2721 }
2722
2604 } 2723 }
2605 2724
2606 seq_begin = cmdbuf_ptr; 2725 seq_begin = cmdbuf_ptr;
2607 ch = next_char (); 2726 ch = next_char ();
2608 } 2727 }
… …
2615 * the number of pages between refreshes is refresh_limit, which 2734 * the number of pages between refreshes is refresh_limit, which
2616 * is incremented here because we must be doing flat-out scrolling. 2735 * is incremented here because we must be doing flat-out scrolling.
2617 */ 2736 */
2618 if (refreshnow) 2737 if (refreshnow)
2619 { 2738 {
2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2621 refresh_limit++; 2740 refresh_limit++;
2622 else 2741 else
2623 { 2742 {
2624 flag = true; 2743 flag = true;
2625 scr_refresh (refresh_type); 2744 scr_refresh (refresh_type);
… …
2679 if (len == (size_t)-1) 2798 if (len == (size_t)-1)
2680 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2799 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2681 2800
2682 // assume wchar == unicode 2801 // assume wchar == unicode
2683 cmdbuf_ptr += len; 2802 cmdbuf_ptr += len;
2684 return wc; 2803 return wc & UNICODE_MASK;
2685 } 2804 }
2686 2805
2687 return NOCHAR; 2806 return NOCHAR;
2688} 2807}
2689 2808
… …
3152 { 3271 {
3153 switch (priv) 3272 switch (priv)
3154 { 3273 {
3155 case '>': 3274 case '>':
3156 if (ch == CSI_DA) /* secondary device attributes */ 3275 if (ch == CSI_DA) /* secondary device attributes */
3157 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3276 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3158 break; 3277 break;
3159 case '?': 3278 case '?':
3160 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3279 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3161 process_terminal_mode (ch, priv, nargs, arg); 3280 process_terminal_mode (ch, priv, nargs, arg);
3162 break; 3281 break;
… …
3267 3386
3268 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3387 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3269 arg[0] = -arg[0]; 3388 arg[0] = -arg[0];
3270 /* FALLTHROUGH */ 3389 /* FALLTHROUGH */
3271 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3273 break; 3392 break;
3274 3393
3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3276 tt_write ((const unsigned char *)VT100_ANS, 3395 tt_write ((const unsigned char *)VT100_ANS,
3277 (unsigned int) (sizeof (VT100_ANS) - 1)); 3396 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3289 break; 3408 break;
3290 case 6: /* CPR requested */ 3409 case 6: /* CPR requested */
3291 scr_report_position (); 3410 scr_report_position ();
3292 break; 3411 break;
3293 case 7: /* unofficial extension */ 3412 case 7: /* unofficial extension */
3294 if (options & Opt_insecure) 3413 if (OPTION (Opt_insecure))
3295 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3414 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3296 break; 3415 break;
3297 case 8: /* unofficial extension */ 3416 case 8: /* unofficial extension */
3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3299 break; 3418 break;
… …
3391rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3510rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3392{ 3511{
3393 int x, y; 3512 int x, y;
3394 XWindowAttributes wattr; 3513 XWindowAttributes wattr;
3395 Window wdummy; 3514 Window wdummy;
3515 dDisp;
3396 3516
3397 if (nargs == 0) 3517 if (nargs == 0)
3398 return; 3518 return;
3399 3519
3400 switch (args[0]) 3520 switch (args[0])
3401 { 3521 {
3402 /* 3522 /*
3403 * commands 3523 * commands
3404 */ 3524 */
3405 case 1: /* deiconify window */ 3525 case 1: /* deiconify window */
3406 XMapWindow (display->display, TermWin.parent[0]); 3526 XMapWindow (disp, parent[0]);
3407 break; 3527 break;
3408 case 2: /* iconify window */ 3528 case 2: /* iconify window */
3409 XIconifyWindow (display->display, TermWin.parent[0], 3529 XIconifyWindow (disp, parent[0], display->screen);
3410 DefaultScreen (display->display));
3411 break; 3530 break;
3412 case 3: /* set position (pixels) */ 3531 case 3: /* set position (pixels) */
3413 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3532 XMoveWindow (disp, parent[0], args[1], args[2]);
3414 break; 3533 break;
3415 case 4: /* set size (pixels) */ 3534 case 4: /* set size (pixels) */
3416 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3535 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3417 break; 3536 break;
3418 case 5: /* raise window */ 3537 case 5: /* raise window */
3419 XRaiseWindow (display->display, TermWin.parent[0]); 3538 XRaiseWindow (disp, parent[0]);
3420 break; 3539 break;
3421 case 6: /* lower window */ 3540 case 6: /* lower window */
3422 XLowerWindow (display->display, TermWin.parent[0]); 3541 XLowerWindow (disp, parent[0]);
3423 break; 3542 break;
3424 case 7: /* refresh window */ 3543 case 7: /* refresh window */
3425 scr_touch (true); 3544 scr_touch (true);
3426 break; 3545 break;
3427 case 8: /* set size (chars) */ 3546 case 8: /* set size (chars) */
3428 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3547 set_widthheight ((unsigned int) (args[2] * fwidth),
3429 (unsigned int) (args[1] * TermWin.fheight)); 3548 (unsigned int) (args[1] * fheight));
3430 break; 3549 break;
3431 3550
3432 //case 9: NYI, TODO, restore maximized window or maximize window 3551 //case 9: NYI, TODO, restore maximized window or maximize window
3433 default: 3552 default:
3434 if (args[0] >= 24) /* set height (chars) */ 3553 if (args[0] >= 24) /* set height (chars) */
3435 set_widthheight ((unsigned int)TermWin.width, 3554 set_widthheight ((unsigned int)width,
3436 (unsigned int) (args[1] * TermWin.fheight)); 3555 (unsigned int) (args[1] * fheight));
3437 break; 3556 break;
3438 3557
3439 3558
3440 /* 3559 /*
3441 * reports - some output format copied from XTerm 3560 * reports - some output format copied from XTerm
3442 */ 3561 */
3443 case 11: /* report window state */ 3562 case 11: /* report window state */
3444 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3563 XGetWindowAttributes (disp, parent[0], &wattr);
3445 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3564 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3446 break; 3565 break;
3447 case 13: /* report window position */ 3566 case 13: /* report window position */
3448 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3567 XGetWindowAttributes (disp, parent[0], &wattr);
3449 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3568 XTranslateCoordinates (disp, parent[0], wattr.root,
3450 -wattr.border_width, -wattr.border_width, 3569 -wattr.border_width, -wattr.border_width,
3451 &x, &y, &wdummy); 3570 &x, &y, &wdummy);
3452 tt_printf ("\033[3;%d;%dt", x, y); 3571 tt_printf ("\033[3;%d;%dt", x, y);
3453 break; 3572 break;
3454 case 14: /* report window size (pixels) */ 3573 case 14: /* report window size (pixels) */
3455 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3574 XGetWindowAttributes (disp, parent[0], &wattr);
3456 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3575 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3457 break; 3576 break;
3458 case 18: /* report text area size (chars) */ 3577 case 18: /* report text area size (chars) */
3459 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3578 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3460 break; 3579 break;
3461 case 19: /* report window size (chars) */ 3580 case 19: /* report window size (chars) */
3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3581 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3463 break; 3582 break;
3464 case 20: /* report icon label */ 3583 case 20: /* report icon label */
3465 { 3584 {
3466 char *s; 3585 char *s;
3467 XGetIconName (display->display, TermWin.parent[0], &s); 3586 XGetIconName (disp, parent[0], &s);
3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s); 3588 XFree (s);
3470 } 3589 }
3471 break; 3590 break;
3472 case 21: /* report window title */ 3591 case 21: /* report window title */
3473 { 3592 {
3474 char *s; 3593 char *s;
3475 XFetchName (display->display, TermWin.parent[0], &s); 3594 XFetchName (disp, parent[0], &s);
3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s); 3596 XFree (s);
3478 } 3597 }
3479 break; 3598 break;
3480 } 3599 }
3481} 3600}
… …
3487 * ends_how is terminator used. returned input must be free()'d 3606 * ends_how is terminator used. returned input must be free()'d
3488 */ 3607 */
3489unsigned char * 3608unsigned char *
3490rxvt_term::get_to_st (unicode_t &ends_how) 3609rxvt_term::get_to_st (unicode_t &ends_how)
3491{ 3610{
3492 unicode_t prev = 0, ch; 3611 unicode_t ch;
3612 bool seen_esc = false;
3493 unsigned int n = 0; 3613 unsigned int n = 0;
3494 unsigned char *s;
3495 unsigned char string[STRING_MAX]; 3614 wchar_t string[STRING_MAX];
3496 3615
3497 while ((ch = cmd_getc ()) != NOCHAR) 3616 while ((ch = cmd_getc ()) != NOCHAR)
3498 { 3617 {
3499 if (prev == C0_ESC) 3618 if (seen_esc)
3500 { 3619 {
3501 if (ch == 0x5c) /* 7bit ST */ 3620 if (ch == 0x5c) /* 7bit ST */
3502 break; 3621 break;
3503 else 3622 else
3504 return NULL; 3623 return NULL;
3505 } 3624 }
3625 else if (ch == C0_ESC)
3626 {
3627 seen_esc = true;
3628 continue;
3629 }
3506 else if (ch == C0_BEL || ch == CHAR_ST) 3630 else if (ch == C0_BEL || ch == CHAR_ST)
3507 break; 3631 break;
3508 else if (ch < 0x20) 3632 else if (ch < 0x20)
3509 return NULL; /* other control character - exit */ 3633 return NULL; /* other control character - exit */
3510 3634
3511 if (n >= sizeof (string) - 1) 3635 seen_esc = false;
3636
3637 if (n >= STRING_MAX - 1)
3512 // stop at some sane length 3638 // stop at some sane length
3513 return NULL; 3639 return NULL;
3514 3640
3515 if (ch == C0_SYN) 3641 if (ch == C0_SYN)
3516 {
3517 string[n++] = cmd_get8 (); 3642 string[n++] = cmd_get8 ();
3518 prev = 0;
3519 }
3520 else 3643 else
3521 string[n++] = prev = ch; 3644 string[n++] = ch;
3522 } 3645 }
3523 3646
3524 string[n++] = '\0'; 3647 string[n++] = '\0';
3525 3648
3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3527 return NULL;
3528
3529 ends_how = (ch == 0x5c ? C0_ESC : ch); 3649 ends_how = (ch == 0x5c ? C0_ESC : ch);
3530 strncpy (s, string, n); 3650
3531 return s; 3651 return (unsigned char *)rxvt_wcstombs (string);
3532} 3652}
3533 3653
3534/*----------------------------------------------------------------------*/ 3654/*----------------------------------------------------------------------*/
3535/* 3655/*
3536 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3590 set_window_color (color, str); 3710 set_window_color (color, str);
3591} 3711}
3592 3712
3593/* 3713/*
3594 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3595 * 0 = change iconName/title
3596 * 1 = change iconName
3597 * 2 = change title
3598 * 4 = change color
3599 * 10 = change fg color
3600 * 11 = change bg color
3601 * 12 = change text color
3602 * 13 = change mouse foreground color
3603 * 17 = change highlight character colour
3604 * 18 = change bold character color
3605 * 19 = change underlined character color
3606 * 46 = change logfile (not implemented)
3607 * 50 = change font
3608 *
3609 * rxvt extensions:
3610 * 20 = bg pixmap
3611 * 39 = change default fg color
3612 * 49 = change default bg color
3613 * 55 = dump scrollback buffer and all of screen
3614 * 701 = change locale
3615 * 702 = find font
3616 * 703 = menu
3617 */ 3715 */
3618void 3716void
3619rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3620{ 3718{
3621 int changed = 0; 3719 int changed = 0;
3622 int color; 3720 int color;
3623 char *buf, *name; 3721 char *buf, *name;
3624 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724 dDisp;
3625 3725
3626 assert (str != NULL); 3726 assert (str != NULL);
3627 switch (op) 3727 switch (op)
3628 { 3728 {
3629 case XTerm_name: 3729 case XTerm_name:
… …
3636 set_title (str); 3736 set_title (str);
3637 break; 3737 break;
3638 case XTerm_property: 3738 case XTerm_property:
3639 if (str[0] == '?') 3739 if (str[0] == '?')
3640 { 3740 {
3641 Atom prop = XInternAtom (display->display, str + 1, True); 3741 Atom prop = display->atom (str + 1);
3642 Atom actual_type; 3742 Atom actual_type;
3643 int actual_format; 3743 int actual_format;
3644 unsigned long nitems; 3744 unsigned long nitems;
3645 unsigned long bytes_after; 3745 unsigned long bytes_after;
3646 unsigned char *value = 0; 3746 unsigned char *value = 0;
3647 const char *str = ""; 3747 const char *str = "";
3648 3748
3649 if (prop 3749 if (prop
3650 && XGetWindowProperty (display->display, TermWin.parent[0], 3750 && XGetWindowProperty (disp, parent[0],
3651 prop, 0, 1<<16, 0, AnyPropertyType, 3751 prop, 0, 1<<16, 0, AnyPropertyType,
3652 &actual_type, &actual_format, 3752 &actual_type, &actual_format,
3653 &nitems, &bytes_after, &value) == Success 3753 &nitems, &bytes_after, &value) == Success
3654 && actual_type != None 3754 && actual_type != None
3655 && actual_format == 8) 3755 && actual_format == 8)
… …
3664 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3764 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3665 3765
3666 if (eq) 3766 if (eq)
3667 { 3767 {
3668 *eq = 0; 3768 *eq = 0;
3669 XChangeProperty (display->display, TermWin.parent[0], 3769 set_utf8_property (display->atom (str), eq + 1);
3670 display->atom (str), XA_STRING, 8,
3671 PropModeReplace, (unsigned char *)eq + 1,
3672 strlen (eq + 1));
3673 } 3770 }
3674 else 3771 else
3675 XDeleteProperty (display->display, TermWin.parent[0], 3772 XDeleteProperty (disp, parent[0],
3676 display->atom (str)); 3773 display->atom (str));
3677 } 3774 }
3678 break; 3775 break;
3679 3776
3680 case XTerm_Color: 3777 case XTerm_Color:
… …
3727 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3824 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3728 break; 3825 break;
3729 case XTerm_Color_RV: 3826 case XTerm_Color_RV:
3730 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3827 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3731 break; 3828 break;
3829 case URxvt_Color_IT:
3830 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3831 break;
3832#endif
3833#if TRANSPARENT && TINTING
3834 case URxvt_Color_tint:
3835 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3836 check_our_parents ();
3837 if (am_transparent)
3838 want_full_refresh = want_refresh = 1;
3839 break;
3732#endif 3840#endif
3733 3841
3734 case XTerm_Pixmap: 3842 case XTerm_Pixmap:
3735 if (*str != ';') 3843 if (*str != ';')
3736 { 3844 {
… …
3744 { 3852 {
3745 str++; 3853 str++;
3746#if XPM_BACKGROUND 3854#if XPM_BACKGROUND
3747 changed += scale_pixmap (str); 3855 changed += scale_pixmap (str);
3748#endif 3856#endif
3749
3750 } 3857 }
3858
3751 if (changed) 3859 if (changed)
3752 { 3860 {
3753#ifdef XPM_BACKGROUND 3861#ifdef XPM_BACKGROUND
3754 resize_pixmap (); 3862 resize_pixmap ();
3755#endif 3863#endif
… …
3766 3874
3767 case XTerm_logfile: 3875 case XTerm_logfile:
3768 // TODO, when secure mode? 3876 // TODO, when secure mode?
3769 break; 3877 break;
3770 3878
3771 case XTerm_font:
3772 if (query)
3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3775 ? TermWin.fontset->fontdesc : "",
3776 resp);
3777 else
3778 change_font (str);
3779 break;
3780
3781#if ENABLE_FRILLS
3782 case XTerm_locale:
3783 if (query)
3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3785 else
3786 {
3787 set_locale (str);
3788# ifdef USE_XIM
3789 im_cb ();
3790# endif
3791 }
3792 break;
3793
3794 case XTerm_findfont:
3795 {
3796 int fid = TermWin.fontset->find_font (atoi (str));
3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3801 }
3802 break;
3803#endif
3804
3805#ifdef MENUBAR 3879#ifdef MENUBAR
3806 case XTerm_Menu: 3880 case URxvt_Menu:
3807 if (options & Opt_insecure) 3881 if (OPTION (Opt_insecure))
3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3809 break; 3883 break;
3810#endif 3884#endif
3811#if 0 3885#if 0
3812 case XTerm_dumpscreen: /* no error notices */ 3886 case XTerm_dumpscreen: /* no error notices */
… …
3816 { 3890 {
3817 scr_dump (fd); 3891 scr_dump (fd);
3818 close (fd); 3892 close (fd);
3819 } 3893 }
3820 } 3894 }
3895 break;
3896#endif
3897 case XTerm_font:
3898 op = URxvt_font;
3899 case URxvt_font:
3900#if ENABLE_STYLES
3901 case URxvt_boldFont:
3902 case URxvt_italicFont:
3903 case URxvt_boldItalicFont:
3904#endif
3905 if (query)
3906 tt_printf ("\33]%d;%-.250s%c", saveop,
3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3908 ? fontset[op - URxvt_font]->fontdesc : "",
3909 resp);
3910 else
3911 {
3912 const char *&res = rs[Rs_font + (op - URxvt_font)];
3913
3914 res = strdup (str);
3915 allocated.push_back ((void *)res);
3916 set_fonts ();
3917 }
3918 break;
3919
3920#if ENABLE_FRILLS
3921 case URxvt_locale:
3922 if (query)
3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3924 else
3925 {
3926 set_locale (str);
3927 pty.set_utf8_mode (enc_utf8);
3928 init_xlocale ();
3929 }
3930 break;
3931
3932 case URxvt_view_up:
3933 case URxvt_view_down:
3934 int lines = atoi (str);
3935
3936 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else
3939 {
3940 scr_erase_savelines ();
3941 }
3942
3821 break; 3943 break;
3822#endif 3944#endif
3823 } 3945 }
3824} 3946}
3825/*----------------------------------------------------------------------*/ 3947/*----------------------------------------------------------------------*/
… …
3934 } 4056 }
3935 4057
3936 /* extra handling for values with state unkept */ 4058 /* extra handling for values with state unkept */
3937 switch (arg[i]) 4059 switch (arg[i])
3938 { 4060 {
4061#if ENABLE_STYLES
4062 case 1021:
4063 if (mode)
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067
4068 want_refresh = 1;
4069 want_full_refresh = 1;
4070 break;
4071#endif
3939 case 1048: /* alternative cursor save */ 4072 case 1048: /* alternative cursor save */
4073 case 1049:
3940 if (options & Opt_secondaryScreen) 4074 if (OPTION (Opt_secondaryScreen))
3941 if (mode == 0) 4075 if (mode == 0)
3942 scr_cursor (RESTORE); 4076 scr_cursor (RESTORE);
3943 else if (mode == 1) 4077 else if (mode == 1)
3944 scr_cursor (SAVE); 4078 scr_cursor (SAVE);
3945 break; 4079 break;
… …
3957 */ 4091 */
3958 PrivMode (1, PrivMode_vt52); 4092 PrivMode (1, PrivMode_vt52);
3959 break; 4093 break;
3960 case 3: /* 80/132 */ 4094 case 3: /* 80/132 */
3961 if (priv_modes & PrivMode_132OK) 4095 if (priv_modes & PrivMode_132OK)
3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4096 set_widthheight (((state ? 132 : 80) * fwidth), height);
3963 break; 4097 break;
3964 case 4: /* smooth scrolling */ 4098 case 4: /* smooth scrolling */
3965 if (state) 4099 if (!state)
3966 options &= ~Opt_jumpScroll; 4100 SET_OPTION (Opt_jumpScroll);
3967 else 4101 else
3968 options |= Opt_jumpScroll; 4102 CLR_OPTION (Opt_jumpScroll);
3969 break; 4103 break;
3970 case 5: /* reverse video */ 4104 case 5: /* reverse video */
3971 scr_rvideo_mode (state); 4105 scr_rvideo_mode (state);
3972 break; 4106 break;
3973 case 6: /* relative/absolute origins */ 4107 case 6: /* relative/absolute origins */
… …
4014#if 0 4148#if 0
4015 case 1001: 4149 case 1001:
4016 break; /* X11 mouse highlighting */ 4150 break; /* X11 mouse highlighting */
4017#endif 4151#endif
4018 case 1010: /* scroll to bottom on TTY output inhibit */ 4152 case 1010: /* scroll to bottom on TTY output inhibit */
4019 if (state) 4153 if (!state)
4020 options &= ~Opt_scrollTtyOutput; 4154 SET_OPTION (Opt_scrollTtyOutput);
4021 else 4155 else
4022 options |= Opt_scrollTtyOutput; 4156 CLR_OPTION (Opt_scrollTtyOutput);
4023 break; 4157 break;
4024 case 1011: /* scroll to bottom on key press */ 4158 case 1011: /* scroll to bottom on key press */
4025 if (state) 4159 if (state)
4026 options |= Opt_scrollTtyKeypress; 4160 SET_OPTION (Opt_scrollTtyKeypress);
4027 else 4161 else
4028 options &= ~Opt_scrollTtyKeypress; 4162 CLR_OPTION (Opt_scrollTtyKeypress);
4029 break; 4163 break;
4030 case 1047: /* secondary screen w/ clearing last */ 4164 case 1047: /* secondary screen w/ clearing last */
4031 if (options & Opt_secondaryScreen) 4165 if (OPTION (Opt_secondaryScreen))
4032 if (current_screen != PRIMARY) 4166 if (current_screen != PRIMARY)
4033 scr_erase_screen (2); 4167 scr_erase_screen (2);
4034 scr_change_screen (state); 4168 scr_change_screen (state);
4035 break; 4169 break;
4036 case 1049: /* secondary screen w/ clearing first */ 4170 case 1049: /* secondary screen w/ clearing first */
4037 scr_change_screen (state); 4171 scr_change_screen (state);
4038 if (options & Opt_secondaryScreen) 4172 if (OPTION (Opt_secondaryScreen))
4039 if (current_screen != PRIMARY) 4173 if (current_screen != PRIMARY)
4040 scr_erase_screen (2); 4174 scr_erase_screen (2);
4041 break; 4175 break;
4042 default: 4176 default:
4043 break; 4177 break;
… …
4069 rendset = 0, rendstyle = ~RS_None; 4203 rendset = 0, rendstyle = ~RS_None;
4070 break; 4204 break;
4071 case 1: 4205 case 1:
4072 rendset = 1, rendstyle = RS_Bold; 4206 rendset = 1, rendstyle = RS_Bold;
4073 break; 4207 break;
4074 //case 2: // faint or second colour 4208 //case 2: // low intensity
4075 //case 3: // italic 4209 case 3:
4210 rendset = 1, rendstyle = RS_Italic;
4211 break;
4076 case 4: 4212 case 4:
4077 rendset = 1, rendstyle = RS_Uline; 4213 rendset = 1, rendstyle = RS_Uline;
4078 break; 4214 break;
4079 case 5: // slowly blinking 4215 case 5: // slowly blinking
4080 case 6: // rapidly blinking 4216 case 6: // rapidly blinking
… …
4092 //case 11: // scoansi acs on, first alt font 4228 //case 11: // scoansi acs on, first alt font
4093 //case 12: // scoansi acs on, |0x80, second alt font 4229 //case 12: // scoansi acs on, |0x80, second alt font
4094 //... 4230 //...
4095 //case 19: // ninth alt font 4231 //case 19: // ninth alt font
4096 //case 20: // gothic 4232 //case 20: // gothic
4097 case 21: // disable bold, faint 4233 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4098 rendset = 0, rendstyle = RS_Bold; 4234 rendset = 0, rendstyle = RS_Bold;
4099 break; 4235 break;
4100 case 22: 4236 case 22: // normal intensity
4101 rendset = 0, rendstyle = RS_Bold; 4237 rendset = 0, rendstyle = RS_Bold;
4102 break; 4238 break;
4103 //case 23: disable italic 4239 case 23: // disable italic
4240 rendset = 0, rendstyle = RS_Italic;
4241 break;
4104 case 24: 4242 case 24:
4105 rendset = 0, rendstyle = RS_Uline; 4243 rendset = 0, rendstyle = RS_Uline;
4106 break; 4244 break;
4107 case 25: 4245 case 25:
4108 rendset = 0, rendstyle = RS_Blink; 4246 rendset = 0, rendstyle = RS_Blink;
4109 break; 4247 break;
4110 case 26: 4248 case 26: // variable spacing (iso 8613)
4111 rendset = 0, rendstyle = RS_Blink; 4249 rendset = 0, rendstyle = RS_Blink;
4112 break; 4250 break;
4113 case 27: 4251 case 27:
4114 rendset = 0, rendstyle = RS_RVid; 4252 rendset = 0, rendstyle = RS_RVid;
4115 break; 4253 break;
… …
4133 case 35: 4271 case 35:
4134 case 36: 4272 case 36:
4135 case 37: 4273 case 37:
4136 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4274 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4137 break; 4275 break;
4138#ifdef TTY_256COLOR 4276 case 38: // set fg color, ISO 8613-6
4139 case 38:
4140 if (nargs > i + 2 && arg[i + 1] == 5) 4277 if (nargs > i + 2 && arg[i + 1] == 5)
4141 { 4278 {
4142 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4279 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4143 i += 2; 4280 i += 2;
4144 } 4281 }
4145 break; 4282 break;
4146#endif
4147 case 39: /* default fg */ 4283 case 39: /* default fg */
4148 scr_color (Color_fg, Color_fg); 4284 scr_color (Color_fg, Color_fg);
4149 break; 4285 break;
4150 4286
4151 case 40: 4287 case 40:
… …
4156 case 45: 4292 case 45:
4157 case 46: 4293 case 46:
4158 case 47: 4294 case 47:
4159 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4295 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4160 break; 4296 break;
4161#ifdef TTY_256COLOR 4297 case 48: // set bg color, ISO 8613-6
4162 case 48:
4163 if (nargs > i + 2 && arg[i + 1] == 5) 4298 if (nargs > i + 2 && arg[i + 1] == 5)
4164 { 4299 {
4165 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4300 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4166 i += 2; 4301 i += 2;
4167 } 4302 }
4168 break; 4303 break;
4169#endif
4170 case 49: /* default bg */ 4304 case 49: /* default bg */
4171 scr_color (Color_bg, Color_bg); 4305 scr_color (Color_bg, Color_bg);
4172 break; 4306 break;
4307
4308 //case 50: // not variable spacing
4173 4309
4174#ifndef NO_BRIGHTCOLOR 4310#ifndef NO_BRIGHTCOLOR
4175 case 90: 4311 case 90:
4176 case 91: /* set bright fg color */ 4312 case 91: /* set bright fg color */
4177 case 92: 4313 case 92:
4178 case 93: 4314 case 93:
4179 case 94: 4315 case 94:
4180 case 95: 4316 case 95:
4181 case 96: 4317 case 96:
4182 case 97: 4318 case 97:
4183 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
4184 Color_fg);
4185 break; 4320 break;
4186 case 100: 4321 case 100:
4187 case 101: /* set bright bg color */ 4322 case 101: /* set bright bg color */
4188 case 102: 4323 case 102:
4189 case 103: 4324 case 103:
4190 case 104: 4325 case 104:
4191 case 105: 4326 case 105:
4192 case 106: 4327 case 106:
4193 case 107: 4328 case 107:
4194 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4329 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4195 Color_bg);
4196 break; 4330 break;
4197#endif 4331#endif
4198
4199 } 4332 }
4200 } 4333 }
4201} 4334}
4202/*}}} */ 4335/*}}} */
4203 4336
… …
4239 4372
4240/* ---------------------------------------------------------------------- */ 4373/* ---------------------------------------------------------------------- */
4241/* Write data to the pty as typed by the user, pasted with the mouse, 4374/* Write data to the pty as typed by the user, pasted with the mouse,
4242 * or generated by us in response to a query ESC sequence. 4375 * or generated by us in response to a query ESC sequence.
4243 */ 4376 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378
4244void 4379void
4245rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4380rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4246{ 4381{
4247 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4382 if (v_buflen == 0)
4383 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4248 4385
4249 if (len) 4386 if ((unsigned int)written == len)
4387 return;
4388
4389 data += written;
4390 len -= written;
4250 { 4391 }
4392
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4394
4395 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len;
4397
4398 pty_ev.set (EVENT_READ | EVENT_WRITE);
4399}
4400
4401void rxvt_term::pty_write ()
4402{
4403 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4404
4405 if (written > 0)
4406 {
4407 v_buflen -= written;
4408
4251 if (v_buflen == 0) 4409 if (v_buflen == 0)
4252 { 4410 {
4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4254
4255 if ((unsigned int)written == len)
4256 return;
4257
4258 data += written;
4259 len -= written;
4260 }
4261
4262
4263 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4264
4265 memcpy (v_buffer + v_buflen, data, len);
4266 v_buflen += len;
4267 }
4268
4269 for (;;)
4270 {
4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
4272
4273 if (written > 0)
4274 {
4275 v_buflen -= written;
4276
4277 if (v_buflen == 0)
4278 {
4279 free (v_buffer); 4411 free (v_buffer);
4280 v_buffer = 0; 4412 v_buffer = 0;
4281 v_buflen = 0; 4413 v_buflen = 0;
4282 4414
4283 pty_ev.set (EVENT_READ); 4415 pty_ev.set (EVENT_READ);
4284 return;
4285 }
4286
4287 memmove (v_buffer, v_buffer + written, v_buflen);
4288 }
4289 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4290 // original code just ignores this...
4291 destroy ();
4292 else
4293 {
4294 pty_ev.set (EVENT_READ | EVENT_WRITE);
4295 return; 4416 return;
4296 } 4417 }
4418
4419 memmove (v_buffer, v_buffer + written, v_buflen);
4297 } 4420 }
4421 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4422 pty_ev.set (EVENT_READ);
4298} 4423}
4299 4424
4300/*----------------------- end-of-file (C source) -----------------------*/ 4425/*----------------------- end-of-file (C source) -----------------------*/
4301 4426

Diff Legend

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