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.170 by root, Sun Nov 21 20:19:24 2004 UTC vs.
Revision 1.224 by root, Sun Jan 1 06:18:20 2006 UTC

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

Diff Legend

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