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

Diff Legend

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