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.171 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#if HAVE_SCHED_YIELD
53#include <wchar.h> 54# include <sched.h>
55#endif
56
57#ifdef KEYSYM_RESOURCE
58# include "keyboard.h"
59#endif
60
54#include <signal.h> 61#include <csignal>
55 62
56/*----------------------------------------------------------------------*/ 63/*----------------------------------------------------------------------*/
57 64
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 65#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 66
… …
114 XK_Escape, 0x238b, 121 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 122 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 123 XK_Print, 0x2399,
117 124
118 XK_space, 0x2423, 125 XK_space, 0x2423,
126
127#ifdef XK_KP_Begin
128 XK_KP_Prior, 0x21de,
129 XK_KP_Next, 0x21df,
130 XK_KP_Begin, 0x2320,
131 XK_KP_Insert, 0x2380,
132 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
134#endif
120 0, 135 0,
121}; 136};
122 137
123void 138void
124rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
125{ 140{
126 x = Pixel2Col (x); 141 x = Pixel2Col (x);
127 y = Pixel2Row (y); 142 y = Pixel2Row (y);
128 143
129 if (x < 0 || x >= TermWin.ncol 144 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 145 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 146 return;
132 147
133 for (;;) 148 for (;;)
134 { 149 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 150 const line_t &l = ROW(y - view_start);
151
152 text_t t = l.t[x];
136 153
137 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
138 { 155 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 156 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
142 break; 158 break;
143 } 159 }
144 160
145 x--; 161 x--;
146 } 162 }
147
148} 163}
149#endif
150 164
151#if ENABLE_OVERLAY
152void 165void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 167{
155 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 169 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 170 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 171 int len;
159 172
173 fname = rxvt_utf8towcs (f->name);
174
160#if ENABLE_COMBINING 175# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 176 if (IS_COMPOSE (ch))
162 { 177 {
163 len = rxvt_composite.expand (ch, 0); 178 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 179 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 180 rxvt_composite.expand (ch, chr);
166 } 181 }
167 else 182 else
168#endif 183# endif
169 { 184 {
170 ch2 = ch; 185 ch2 = ch;
171 186
172 alloc = 0; 187 alloc = 0;
173 chr = &ch2; 188 chr = &ch2;
174 len = 1; 189 len = 1;
175 } 190 }
176 191
177 int width = strlen (f->name); 192 char attr[80]; // plenty
178 193
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r,
196 fgcolor_of (r), bgcolor_of (r),
197 r & RS_Bold ? " bold" : "",
198 r & RS_Italic ? " italic" : "",
199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : "");
203
204 int width = wcswidth (fname, wcslen (fname));
205
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr));
208
209 if (y >= 0)
210 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
212 x = 0;
213 }
214
215 scr_overlay_new (x, y, width, len + 2);
180 216
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 218
183 for (int y = 0; y < len; y++) 219 for (int y = 0; y < len; y++)
184 { 220 {
… …
187 ch = *chr++; 223 ch = *chr++;
188 224
189 sprintf (buf, "%8x", ch); 225 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 226 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 227 scr_overlay_set (9, y, '=');
192#if !UNICODE3 228# if !UNICODE3
193 if (ch >= 0x10000) 229 if (ch >= 0x10000)
194 ch = 0xfffd; 230 ch = 0xfffd;
195#endif 231# endif
196 scr_overlay_set (11, y, ch, r); 232 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
198 } 234 }
199 235
236 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 237 scr_overlay_set (0, len + 1, fname);
201 238
239 free (fname);
240
202#if ENABLE_COMBINING 241# if ENABLE_COMBINING
203 if (alloc) 242 if (alloc)
204 delete [] alloc; 243 delete [] alloc;
205#endif 244# endif
206} 245}
207#endif 246#endif
208 247
209void 248void
210rxvt_term::commit_iso14755 () 249rxvt_term::commit_iso14755 ()
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 312 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 313 * escape sequence to toggle the Keypad.
275 * 314 *
276 * Always permit `shift' to override the current setting 315 * Always permit `shift' to override the current setting
277 */ 316 */
278 shft = (ev.state & ShiftMask); 317 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 318 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 319 meta = ev.state & ModMetaMask;
281 320
282 if (numlock_state || (ev.state & ModNumLockMask)) 321 if (numlock_state || (ev.state & ModNumLockMask))
283 { 322 {
284 numlock_state = (ev.state & ModNumLockMask); 323 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 324 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 344
306 // the XOpenIM manpage lies about hardcoding the locale 345 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 346 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 347 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 348 SET_LOCALE (rs[Rs_imLocale]);
349
310 // assume wchar_t == unicode or better 350 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 351 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 352 KBUFSZ, &keysym, &status_return);
353
313 if (rs[Rs_imLocale]) 354 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 355 SET_LOCALE (locale);
315 356
316 if (status_return == XLookupChars 357 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 358 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 385 valid_keysym = keysym != NoSymbol;
345 } 386 }
346 387
347 if (valid_keysym) 388 if (valid_keysym)
348 { 389 {
390#ifdef KEYSYM_RESOURCE
391 if (keyboard->dispatch (this, keysym, ev.state))
392 return;
393#endif
394
349 if (TermWin.saveLines) 395 if (saveLines)
350 { 396 {
351#ifdef UNSHIFTED_SCROLLKEYS 397#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 398 if (!ctrl && !meta)
353#else 399#else
354 if (IS_SCROLL_MOD) 400 if (IS_SCROLL_MOD)
355#endif 401#endif
356 { 402 {
357 int lnsppg; 403 int lnsppg;
358 404
359#ifdef PAGING_CONTEXT_LINES 405#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 406 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 407#else
362 lnsppg = TermWin.nrow * 4 / 5; 408 lnsppg = nrow * 4 / 5;
363#endif 409#endif
364 if (keysym == XK_Prior) 410 if (keysym == XK_Prior)
365 { 411 {
366 scr_page (UP, lnsppg); 412 scr_page (UP, lnsppg);
367 return; 413 return;
… …
487 } 533 }
488#endif 534#endif
489 535
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 536 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 537 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 538 {
518 newlen = 1; 539 newlen = 1;
519 switch (keysym) 540 switch (keysym)
520 { 541 {
521#ifndef NO_BACKSPACE_KEY 542#ifndef NO_BACKSPACE_KEY
… …
529 else 550 else
530 strcpy (kbuf, key_backspace); 551 strcpy (kbuf, key_backspace);
531 break; 552 break;
532#endif 553#endif
533#ifndef NO_DELETE_KEY 554#ifndef NO_DELETE_KEY
555# ifdef XK_KP_Prior
556 case XK_KP_Delete:
557 /* allow shift to override */
558 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
559 {
560 strcpy (kbuf, "\033On");
561 break;
562 }
563 /* FALLTHROUGH */
564# endif
534 case XK_Delete: 565 case XK_Delete:
535 strcpy (kbuf, key_delete); 566 strcpy (kbuf, key_delete);
536 break; 567 break;
537#endif 568#endif
538 case XK_Tab: 569 case XK_Tab:
… …
641#ifdef XK_KP_Begin 672#ifdef XK_KP_Begin
642 case XK_KP_Begin: 673 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 674 strcpy (kbuf, "\033Ou");
644 break; 675 break;
645 676
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 677#endif
654 case XK_KP_F1: /* "\033OP" */ 678 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 679 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 680 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 681 case XK_KP_F4: /* "\033OS" */
… …
689 break; 713 break;
690 714
691 case XK_Find: 715 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 716 strcpy (kbuf, "\033[1~");
693 break; 717 break;
718
719#ifdef XK_KP_End
720 case XK_KP_Insert:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Op");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
694 case XK_Insert: 729 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 730 strcpy (kbuf, "\033[2~");
696 break; 731 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 732#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 733 case DXK_Remove:
… …
788#undef FKEY 823#undef FKEY
789 default: 824 default:
790 newlen = 0; 825 newlen = 0;
791 break; 826 break;
792 } 827 }
828
793 if (newlen) 829 if (newlen)
794 len = strlen (kbuf); 830 len = strlen (kbuf);
795 } 831 }
796 832
797 /* 833 /*
… …
806 else if (ctrl && keysym == XK_minus) 842 else if (ctrl && keysym == XK_minus)
807 { 843 {
808 len = 1; 844 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 845 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 846 }
847 else if (keysym == XK_ISO_Left_Tab)
848 {
849 strcpy (kbuf, "\033[Z");
850 len = 3;
851 }
811 else 852 else
812 { 853 {
813#ifdef META8_OPTION 854#ifdef META8_OPTION
814 /* set 8-bit on */ 855 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 856 if (meta && (meta_char == 0x80))
… …
827 } 868 }
828 869
829 if (len <= 0) 870 if (len <= 0)
830 return; /* not mapped */ 871 return; /* not mapped */
831 872
832 if (options & Opt_scrollTtyKeypress) 873 if (OPTION (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 874 if (view_start)
834 { 875 {
835 TermWin.view_start = 0; 876 view_start = 0;
836 want_refresh = 1; 877 want_refresh = 1;
837 } 878 }
838 879
839 /* 880 /*
840 * these modifications only affect the static keybuffer 881 * these modifications only affect the static keybuffer
… …
873#endif /* DEBUG_CMD */ 914#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 915 tt_write (kbuf, (unsigned int)len);
875} 916}
876/*}}} */ 917/*}}} */
877 918
878#if (MENUBAR_MAX) 919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 921/* attempt to `write' count to the input buffer */
881unsigned int 922unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 924{
… …
906 947
907 cmd_parse (); 948 cmd_parse ();
908 949
909 return 0; 950 return 0;
910} 951}
911#endif /* MENUBAR_MAX */ 952#endif
912 953
913void 954void
914rxvt_term::flush () 955rxvt_term::flush ()
915{ 956{
916 flush_ev.stop (); 957 flush_ev.stop ();
… …
1017{ 1058{
1018 if (mouse_slip_wheel_speed == 0 1059 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1061 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1062 {
1063 if (view_start == nsaved ||
1064 view_start == 0)
1065 mouse_slip_wheel_speed = 0;
1066
1022 refresh_type |= SMOOTH_REFRESH; 1067 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1068 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1070 }
1026} 1071}
… …
1039 1084
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1086 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1087 cmdbuf_endp = cmdbuf_ptr + n;
1043 1088
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1045 1090
1046 if (n > 0) 1091 if (r > 0)
1047 { 1092 {
1048 cmdbuf_endp += n; 1093 cmdbuf_endp += r;
1049 return true; 1094 return true;
1050 } 1095 }
1051 else if (n < 0 && errno != EAGAIN) 1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 {
1098#if HAVE_SCHED_YIELD
1099 sched_yield ();
1100#endif
1101 }
1102 else
1103 {
1104 pty_ev.stop ();
1105
1106 if (!OPTION (Opt_hold))
1052 destroy (); 1107 destroy ();
1108 }
1053 1109
1054 return false; 1110 return false;
1055} 1111}
1056 1112
1057void 1113void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1114rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1115{
1060 SET_R (this); 1116 SET_R (this);
1061 SET_LOCALE (locale); 1117 SET_LOCALE (locale);
1062 1118
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1119 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1120 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1121 while (pty_fill ())
1068 if (cmd_parse ()) 1122 if (cmd_parse ())
1069 break; 1123 break;
1124
1125 if (revents & EVENT_WRITE)
1126 pty_write ();
1070} 1127}
1071 1128
1072void 1129void
1073rxvt_term::pointer_unblank () 1130rxvt_term::pointer_unblank ()
1074{ 1131{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1132 XDefineCursor (display->display, vt, TermWin_cursor);
1076 recolour_cursor (); 1133 recolour_cursor ();
1077 1134
1078#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1136 hidden_pointer = 0;
1080 1137
1081 if (options & Opt_pointerBlank) 1138 if (OPTION (Opt_pointerBlank))
1082 pointer_ev.start (NOW + pointerBlankDelay); 1139 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif 1140#endif
1084} 1141}
1085 1142
1086#ifdef POINTER_BLANK 1143#ifdef POINTER_BLANK
1087void 1144void
1088rxvt_term::pointer_blank () 1145rxvt_term::pointer_blank ()
1089{ 1146{
1090 if (! (options & Opt_pointerBlank)) 1147 if (! OPTION (Opt_pointerBlank))
1091 return; 1148 return;
1092 1149
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1150 XDefineCursor (display->display, vt, display->blank_cursor);
1094 XFlush (display->display); 1151 XFlush (display->display);
1095 1152
1096 hidden_pointer = 1; 1153 hidden_pointer = 1;
1097} 1154}
1098 1155
… …
1187 1244
1188/*{{{ process an X event */ 1245/*{{{ process an X event */
1189void 1246void
1190rxvt_term::x_cb (XEvent &ev) 1247rxvt_term::x_cb (XEvent &ev)
1191{ 1248{
1249 dDisp;
1250
1192 SET_R (this); 1251 SET_R (this);
1193 SET_LOCALE (locale); 1252 SET_LOCALE (locale);
1194 1253
1195#if defined(CURSOR_BLINK) 1254#if defined(CURSOR_BLINK)
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1197 { 1256 {
1198 if (hidden_cursor) 1257 if (hidden_cursor)
1199 { 1258 {
1200 hidden_cursor = 0; 1259 hidden_cursor = 0;
1201 want_refresh = 1; 1260 want_refresh = 1;
… …
1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1205 } 1264 }
1206#endif 1265#endif
1207 1266
1208#if defined(POINTER_BLANK) 1267#if defined(POINTER_BLANK)
1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1210 { 1269 {
1211 if (ev.type == MotionNotify 1270 if (ev.type == MotionNotify
1212 || ev.type == ButtonPress 1271 || ev.type == ButtonPress
1213 || ev.type == ButtonRelease) 1272 || ev.type == ButtonRelease)
1214 if (hidden_pointer) 1273 if (hidden_pointer)
… …
1217 if (ev.type == KeyPress && hidden_pointer == 0) 1276 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank (); 1277 pointer_blank ();
1219 } 1278 }
1220#endif 1279#endif
1221 1280
1222 Window unused_root, unused_child; 1281 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1282 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1283 unsigned int unused_mask;
1225 1284
1226 switch (ev.type) 1285 switch (ev.type)
1227 { 1286 {
1228 case KeyPress: 1287 case KeyPress:
1229#if ISO_14755 1288#if ISO_14755
… …
1312 button_release (ev.xbutton); 1371 button_release (ev.xbutton);
1313 break; 1372 break;
1314 1373
1315 case ClientMessage: 1374 case ClientMessage:
1316 if (ev.xclient.format == 32 1375 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1377 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1379 destroy ();
1380#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev);
1385#endif
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1319#ifdef OFFIX_DND 1396#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1397 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1399 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1400 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1401 || ev.xclient.data.l[0] == DndLink))
1325 { 1402 {
1326 /* Get Dnd data */ 1403 /* Get Dnd data */
1327 Atom ActualType; 1404 Atom ActualType;
1328 int ActualFormat; 1405 int ActualFormat;
1329 unsigned char *data; 1406 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1407 unsigned long Size, RemainingBytes;
1331 1408
1332 XGetWindowProperty (display->display, display->root, 1409 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1410 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1411 0L, 1000000L,
1335 False, AnyPropertyType, 1412 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1413 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1414 &Size, &RemainingBytes,
1338 &data); 1415 &data);
1339 XChangeProperty (display->display, display->root, 1416 set_string_property (XA_CUT_BUFFER0, data);
1340 XA_CUT_BUFFER0, XA_STRING,
1341 8, PropModeReplace,
1342 data, strlen (data));
1343 XFree (data); 1417 XFree (data);
1344 selection_paste (display->root, XA_CUT_BUFFER0, True); 1418 selection_paste (display->root, XA_CUT_BUFFER0, true);
1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1419 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1346 } 1420 }
1347#endif /* OFFIX_DND */ 1421#endif /* OFFIX_DND */
1348 break; 1422 break;
1349 1423
1350 case MappingNotify: 1424 case MappingNotify:
… …
1375 break; 1449 break;
1376 } 1450 }
1377 break; 1451 break;
1378 1452
1379 case FocusIn: 1453 case FocusIn:
1380 if (!TermWin.focus) 1454 focus_in ();
1455 break;
1456
1457 case FocusOut:
1458 focus_out ();
1459 break;
1460
1461 case ConfigureNotify:
1462 if (ev.xconfigure.window == parent[0])
1381 { 1463 {
1382 TermWin.focus = 1;
1383 want_refresh = 1;
1384#ifdef USE_XIM
1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1388 XSetICFocus (Input_Context);
1389 }
1390#endif
1391#ifdef CURSOR_BLINK
1392 if (options & Opt_cursorBlink)
1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1401#endif
1402
1403 }
1404 break;
1405
1406 case FocusOut:
1407 if (TermWin.focus)
1408 {
1409 TermWin.focus = 0;
1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1418#ifdef USE_XIM
1419 if (Input_Context != NULL)
1420 XUnsetICFocus (Input_Context);
1421#endif
1422#ifdef CURSOR_BLINK
1423 if (options & Opt_cursorBlink)
1424 cursor_blink_ev.stop ();
1425 hidden_cursor = 0;
1426#endif
1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1434 }
1435 break;
1436
1437 case ConfigureNotify:
1438 if (ev.xconfigure.window == TermWin.parent[0])
1439 {
1440 int height, width;
1441
1442 do
1443 { /* Wrap lots of configures into one */
1444 width = ev.xconfigure.width;
1445 height = ev.xconfigure.height;
1446 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1447 }
1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ;
1449 1466
1450 if (szHint.width != width || szHint.height != height) 1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1451 { 1468 {
1452 seen_resize = 1; 1469 seen_resize = 1;
1453 resize_all_windows (width, height, 1); 1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1454 } 1471 }
1455 1472
1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1457 if (options & Opt_transparent) 1474 if (OPTION (Opt_transparent))
1458 {
1459 check_our_parents (); 1475 check_our_parents ();
1460 if (am_transparent)
1461 want_refresh = want_full_refresh = 1;
1462 }
1463#endif 1476#endif
1464 } 1477 }
1465 break; 1478 break;
1466 1479
1467 case PropertyNotify: 1480 case PropertyNotify:
… …
1475 selection_clear (); 1488 selection_clear ();
1476 break; 1489 break;
1477 1490
1478 case SelectionNotify: 1491 case SelectionNotify:
1479 if (selection_wait == Sel_normal) 1492 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, 1493 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 ev.xselection.property, True);
1482 break; 1494 break;
1483 1495
1484 case SelectionRequest: 1496 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1497 selection_send (ev.xselectionrequest);
1486 break; 1498 break;
1487 1499
1488 case UnmapNotify: 1500 case UnmapNotify:
1489 TermWin.mapped = 0; 1501 mapped = 0;
1490#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1491 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1492#endif 1504#endif
1493 break; 1505 break;
1494 1506
1495 case MapNotify: 1507 case MapNotify:
1496 TermWin.mapped = 1; 1508 mapped = 1;
1497#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1498 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1499#endif 1511#endif
1500 break; 1512 break;
1501 1513
… …
1505 break; 1517 break;
1506#endif /* TRANSPARENT */ 1518#endif /* TRANSPARENT */
1507 1519
1508 case GraphicsExpose: 1520 case GraphicsExpose:
1509 case Expose: 1521 case Expose:
1510 if (ev.xany.window == TermWin.vt) 1522 if (ev.xany.window == vt)
1511 { 1523 {
1512 do 1524 do
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1516 1528
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518 1530
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1520 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1521 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1522 1534
1523 scr_refresh (refresh_type); 1535 scr_refresh (refresh_type);
1524 } 1536 }
1525 else 1537 else
1526 { 1538 {
1527 XEvent unused_event; 1539 XEvent unused_event;
1528 1540
1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1530 ; 1542 ;
1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1543 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1544 ;
1533 1545
1534 if (isScrollbarWindow (ev.xany.window)) 1546 if (isScrollbarWindow (ev.xany.window))
1535 { 1547 {
1536 scrollBar.setIdle (); 1548 scrollBar.setIdle ();
… …
1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1541 menubar_expose (); 1553 menubar_expose ();
1542#endif 1554#endif
1543 1555
1544#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1557 if (am_transparent && ev.xany.window == parent[0])
1546 XClearWindow (display->display, ev.xany.window); 1558 XClearWindow (disp, ev.xany.window);
1547#endif 1559#endif
1548 } 1560 }
1549 break; 1561 break;
1550 1562
1551 case MotionNotify: 1563 case MotionNotify:
… …
1561 } 1573 }
1562#endif 1574#endif
1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1564 break; 1576 break;
1565 1577
1566 if (ev.xany.window == TermWin.vt) 1578 if (ev.xany.window == vt)
1567 { 1579 {
1568 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1581 {
1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1571 ; 1583 ;
1572 1584
1573 XQueryPointer (display->display, TermWin.vt, 1585 XQueryPointer (disp, vt,
1574 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1589 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1590#endif 1602#endif
1591 selection_extend (ev.xbutton.x, ev.xbutton.y, 1603 selection_extend (ev.xbutton.x, ev.xbutton.y,
1592 ev.xbutton.state & Button3Mask ? 2 : 0); 1604 ev.xbutton.state & Button3Mask ? 2 : 0);
1593 1605
1594#ifdef SELECTION_SCROLLING 1606#ifdef SELECTION_SCROLLING
1595 if (ev.xbutton.y < TermWin.int_bwidth 1607 if (ev.xbutton.y < int_bwidth
1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1608 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1597 { 1609 {
1598 int dist; 1610 int dist;
1599 1611
1600 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
… …
1609 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1610 selection_save_y = ev.xbutton.y; 1622 selection_save_y = ev.xbutton.y;
1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1623 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1612 1624
1613 /* calc number of lines to scroll */ 1625 /* calc number of lines to scroll */
1614 if (ev.xbutton.y < TermWin.int_bwidth) 1626 if (ev.xbutton.y < int_bwidth)
1615 { 1627 {
1616 scroll_selection_dir = UP; 1628 scroll_selection_dir = UP;
1617 dist = TermWin.int_bwidth - ev.xbutton.y; 1629 dist = int_bwidth - ev.xbutton.y;
1618 } 1630 }
1619 else 1631 else
1620 { 1632 {
1621 scroll_selection_dir = DN; 1633 scroll_selection_dir = DN;
1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1634 dist = ev.xbutton.y - (int_bwidth + height);
1623 } 1635 }
1624 1636
1625 scroll_selection_lines = Pixel2Height (dist) 1637 scroll_selection_lines = Pixel2Height (dist)
1626 / SELECTION_SCROLL_LINE_SPEEDUP 1638 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1; 1639 + 1;
1628 MIN_IT (scroll_selection_lines, 1640 min_it (scroll_selection_lines,
1629 SELECTION_SCROLL_MAX_LINES); 1641 SELECTION_SCROLL_MAX_LINES);
1630 } 1642 }
1631 else 1643 else
1632 { 1644 {
1633 /* we are within the text window, so we 1645 /* we are within the text window, so we
… …
1642#endif 1654#endif
1643 } 1655 }
1644 } 1656 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1658 {
1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1659 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1648 MotionNotify, &ev)) 1660 MotionNotify, &ev))
1649 ; 1661 ;
1650 1662
1651 XQueryPointer (display->display, scrollBar.win, 1663 XQueryPointer (disp, scrollBar.win,
1652 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1666 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1667 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1661 } 1673 }
1662 break; 1674 break;
1663 } 1675 }
1664} 1676}
1665 1677
1678void
1679rxvt_term::focus_in ()
1680{
1681 if (!focus)
1682 {
1683 focus = 1;
1684 want_refresh = 1;
1685#if USE_XIM
1686 if (Input_Context != NULL)
1687 {
1688 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context);
1690 }
1691#endif
1692#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1695#endif
1696#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade])
1698 {
1699 pix_colors = pix_colors_focused;
1700 scr_recolour ();
1701 }
1702#endif
1703 }
1704}
1705
1706void
1707rxvt_term::focus_out ()
1708{
1709 if (focus)
1710 {
1711 focus = 0;
1712 want_refresh = 1;
1713
1714#if ENABLE_FRILLS || ISO_14755
1715 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY
1718 scr_overlay_off ();
1719#endif
1720#if USE_XIM
1721 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context);
1723#endif
1724#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink))
1726 cursor_blink_ev.stop ();
1727 hidden_cursor = 0;
1728#endif
1729#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade])
1731 {
1732 pix_colors = pix_colors_unfocused;
1733 scr_recolour ();
1734 }
1735#endif
1736 }
1737}
1738
1666#if TRANSPARENT 1739#if TRANSPARENT
1667void 1740void
1668rxvt_term::rootwin_cb (XEvent &ev) 1741rxvt_term::rootwin_cb (XEvent &ev)
1669{ 1742{
1670 SET_R (this); 1743 SET_R (this);
… …
1675 case PropertyNotify: 1748 case PropertyNotify:
1676 /* 1749 /*
1677 * if user used some Esetroot compatible prog to set the root bg, 1750 * if user used some Esetroot compatible prog to set the root bg,
1678 * use the property to determine the pixmap. We use it later on. 1751 * use the property to determine the pixmap. We use it later on.
1679 */ 1752 */
1680 if (xa[XA_XROOTPMAPID] == 0)
1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1682
1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1753 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1684 return; 1755 return;
1685 1756
1686 /* FALLTHROUGH */ 1757 /* FALLTHROUGH */
1687 case ReparentNotify: 1758 case ReparentNotify:
1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1689 want_refresh = want_full_refresh = 1; 1760 want_refresh = want_full_refresh = 1;
1690 break; 1761 break;
1691 } 1762 }
1692} 1763}
1693#endif 1764#endif
… …
1702 reportmode = !! (priv_modes & PrivMode_mouse_report); 1773 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703 1774
1704 /* 1775 /*
1705 * VT window processing of button press 1776 * VT window processing of button press
1706 */ 1777 */
1707 if (ev.window == TermWin.vt) 1778 if (ev.window == vt)
1708 { 1779 {
1709#if ISO_14755 1780#if ISO_14755
1710 // 5.4 1781 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 { 1783 {
… …
1760 { 1831 {
1761 case Button1: 1832 case Button1:
1762 /* allow meta + click to select rectangular areas */ 1833 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */ 1834 /* should be done in screen.C */
1764#if ENABLE_FRILLS 1835#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask); 1836 selection.rect = !!(ev.state & ModMetaMask);
1766#else 1837#else
1767 selection.rect = false; 1838 selection.rect = false;
1768#endif 1839#endif
1769 1840
1770 /* allow shift+left click to extend selection */ 1841 /* allow shift+left click to extend selection */
… …
1917 case Button3: 1988 case Button3:
1918 if (scrollBar.style != R_SB_XTERM) 1989 if (scrollBar.style != R_SB_XTERM)
1919 { 1990 {
1920 if (scrollbar_above_slider (ev.y)) 1991 if (scrollbar_above_slider (ev.y))
1921# ifdef RXVT_SCROLL_FULL 1992# ifdef RXVT_SCROLL_FULL
1922 scr_page (UP, TermWin.nrow - 1); 1993 scr_page (UP, nrow - 1);
1923# else 1994# else
1924 scr_page (UP, TermWin.nrow / 4); 1995 scr_page (UP, nrow / 4);
1925# endif 1996# endif
1926 else if (scrollbar_below_slider (ev.y)) 1997 else if (scrollbar_below_slider (ev.y))
1927# ifdef RXVT_SCROLL_FULL 1998# ifdef RXVT_SCROLL_FULL
1928 scr_page (DN, TermWin.nrow - 1); 1999 scr_page (DN, nrow - 1);
1929# else 2000# else
1930 scr_page (DN, TermWin.nrow / 4); 2001 scr_page (DN, nrow / 4);
1931# endif 2002# endif
1932 else 2003 else
1933 scrollBar.setMotion (); 2004 scrollBar.setMotion ();
1934 } 2005 }
1935 else 2006 else
1936 { 2007 {
1937 scr_page ((ev.button == Button1 ? DN : UP), 2008 scr_page ((ev.button == Button1 ? DN : UP),
1938 (TermWin.nrow 2009 (nrow
1939 * scrollbar_position (ev.y) 2010 * scrollbar_position (ev.y)
1940 / scrollbar_size ())); 2011 / scrollbar_size ()));
1941 } 2012 }
1942 2013
1943 break; 2014 break;
… …
1975#ifdef SELECTION_SCROLLING 2046#ifdef SELECTION_SCROLLING
1976 if (sel_scroll_ev.active) 2047 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop(); 2048 sel_scroll_ev.stop();
1978#endif 2049#endif
1979 2050
1980 if (ev.window == TermWin.vt) 2051 if (ev.window == vt)
1981 { 2052 {
1982#if ISO_14755 2053#if ISO_14755
1983 // 5.4 2054 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return; 2056 return;
… …
2035 2106
2036 v = ev.button == Button4 ? UP : DN; 2107 v = ev.button == Button4 ? UP : DN;
2037 2108
2038 if (ev.state & ShiftMask) 2109 if (ev.state & ShiftMask)
2039 i = 1; 2110 i = 1;
2040 else if (options & Opt_mouseWheelScrollPage) 2111 else if (OPTION (Opt_mouseWheelScrollPage))
2041 i = TermWin.nrow - 1; 2112 i = nrow - 1;
2042 else 2113 else
2043 i = 5; 2114 i = 5;
2044 2115
2045# ifdef MOUSE_SLIP_WHEELING 2116# ifdef MOUSE_SLIP_WHEELING
2046 if (ev.state & ControlMask) 2117 if (ev.state & ControlMask)
2047 { 2118 {
2048 mouse_slip_wheel_speed += v ? -1 : 1; 2119 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2051 2122
2052 if (slip_wheel_ev.at < NOW) 2123 if (slip_wheel_ev.at < NOW)
2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054 2125
2055 slip_wheel_ev.start (); 2126 slip_wheel_ev.start ();
… …
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2167 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2168 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2169 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i; 2170 int i;
2100 2171
2101 Visual* visual = display->visual; 2172 Visual *visual = display->visual;
2102 2173
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2174 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104 2175
2105 /* for convenience */ 2176 /* for convenience */
2106 mask_r = visual->red_mask; 2177 mask_r = visual->red_mask;
… …
2327 Atom atype; 2398 Atom atype;
2328 unsigned char *prop = NULL; 2399 unsigned char *prop = NULL;
2329 Window root, oldp, *list; 2400 Window root, oldp, *list;
2330 Pixmap rootpixmap = None; 2401 Pixmap rootpixmap = None;
2331 XWindowAttributes wattr, wrootattr; 2402 XWindowAttributes wattr, wrootattr;
2403 dDisp;
2332 2404
2333 pchanged = 0; 2405 pchanged = 0;
2334 2406
2335 if (!(options & Opt_transparent)) 2407 if (!OPTION (Opt_transparent))
2336 return pchanged; /* Don't try any more */ 2408 return pchanged; /* Don't try any more */
2337 2409
2338 XGetWindowAttributes (display->display, display->root, &wrootattr); 2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2339 rootdepth = wrootattr.depth; 2411 rootdepth = wrootattr.depth;
2340 2412
2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2413 XGetWindowAttributes (disp, parent[0], &wattr);
2342 2414
2343 if (rootdepth != wattr.depth) 2415 if (rootdepth != wattr.depth)
2344 { 2416 {
2345 if (am_transparent) 2417 if (am_transparent)
2346 { 2418 {
2347 pchanged = 1; 2419 pchanged = 1;
2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2349 am_transparent = am_pixmap_trans = 0; 2421 am_transparent = am_pixmap_trans = 0;
2350 } 2422 }
2351 2423
2352 return pchanged; /* Don't try any more */ 2424 return pchanged; /* Don't try any more */
2353 } 2425 }
2354 2426
2355 /* Get all X ops out of the queue so that our information is up-to-date. */ 2427 /* Get all X ops out of the queue so that our information is up-to-date. */
2356 XSync (display->display, False); 2428 XSync (disp, False);
2357 2429
2358 /* 2430 /*
2359 * Make the frame window set by the window manager have 2431 * Make the frame window set by the window manager have
2360 * the root background. Some window managers put multiple nested frame 2432 * the root background. Some window managers put multiple nested frame
2361 * windows for each client, so we have to take care about that. 2433 * windows for each client, so we have to take care about that.
2362 */ 2434 */
2363 i = (xa[XA_XROOTPMAPID] 2435 i = (xa[XA_XROOTPMAP_ID]
2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2436 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2437 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2366 &nitems, &bytes_after, &prop) == Success); 2438 &nitems, &bytes_after, &prop) == Success);
2367 2439
2368 if (!i || prop == NULL) 2440 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID] 2441 i = (xa[XA_ESETROOT_PMAP_ID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2442 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2443 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success); 2444 &nitems, &bytes_after, &prop) == Success);
2373 2445
2374 if (!i || prop == NULL 2446 if (!i || prop == NULL
2375#if TINTING 2447#if TINTING
… …
2394 Window cr; 2466 Window cr;
2395 XImage *image; 2467 XImage *image;
2396 GC gc; 2468 GC gc;
2397 XGCValues gcvalue; 2469 XGCValues gcvalue;
2398 2470
2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2471 XTranslateCoordinates (disp, parent[0], display->root,
2400 0, 0, &sx, &sy, &cr); 2472 0, 0, &sx, &sy, &cr);
2401 nw = (unsigned int)szHint.width; 2473 nw = (unsigned int)szHint.width;
2402 nh = (unsigned int)szHint.height; 2474 nh = (unsigned int)szHint.height;
2403 nx = ny = 0; 2475 nx = ny = 0;
2404 2476
… …
2414 nh += sy; 2486 nh += sy;
2415 ny = -sy; 2487 ny = -sy;
2416 sy = 0; 2488 sy = 0;
2417 } 2489 }
2418 2490
2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2493
2494 XSync (disp, False);
2421 allowedxerror = -1; 2495 allowedxerror = -1;
2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2423 2497
2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2498 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2425 /* XXX: may need a delay here? */ 2499 /* XXX: may need a delay here? */
2426 allowedxerror = 0; 2500 allowedxerror = 0;
2427 2501
2428 if (image == NULL) 2502 if (image == NULL)
2429 { 2503 {
2430 if (am_transparent && am_pixmap_trans) 2504 if (am_transparent && am_pixmap_trans)
2431 { 2505 {
2432 pchanged = 1; 2506 pchanged = 1;
2433 if (TermWin.pixmap != None) 2507 if (pixmap != None)
2434 { 2508 {
2435 XFreePixmap (display->display, TermWin.pixmap); 2509 XFreePixmap (disp, pixmap);
2436 TermWin.pixmap = None; 2510 pixmap = None;
2437 } 2511 }
2438 } 2512 }
2439 2513
2440 am_pixmap_trans = 0; 2514 am_pixmap_trans = 0;
2441 } 2515 }
2442 else 2516 else
2443 { 2517 {
2444 if (TermWin.pixmap != None) 2518 if (pixmap != None)
2445 XFreePixmap (display->display, TermWin.pixmap); 2519 XFreePixmap (disp, pixmap);
2446 2520
2447#if TINTING 2521#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint)) 2522 if (ISSET_PIXCOLOR (Color_tint))
2449 { 2523 {
2450 unsigned short rm, gm, bm; 2524 unsigned short rm, gm, bm;
… …
2454 2528
2455 ShadeXImage (display, image, shade, rm, gm, bm); 2529 ShadeXImage (display, image, shade, rm, gm, bm);
2456 } 2530 }
2457#endif 2531#endif
2458 2532
2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2533 pixmap = XCreatePixmap (disp, vt,
2460 szHint.width, szHint.height, image->depth); 2534 szHint.width, szHint.height, image->depth);
2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2463 nx, ny, image->width, image->height); 2537 nx, ny, image->width, image->height);
2464 XFreeGC (display->display, gc); 2538 XFreeGC (disp, gc);
2465 XDestroyImage (image); 2539 XDestroyImage (image);
2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2467 XClearWindow (display->display, TermWin.parent[0]); 2541 XClearWindow (disp, parent[0]);
2468 2542
2469 if (!am_transparent || !am_pixmap_trans) 2543 if (!am_transparent || !am_pixmap_trans)
2470 pchanged = 1; 2544 pchanged = 1;
2471 2545
2472 am_transparent = am_pixmap_trans = 1; 2546 am_transparent = am_pixmap_trans = 1;
2473 } 2547 }
2474 } 2548 }
2475 2549
2476 if (!am_pixmap_trans) 2550 if (am_pixmap_trans)
2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2552 else
2477 { 2553 {
2478 unsigned int n; 2554 unsigned int n;
2479 /* 2555 /*
2480 * InheritPixmap transparency 2556 * InheritPixmap transparency
2481 */ 2557 */
2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2483 { 2559 {
2484 oldp = TermWin.parent[i]; 2560 oldp = parent[i];
2485 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2561 XQueryTree (disp, parent[i - 1], &root,
2486 &TermWin.parent[i], &list, &n); 2562 &parent[i], &list, &n);
2487 XFree (list); 2563 XFree (list);
2488 2564
2489 if (TermWin.parent[i] == display->root) 2565 if (parent[i] == display->root)
2490 { 2566 {
2491 if (oldp != None) 2567 if (oldp != None)
2492 pchanged = 1; 2568 pchanged = 1;
2493 2569
2494 break; 2570 break;
2495 } 2571 }
2496 2572
2497 if (oldp != TermWin.parent[i]) 2573 if (oldp != parent[i])
2498 pchanged = 1; 2574 pchanged = 1;
2499 } 2575 }
2500 2576
2501 n = 0; 2577 n = 0;
2502 2578
2503 if (pchanged) 2579 if (pchanged)
2504 { 2580 {
2505 for (; n < (unsigned int)i; n++) 2581 for (; n < (unsigned int)i; n++)
2506 { 2582 {
2507 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2583 XGetWindowAttributes (disp, parent[n], &wattr);
2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2509 { 2585 {
2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2511 break; 2587 break;
2512 } 2588 }
2513 } 2589 }
2514 } 2590 }
2515 2591
2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2517 { 2593 {
2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2520 am_transparent = 0; 2596 am_transparent = 0;
2521 /* XXX: also turn off Opt_transparent? */ 2597 /* XXX: also turn off Opt_transparent? */
2522 } 2598 }
2523 else 2599 else
2524 { 2600 {
… …
2527 * needed for fvwm2.2.2 (and before?) */ 2603 * needed for fvwm2.2.2 (and before?) */
2528 sleep (1); 2604 sleep (1);
2529#endif 2605#endif
2530 for (n = 0; n < (unsigned int)i; n++) 2606 for (n = 0; n < (unsigned int)i; n++)
2531 { 2607 {
2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2533 XClearWindow (display->display, TermWin.parent[n]); 2609 XClearWindow (disp, parent[n]);
2534 } 2610 }
2535 2611
2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2537 am_transparent = 1; 2613 am_transparent = 1;
2538 } 2614 }
2539 2615
2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2541 TermWin.parent[i] = None; 2617 parent[i] = None;
2542 } 2618 }
2543 2619
2544 if (scrollBar.win) 2620 if (scrollBar.win)
2545 { 2621 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle (); 2623 scrollBar.setIdle ();
2548 scrollbar_show (0); 2624 scrollbar_show (0);
2625 }
2626
2627 if (am_transparent)
2628 {
2629 want_refresh = want_full_refresh = 1;
2630 if (am_pixmap_trans)
2631 flush ();
2549 } 2632 }
2550 2633
2551 return pchanged; 2634 return pchanged;
2552} 2635}
2553#endif 2636#endif
… …
2582 // some window managers resize the window early, and these programs 2665 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong. 2666 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike 2667 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being 2668 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized. 2669 // resized.
2587 if (seen_resize) 2670 if (seen_resize && cmd_pid)
2588 kill (-cmd_pid, SIGWINCH); 2671 kill (-cmd_pid, SIGWINCH);
2589 } 2672 }
2590 2673
2591 /* Read a text string from the input buffer */ 2674 /* Read a text string from the input buffer */
2592 unicode_t buf[UBUFSIZ]; 2675 unicode_t buf[UBUFSIZ];
2593 bool refreshnow = false; 2676 bool refreshnow = false;
2594 int nlines = 0; 2677 int nlines = 0;
2595 unicode_t *str = buf; 2678 unicode_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ);
2596 2680
2597 for (;;) 2681 for (;;)
2598 { 2682 {
2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2600 break; 2684 break;
2601 2685
2602 *str++ = ch; 2686 *str++ = ch;
2603 2687
2604 if (ch == C0_LF) 2688 if (ch == C0_LF || str >= eol)
2605 { 2689 {
2690 if (ch == C0_LF)
2606 nlines++; 2691 nlines++;
2692
2607 refresh_count++; 2693 refresh_count++;
2608 2694
2609 if (!(options & Opt_jumpScroll) 2695 if (!OPTION (Opt_jumpScroll)
2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2611 { 2697 {
2612 refreshnow = true; 2698 refreshnow = true;
2613 ch = NOCHAR; 2699 ch = NOCHAR;
2614 break; 2700 break;
2615 } 2701 }
2616 2702
2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2703 // scr_add_lines only works for nlines <= nrow - 1.
2618 if (nlines >= TermWin.nrow - 1) 2704 if (nlines >= nrow - 1)
2619 { 2705 {
2620 scr_add_lines (buf, nlines, str - buf); 2706 scr_add_lines (buf, nlines, str - buf);
2621 nlines = 0; 2707 nlines = 0;
2622 str = buf; 2708 str = buf;
2709 eol = str + min (ncol, UBUFSIZ);
2623 } 2710 }
2624 }
2625 2711
2626 if (str >= buf + UBUFSIZ) 2712 if (str >= eol)
2627 { 2713 {
2714 if (eol >= buf + UBUFSIZ)
2715 {
2628 ch = NOCHAR; 2716 ch = NOCHAR;
2629 break; 2717 break;
2718 }
2719 else
2720 eol = min (eol + ncol, buf + UBUFSIZ);
2721 }
2722
2630 } 2723 }
2631 2724
2632 seq_begin = cmdbuf_ptr; 2725 seq_begin = cmdbuf_ptr;
2633 ch = next_char (); 2726 ch = next_char ();
2634 } 2727 }
… …
2641 * the number of pages between refreshes is refresh_limit, which 2734 * the number of pages between refreshes is refresh_limit, which
2642 * is incremented here because we must be doing flat-out scrolling. 2735 * is incremented here because we must be doing flat-out scrolling.
2643 */ 2736 */
2644 if (refreshnow) 2737 if (refreshnow)
2645 { 2738 {
2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2647 refresh_limit++; 2740 refresh_limit++;
2648 else 2741 else
2649 { 2742 {
2650 flag = true; 2743 flag = true;
2651 scr_refresh (refresh_type); 2744 scr_refresh (refresh_type);
… …
2705 if (len == (size_t)-1) 2798 if (len == (size_t)-1)
2706 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2799 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2707 2800
2708 // assume wchar == unicode 2801 // assume wchar == unicode
2709 cmdbuf_ptr += len; 2802 cmdbuf_ptr += len;
2710 return wc; 2803 return wc & UNICODE_MASK;
2711 } 2804 }
2712 2805
2713 return NOCHAR; 2806 return NOCHAR;
2714} 2807}
2715 2808
… …
3178 { 3271 {
3179 switch (priv) 3272 switch (priv)
3180 { 3273 {
3181 case '>': 3274 case '>':
3182 if (ch == CSI_DA) /* secondary device attributes */ 3275 if (ch == CSI_DA) /* secondary device attributes */
3183 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3276 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3184 break; 3277 break;
3185 case '?': 3278 case '?':
3186 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3279 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3187 process_terminal_mode (ch, priv, nargs, arg); 3280 process_terminal_mode (ch, priv, nargs, arg);
3188 break; 3281 break;
… …
3293 3386
3294 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3387 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3295 arg[0] = -arg[0]; 3388 arg[0] = -arg[0];
3296 /* FALLTHROUGH */ 3389 /* FALLTHROUGH */
3297 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3299 break; 3392 break;
3300 3393
3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3302 tt_write ((const unsigned char *)VT100_ANS, 3395 tt_write ((const unsigned char *)VT100_ANS,
3303 (unsigned int) (sizeof (VT100_ANS) - 1)); 3396 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3315 break; 3408 break;
3316 case 6: /* CPR requested */ 3409 case 6: /* CPR requested */
3317 scr_report_position (); 3410 scr_report_position ();
3318 break; 3411 break;
3319 case 7: /* unofficial extension */ 3412 case 7: /* unofficial extension */
3320 if (options & Opt_insecure) 3413 if (OPTION (Opt_insecure))
3321 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3414 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3322 break; 3415 break;
3323 case 8: /* unofficial extension */ 3416 case 8: /* unofficial extension */
3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3325 break; 3418 break;
… …
3417rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3510rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3418{ 3511{
3419 int x, y; 3512 int x, y;
3420 XWindowAttributes wattr; 3513 XWindowAttributes wattr;
3421 Window wdummy; 3514 Window wdummy;
3515 dDisp;
3422 3516
3423 if (nargs == 0) 3517 if (nargs == 0)
3424 return; 3518 return;
3425 3519
3426 switch (args[0]) 3520 switch (args[0])
3427 { 3521 {
3428 /* 3522 /*
3429 * commands 3523 * commands
3430 */ 3524 */
3431 case 1: /* deiconify window */ 3525 case 1: /* deiconify window */
3432 XMapWindow (display->display, TermWin.parent[0]); 3526 XMapWindow (disp, parent[0]);
3433 break; 3527 break;
3434 case 2: /* iconify window */ 3528 case 2: /* iconify window */
3435 XIconifyWindow (display->display, TermWin.parent[0], 3529 XIconifyWindow (disp, parent[0], display->screen);
3436 DefaultScreen (display->display));
3437 break; 3530 break;
3438 case 3: /* set position (pixels) */ 3531 case 3: /* set position (pixels) */
3439 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3532 XMoveWindow (disp, parent[0], args[1], args[2]);
3440 break; 3533 break;
3441 case 4: /* set size (pixels) */ 3534 case 4: /* set size (pixels) */
3442 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3535 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3443 break; 3536 break;
3444 case 5: /* raise window */ 3537 case 5: /* raise window */
3445 XRaiseWindow (display->display, TermWin.parent[0]); 3538 XRaiseWindow (disp, parent[0]);
3446 break; 3539 break;
3447 case 6: /* lower window */ 3540 case 6: /* lower window */
3448 XLowerWindow (display->display, TermWin.parent[0]); 3541 XLowerWindow (disp, parent[0]);
3449 break; 3542 break;
3450 case 7: /* refresh window */ 3543 case 7: /* refresh window */
3451 scr_touch (true); 3544 scr_touch (true);
3452 break; 3545 break;
3453 case 8: /* set size (chars) */ 3546 case 8: /* set size (chars) */
3454 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3547 set_widthheight ((unsigned int) (args[2] * fwidth),
3455 (unsigned int) (args[1] * TermWin.fheight)); 3548 (unsigned int) (args[1] * fheight));
3456 break; 3549 break;
3457 3550
3458 //case 9: NYI, TODO, restore maximized window or maximize window 3551 //case 9: NYI, TODO, restore maximized window or maximize window
3459 default: 3552 default:
3460 if (args[0] >= 24) /* set height (chars) */ 3553 if (args[0] >= 24) /* set height (chars) */
3461 set_widthheight ((unsigned int)TermWin.width, 3554 set_widthheight ((unsigned int)width,
3462 (unsigned int) (args[1] * TermWin.fheight)); 3555 (unsigned int) (args[1] * fheight));
3463 break; 3556 break;
3464 3557
3465 3558
3466 /* 3559 /*
3467 * reports - some output format copied from XTerm 3560 * reports - some output format copied from XTerm
3468 */ 3561 */
3469 case 11: /* report window state */ 3562 case 11: /* report window state */
3470 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3563 XGetWindowAttributes (disp, parent[0], &wattr);
3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3564 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3472 break; 3565 break;
3473 case 13: /* report window position */ 3566 case 13: /* report window position */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3567 XGetWindowAttributes (disp, parent[0], &wattr);
3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3568 XTranslateCoordinates (disp, parent[0], wattr.root,
3476 -wattr.border_width, -wattr.border_width, 3569 -wattr.border_width, -wattr.border_width,
3477 &x, &y, &wdummy); 3570 &x, &y, &wdummy);
3478 tt_printf ("\033[3;%d;%dt", x, y); 3571 tt_printf ("\033[3;%d;%dt", x, y);
3479 break; 3572 break;
3480 case 14: /* report window size (pixels) */ 3573 case 14: /* report window size (pixels) */
3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3574 XGetWindowAttributes (disp, parent[0], &wattr);
3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3575 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3483 break; 3576 break;
3484 case 18: /* report text area size (chars) */ 3577 case 18: /* report text area size (chars) */
3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3578 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3486 break; 3579 break;
3487 case 19: /* report window size (chars) */ 3580 case 19: /* report window size (chars) */
3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3581 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3489 break; 3582 break;
3490 case 20: /* report icon label */ 3583 case 20: /* report icon label */
3491 { 3584 {
3492 char *s; 3585 char *s;
3493 XGetIconName (display->display, TermWin.parent[0], &s); 3586 XGetIconName (disp, parent[0], &s);
3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s); 3588 XFree (s);
3496 } 3589 }
3497 break; 3590 break;
3498 case 21: /* report window title */ 3591 case 21: /* report window title */
3499 { 3592 {
3500 char *s; 3593 char *s;
3501 XFetchName (display->display, TermWin.parent[0], &s); 3594 XFetchName (disp, parent[0], &s);
3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s); 3596 XFree (s);
3504 } 3597 }
3505 break; 3598 break;
3506 } 3599 }
3507} 3600}
… …
3513 * ends_how is terminator used. returned input must be free()'d 3606 * ends_how is terminator used. returned input must be free()'d
3514 */ 3607 */
3515unsigned char * 3608unsigned char *
3516rxvt_term::get_to_st (unicode_t &ends_how) 3609rxvt_term::get_to_st (unicode_t &ends_how)
3517{ 3610{
3518 unicode_t seen_esc = 0, ch; 3611 unicode_t ch;
3612 bool seen_esc = false;
3519 unsigned int n = 0; 3613 unsigned int n = 0;
3520 unsigned char *s;
3521 unsigned char string[STRING_MAX]; 3614 wchar_t string[STRING_MAX];
3522 3615
3523 while ((ch = cmd_getc ()) != NOCHAR) 3616 while ((ch = cmd_getc ()) != NOCHAR)
3524 { 3617 {
3525 if (seen_esc) 3618 if (seen_esc)
3526 { 3619 {
… …
3529 else 3622 else
3530 return NULL; 3623 return NULL;
3531 } 3624 }
3532 else if (ch == C0_ESC) 3625 else if (ch == C0_ESC)
3533 { 3626 {
3534 seen_esc = 1; 3627 seen_esc = true;
3535 continue; 3628 continue;
3536 } 3629 }
3537 else if (ch == C0_BEL || ch == CHAR_ST) 3630 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break; 3631 break;
3539 else if (ch < 0x20) 3632 else if (ch < 0x20)
3540 return NULL; /* other control character - exit */ 3633 return NULL; /* other control character - exit */
3541 3634
3542 seen_esc = 0; 3635 seen_esc = false;
3543 3636
3544 if (n >= sizeof (string) - 1) 3637 if (n >= STRING_MAX - 1)
3545 // stop at some sane length 3638 // stop at some sane length
3546 return NULL; 3639 return NULL;
3547 3640
3548 if (ch == C0_SYN) 3641 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 (); 3642 string[n++] = cmd_get8 ();
… …
3551 string[n++] = ch; 3644 string[n++] = ch;
3552 } 3645 }
3553 3646
3554 string[n++] = '\0'; 3647 string[n++] = '\0';
3555 3648
3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3557 return NULL;
3558
3559 ends_how = (ch == 0x5c ? C0_ESC : ch); 3649 ends_how = (ch == 0x5c ? C0_ESC : ch);
3560 strncpy (s, string, n); 3650
3561 return s; 3651 return (unsigned char *)rxvt_wcstombs (string);
3562} 3652}
3563 3653
3564/*----------------------------------------------------------------------*/ 3654/*----------------------------------------------------------------------*/
3565/* 3655/*
3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3620 set_window_color (color, str); 3710 set_window_color (color, str);
3621} 3711}
3622 3712
3623/* 3713/*
3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3625 * 0 = change iconName/title
3626 * 1 = change iconName
3627 * 2 = change title
3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
3631 * 12 = change text color
3632 * 13 = change mouse foreground color
3633 * 17 = change highlight character colour
3634 * 18 = change bold character color
3635 * 19 = change underlined character color
3636 * 46 = change logfile (not implemented)
3637 * 50 = change font
3638 *
3639 * rxvt extensions:
3640 * 20 = bg pixmap
3641 * 39 = change default fg color
3642 * 49 = change default bg color
3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
3647 */ 3715 */
3648void 3716void
3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3650{ 3718{
3651 int changed = 0; 3719 int changed = 0;
3652 int color; 3720 int color;
3653 char *buf, *name; 3721 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3655 int saveop = op; 3723 int saveop = op;
3724 dDisp;
3656 3725
3657 assert (str != NULL); 3726 assert (str != NULL);
3658 switch (op) 3727 switch (op)
3659 { 3728 {
3660 case XTerm_name: 3729 case XTerm_name:
… …
3667 set_title (str); 3736 set_title (str);
3668 break; 3737 break;
3669 case XTerm_property: 3738 case XTerm_property:
3670 if (str[0] == '?') 3739 if (str[0] == '?')
3671 { 3740 {
3672 Atom prop = XInternAtom (display->display, str + 1, True); 3741 Atom prop = display->atom (str + 1);
3673 Atom actual_type; 3742 Atom actual_type;
3674 int actual_format; 3743 int actual_format;
3675 unsigned long nitems; 3744 unsigned long nitems;
3676 unsigned long bytes_after; 3745 unsigned long bytes_after;
3677 unsigned char *value = 0; 3746 unsigned char *value = 0;
3678 const char *str = ""; 3747 const char *str = "";
3679 3748
3680 if (prop 3749 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0], 3750 && XGetWindowProperty (disp, parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType, 3751 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format, 3752 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success 3753 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None 3754 && actual_type != None
3686 && actual_format == 8) 3755 && actual_format == 8)
… …
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3764 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696 3765
3697 if (eq) 3766 if (eq)
3698 { 3767 {
3699 *eq = 0; 3768 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0], 3769 set_utf8_property (display->atom (str), eq + 1);
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 } 3770 }
3705 else 3771 else
3706 XDeleteProperty (display->display, TermWin.parent[0], 3772 XDeleteProperty (disp, parent[0],
3707 display->atom (str)); 3773 display->atom (str));
3708 } 3774 }
3709 break; 3775 break;
3710 3776
3711 case XTerm_Color: 3777 case XTerm_Color:
… …
3752 break; 3818 break;
3753#ifndef NO_BOLD_UNDERLINE_REVERSE 3819#ifndef NO_BOLD_UNDERLINE_REVERSE
3754 case XTerm_Color_BD: 3820 case XTerm_Color_BD:
3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3821 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break; 3822 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759 break;
3760 case XTerm_Color_UL: 3823 case XTerm_Color_UL:
3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3824 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3762 break; 3825 break;
3763 case XTerm_Color_RV: 3826 case XTerm_Color_RV:
3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3827 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3765 break; 3828 break;
3829 case URxvt_Color_IT:
3830 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3831 break;
3766#endif 3832#endif
3767#if TRANSPARENT && TINTING 3833#if TRANSPARENT && TINTING
3768 case XTerm_Color_tint: 3834 case URxvt_Color_tint:
3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3835 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3770 check_our_parents (); 3836 check_our_parents ();
3771 if (am_transparent) 3837 if (am_transparent)
3772 want_full_refresh = want_refresh = 1; 3838 want_full_refresh = want_refresh = 1;
3773 break; 3839 break;
3774#endif 3840#endif
… …
3786 { 3852 {
3787 str++; 3853 str++;
3788#if XPM_BACKGROUND 3854#if XPM_BACKGROUND
3789 changed += scale_pixmap (str); 3855 changed += scale_pixmap (str);
3790#endif 3856#endif
3791
3792 } 3857 }
3858
3793 if (changed) 3859 if (changed)
3794 { 3860 {
3795#ifdef XPM_BACKGROUND 3861#ifdef XPM_BACKGROUND
3796 resize_pixmap (); 3862 resize_pixmap ();
3797#endif 3863#endif
… …
3808 3874
3809 case XTerm_logfile: 3875 case XTerm_logfile:
3810 // TODO, when secure mode? 3876 // TODO, when secure mode?
3811 break; 3877 break;
3812 3878
3879#ifdef MENUBAR
3880 case URxvt_Menu:
3881 if (OPTION (Opt_insecure))
3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3883 break;
3884#endif
3885#if 0
3886 case XTerm_dumpscreen: /* no error notices */
3887 {
3888 int fd;
3889 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3890 {
3891 scr_dump (fd);
3892 close (fd);
3893 }
3894 }
3895 break;
3896#endif
3813 case XTerm_font: 3897 case XTerm_font:
3814 op = URxvt_font; 3898 op = URxvt_font;
3815 case URxvt_font: 3899 case URxvt_font:
3816#if ENABLE_STYLES 3900#if ENABLE_STYLES
3817 case URxvt_boldFont: 3901 case URxvt_boldFont:
3818 case URxvt_italicFont: 3902 case URxvt_italicFont:
3819 case URxvt_boldItalicFont: 3903 case URxvt_boldItalicFont:
3820#endif 3904#endif
3821 if (query) 3905 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop, 3906 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3908 ? fontset[op - URxvt_font]->fontdesc : "",
3825 resp); 3909 resp);
3826 else 3910 else
3827 { 3911 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3912 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829 3913
… …
3832 set_fonts (); 3916 set_fonts ();
3833 } 3917 }
3834 break; 3918 break;
3835 3919
3836#if ENABLE_FRILLS 3920#if ENABLE_FRILLS
3837 case XTerm_locale: 3921 case URxvt_locale:
3838 if (query) 3922 if (query)
3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3840 else 3924 else
3841 { 3925 {
3842 set_locale (str); 3926 set_locale (str);
3843# ifdef USE_XIM 3927 pty.set_utf8_mode (enc_utf8);
3844 im_cb (); 3928 init_xlocale ();
3845# endif
3846 } 3929 }
3847 break; 3930 break;
3848#endif
3849 3931
3850#ifdef MENUBAR 3932 case URxvt_view_up:
3851 case XTerm_Menu: 3933 case URxvt_view_down:
3852 if (options & Opt_insecure) 3934 int lines = atoi (str);
3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3935
3854 break; 3936 if (lines)
3855#endif 3937 scr_page (op == URxvt_view_up ? UP : DN, lines);
3856#if 0
3857 case XTerm_dumpscreen: /* no error notices */
3858 { 3938 else
3859 int fd;
3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3861 { 3939 {
3862 scr_dump (fd); 3940 scr_erase_savelines ();
3863 close (fd);
3864 } 3941 }
3865 } 3942
3866 break; 3943 break;
3867#endif 3944#endif
3868 } 3945 }
3869} 3946}
3870/*----------------------------------------------------------------------*/ 3947/*----------------------------------------------------------------------*/
… …
3979 } 4056 }
3980 4057
3981 /* extra handling for values with state unkept */ 4058 /* extra handling for values with state unkept */
3982 switch (arg[i]) 4059 switch (arg[i])
3983 { 4060 {
4061#if ENABLE_STYLES
4062 case 1021:
4063 if (mode)
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067
4068 want_refresh = 1;
4069 want_full_refresh = 1;
4070 break;
4071#endif
3984 case 1048: /* alternative cursor save */ 4072 case 1048: /* alternative cursor save */
3985 case 1049: 4073 case 1049:
3986 if (options & Opt_secondaryScreen) 4074 if (OPTION (Opt_secondaryScreen))
3987 if (mode == 0) 4075 if (mode == 0)
3988 scr_cursor (RESTORE); 4076 scr_cursor (RESTORE);
3989 else if (mode == 1) 4077 else if (mode == 1)
3990 scr_cursor (SAVE); 4078 scr_cursor (SAVE);
3991 break; 4079 break;
… …
4003 */ 4091 */
4004 PrivMode (1, PrivMode_vt52); 4092 PrivMode (1, PrivMode_vt52);
4005 break; 4093 break;
4006 case 3: /* 80/132 */ 4094 case 3: /* 80/132 */
4007 if (priv_modes & PrivMode_132OK) 4095 if (priv_modes & PrivMode_132OK)
4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4096 set_widthheight (((state ? 132 : 80) * fwidth), height);
4009 break; 4097 break;
4010 case 4: /* smooth scrolling */ 4098 case 4: /* smooth scrolling */
4011 if (state) 4099 if (!state)
4012 options &= ~Opt_jumpScroll; 4100 SET_OPTION (Opt_jumpScroll);
4013 else 4101 else
4014 options |= Opt_jumpScroll; 4102 CLR_OPTION (Opt_jumpScroll);
4015 break; 4103 break;
4016 case 5: /* reverse video */ 4104 case 5: /* reverse video */
4017 scr_rvideo_mode (state); 4105 scr_rvideo_mode (state);
4018 break; 4106 break;
4019 case 6: /* relative/absolute origins */ 4107 case 6: /* relative/absolute origins */
… …
4060#if 0 4148#if 0
4061 case 1001: 4149 case 1001:
4062 break; /* X11 mouse highlighting */ 4150 break; /* X11 mouse highlighting */
4063#endif 4151#endif
4064 case 1010: /* scroll to bottom on TTY output inhibit */ 4152 case 1010: /* scroll to bottom on TTY output inhibit */
4065 if (state) 4153 if (!state)
4066 options &= ~Opt_scrollTtyOutput; 4154 SET_OPTION (Opt_scrollTtyOutput);
4067 else 4155 else
4068 options |= Opt_scrollTtyOutput; 4156 CLR_OPTION (Opt_scrollTtyOutput);
4069 break; 4157 break;
4070 case 1011: /* scroll to bottom on key press */ 4158 case 1011: /* scroll to bottom on key press */
4071 if (state) 4159 if (state)
4072 options |= Opt_scrollTtyKeypress; 4160 SET_OPTION (Opt_scrollTtyKeypress);
4073 else 4161 else
4074 options &= ~Opt_scrollTtyKeypress; 4162 CLR_OPTION (Opt_scrollTtyKeypress);
4075 break; 4163 break;
4076 case 1047: /* secondary screen w/ clearing last */ 4164 case 1047: /* secondary screen w/ clearing last */
4077 if (options & Opt_secondaryScreen) 4165 if (OPTION (Opt_secondaryScreen))
4078 if (current_screen != PRIMARY) 4166 if (current_screen != PRIMARY)
4079 scr_erase_screen (2); 4167 scr_erase_screen (2);
4080 scr_change_screen (state); 4168 scr_change_screen (state);
4081 break; 4169 break;
4082 case 1049: /* secondary screen w/ clearing first */ 4170 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state); 4171 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen) 4172 if (OPTION (Opt_secondaryScreen))
4085 if (current_screen != PRIMARY) 4173 if (current_screen != PRIMARY)
4086 scr_erase_screen (2); 4174 scr_erase_screen (2);
4087 break; 4175 break;
4088 default: 4176 default:
4089 break; 4177 break;
… …
4239 case 106: 4327 case 106:
4240 case 107: 4328 case 107:
4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4329 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4242 break; 4330 break;
4243#endif 4331#endif
4244
4245 } 4332 }
4246 } 4333 }
4247} 4334}
4248/*}}} */ 4335/*}}} */
4249 4336
… …
4285 4372
4286/* ---------------------------------------------------------------------- */ 4373/* ---------------------------------------------------------------------- */
4287/* Write data to the pty as typed by the user, pasted with the mouse, 4374/* Write data to the pty as typed by the user, pasted with the mouse,
4288 * or generated by us in response to a query ESC sequence. 4375 * or generated by us in response to a query ESC sequence.
4289 */ 4376 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378
4290void 4379void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4380rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4292{ 4381{
4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4382 if (v_buflen == 0)
4383 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4294 4385
4295 if (len) 4386 if ((unsigned int)written == len)
4387 return;
4388
4389 data += written;
4390 len -= written;
4296 { 4391 }
4392
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4394
4395 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len;
4397
4398 pty_ev.set (EVENT_READ | EVENT_WRITE);
4399}
4400
4401void rxvt_term::pty_write ()
4402{
4403 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4404
4405 if (written > 0)
4406 {
4407 v_buflen -= written;
4408
4297 if (v_buflen == 0) 4409 if (v_buflen == 0)
4298 { 4410 {
4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4300
4301 if ((unsigned int)written == len)
4302 return;
4303
4304 data += written;
4305 len -= written;
4306 }
4307
4308
4309 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4310
4311 memcpy (v_buffer + v_buflen, data, len);
4312 v_buflen += len;
4313 }
4314
4315 for (;;)
4316 {
4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4318
4319 if (written > 0)
4320 {
4321 v_buflen -= written;
4322
4323 if (v_buflen == 0)
4324 {
4325 free (v_buffer); 4411 free (v_buffer);
4326 v_buffer = 0; 4412 v_buffer = 0;
4327 v_buflen = 0; 4413 v_buflen = 0;
4328 4414
4329 pty_ev.set (EVENT_READ); 4415 pty_ev.set (EVENT_READ);
4330 return;
4331 }
4332
4333 memmove (v_buffer, v_buffer + written, v_buflen);
4334 }
4335 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4336 // original code just ignores this...
4337 destroy ();
4338 else
4339 {
4340 pty_ev.set (EVENT_READ | EVENT_WRITE);
4341 return; 4416 return;
4342 } 4417 }
4418
4419 memmove (v_buffer, v_buffer + written, v_buflen);
4343 } 4420 }
4421 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4422 pty_ev.set (EVENT_READ);
4344} 4423}
4345 4424
4346/*----------------------- end-of-file (C source) -----------------------*/ 4425/*----------------------- end-of-file (C source) -----------------------*/
4347 4426

Diff Legend

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