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

Diff Legend

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