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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.264 by root, Mon Jan 16 06:37:51 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2006 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755
73
74#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
77#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
78#define ISO_14755_MASK 0x0fffffffUL
79
80#if ISO_14755
81static unsigned short iso14755_symtab[] = {
82 // keysym, unicode
83 XK_Left, 0x2190,
84 XK_KP_Left, 0x2190,
85 XK_Up, 0x2191,
86 XK_KP_Up, 0x2191,
87 XK_Right, 0x2192,
88 XK_KP_Right, 0x2192,
89 XK_Down, 0x2193,
90 XK_KP_Down, 0x2193,
91 XK_Linefeed, 0x21b4,
92 XK_Return, 0x21b5,
93 XK_KP_Enter, 0x21b5,
94
95 XK_Prior, 0x21de,
96 XK_Next, 0x21df,
97 XK_Tab, 0x21e5,
98 XK_ISO_Left_Tab, 0x21e6,
99 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7,
101
102 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0,
110 XK_Home, 0x21f1,
111 XK_End, 0x21f2,
112
113 XK_Execute, 0x2318,
114 XK_Begin, 0x2320,
115 XK_Delete, 0x2326,
116 XK_Clear, 0x2327,
117 XK_BackSpace, 0x232b,
118 XK_Insert, 0x2380,
119 XK_Control_L, 0x2388,
120 XK_Control_R, 0x2388,
121 XK_Pause, 0x2389,
122 XK_Break, 0x238a,
123 XK_Escape, 0x238b,
124 XK_Undo, 0x238c,
125 XK_Print, 0x2399,
126
127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
135 XK_KP_Space, 0x2422,
136#endif
137 0,
138};
139
140void
141rxvt_term::iso14755_54 (int x, int y)
142{
143 x = Pixel2Col (x);
144 y = Pixel2Row (y);
145
146 if (!IN_RANGE_EXC (x, 0, ncol)
147 || !IN_RANGE_EXC (y, 0, nrow))
148 return;
149
150 for (;;)
151 {
152 const line_t &l = ROW(y + view_start);
153
154 text_t t = l.t[x];
155
156 if (t != NOCHAR || !x)
157 {
158 iso14755_51 (l.t[x], l.r[x], x, y);
159 iso14755buf = ISO_14755_54;
160 break;
161 }
162
163 x--;
164 }
165}
166
167void
168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname;
173 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176
177# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch))
179 {
180 len = rxvt_composite.expand (ch, 0);
181 alloc = chr = new wchar_t[len];
182 rxvt_composite.expand (ch, chr);
183 }
184 else
185# endif
186 {
187 ch2 = ch;
188
189 alloc = 0;
190 chr = &ch2;
191 len = 1;
192 }
193
194 char attr[80]; // plenty
195
196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220
221 for (int y = 0; y < len; y++)
222 {
223 char buf[9];
224
225 ch = *chr++;
226
227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '=');
230# if !UNICODE3
231 if (ch >= 0x10000)
232 ch = 0xfffd;
233# endif
234 scr_overlay_set (11, y, ch, r);
235 scr_overlay_set (12, y, NOCHAR, r);
236 }
237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
243# if ENABLE_COMBINING
244 if (alloc)
245 delete [] alloc;
246# endif
247}
248#endif
249
250void
251rxvt_term::commit_iso14755 ()
252{
253 wchar_t ch[2];
254
255 ch[0] = iso14755buf & ISO_14755_MASK;
256 ch[1] = 0;
257
258 if (iso14755buf & ISO_14755_51)
259 {
260 char mb[16];
261 int len;
262
263 // allow verbatim 0-bytes and control-bytes to be entered
264 if (ch[0] >= 0x20)
265 len = wcstombs (mb, ch, 16);
266 else
267 {
268 mb[0] = ch[0];
269 len = 1;
270 }
271
272 if (len > 0)
273 tt_write (mb, len);
274 else
275 scr_bell ();
276 }
277
278 iso14755buf = 0;
279}
280
281int
282rxvt_term::hex_keyval (XKeyEvent &ev)
283{
284 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++)
287 {
288 KeySym k = XLookupKeysym (&ev, index);
289
290 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
291 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
292 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
293 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
294 }
295
296 return -1;
297}
298#endif
56 299
57/*{{{ Convert the keypress event into a string */ 300/*{{{ Convert the keypress event into a string */
58void 301void
59rxvt_term::lookup_key (XKeyEvent &ev) 302rxvt_term::lookup_key (XKeyEvent &ev)
60{ 303{
… …
63 KeySym keysym; 306 KeySym keysym;
64#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
65 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
66#endif 309#endif
67 int valid_keysym; 310 int valid_keysym;
68 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
69 312
70 /* 313 /*
71 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
72 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
73 * 316 *
74 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
75 */ 318 */
76 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
77 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
78 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
79 322
80 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
81 { 324 {
82 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
83 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
88#ifdef USE_XIM 331#ifdef USE_XIM
89 if (Input_Context) 332 if (Input_Context)
90 { 333 {
91 Status status_return; 334 Status status_return;
92 335
336#if 0
93#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
96 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
97 else 341 else
342#endif
98#endif 343#endif
99 { 344 {
100 wchar_t wkbuf[KBUFSZ + 1]; 345 wchar_t wkbuf[KBUFSZ + 1];
101 346
102 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
106 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
107 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
108 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
109 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
110 SET_LOCALE (locale); 357 SET_LOCALE (locale);
111 358
112 if (status_return == XLookupChars 359 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
114 { 361 {
362 /* make sure the user can type ctrl-@, i.e. NUL */
363 if (len == 1 && *wkbuf == 0)
364 {
365 kbuf[0] = 0;
366 len = 1;
367 }
368 else
369 {
115 wkbuf[len] = 0; 370 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 371 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 372 if (len < 0)
118 len = 0; 373 len = 0;
374 }
119 } 375 }
120 else 376 else
121 len = 0; 377 len = 0;
122 } 378 }
123 379
… …
125 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
126 } 382 }
127 else 383 else
128#endif 384#endif
129 { 385 {
130 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
131 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
132 } 388 }
133 389
134 if (valid_keysym) 390 if (valid_keysym)
135 { 391 {
136 /* for some backwards compatibility */ 392#ifdef KEYSYM_RESOURCE
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 393 if (keyboard->dispatch (this, keysym, ev.state))
138# ifdef HOTKEY_CTRL 394 return;
139 if (ctrl)
140# else
141 if (meta)
142# endif 395#endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156 396
157 if (TermWin.saveLines) 397 if (saveLines)
158 { 398 {
159#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 400 if (!ctrl && !meta)
161 {
162#else 401#else
163 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
403#endif
164 { 404 {
165#endif
166 int lnsppg; 405 int lnsppg;
167 406
168#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
170#else 409#else
171 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
172#endif 411#endif
173 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
174 { 413 {
175 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
176 return; 415 return;
… …
204 scr_move_to (0, 1); 443 scr_move_to (0, 1);
205 return; 444 return;
206 } 445 }
207 else if (keysym == XK_End) 446 else if (keysym == XK_End)
208 { 447 {
209 scr_move_to (1, 0); 448 scr_move_to (1, 1);
210 return; 449 return;
211 } 450 }
212 } 451 }
213#endif 452#endif
214 } 453 }
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 459 {
221 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
223 } 462 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 464 {
226 switch (keysym) 465 switch (keysym)
227 { 466 {
228 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
231 return; 470 return;
471#if TODO
232 /* rxvt extras */ 472 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 474 change_font (FONT_UP);
235 return; 475 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 477 change_font (FONT_DN);
238 return; 478 return;
479#endif
239 } 480 }
240 } 481 }
241 } 482 }
242#ifdef PRINTPIPE 483
243 if (keysym == XK_Print) 484#if ENABLE_FRILLS || ISO_14755
244 { 485 // ISO 14755 support
245 scr_printscreen (ctrl | shft); 486 if (shft && ctrl)
246 return;
247 } 487 {
248#endif 488 int hv;
249#ifdef GREEK_SUPPORT 489
250 if (keysym == ks_greekmodeswith) 490 if (iso14755buf & ISO_14755_51
251 { 491 && (keysym == XK_space || keysym == XK_KP_Space
252 greek_mode = !greek_mode; 492 || keysym == XK_Return || keysym == XK_KP_Enter))
253 if (greek_mode)
254 { 493 {
255 xterm_seq (XTerm_title, 494 commit_iso14755 ();
256 (greek_getmode () == GREEK_ELOT928 495 iso14755buf = ISO_14755_51;
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 496# if ISO_14755
258 greek_reset (); 497 iso14755_51 (0);
498# endif
499 return;
259 } 500 }
260 else 501 else if ((hv = hex_keyval (ev)) >= 0)
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return;
263 }
264#endif
265
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
267 {
268#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 502 {
271 unsigned int l; 503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
272 const unsigned char *kbuf0; 504 | hv | ISO_14755_51;
273 const unsigned char ch = C0_ESC; 505# if ISO_14755
274 506 iso14755_51 (iso14755buf & ISO_14755_MASK);
275 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++;
277
278 /* escape prefix */
279 if (meta)
280# ifdef META8_OPTION
281 if (meta_char == C0_ESC)
282# endif 507# endif
283 tt_write (&ch, 1);
284 tt_write (kbuf0, l);
285 return; 508 return;
286 } 509 }
287 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
288#endif 514# endif
515 iso14755buf = 0;
516 }
517 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
522 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif
527 }
528#endif
529
530#ifdef PRINTPIPE
531 if (keysym == XK_Print)
532 {
533 scr_printscreen (ctrl | shft);
534 return;
535 }
536#endif
537
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 {
289 { 540 {
290 newlen = 1; 541 newlen = 1;
291 switch (keysym) 542 switch (keysym)
292 { 543 {
293#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
294 case XK_BackSpace: 545 case XK_BackSpace:
295 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
296 { 547 {
297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
298 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
300 } 551 }
301 else 552 else
302 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
303# ifdef MULTICHAR_SET 554 break;
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0) 555#endif
556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
305 { 561 {
306 int col, row; 562 strcpy (kbuf, "\033On");
307 563 break;
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 } 564 }
565 /* FALLTHROUGH */
314# endif 566# endif
315 break;
316#endif
317#ifndef NO_DELETE_KEY
318 case XK_Delete: 567 case XK_Delete:
319 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 569 break;
333#endif 570#endif
334 case XK_Tab: 571 case XK_Tab:
335 if (shft) 572 if (shft)
336 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
337 else 574 else
338 { 575 {
339#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
340 if (ctrl) 577 if (ctrl)
341 meta = 1; 578 meta = 1;
… …
347 newlen = 0; 584 newlen = 0;
348 } 585 }
349 break; 586 break;
350 587
351#ifdef XK_KP_Left 588#ifdef XK_KP_Left
352 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
353 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
354 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
355 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
357 { 594 {
358 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
359 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
360 break; 597 break;
361 } 598 }
362 else 599 else
363 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
366#endif 603#endif
367 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
368 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
369 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
370 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
371 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
372 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
373 /* do Shift first */ 610 /* do Shift first */
374 if (shft) 611 if (shft)
375 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
376 else if (ctrl) 613 else if (ctrl)
377 { 614 {
378 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 617 }
381 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 620 break;
419 621
420#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
422 case XK_KP_Prior: 624 case XK_KP_Prior:
423 /* allow shift to override */ 625 /* allow shift to override */
424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
425 { 627 {
426 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
427 break; 629 break;
428 } 630 }
429 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
430# endif 632# endif
431 case XK_Prior: 633 case XK_Prior:
432 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
433 break; 635 break;
434# ifdef XK_KP_Next 636# ifdef XK_KP_Next
435 case XK_KP_Next: 637 case XK_KP_Next:
436 /* allow shift to override */ 638 /* allow shift to override */
437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
438 { 640 {
439 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
440 break; 642 break;
441 } 643 }
442 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
443# endif 645# endif
444 case XK_Next: 646 case XK_Next:
445 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
446 break; 648 break;
447#endif 649#endif
448 case XK_KP_Enter: 650 case XK_KP_Enter:
449 /* allow shift to override */ 651 /* allow shift to override */
450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
451 { 653 {
452 STRCPY (kbuf, "\033OM"); 654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
453 } 666 }
454 else 667 else
455 { 668 {
456 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
457 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
458 } 671 }
459 break; 672 break;
460 673
461#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
462 case XK_KP_Begin: 675 case XK_KP_Begin:
463 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
464 break; 677 break;
465 678
466 case XK_KP_Insert:
467 STRCPY (kbuf, "\033Op");
468 break;
469
470 case XK_KP_Delete:
471 STRCPY (kbuf, "\033On");
472 break;
473#endif 679#endif
474 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
475 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
476 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
477 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
478 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
479 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
480 break; 686 break;
481 687
482 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
483 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
494 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
495 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
496 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
497 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
498 /* allow shift to override */ 704 /* allow shift to override */
499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
500 { 706 {
501 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
502 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
503 } 709 }
504 else 710 else
505 { 711 {
506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
507 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
508 } 714 }
509 break; 715 break;
510 716
511 case XK_Find: 717 case XK_Find:
512 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
513 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
514 case XK_Insert: 731 case XK_Insert:
515 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
516 break; 733 break;
517#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
518 case DXK_Remove: 735 case DXK_Remove:
519 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
520#endif 737#endif
521 case XK_Execute: 738 case XK_Execute:
522 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
523 break; 740 break;
524 case XK_Select: 741 case XK_Select:
525 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
526 break; 743 break;
527#ifdef XK_KP_End 744#ifdef XK_KP_End
528 case XK_KP_End: 745 case XK_KP_End:
529 /* allow shift to override */ 746 /* allow shift to override */
530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 { 748 {
532 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
533 break; 750 break;
534 } 751 }
535 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
536#endif 753#endif
537 case XK_End: 754 case XK_End:
538 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
539 break; 756 break;
540#ifdef XK_KP_Home 757#ifdef XK_KP_Home
541 case XK_KP_Home: 758 case XK_KP_Home:
542 /* allow shift to override */ 759 /* allow shift to override */
543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
544 { 761 {
545 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
546 break; 763 break;
547 } 764 }
548 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
549#endif 766#endif
550 case XK_Home: 767 case XK_Home:
551 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
552 break; 769 break;
553 770
554#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
556 773
… …
608#undef FKEY 825#undef FKEY
609 default: 826 default:
610 newlen = 0; 827 newlen = 0;
611 break; 828 break;
612 } 829 }
830
613 if (newlen) 831 if (newlen)
614 len = STRLEN (kbuf); 832 len = strlen (kbuf);
615 } 833 }
834
616 /* 835 /*
617 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
618 */ 837 */
619#ifdef META8_OPTION 838#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 839 if (meta && (meta_char == 0x80) && len > 0)
… …
625 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
626 { 845 {
627 len = 1; 846 len = 1;
628 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
629 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
630 else 854 else
631 { 855 {
632#ifdef META8_OPTION 856#ifdef META8_OPTION
633 /* set 8-bit on */ 857 /* set 8-bit on */
634 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
635 { 859 {
636 unsigned char *ch; 860 char *ch;
637 861
638 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 863 *ch |= 0x80;
864
640 meta = 0; 865 meta = 0;
641 } 866 }
642#endif 867#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif
647 /* nil */ ; 868 /* nil */ ;
648 } 869 }
649 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
650 874
651 if (len <= 0) 875 if (len <= 0)
652 return; /* not mapped */ 876 return; /* not mapped */
653 877
654 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
655 if (TermWin.view_start) 879 if (view_start)
656 { 880 {
657 TermWin.view_start = 0; 881 view_start = 0;
658 want_refresh = 1; 882 want_refresh = 1;
659 } 883 }
660 884
661 /* 885 /*
662 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 897 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 898
675 /* escape prefix */ 899 /* escape prefix */
676 if (meta 900 if (meta
677#ifdef META8_OPTION 901#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 902 && meta_char == C0_ESC
679#endif 903#endif
680 ) 904 )
681 { 905 {
682 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
683
684 tt_write (&ch, 1); 907 tt_write (&ch, 1);
685 } 908 }
909
686#ifdef DEBUG_CMD 910#if defined(DEBUG_CMD)
687 if (debug_key)
688 { /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
689 char *p; 912 unsigned char *p;
690 int i; 913 int i;
691 914
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++) 916 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n"); 918 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
699} 921}
700/*}}} */ 922/*}}} */
701 923
702#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
705unsigned int 927unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
707{ 929{
708 unsigned int n, s; 930 unsigned int n, s;
709 931
710 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
934
712 if (n > 0 && s < count) 935 if (n > 0 && s < count)
713 { 936 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 937 memmove (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 939 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 940 cmdbuf_endp -= n;
718 s += n; 941 s += n;
719 } 942 }
943
720 if (count > s) 944 if (count > s)
721 { 945 {
722 rxvt_print_error ("data loss: cmd_write too large"); 946 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 947 count = s;
724 } 948 }
949
725 for (; count--;) 950 for (; count--;)
726 *cmdbuf_endp++ = *str++; 951 *cmdbuf_endp++ = *str++;
952
953 cmd_parse ();
954
727 return 0; 955 return 0;
728} 956}
729#endif /* MENUBAR_MAX */ 957#endif
730 958
731void 959void
732rxvt_term::flush () 960rxvt_term::flush ()
733{ 961{
962 flush_ev.stop ();
963
734#ifdef TRANSPARENT 964#ifdef TRANSPARENT
735 if (want_full_refresh) 965 if (want_full_refresh)
736 { 966 {
737 want_full_refresh = 0; 967 want_full_refresh = 0;
738 scr_clear (); 968 scr_clear ();
739 scr_touch (false); 969 scr_touch (false);
740 want_refresh = 1;
741 } 970 }
742#endif 971#endif
743 972
744 if (want_refresh) 973 if (want_refresh)
745 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = view_start;
978 int end_row = row + nrow;
979
980 while (row > top_row && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
746 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
747 scrollbar_show (1); 1014 scrollbar_show (1);
748#ifdef USE_XIM 1015#ifdef USE_XIM
749 IMSendSpot (); 1016 IMSendSpot ();
750#endif 1017#endif
751
752 } 1018 }
753 1019
754 display->flush (); 1020 display->flush ();
755} 1021}
756 1022
757void 1023void
758rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
759{ 1025{
760 SET_R (this); 1026 make_current ();
761 SET_LOCALE (locale);
762 1027
1028 display->flush ();
1029
1030 if (want_refresh && !flush_ev.active)
1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1032}
1033
1034void
1035rxvt_term::flush_cb (time_watcher &w)
1036{
1037 make_current ();
1038
1039 refresh_limit = 1;
1040 refresh_count = 0;
763 flush (); 1041 flush ();
764} 1042}
765 1043
766#ifdef CURSOR_BLINK 1044#ifdef CURSOR_BLINK
767void 1045void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 1063 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 1064 }
787} 1065}
788#endif 1066#endif
789 1067
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void
1070rxvt_term::cont_scroll_cb (time_watcher &w)
1071{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 }
1079}
1080#endif
1081
1082#ifdef SELECTION_SCROLLING
1083void
1084rxvt_term::sel_scroll_cb (time_watcher &w)
1085{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 }
1093}
1094#endif
1095
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void
1098rxvt_term::slip_wheel_cb (time_watcher &w)
1099{
1100 if (mouse_slip_wheel_speed == 0
1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1102 : scr_page (UP, mouse_slip_wheel_speed))
1103 {
1104 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0;
1106
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 }
1111}
1112#endif
1113
1114#if HAVE_SCHED_YIELD
1115static struct event_handler
1116{
1117 check_watcher cw_yield;
1118
1119 void yield (check_watcher &w)
1120 {
1121 sched_yield ();
1122 w.stop ();
1123 }
1124
1125 event_handler ()
1126 : cw_yield (this, &event_handler::yield)
1127 {
1128 }
1129} event_handler;
1130#endif
1131
790bool 1132bool
791rxvt_term::pty_fill () 1133rxvt_term::pty_fill ()
792{ 1134{
793 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1136
1137 if (CBUFSIZ == n)
1138 {
1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1140 n = 0;
1141 }
794 1142
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1144 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1145 cmdbuf_endp = cmdbuf_ptr + n;
798 1146
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
800 1148
801 if (n > 0) 1149 if (r > 0)
802 { 1150 {
803 cmdbuf_endp += n; 1151 cmdbuf_endp += r;
804 return true; 1152 return true;
805 } 1153 }
806 else if (n < 0 && errno != EAGAIN) 1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 {
1156#if HAVE_SCHED_YIELD
1157 if (display->is_local)
1158 event_handler.cw_yield.start ();
1159#endif
1160 }
1161 else
1162 {
1163 pty_ev.stop ();
1164
1165 if (!OPTION (Opt_hold))
807 destroy (); 1166 destroy ();
808 1167 }
1168
809 return false; 1169 return false;
810} 1170}
811 1171
812void 1172void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
814{ 1174{
815 SET_R (this); 1175 make_current ();
816 SET_LOCALE (locale); 1176
1177 if (revents & EVENT_READ)
1178 // loop, but don't allow a single term to monopolize us
1179 while (pty_fill ())
1180 if (cmd_parse ())
1181 break;
817 1182
818 if (revents & EVENT_WRITE) 1183 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1184 pty_write ();
820 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ())
827 {
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935} 1185}
936 1186
937// read the next character, currently handles UTF-8 1187void
938// will probably handle all sorts of other stuff in the future 1188rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1189{
942 while (cmdbuf_ptr < cmdbuf_endp) 1190 XDefineCursor (display->display, vt, TermWin_cursor);
943 { 1191 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1192
947 wchar_t wc; 1193#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1194 hidden_pointer = 0;
949 1195
950 if (len == (size_t)-2) 1196 if (OPTION (Opt_pointerBlank))
951 return NOCHAR; 1197 pointer_ev.start (NOW + pointerBlankDelay);
952 1198#endif
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 1199}
985 1200
986#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
987void 1202void
988rxvt_term::pointer_unblank ()
989{
990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
991 recolour_cursor ();
992
993 hidden_pointer = 0;
994
995 if (Options & Opt_pointerBlank)
996 pointer_ev.start (NOW + pointerBlankDelay);
997}
998
999void
1000rxvt_term::pointer_blank () 1203rxvt_term::pointer_blank ()
1001{ 1204{
1002 if (! (Options & Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
1003 return; 1206 return;
1004 1207
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
1006 XFlush (display->display); 1209 XFlush (display->display);
1007 1210
1008 hidden_pointer = 1; 1211 hidden_pointer = 1;
1009} 1212}
1010 1213
1011void 1214void
1012rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1013{ 1216{
1014 SET_R (this); 1217 make_current ();
1015 SET_LOCALE (locale);
1016 1218
1017 pointer_blank (); 1219 pointer_blank ();
1018} 1220}
1019#endif 1221#endif
1020 1222
1021void 1223void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1224rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1225{
1024 int button_number, key_state = 0; 1226 int button_number, key_state = 0;
1025 int x, y; 1227 int x, y;
1026 1228
1027 x = ev.x; 1229 x = ev.x;
1028 y = ev.y; 1230 y = ev.y;
1029 pixel_position (&x, &y); 1231 pixel_position (&x, &y);
1030 1232
1031 if (MEvent.button == AnyButton) 1233 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1234 button_number = 3;
1034 }
1035 else 1235 else
1036 { 1236 {
1037 button_number = MEvent.button - Button1; 1237 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1238 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1239 if (button_number >= 3)
1040 button_number += (64 - 3); 1240 button_number += (64 - 3);
1041 } 1241 }
1042 1242
1043 if (PrivateModes & PrivMode_MouseX10) 1243 if (priv_modes & PrivMode_MouseX10)
1044 { 1244 {
1045 /* 1245 /*
1046 * do not report ButtonRelease 1246 * do not report ButtonRelease
1047 * no state info allowed 1247 * no state info allowed
1048 */ 1248 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1263 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1264 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1265#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1266 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1267#endif
1068
1069 } 1268 }
1070 1269
1071#ifdef DEBUG_MOUSEREPORT 1270#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1271 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1272 if (key_state & 16)
1074 fputc ('C', stderr); 1273 fputc ('C', stderr);
1075 if (key_state & 4) 1274 if (key_state & 4)
1076 fputc ('S', stderr); 1275 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1279 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1280 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1281 button_number,
1083 x + 1, 1282 x + 1,
1084 y + 1); 1283 y + 1);
1085#else 1284#endif
1285
1086 tt_printf ("\033[M%c%c%c", 1286 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1287 (32 + button_number + key_state),
1088 (32 + x + 1), 1288 (32 + x + 1),
1089 (32 + y + 1)); 1289 (32 + y + 1));
1090#endif
1091} 1290}
1092 1291
1093#ifdef USING_W11LIB 1292#ifdef USING_W11LIB
1094void 1293void
1095rxvt_W11_process_x_event (XEvent *ev) 1294rxvt_W11_process_x_event (XEvent *ev)
… …
1102 1301
1103/*{{{ process an X event */ 1302/*{{{ process an X event */
1104void 1303void
1105rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1106{ 1305{
1107 SET_R (this); 1306 make_current ();
1108 SET_LOCALE (locale);
1109 1307
1110#if defined(CURSOR_BLINK) 1308 dDisp;
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1112 {
1113 if (hidden_cursor)
1114 {
1115 hidden_cursor = 0;
1116 want_refresh = 1;
1117 }
1118 1309
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1310 if (ev.xany.window == vt
1120 } 1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1121#endif
1122
1123#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 {
1126 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease)
1129 if (hidden_pointer)
1130 pointer_unblank ();
1131
1132 if (ev.type == KeyPress && hidden_pointer == 0)
1133 pointer_blank ();
1134 }
1135#endif
1136
1137#ifdef USE_XIM
1138 if (XFilterEvent (&ev, None))
1139 return; 1312 return;
1140#endif
1141 1313
1314 // for XQueryPointer
1142 Window unused_root, unused_child; 1315 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1316 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1317 unsigned int unused_mask;
1145
1146#ifdef DEBUG_X
1147 const char *const eventnames[] =
1148 { /* mason - this matches my system */
1149 "",
1150 "",
1151 "KeyPress",
1152 "KeyRelease",
1153 "ButtonPress",
1154 "ButtonRelease",
1155 "MotionNotify",
1156 "EnterNotify",
1157 "LeaveNotify",
1158 "FocusIn",
1159 "FocusOut",
1160 "KeymapNotify",
1161 "Expose",
1162 "GraphicsExpose",
1163 "NoExpose",
1164 "VisibilityNotify",
1165 "CreateNotify",
1166 "DestroyNotify",
1167 "UnmapNotify",
1168 "MapNotify",
1169 "MapRequest",
1170 "ReparentNotify",
1171 "ConfigureNotify",
1172 "ConfigureRequest",
1173 "GravityNotify",
1174 "ResizeRequest",
1175 "CirculateNotify",
1176 "CirculateRequest",
1177 "PropertyNotify",
1178 "SelectionClear",
1179 "SelectionRequest",
1180 "SelectionNotify",
1181 "ColormapNotify",
1182 "ClientMessage",
1183 "MappingNotify"
1184 };
1185#endif
1186
1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime (& (tp.tv_sec));
1192 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1193#endif
1194 1318
1195 switch (ev.type) 1319 switch (ev.type)
1196 { 1320 {
1197 case KeyPress: 1321 case KeyPress:
1322#if ISO_14755
1323 if (!(iso14755buf & ISO_14755_52))
1324#endif
1198 lookup_key (ev.xkey); 1325 lookup_key (ev.xkey);
1326
1327 break;
1328
1329 case KeyRelease:
1330 {
1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1332 KeySym keysym;
1333
1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1335#endif
1336
1337#if ENABLE_FRILLS || ISO_14755
1338 // ISO 14755 support
1339 if (iso14755buf)
1340 if (iso14755buf & ISO_14755_52)
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345# if ISO_14755
1346 // iso14755 part 5.2 handling: release time
1347 // first: controls
1348 if ((ev.xkey.state & ControlMask)
1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1351 {
1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1353 commit_iso14755 ();
1354 goto skip_switch;
1355 }
1356
1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1358 if (i[0] == keysym)
1359 {
1360 iso14755buf = ISO_14755_51 | i[1];
1361 commit_iso14755 ();
1362 goto skip_switch;
1363 }
1364
1365 scr_bell ();
1366# endif
1367 iso14755buf = 0;
1368 break;
1369 }
1370 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1371 {
1372# if ENABLE_OVERLAY
1373 scr_overlay_off ();
1374# endif
1375 if (iso14755buf & ISO_14755_51)
1376 commit_iso14755 ();
1377#if ISO_14755
1378 else if (iso14755buf & ISO_14755_STARTED)
1379 {
1380 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1381
1382 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1383 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1384 }
1385# endif
1386 else
1387 iso14755buf = 0;
1388 }
1389#endif
1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1199 break; 1393 break;
1200 1394
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 if (! (ev.xkey.state & ControlMask)) 1396 if (!(ev.xkey.state & ControlMask))
1397 slip_wheel_ev.stop ();
1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1205 mouse_slip_wheel_speed = 0; 1399 mouse_slip_wheel_speed = 0;
1206 else 1400#endif
1207 {
1208 KeySym ks;
1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break; 1401 break;
1215 } 1402 }
1216#endif
1217 1403
1218 case ButtonPress: 1404 case ButtonPress:
1219 button_press (ev.xbutton); 1405 button_press (ev.xbutton);
1220 break; 1406 break;
1221 1407
… …
1223 button_release (ev.xbutton); 1409 button_release (ev.xbutton);
1224 break; 1410 break;
1225 1411
1226 case ClientMessage: 1412 case ClientMessage:
1227 if (ev.xclient.format == 32 1413 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1415 {
1228 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1229 destroy (); 1417 destroy ();
1418#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev);
1423#endif
1424 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1230#ifdef OFFIX_DND 1434#ifdef OFFIX_DND
1231 /* OffiX Dnd (drag 'n' drop) protocol */ 1435 /* OffiX Dnd (drag 'n' drop) protocol */
1232 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1233 && (ev.xclient.data.l[0] == DndFile 1437 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1438 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1439 || ev.xclient.data.l[0] == DndLink))
1236 { 1440 {
1237 /* Get Dnd data */ 1441 /* Get Dnd data */
1238 Atom ActualType; 1442 Atom ActualType;
1239 int ActualFormat; 1443 int ActualFormat;
1240 unsigned char *data; 1444 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1445 unsigned long Size, RemainingBytes;
1242 1446
1243 XGetWindowProperty (display->display, display->root, 1447 XGetWindowProperty (disp, display->root,
1244 xa[XA_DNDSELECTION], 1448 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1449 0L, 1000000L,
1246 False, AnyPropertyType, 1450 False, AnyPropertyType,
1247 &ActualType, &ActualFormat, 1451 &ActualType, &ActualFormat,
1248 &Size, &RemainingBytes, 1452 &Size, &RemainingBytes,
1249 &data); 1453 &data);
1250 XChangeProperty (display->display, display->root, 1454 set_string_property (XA_CUT_BUFFER0, data);
1251 XA_CUT_BUFFER0, XA_STRING, 1455 XFree (data);
1252 8, PropModeReplace,
1253 data, STRLEN (data));
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1256 } 1458 }
1257#endif /* OFFIX_DND */ 1459#endif /* OFFIX_DND */
1258 break; 1460 break;
1259 1461
1260 case MappingNotify: 1462 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1463 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1464 break;
1263 1465
1264 /* 1466 /*
1265 * XXX: this is not the _current_ arrangement 1467 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1468 * Here's my conclusion:
… …
1285 break; 1487 break;
1286 } 1488 }
1287 break; 1489 break;
1288 1490
1289 case FocusIn: 1491 case FocusIn:
1290 if (!TermWin.focus) 1492 focus_in ();
1493 break;
1494
1495 case FocusOut:
1496 focus_out ();
1497 break;
1498
1499 case ConfigureNotify:
1500 if (ev.xconfigure.window == parent[0])
1291 { 1501 {
1292 TermWin.focus = 1; 1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1293 want_refresh = 1; 1503 ;
1294#ifdef USE_XIM
1295 if (Input_Context != NULL)
1296 XSetICFocus (Input_Context);
1297#endif
1298#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink)
1300 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1301#endif
1302 1504
1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506 {
1507 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 }
1510
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1512 if (OPTION (Opt_transparent))
1513 check_our_parents ();
1514#endif
1303 } 1515 }
1304 break; 1516 break;
1305 1517
1306 case FocusOut:
1307 if (TermWin.focus)
1308 {
1309 TermWin.focus = 0;
1310 want_refresh = 1;
1311#ifdef USE_XIM
1312 if (Input_Context != NULL)
1313 XUnsetICFocus (Input_Context);
1314#endif
1315#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink)
1317 cursor_blink_ev.stop ();
1318 hidden_cursor = 0;
1319#endif
1320
1321 }
1322 break;
1323
1324 case ConfigureNotify: 1518 case PropertyNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1326 { 1520 && ev.xproperty.state == PropertyNewValue)
1327 int height, width; 1521 selection_property (ev.xproperty.window, ev.xproperty.atom);
1328 1522
1329 do
1330 { /* Wrap lots of configures into one */
1331 width = ev.xconfigure.width;
1332 height = ev.xconfigure.height;
1333 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1334 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336
1337 if (szHint.width != width || szHint.height != height)
1338 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1340 resize_all_windows (width, height, 1);
1341 }
1342#ifdef DEBUG_SIZE
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent)
1350 {
1351 check_our_parents ();
1352 if (am_transparent)
1353 want_full_refresh = 1;
1354 }
1355#endif
1356
1357 }
1358 break; 1523 break;
1359 1524
1360 case SelectionClear: 1525 case SelectionClear:
1361 display->set_selection_owner (0); 1526 selection_clear ();
1362 break; 1527 break;
1363 1528
1364 case SelectionNotify: 1529 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1530 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1531 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1367 ev.xselection.property, True);
1368 break; 1532 break;
1369 1533
1370 case SelectionRequest: 1534 case SelectionRequest:
1371 selection_send (ev.xselectionrequest); 1535 selection_send (ev.xselectionrequest);
1372 break; 1536 break;
1373 1537
1538 case MapNotify:
1539 mapped = 1;
1540#ifdef TEXT_BLINK
1541 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1542#endif
1543 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 break;
1545
1374 case UnmapNotify: 1546 case UnmapNotify:
1375 TermWin.mapped = 0; 1547 mapped = 0;
1376#ifdef TEXT_BLINK 1548#ifdef TEXT_BLINK
1377 text_blink_ev.stop (); 1549 text_blink_ev.stop ();
1378#endif 1550#endif
1379 break; 1551 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1380
1381 case MapNotify:
1382 TermWin.mapped = 1;
1383#ifdef TEXT_BLINK
1384 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1385#endif
1386 break; 1552 break;
1387 1553
1388#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1389 case ReparentNotify: 1555 case ReparentNotify:
1390 rootwin_cb (ev); 1556 rootwin_cb (ev);
1391 break; 1557 break;
1392#endif /* TRANSPARENT */ 1558#endif /* TRANSPARENT */
1393 1559
1394 case GraphicsExpose: 1560 case GraphicsExpose:
1395 case Expose: 1561 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1562 if (ev.xany.window == vt)
1397 { 1563 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1564 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1402 // don't understand this, so commented it out 1568
1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570
1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1572 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1573 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1574
1406 // ev.xexpose.width, TermWin.height, False);
1407#endif
1408 want_refresh = 1; 1575 want_refresh = 1;
1409 } 1576 }
1410 else 1577 else
1411 { 1578 {
1412 XEvent unused_event; 1579 XEvent unused_event;
1413 1580
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1415 Expose, 1582 ;
1416 &unused_event)) ; 1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1584 ;
1418 GraphicsExpose, 1585
1419 &unused_event)) ;
1420 if (isScrollbarWindow (ev.xany.window)) 1586 if (isScrollbarWindow (ev.xany.window))
1421 { 1587 {
1422 scrollBar.setIdle (); 1588 scrollBar.setIdle ();
1423 scrollbar_show (0); 1589 scrollbar_show (0);
1424 } 1590 }
1425#ifdef MENUBAR 1591#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1593 menubar_expose ();
1428#endif 1594#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1595
1596#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window);
1599#endif
1433 } 1600 }
1434 break; 1601 break;
1435 1602
1436 case MotionNotify: 1603 case MotionNotify:
1437#ifdef POINTER_BLANK 1604#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1606 pointer_unblank ();
1440#endif 1607#endif
1441#if MENUBAR 1608#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1609 if (isMenuBarWindow (ev.xany.window))
1443 { 1610 {
1444 menubar_control (& (ev.xbutton)); 1611 menubar_control (ev.xbutton);
1445 break; 1612 break;
1446 } 1613 }
1447#endif 1614#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1449 break; 1616 break;
1450 1617
1451 if (ev.xany.window == TermWin.vt) 1618 if (ev.xany.window == vt)
1452 { 1619 {
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1623 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1456 ; 1625 ;
1457 1626
1458 XQueryPointer (display->display, TermWin.vt, 1627 XQueryPointer (disp, vt,
1459 &unused_root, &unused_child, 1628 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1629 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1630 &ev.xbutton.x, &ev.xbutton.y,
1462 &unused_mask); 1631 &ev.xbutton.state);
1463#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1633 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1634 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1635 {
1467#endif 1636#endif
1637#if ISO_14755
1638 // 5.4
1639 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1640 {
1641 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1642 break;
1643 }
1644#endif
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1645 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1646 ev.xbutton.state & Button3Mask ? 2 : 0);
1647
1470#ifdef SELECTION_SCROLLING 1648#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1649 if (ev.xbutton.y < int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1650 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1473 { 1651 {
1474 int dist; 1652 int dist;
1475
1476 pending_scroll_selection=1;
1477 1653
1478 /* don't clobber the current delay if we are 1654 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1655 * already in the middle of scrolling.
1480 */ 1656 */
1481 if (scroll_selection_delay<=0) 1657 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1658 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1659
1484 /* save the event params so we can highlight 1660 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1661 * the selection in the pending-scroll loop
1486 */ 1662 */
1487 selection_save_x=ev.xbutton.x; 1663 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1664 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1665 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1666
1492 /* calc number of lines to scroll */ 1667 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1668 if (ev.xbutton.y < int_bwidth)
1494 { 1669 {
1495 scroll_selection_dir = UP; 1670 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1671 dist = int_bwidth - ev.xbutton.y;
1497 } 1672 }
1498 else 1673 else
1499 { 1674 {
1500 scroll_selection_dir = DN; 1675 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y - 1676 dist = ev.xbutton.y - (int_bwidth + height);
1502 (TermWin.int_bwidth + TermWin.height);
1503 } 1677 }
1678
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1679 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1680 / SELECTION_SCROLL_LINE_SPEEDUP
1681 + 1;
1506 MIN_IT (scroll_selection_lines, 1682 min_it (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1683 SELECTION_SCROLL_MAX_LINES);
1508 } 1684 }
1509 else 1685 else
1510 { 1686 {
1511 /* we are within the text window, so we 1687 /* we are within the text window, so we
1512 * shouldn't be scrolling 1688 * shouldn't be scrolling
1513 */ 1689 */
1514 pending_scroll_selection = 0; 1690 if (sel_scroll_ev.active)
1691 sel_scroll_ev.stop();
1515 } 1692 }
1516#endif 1693#endif
1517#ifdef MOUSE_THRESHOLD 1694#ifdef MOUSE_THRESHOLD
1518
1519 } 1695 }
1520#endif 1696#endif
1521
1522 } 1697 }
1523 } 1698 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1700 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1701 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1527 MotionNotify, &ev)) ; 1702 MotionNotify, &ev))
1703 ;
1704
1528 XQueryPointer (display->display, scrollBar.win, 1705 XQueryPointer (disp, scrollBar.win,
1529 &unused_root, &unused_child, 1706 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1707 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1708 &ev.xbutton.x, &ev.xbutton.y,
1532 &unused_mask); 1709 &unused_mask);
1533 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1534 scrollbar_size ()); 1711 scrollbar_size ());
1535 scr_refresh (refresh_type); 1712 want_refresh = 1;
1536 refresh_limit = 0; 1713 refresh_limit = 0;
1537 scrollbar_show (1); 1714 scrollbar_show (1);
1538 } 1715 }
1539 break; 1716 break;
1540 } 1717 }
1541}
1542 1718
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1723 {
1724 if (hidden_cursor)
1725 {
1726 hidden_cursor = 0;
1727 want_refresh = 1;
1728 }
1729
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1731 }
1732#endif
1733
1734#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 {
1737 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease)
1740 if (hidden_pointer)
1741 pointer_unblank ();
1742
1743 if (ev.type == KeyPress && hidden_pointer == 0)
1744 pointer_blank ();
1745 }
1746#endif
1747}
1748
1749void
1750rxvt_term::focus_in ()
1751{
1752 if (!focus)
1753 {
1754 focus = 1;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if USE_XIM
1760 if (Input_Context != NULL)
1761 {
1762 IMSetStatusPosition ();
1763 XSetICFocus (Input_Context);
1764 }
1765#endif
1766#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1769#endif
1770#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade])
1772 {
1773 pix_colors = pix_colors_focused;
1774 scr_recolour ();
1775 }
1776#endif
1777 }
1778}
1779
1780void
1781rxvt_term::focus_out ()
1782{
1783 if (focus)
1784 {
1785 focus = 0;
1786 want_refresh = 1;
1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1793 iso14755buf = 0;
1794# if ENABLE_OVERLAY
1795 scr_overlay_off ();
1796# endif
1797 }
1798#endif
1799#if USE_XIM
1800 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context);
1802#endif
1803#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink))
1805 cursor_blink_ev.stop ();
1806 hidden_cursor = 0;
1807#endif
1808#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade])
1810 {
1811 pix_colors = pix_colors_unfocused;
1812 scr_recolour ();
1813 }
1814#endif
1815 }
1816}
1817
1818#if TRANSPARENT
1543void 1819void
1544rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1821{
1546 SET_R (this); 1822 make_current ();
1547 SET_LOCALE (locale);
1548 1823
1549 switch (ev.type) 1824 switch (ev.type)
1550 { 1825 {
1551 case PropertyNotify: 1826 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /* 1827 /*
1562 * if user used some Esetroot compatible prog to set the root bg, 1828 * if user used some Esetroot compatible prog to set the root bg,
1563 * use the property to determine the pixmap. We use it later on. 1829 * use the property to determine the pixmap. We use it later on.
1564 */ 1830 */
1565 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1831 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1832 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1569 return; 1833 return;
1570 }
1571 1834
1572 /* FALLTHROUGH */ 1835 /* FALLTHROUGH */
1573 case ReparentNotify: 1836 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1838 want_refresh = want_full_refresh = 1;
1577 break; 1839 break;
1578#endif
1579 } 1840 }
1580} 1841}
1842#endif
1581 1843
1582void 1844void
1583rxvt_term::button_press (const XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
1584{ 1846{
1585 int reportmode = 0, clickintime; 1847 int reportmode = 0, clickintime;
1586 1848
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1849 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1850
1588 if (!bypass_keystate) 1851 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1852 reportmode = !! (priv_modes & PrivMode_mouse_report);
1853
1590 /* 1854 /*
1591 * VT window processing of button press 1855 * VT window processing of button press
1592 */ 1856 */
1593 if (ev.window == TermWin.vt) 1857 if (ev.window == vt)
1594 { 1858 {
1595#if RXVT_GRAPHICS 1859#if ISO_14755
1596 if (ev.subwindow != None) 1860 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1862 {
1599#endif 1863 iso14755_54 (ev.x, ev.y);
1600 1864 return;
1601 { 1865 }
1866#endif
1867
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1868 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1869
1603 if (reportmode) 1870 if (reportmode)
1871 {
1872 /* mouse report from vt window */
1873 /* save the xbutton state (for ButtonRelease) */
1874 MEvent.state = ev.state;
1875#ifdef MOUSE_REPORT_DOUBLECLICK
1876 if (ev.button == MEvent.button && clickintime)
1604 { 1877 {
1605 /* mouse report from vt window */ 1878 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1879 MEvent.clicks++;
1607 MEvent.state = ev.state; 1880
1608#ifdef MOUSE_REPORT_DOUBLECLICK 1881 if (MEvent.clicks > 1)
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1882 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1883 /* only report double clicks */
1616 MEvent.clicks = 2; 1884 MEvent.clicks = 2;
1617 mouse_report (ev); 1885 mouse_report (ev);
1618 1886
1619 /* don't report the release */ 1887 /* don't report the release */
1620 MEvent.clicks = 0; 1888 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1889 MEvent.button = AnyButton;
1622 }
1623 } 1890 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1891 }
1637 else 1892 else
1638 { 1893 {
1639 if (ev.button != MEvent.button) 1894 /* different button, or time expired */
1640 MEvent.clicks = 0; 1895 MEvent.clicks = 1;
1641 switch (ev.button)
1642 {
1643 case Button1:
1644 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report))
1646 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1; 1896 MEvent.button = ev.button;
1663 break; 1897 mouse_report (ev);
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime)
1667 selection_rotate (ev.x, ev.y);
1668 else
1669 selection_extend (ev.x, ev.y, 1);
1670 MEvent.button = Button3;
1671 break;
1672 }
1673 } 1898 }
1899#else
1900 MEvent.button = ev.button;
1901 mouse_report (ev);
1902#endif /* MOUSE_REPORT_DOUBLECLICK */
1903
1904 }
1905 else
1906 {
1907 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0;
1909
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button)
1912 {
1913 case Button1:
1914 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */
1916#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask);
1918#else
1919 selection.rect = false;
1920#endif
1921
1922 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 {
1925 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y);
1927 else
1928 selection_extend (ev.x, ev.y, 1);
1929 }
1930 else
1931 {
1932 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++;
1934 else
1935 MEvent.clicks = 1;
1936
1937 selection_click (MEvent.clicks, ev.x, ev.y);
1938 }
1939
1940 MEvent.button = Button1;
1941 break;
1942
1943 case Button3:
1944 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y);
1946 else
1947 selection_extend (ev.x, ev.y, 1);
1948
1949 MEvent.button = Button3;
1950 break;
1951 }
1952 }
1953
1674 MEvent.time = ev.time; 1954 MEvent.time = ev.time;
1675 return; 1955 return;
1676 }
1677 } 1956 }
1678 1957
1679 /* 1958 /*
1680 * Scrollbar window processing of button press 1959 * Scrollbar window processing of button press
1681 */ 1960 */
… …
1745 upordown = 1; /* down */ 2024 upordown = 1; /* down */
1746 } 2025 }
1747 if (upordown) 2026 if (upordown)
1748 { 2027 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2028#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2029 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 2030#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 2031 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 2032 {
1754 if (upordown < 0) 2033 if (upordown < 0)
1755 scrollBar.setUp (); 2034 scrollBar.setUp ();
… …
1771 break; 2050 break;
1772 case R_SB_ALIGN_BOTTOM: 2051 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 2052 csrO = scrollBar.bot - scrollBar.top;
1774 break; 2053 break;
1775 } 2054 }
2055
1776 if (scrollBar.style == R_SB_XTERM 2056 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 2057 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 2058 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 2060
1781 scrollBar.setMotion (); 2061 scrollBar.setMotion ();
1782 break; 2062 break;
1783 2063
1784 case Button1: 2064 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2065 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1789 case Button3: 2069 case Button3:
1790 if (scrollBar.style != R_SB_XTERM) 2070 if (scrollBar.style != R_SB_XTERM)
1791 { 2071 {
1792 if (scrollbar_above_slider (ev.y)) 2072 if (scrollbar_above_slider (ev.y))
1793# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
1794 scr_page (UP, TermWin.nrow - 1); 2074 scr_page (UP, nrow - 1);
1795# else 2075# else
1796 scr_page (UP, TermWin.nrow / 4); 2076 scr_page (UP, nrow / 4);
1797# endif 2077# endif
1798 else if (scrollbar_below_slider (ev.y)) 2078 else if (scrollbar_below_slider (ev.y))
1799# ifdef RXVT_SCROLL_FULL 2079# ifdef RXVT_SCROLL_FULL
1800 scr_page (DN, TermWin.nrow - 1); 2080 scr_page (DN, nrow - 1);
1801# else 2081# else
1802 scr_page (DN, TermWin.nrow / 4); 2082 scr_page (DN, nrow / 4);
1803# endif 2083# endif
1804 else 2084 else
1805 scrollBar.setMotion (); 2085 scrollBar.setMotion ();
1806 } 2086 }
1807 else 2087 else
1808 { 2088 {
1809 scr_page ((ev.button == Button1 ? DN : UP), 2089 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 2090 (nrow
1811 * scrollbar_position (ev.y) 2091 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 2092 / scrollbar_size ()));
1813 } 2093 }
2094
1814 break; 2095 break;
1815 } 2096 }
1816 } 2097 }
2098
1817 return; 2099 return;
1818 } 2100 }
2101
1819#if MENUBAR 2102#if MENUBAR
1820 /* 2103 /*
1821 * Menubar window processing of button press 2104 * Menubar window processing of button press
1822 */ 2105 */
1823 if (isMenuBarWindow (ev.window)) 2106 if (isMenuBarWindow (ev.window))
1824 menubar_control (ev); 2107 menubar_control (ev);
1825#endif 2108#endif
1826} 2109}
1827 2110
1828void 2111void
1829rxvt_term::button_release (const XButtonEvent &ev) 2112rxvt_term::button_release (XButtonEvent &ev)
1830{ 2113{
1831 int reportmode = 0; 2114 int reportmode = 0;
1832 2115
1833 csrO = 0; /* reset csr Offset */ 2116 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 2117 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2118 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 2119
1837 if (scrollbar_isUpDn ()) 2120 if (scrollbar_isUpDn ())
1838 { 2121 {
1839 scrollBar.setIdle (); 2122 scrollBar.setIdle ();
1840 scrollbar_show (0); 2123 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 2125 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 2126#endif
1844
1845 } 2127 }
2128
1846#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop();
1848#endif 2132#endif
2133
1849 if (ev.window == TermWin.vt) 2134 if (ev.window == vt)
1850 { 2135 {
1851#ifdef RXVT_GRAPHICS 2136#if ISO_14755
1852 if (ev.subwindow != None) 2137 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 2139 return;
1855#endif 2140#endif
1856
1857 {
1858 if (reportmode) 2141 if (reportmode)
2142 {
2143 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4)
2146 return;
2147#ifdef MOUSE_REPORT_DOUBLECLICK
2148 /* only report the release of 'slow' single clicks */
2149 if (MEvent.button != AnyButton
2150 && (ev.button != MEvent.button
2151 || (ev.time - MEvent.time
2152 > MULTICLICK_TIME / 2)))
1859 { 2153 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 2154 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 2155 MEvent.button = AnyButton;
1877 mouse_report (ev); 2156 mouse_report (ev);
2157 }
2158#else /* MOUSE_REPORT_DOUBLECLICK */
2159 MEvent.button = AnyButton;
2160 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 2161#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 2162 return;
2163 }
2164
2165 /*
2166 * dumb hack to compensate for the failure of click-and-drag
2167 * when overriding mouse reporting
2168 */
2169 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0);
2173
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button)
2178 {
2179 case Button1:
2180 case Button3:
2181 selection_make (ev.time);
2182 break;
2183 case Button2:
2184 selection_request (ev.time, ev.x, ev.y);
2185 break;
2186#ifdef MOUSE_WHEEL
2187 case Button4:
2188 case Button5:
2189 {
2190 int i;
2191 page_dirn v;
2192
2193 v = ev.button == Button4 ? UP : DN;
2194
2195 if (ev.state & ShiftMask)
2196 i = 1;
2197 else if (OPTION (Opt_mouseWheelScrollPage))
2198 i = nrow - 1;
2199 else
2200 i = 5;
2201
2202# ifdef MOUSE_SLIP_WHEELING
2203 if (ev.state & ControlMask)
2204 {
2205 mouse_slip_wheel_speed += v ? -1 : 1;
2206 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2207 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2208
2209 if (slip_wheel_ev.at < NOW)
2210 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2211
2212 slip_wheel_ev.start ();
2213 }
2214 else
2215 {
2216# endif
2217 scr_page (v, i);
2218 scrollbar_show (1);
2219# ifdef MOUSE_SLIP_WHEELING
2220 }
2221# endif
1880 } 2222 }
1881 /*
1882 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting
1884 */
1885 if (PrivateModes & PrivMode_mouse_report
1886 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0);
1889
1890 switch (ev.button)
1891 {
1892 case Button1:
1893 case Button3:
1894 selection_make (ev.time);
1895 break; 2223 break;
1896 case Button2:
1897 selection_request (ev.time, ev.x, ev.y);
1898 break;
1899#ifdef MOUSE_WHEEL
1900 case Button4:
1901 case Button5:
1902 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 mouse_slip_wheel_speed += (v ? -1 : 1);
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1918 }
1919# endif 2224#endif
1920# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1);
1924# else
1925 while (i--)
1926 {
1927 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1);
1930 }
1931# endif
1932
1933 }
1934 break;
1935#endif
1936
1937 }
1938 } 2225 }
1939 } 2226 }
1940#ifdef MENUBAR 2227#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2228 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2229 menubar_control (ev);
1943#endif 2230#endif
1944} 2231}
1945 2232
1946
1947#ifdef TRANSPARENT 2233#ifdef TRANSPARENT
2234#if TINTING
2235/* taken from aterm-0.4.2 */
2236
2237typedef uint32_t RUINT32T;
2238
2239void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2240{
2241 int sh_r, sh_g, sh_b;
2242 RUINT32T mask_r, mask_g, mask_b;
2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246 int i;
2247
2248 Visual *visual = display->visual;
2249
2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251
2252 /* for convenience */
2253 mask_r = visual->red_mask;
2254 mask_g = visual->green_mask;
2255 mask_b = visual->blue_mask;
2256
2257 /* boring lookup table pre-initialization */
2258 switch (srcImage->bits_per_pixel) {
2259 case 15:
2260 if ((mask_r != 0x7c00) ||
2261 (mask_g != 0x03e0) ||
2262 (mask_b != 0x001f))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2265 lookup_r = lookup;
2266 lookup_g = lookup+32;
2267 lookup_b = lookup+32+32;
2268 sh_r = 10;
2269 sh_g = 5;
2270 sh_b = 0;
2271 break;
2272 case 16:
2273 if ((mask_r != 0xf800) ||
2274 (mask_g != 0x07e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+64;
2281 sh_r = 11;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 24:
2286 if ((mask_r != 0xff0000) ||
2287 (mask_g != 0x00ff00) ||
2288 (mask_b != 0x0000ff))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2291 lookup_r = lookup;
2292 lookup_g = lookup+256;
2293 lookup_b = lookup+256+256;
2294 sh_r = 16;
2295 sh_g = 8;
2296 sh_b = 0;
2297 break;
2298 case 32:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 default:
2312 return; /* we do not support this color depth */
2313 }
2314
2315 /* prepare limits for color transformation (each channel is handled separately) */
2316 if (shade < 0) {
2317 shade = -shade;
2318 if (shade < 0) shade = 0;
2319 if (shade > 100) shade = 100;
2320
2321 lower_lim_r = 65535-rm;
2322 lower_lim_g = 65535-gm;
2323 lower_lim_b = 65535-bm;
2324
2325 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2326 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2327 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2328
2329 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2330 } else {
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2335
2336 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2337 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2338 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2339 }
2340
2341 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2342 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2343 {
2344 unsigned int tmp;
2345
2346 tmp = lower_lim_r;
2347 lower_lim_r = lower_lim_b;
2348 lower_lim_b = tmp;
2349
2350 tmp = upper_lim_r;
2351 upper_lim_r = upper_lim_b;
2352 upper_lim_b = tmp;
2353 }
2354
2355 /* fill our lookup tables */
2356 for (i = 0; i <= mask_r>>sh_r; i++)
2357 {
2358 RUINT32T tmp;
2359 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2360 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2361 lookup_r[i] = (tmp/65535)<<sh_r;
2362 }
2363 for (i = 0; i <= mask_g>>sh_g; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2367 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2368 lookup_g[i] = (tmp/65535)<<sh_g;
2369 }
2370 for (i = 0; i <= mask_b>>sh_b; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2374 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2375 lookup_b[i] = (tmp/65535)<<sh_b;
2376 }
2377
2378 /* apply table to input image (replacing colors by newly calculated ones) */
2379 switch (srcImage->bits_per_pixel)
2380 {
2381 case 15:
2382 {
2383 unsigned short *p1, *pf, *p, *pl;
2384 p1 = (unsigned short *) srcImage->data;
2385 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2386 while (p1 < pf)
2387 {
2388 p = p1;
2389 pl = p1 + srcImage->width;
2390 for (; p < pl; p++)
2391 {
2392 *p = lookup_r[(*p & 0x7c00)>>10] |
2393 lookup_g[(*p & 0x03e0)>> 5] |
2394 lookup_b[(*p & 0x001f)];
2395 }
2396 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2397 }
2398 break;
2399 }
2400 case 16:
2401 {
2402 unsigned short *p1, *pf, *p, *pl;
2403 p1 = (unsigned short *) srcImage->data;
2404 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2405 while (p1 < pf)
2406 {
2407 p = p1;
2408 pl = p1 + srcImage->width;
2409 for (; p < pl; p++)
2410 {
2411 *p = lookup_r[(*p & 0xf800)>>11] |
2412 lookup_g[(*p & 0x07e0)>> 5] |
2413 lookup_b[(*p & 0x001f)];
2414 }
2415 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 case 24:
2420 {
2421 unsigned char *p1, *pf, *p, *pl;
2422 p1 = (unsigned char *) srcImage->data;
2423 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2424 while (p1 < pf)
2425 {
2426 p = p1;
2427 pl = p1 + srcImage->width * 3;
2428 for (; p < pl; p += 3)
2429 {
2430 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2431 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2432 p[2] = lookup_r[(p[2] & 0x0000ff)];
2433 }
2434 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2435 }
2436 break;
2437 }
2438 case 32:
2439 {
2440 RUINT32T *p1, *pf, *p, *pl;
2441 p1 = (RUINT32T *) srcImage->data;
2442 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2443
2444 while (p1 < pf)
2445 {
2446 p = p1;
2447 pl = p1 + srcImage->width;
2448 for (; p < pl; p++)
2449 {
2450 *p = lookup_r[(*p & 0xff0000)>>16] |
2451 lookup_g[(*p & 0x00ff00)>> 8] |
2452 lookup_b[(*p & 0x0000ff)] |
2453 (*p & ~0xffffff);
2454 }
2455 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2456 }
2457 break;
2458 }
2459 }
2460
2461 free (lookup);
2462}
2463#endif
2464
1948/* 2465/*
1949 * Check our parents are still who we think they are. 2466 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2467 * Do transparency updates if required
1951 */ 2468 */
1952int 2469int
1953rxvt_term::check_our_parents () 2470rxvt_term::check_our_parents ()
1954{ 2471{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2472 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2473 unsigned long nitems, bytes_after;
1957 Atom atype; 2474 Atom atype;
1958 unsigned char *prop = NULL; 2475 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2476 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2477 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2478 XWindowAttributes wattr, wrootattr;
2479 dDisp;
1962 2480
1963 pchanged = 0; 2481 pchanged = 0;
1964 2482
1965 if (! (Options & Opt_transparent)) 2483 if (!OPTION (Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2484 return pchanged; /* Don't try any more */
1967 2485
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2486 XGetWindowAttributes (disp, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2487 rootdepth = wrootattr.depth;
1970 2488
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2489 XGetWindowAttributes (disp, parent[0], &wattr);
2490
1972 if (rootdepth != wattr.depth) 2491 if (rootdepth != wattr.depth)
1973 { 2492 {
1974 if (am_transparent) 2493 if (am_transparent)
1975 { 2494 {
1976 pchanged = 1; 2495 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2497 am_transparent = am_pixmap_trans = 0;
1980 } 2498 }
2499
1981 return pchanged; /* Don't try any more */ 2500 return pchanged; /* Don't try any more */
1982 } 2501 }
1983 2502
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2503 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2504 XSync (disp, False);
1986 2505
1987 /* 2506 /*
1988 * Make the frame window set by the window manager have 2507 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2508 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2509 * windows for each client, so we have to take care about that.
1991 */ 2510 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2511 i = (xa[XA_XROOTPMAP_ID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2514 &nitems, &bytes_after, &prop) == Success);
2515
1996 if (!i || prop == NULL) 2516 if (!i || prop == NULL)
2517 i = (xa[XA_ESETROOT_PMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL
2523#if TINTING
2524 || !rs[Rs_color + Color_tint]
2525#endif
2526 )
1997 have_pixmap = 0; 2527 have_pixmap = 0;
1998 else 2528 else
1999 { 2529 {
2000 have_pixmap = 1; 2530 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2531 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2532 XFree (prop);
2003 } 2533 }
2534
2004 if (have_pixmap) 2535 if (have_pixmap)
2005 { 2536 {
2006 /* 2537 /*
2007 * Copy display->root pixmap transparency 2538 * Copy display->root pixmap transparency
2008 */ 2539 */
2009 int sx, sy, nx, ny; 2540 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2541 unsigned int nw, nh;
2011 Window cr; 2542 Window cr;
2012 XImage *image; 2543 XImage *image;
2013 GC gc; 2544 GC gc;
2014 XGCValues gcvalue; 2545 XGCValues gcvalue;
2015 2546
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2547 XTranslateCoordinates (disp, parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2548 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2549 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2550 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2551 nx = ny = 0;
2552
2021 if (sx < 0) 2553 if (sx < 0)
2022 { 2554 {
2023 nw += sx; 2555 nw += sx;
2024 nx = -sx; 2556 nx = -sx;
2025 sx = 0; 2557 sx = 0;
2026 } 2558 }
2559
2027 if (sy < 0) 2560 if (sy < 0)
2028 { 2561 {
2029 nh += sy; 2562 nh += sy;
2030 ny = -sy; 2563 ny = -sy;
2031 sy = 0; 2564 sy = 0;
2032 } 2565 }
2566
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2567 min_it (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2568 min_it (nh, (unsigned int) (wrootattr.height - sy));
2569
2570 XSync (disp, False);
2035 allowedxerror = -1; 2571 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2573
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2575 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2576 allowedxerror = 0;
2577
2041 if (image == NULL) 2578 if (image == NULL)
2042 { 2579 {
2043 if (am_transparent && am_pixmap_trans) 2580 if (am_transparent && am_pixmap_trans)
2044 { 2581 {
2045 pchanged = 1; 2582 pchanged = 1;
2046 if (TermWin.pixmap != None) 2583 if (pixmap != None)
2047 { 2584 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2585 XFreePixmap (disp, pixmap);
2049 TermWin.pixmap = None; 2586 pixmap = None;
2050 } 2587 }
2051 } 2588 }
2589
2052 am_pixmap_trans = 0; 2590 am_pixmap_trans = 0;
2053 } 2591 }
2054 else 2592 else
2055 { 2593 {
2056 if (TermWin.pixmap != None) 2594 if (pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2595 XFreePixmap (disp, pixmap);
2596
2597#if TINTING
2598 if (ISSET_PIXCOLOR (Color_tint))
2599 {
2600 unsigned short rm, gm, bm;
2601 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602
2603 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2604
2605 ShadeXImage (display, image, shade, rm, gm, bm);
2606 }
2607#endif
2608
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2609 pixmap = XCreatePixmap (disp, vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2610 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2612 XPutImage (disp, pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2613 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2614 XFreeGC (disp, gc);
2067 XDestroyImage (image); 2615 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2069 TermWin.pixmap); 2617 XClearWindow (disp, parent[0]);
2618
2070 if (!am_transparent || !am_pixmap_trans) 2619 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2620 pchanged = 1;
2621
2072 am_transparent = am_pixmap_trans = 1; 2622 am_transparent = am_pixmap_trans = 1;
2073 } 2623 }
2074 } 2624 }
2625
2075 if (!am_pixmap_trans) 2626 if (am_pixmap_trans)
2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2628 else
2076 { 2629 {
2077 unsigned int n; 2630 unsigned int n;
2078 /* 2631 /*
2079 * InheritPixmap transparency 2632 * InheritPixmap transparency
2080 */ 2633 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2635 {
2085 oldp = TermWin.parent[i]; 2636 oldp = parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2637 XQueryTree (disp, parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2638 &parent[i], &list, &n);
2088 XFree (list); 2639 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2640
2090 if (TermWin.parent[i] == display->root) 2641 if (parent[i] == display->root)
2091 { 2642 {
2092 if (oldp != None) 2643 if (oldp != None)
2093 pchanged = 1; 2644 pchanged = 1;
2645
2094 break; 2646 break;
2095 } 2647 }
2648
2096 if (oldp != TermWin.parent[i]) 2649 if (oldp != parent[i])
2097 pchanged = 1; 2650 pchanged = 1;
2098 } 2651 }
2652
2099 n = 0; 2653 n = 0;
2654
2100 if (pchanged) 2655 if (pchanged)
2101 { 2656 {
2102 for (; n < (unsigned int)i; n++) 2657 for (; n < (unsigned int)i; n++)
2103 { 2658 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2659 XGetWindowAttributes (disp, parent[n], &wattr);
2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2661 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2109 break; 2663 break;
2110 } 2664 }
2111 } 2665 }
2112 } 2666 }
2113 if (n > (int) (sizeof (TermWin.parent) 2667
2114 / sizeof (TermWin.parent[0]))) 2668 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2115 { 2669 {
2116 D_X ((stderr, "InheritPixmap Turning off")); 2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt,
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2672 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2673 /* XXX: also turn off Opt_transparent? */
2123 } 2674 }
2124 else 2675 else
2125 { 2676 {
2677#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2678 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2679 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130
2131 rqt.tv_sec = 1;
2132 rqt.tv_nsec = 0;
2133 nanosleep (&rqt, NULL);
2134# else
2135 sleep (1); 2680 sleep (1);
2136# endif 2681#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2682 for (n = 0; n < (unsigned int)i; n++)
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2683 {
2140 ParentRelative); 2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2685 XClearWindow (disp, parent[n]);
2142 ParentRelative); 2686 }
2687
2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2143 am_transparent = 1; 2689 am_transparent = 1;
2144 } 2690 }
2691
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2693 parent[i] = None;
2694 }
2695
2696 if (scrollBar.win)
2147 } 2697 {
2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2699 scrollBar.setIdle ();
2700 scrollbar_show (0);
2701 }
2702
2703 if (am_transparent)
2704 {
2705 want_refresh = want_full_refresh = 1;
2706 if (am_pixmap_trans)
2707 flush ();
2708 }
2709
2148 return pchanged; 2710 return pchanged;
2149} 2711}
2150#endif 2712#endif
2151 2713
2152/*}}} */ 2714/*}}} */
2715
2716bool
2717rxvt_term::cmd_parse ()
2718{
2719 bool flag = false;
2720 wchar_t ch = NOCHAR;
2721 char *seq_begin; // remember start of esc-sequence here
2722
2723 for (;;)
2724 {
2725 if (ch == NOCHAR)
2726 {
2727 seq_begin = cmdbuf_ptr;
2728 ch = next_char ();
2729
2730 if (ch == NOCHAR)
2731 break;
2732 }
2733
2734 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2735 {
2736 if (!seen_input)
2737 {
2738 seen_input = 1;
2739 // many badly-written programs (e.g. jed) contain a race condition:
2740 // they first read the screensize and then install a SIGWINCH handler.
2741 // some window managers resize the window early, and these programs
2742 // then sometimes get the size wrong.
2743 // unfortunately other programs are even more buggy and dislike
2744 // being sent SIGWINCH, so only do it when we were in fact being
2745 // resized.
2746 if (seen_resize && cmd_pid)
2747 kill (-cmd_pid, SIGWINCH);
2748 }
2749
2750 /* Read a text string from the input buffer */
2751 wchar_t buf[UBUFSIZ];
2752 bool refreshnow = false;
2753 int nlines = 0;
2754 wchar_t *str = buf;
2755 wchar_t *eol = str + min (ncol, UBUFSIZ);
2756
2757 for (;;)
2758 {
2759 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2760 break;
2761
2762 *str++ = ch;
2763
2764 if (ch == C0_LF || str >= eol)
2765 {
2766 if (ch == C0_LF)
2767 nlines++;
2768
2769 refresh_count++;
2770
2771 if (!OPTION (Opt_jumpScroll)
2772 || (refresh_count >= refresh_limit * (nrow - 1)))
2773 {
2774 refreshnow = true;
2775 refresh_count = 0;
2776 ch = NOCHAR;
2777 break;
2778 }
2779
2780 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1)
2782 {
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2784 scr_add_lines (buf, str - buf, nlines);
2785
2786 nlines = 0;
2787 str = buf;
2788 eol = str + min (ncol, UBUFSIZ);
2789 }
2790
2791 if (str >= eol)
2792 {
2793 if (eol >= buf + UBUFSIZ)
2794 {
2795 ch = NOCHAR;
2796 break;
2797 }
2798 else
2799 eol = min (eol + ncol, buf + UBUFSIZ);
2800 }
2801
2802 }
2803
2804 seq_begin = cmdbuf_ptr;
2805 ch = next_char ();
2806 }
2807
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2809 scr_add_lines (buf, str - buf, nlines);
2810
2811 /*
2812 * If there have been a lot of new lines, then update the screen
2813 * What the heck I'll cheat and only refresh less than every page-full.
2814 * the number of pages between refreshes is refresh_limit, which
2815 * is incremented here because we must be doing flat-out scrolling.
2816 */
2817 if (refreshnow)
2818 {
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++;
2821 else
2822 {
2823 flag = true;
2824 scr_refresh (refresh_type);
2825 want_refresh = 1;
2826 }
2827 }
2828
2829 }
2830 else
2831 {
2832 try
2833 {
2834 process_nonprinting (ch);
2835 }
2836 catch (const class out_of_input &o)
2837 {
2838 // we ran out of input, retry later
2839 cmdbuf_ptr = seq_begin;
2840 break;
2841 }
2842
2843 ch = NOCHAR;
2844 }
2845 }
2846
2847 return flag;
2848}
2849
2850// read the next character
2851wchar_t
2852rxvt_term::next_char ()
2853{
2854 while (cmdbuf_ptr < cmdbuf_endp)
2855 {
2856 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2858 return *cmdbuf_ptr++;
2859
2860 wchar_t wc;
2861 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2862
2863 if (len == (size_t)-2)
2864 {
2865 // the mbstate stores incomplete sequences. didn't know this :/
2866 cmdbuf_ptr = cmdbuf_endp;
2867 break;
2868 }
2869
2870 if (len == (size_t)-1)
2871 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2872
2873 // assume wchar == unicode
2874 cmdbuf_ptr += len;
2875 return wc & UNICODE_MASK;
2876 }
2877
2878 return NOCHAR;
2879}
2880
2881// read the next octet
2882uint32_t
2883rxvt_term::next_octet ()
2884{
2885 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR;
2888}
2889
2890/* rxvt_cmd_getc () - Return next input character */
2891/*
2892 * Return the next input character after first passing any keyboard input
2893 * to the command.
2894 */
2895wchar_t
2896rxvt_term::cmd_getc ()
2897{
2898 wchar_t c = next_char ();
2899
2900 if (c == NOCHAR)
2901 throw out_of_input;
2902
2903 return c;
2904}
2905
2906uint32_t
2907rxvt_term::cmd_get8 ()
2908{
2909 uint32_t c = next_octet ();
2910
2911 if (c == NOCHAR)
2912 throw out_of_input;
2913
2914 return c;
2915}
2153 2916
2154/*{{{ print pipe */ 2917/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2918/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2919#ifdef PRINTPIPE
2157FILE * 2920FILE *
2158rxvt_term::popen_printer () 2921rxvt_term::popen_printer ()
2159{ 2922{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2923 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2924
2162 if (stream == NULL) 2925 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2926 rxvt_warn ("can't open printer pipe, not printing.\n");
2927
2164 return stream; 2928 return stream;
2165} 2929}
2166 2930
2167int 2931int
2168rxvt_term::pclose_printer (FILE *stream) 2932rxvt_term::pclose_printer (FILE *stream)
2169{ 2933{
2170 fflush (stream); 2934 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2935 return pclose (stream);
2177# endif
2178} 2936}
2179 2937
2180/* 2938/*
2181 * simulate attached vt100 printer 2939 * simulate attached vt100 printer
2182 */ 2940 */
2183void 2941void
2184rxvt_term::process_print_pipe () 2942rxvt_term::process_print_pipe ()
2185{ 2943{
2186 int done; 2944 int done;
2187 FILE *fd; 2945 FILE *fd;
2188 2946
2189 if ((fd = popen_printer ()) == NULL) 2947 if ((fd = popen_printer ()) == NULL)
2190 return; 2948 return;
2191 2949
2192 /* 2950 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2951 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2952 * is received.
2195 */ 2953 */
2196 for (done = 0; !done;) 2954 for (done = 0; !done;)
2197 { 2955 {
2198 unsigned char buf[8]; 2956 unsigned char buf[8];
2199 unsigned char ch; 2957 unicode_t ch;
2200 unsigned int i, len; 2958 unsigned int i, len;
2201 2959
2202 if ((ch = cmd_getc ()) != C0_ESC) 2960 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2961 {
2204 if (putc (ch, fd) == EOF) 2962 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2963 break; /* done = 1 */
… …
2220 { 2978 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2979 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2980 break; /* done = 1 */
2223 } 2981 }
2224 } 2982 }
2983
2225 for (i = 0; i < len; i++) 2984 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2985 if (putc (buf[i], fd) == EOF)
2227 { 2986 {
2228 done = 1; 2987 done = 1;
2229 break; 2988 break;
2230 } 2989 }
2231 } 2990 }
2232 } 2991 }
2992
2233 pclose_printer (fd); 2993 pclose_printer (fd);
2234} 2994}
2235#endif /* PRINTPIPE */ 2995#endif /* PRINTPIPE */
2236/*}}} */ 2996/*}}} */
2237 2997
2238/* *INDENT-OFF* */ 2998/* *INDENT-OFF* */
2239enum { 2999enum {
2240 C1_40 = 0x40, 3000 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3001 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 3002 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 3003 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 3004 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 3005};
2246/* *INDENT-ON* */ 3006/* *INDENT-ON* */
2247 3007
2248/*{{{ process non-printing single characters */ 3008/*{{{ process non-printing single characters */
2249void 3009void
2250rxvt_term::process_nonprinting (unsigned char ch) 3010rxvt_term::process_nonprinting (unicode_t ch)
2251{ 3011{
2252 switch (ch) 3012 switch (ch)
2253 { 3013 {
3014 case C0_ESC:
3015 process_escape_seq ();
3016 break;
2254 case C0_ENQ: /* terminal Status */ 3017 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 3018 if (rs[Rs_answerbackstring])
2256 tt_write ( 3019 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2257 (const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2259 else 3020 else
2260 tt_write ((unsigned char *)VT100_ANS, 3021 tt_write (VT100_ANS, strlen (VT100_ANS));
2261 (unsigned int)STRLEN (VT100_ANS));
2262 break; 3022 break;
2263 case C0_BEL: /* bell */ 3023 case C0_BEL: /* bell */
2264 scr_bell (); 3024 scr_bell ();
2265 break; 3025 break;
2266 case C0_BS: /* backspace */ 3026 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 3041 scr_charset_choose (1);
2282 break; 3042 break;
2283 case C0_SI: /* shift in - acs */ 3043 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 3044 scr_charset_choose (0);
2285 break; 3045 break;
3046
3047#ifdef EIGHT_BIT_CONTROLS
3048 // 8-bit controls
3049 case 0x90: /* DCS */
3050 process_dcs_seq ();
3051 break;
3052 case 0x9b: /* CSI */
3053 process_csi_seq ();
3054 break;
3055 case 0x9d: /* CSI */
3056 process_osc_seq ();
3057 break;
3058#endif
2286 } 3059 }
2287} 3060}
2288/*}}} */ 3061/*}}} */
2289 3062
2290 3063
2291/*{{{ process VT52 escape sequences */ 3064/*{{{ process VT52 escape sequences */
2292void 3065void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 3066rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 3067{
2295 int row, col; 3068 int row, col;
2296 3069
2297 switch (ch) 3070 switch (ch)
2298 { 3071 {
… …
2350 3123
2351/*{{{ process escape sequences */ 3124/*{{{ process escape sequences */
2352void 3125void
2353rxvt_term::process_escape_seq () 3126rxvt_term::process_escape_seq ()
2354{ 3127{
2355 unsigned char ch = cmd_getc (); 3128 unicode_t ch = cmd_getc ();
2356 3129
2357 if (PrivateModes & PrivMode_vt52) 3130 if (priv_modes & PrivMode_vt52)
2358 { 3131 {
2359 process_escape_vt52 (ch); 3132 process_escape_vt52 (ch);
2360 return; 3133 return;
2361 } 3134 }
2362 3135
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 3150 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 3151 break;
2379 case '+': 3152 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 3153 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 3154 break;
2382#ifdef MULTICHAR_SET 3155#if ENABLE_FRILLS
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS
2388 case '6': 3156 case '6':
2389 scr_backindex (); 3157 scr_backindex ();
2390 break; 3158 break;
2391#endif 3159#endif
2392 case '7': 3160 case '7':
2393 scr_cursor (SAVE); 3161 scr_cursor (SAVE);
2394 break; 3162 break;
2395 case '8': 3163 case '8':
2396 scr_cursor (RESTORE); 3164 scr_cursor (RESTORE);
2397 break; 3165 break;
2398#ifndef NO_FRILLS 3166#if ENABLE_FRILLS
2399 case '9': 3167 case '9':
2400 scr_forwardindex (); 3168 scr_forwardindex ();
2401 break; 3169 break;
2402#endif 3170#endif
2403 case '=': 3171 case '=':
… …
2413 break; 3181 break;
2414 3182
2415 /* 8.3.87: NEXT LINE */ 3183 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3184 case C1_NEL: /* ESC E */
2417 { 3185 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3186 wchar_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3187 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2420 } 3188 }
2421 break; 3189 break;
2422 3190
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3191 /* kidnapped escape sequence: Should be 8.3.48 */
2424 case C1_ESA: /* ESC G */ 3192 case C1_ESA: /* ESC G */
… …
2434 case C1_RI: /* ESC M */ 3202 case C1_RI: /* ESC M */
2435 scr_index (DN); 3203 scr_index (DN);
2436 break; 3204 break;
2437 3205
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3206 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3207 /*case C1_SS2: scr_single_shift (2); break; */
2440 3208
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3209 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3210 /*case C1_SS3: scr_single_shift (3); break; */
2443 3211
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3212 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3213 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3214 process_dcs_seq ();
2447 break; 3215 break;
2448 3216
2449 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3217 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2450 case C1_SCI: /* ESC Z */ 3218 case C1_SCI: /* ESC Z */
2451 tt_write ((const unsigned char *)ESCZ_ANSWER, 3219 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2452 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2453 break; /* steal obsolete ESC [ c */ 3220 break; /* steal obsolete ESC [ c */
2454 3221
2455 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3222 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2456 case C1_CSI: /* ESC [ */ 3223 case C1_CSI: /* ESC [ */
2457 process_csi_seq (); 3224 process_csi_seq ();
… …
2462 process_osc_seq (); 3229 process_osc_seq ();
2463 break; 3230 break;
2464 3231
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3232 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3233 case 'c':
3234 mbstate.reset ();
2467 scr_poweron (); 3235 scr_poweron ();
2468 scrollbar_show (1); 3236 scrollbar_show (1);
2469 break; 3237 break;
2470 3238
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3239 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3251
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3252/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3253/* *INDENT-OFF* */
2486enum { 3254enum {
2487 CSI_ICH = 0x40, 3255 CSI_ICH = 0x40,
2488 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3256 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2489 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3257 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2490 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3258 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2491 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3259 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2492 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3260 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2493 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3261 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3276 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3277 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3278 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3279 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3280 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3281 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3282 };
2515/* *INDENT-ON* */ 3283/* *INDENT-ON* */
2516 3284
2517void 3285void
2518rxvt_term::process_csi_seq () 3286rxvt_term::process_csi_seq ()
2519{ 3287{
2520 unsigned char ch, priv, i; 3288 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3289 unsigned int nargs, p;
2522 int n, ndef; 3290 int n, ndef;
2523 int arg[ESC_ARGS]; 3291 int arg[ESC_ARGS];
2524 3292
2525 for (nargs = ESC_ARGS; nargs > 0;) 3293 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3294 arg[--nargs] = 0;
2527 3295
2528 priv = 0; 3296 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3298 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3299 { /* '<' '=' '>' '?' */
2532 priv = ch; 3300 priv = ch;
2533 ch = cmd_getc (); 3301 ch = cmd_getc ();
2534 } 3302 }
3303
2535 /* read any numerical arguments */ 3304 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3305 for (n = -1; ch < CSI_ICH; )
2537 { 3306 {
2538 if (isdigit (ch)) 3307 if (isdigit (ch))
2539 { 3308 {
… …
2546 { 3315 {
2547 if (nargs < ESC_ARGS) 3316 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3317 arg[nargs++] = n;
2549 n = -1; 3318 n = -1;
2550 } 3319 }
2551 else if (ch == '\b') 3320 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 3321 process_nonprinting (ch);
2563 } 3322
2564 ch = cmd_getc (); 3323 ch = cmd_getc ();
2565 } 3324 }
2566 3325
2567 if (ch > CSI_7F) 3326 if (ch > CSI_7F)
2568 return; 3327 return;
… …
2590 { 3349 {
2591 switch (priv) 3350 switch (priv)
2592 { 3351 {
2593 case '>': 3352 case '>':
2594 if (ch == CSI_DA) /* secondary device attributes */ 3353 if (ch == CSI_DA) /* secondary device attributes */
2595 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3354 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2596 break; 3355 break;
2597 case '?': 3356 case '?':
2598 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2599 process_terminal_mode (ch, priv, nargs, arg); 3358 process_terminal_mode (ch, priv, nargs, arg);
2600 break; 3359 break;
… …
2705 3464
2706 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3465 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2707 arg[0] = -arg[0]; 3466 arg[0] = -arg[0];
2708 /* FALLTHROUGH */ 3467 /* FALLTHROUGH */
2709 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3468 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3469 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2711 break; 3470 break;
2712 3471
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3472 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3473 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2715 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3474 break;
2717 3475
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3476 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3477 process_sgr_mode (nargs, arg);
2720 break; 3478 break;
… …
2726 tt_printf ("\033[0n"); 3484 tt_printf ("\033[0n");
2727 break; 3485 break;
2728 case 6: /* CPR requested */ 3486 case 6: /* CPR requested */
2729 scr_report_position (); 3487 scr_report_position ();
2730 break; 3488 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3489 case 7: /* unofficial extension */
3490 if (OPTION (Opt_insecure))
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3491 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3492 break;
2735#endif
2736 case 8: /* unofficial extension */ 3493 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3494 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3495 break;
2739 } 3496 }
2740 break; 3497 break;
2741 3498
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3499 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3532 break;
2776 3533
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3534 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3535 if (arg[0] == 4)
2779 scr_insert_mode (0); 3536 scr_insert_mode (0);
3537 else if (arg[0] == 20)
3538 priv_modes &= ~PrivMode_LFNL;
2780 break; 3539 break;
2781 3540
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3541 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3542 if (arg[0] == 4)
2784 scr_insert_mode (1); 3543 scr_insert_mode (1);
3544 else if (arg[0] == 20)
3545 priv_modes |= PrivMode_LFNL;
2785 break; 3546 break;
2786 3547
2787 /* 3548 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3549 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3550 */
… …
2801 break; 3562 break;
2802 case CSI_75: 3563 case CSI_75:
2803 scr_cursor (RESTORE); 3564 scr_cursor (RESTORE);
2804 break; 3565 break;
2805 3566
2806#ifndef NO_FRILLS 3567#if ENABLE_FRILLS
2807 case CSI_74: 3568 case CSI_74:
2808 process_window_ops (arg, nargs); 3569 process_window_ops (arg, nargs);
2809 break; 3570 break;
2810#endif 3571#endif
2811 3572
2812 case CSI_78: /* DECREQTPARM */ 3573 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3574 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3575 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3576 break;
2816 3577
2817 default: 3578 default:
2818 break; 3579 break;
2819 } 3580 }
2820} 3581}
2821/*}}} */ 3582/*}}} */
2822 3583
2823#ifndef NO_FRILLS 3584#if ENABLE_FRILLS
2824/* ARGSUSED */ 3585/* ARGSUSED */
2825void 3586void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3587rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3588{
2828 int x, y; 3589 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3590 XWindowAttributes wattr;
2833 Window wdummy; 3591 Window wdummy;
3592 dDisp;
2834 3593
2835 if (nargs == 0) 3594 if (nargs == 0)
2836 return; 3595 return;
3596
2837 switch (args[0]) 3597 switch (args[0])
2838 { 3598 {
2839 /* 3599 /*
2840 * commands 3600 * commands
2841 */ 3601 */
2842 case 1: /* deiconify window */ 3602 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3603 XMapWindow (disp, parent[0]);
2844 break; 3604 break;
2845 case 2: /* iconify window */ 3605 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3606 XIconifyWindow (disp, parent[0], display->screen);
2847 DefaultScreen (display->display));
2848 break; 3607 break;
2849 case 3: /* set position (pixels) */ 3608 case 3: /* set position (pixels) */
2850 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3609 XMoveWindow (disp, parent[0], args[1], args[2]);
2851 break; 3610 break;
2852 case 4: /* set size (pixels) */ 3611 case 4: /* set size (pixels) */
2853 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2854 break; 3613 break;
2855 case 5: /* raise window */ 3614 case 5: /* raise window */
2856 XRaiseWindow (display->display, TermWin.parent[0]); 3615 XRaiseWindow (disp, parent[0]);
2857 break; 3616 break;
2858 case 6: /* lower window */ 3617 case 6: /* lower window */
2859 XLowerWindow (display->display, TermWin.parent[0]); 3618 XLowerWindow (disp, parent[0]);
2860 break; 3619 break;
2861 case 7: /* refresh window */ 3620 case 7: /* refresh window */
2862 scr_touch (true); 3621 scr_touch (true);
2863 break; 3622 break;
2864 case 8: /* set size (chars) */ 3623 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3624 set_widthheight ((unsigned int) (args[2] * fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3625 (unsigned int) (args[1] * fheight));
2867 break; 3626 break;
3627
3628 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3629 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3630 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3631 set_widthheight ((unsigned int)width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3632 (unsigned int) (args[1] * fheight));
2872 break; 3633 break;
3634
3635
2873 /* 3636 /*
2874 * reports - some output format copied from XTerm 3637 * reports - some output format copied from XTerm
2875 */ 3638 */
2876 case 11: /* report window state */ 3639 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3640 XGetWindowAttributes (disp, parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3642 break;
2880 case 13: /* report window position */ 3643 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3644 XGetWindowAttributes (disp, parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3645 XTranslateCoordinates (disp, parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3646 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3647 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3648 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3649 break;
2887 case 14: /* report window size (pixels) */ 3650 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3651 XGetWindowAttributes (disp, parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3653 break;
3654 case 18: /* report text area size (chars) */
3655 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656 break;
2891 case 18: /* report window size (chars) */ 3657 case 19: /* report window size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3658 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2893 break; 3659 break;
2894#if 0 /* XXX: currently disabled due to security concerns */
2895 case 20: /* report icon label */ 3660 case 20: /* report icon label */
3661 {
3662 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3663 XGetIconName (disp, parent[0], &s);
2897 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3664 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3665 XFree (s);
3666 }
2898 break; 3667 break;
2899 case 21: /* report window title */ 3668 case 21: /* report window title */
3669 {
3670 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3671 XFetchName (disp, parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3672 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s);
3674 }
2902 break; 3675 break;
2903#endif
2904
2905 } 3676 }
2906} 3677}
2907#endif 3678#endif
2908 3679
2909/*----------------------------------------------------------------------*/ 3680/*----------------------------------------------------------------------*/
2910/* 3681/*
2911 * get input up until STRING TERMINATOR (or BEL) 3682 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3683 * ends_how is terminator used. returned input must be free()'d
2913 */ 3684 */
2914unsigned char * 3685char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3686rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3687{
2917 int seen_esc = 0; /* seen escape? */ 3688 unicode_t ch;
3689 bool seen_esc = false;
2918 unsigned int n = 0; 3690 unsigned int n = 0;
2919 unsigned char *s; 3691 wchar_t string[STRING_MAX];
2920 unsigned char ch, string[STRING_MAX];
2921 3692
2922 for (; (ch = cmd_getc ());) 3693 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3694 {
2924 if (ch == C0_BEL 3695 if (seen_esc)
2925 || ch == CHAR_ST 3696 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3697 if (ch == 0x5c) /* 7bit ST */
2927 break; 3698 break;
3699 else
3700 return NULL;
3701 }
2928 if (ch == C0_ESC) 3702 else if (ch == C0_ESC)
2929 { 3703 {
2930 seen_esc = 1; 3704 seen_esc = true;
2931 continue; 3705 continue;
2932 } 3706 }
2933 else if (ch == '\t') 3707 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3708 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3709 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3710 return NULL; /* other control character - exit */
2937 if (n < sizeof (string) - 1) 3711
3712 seen_esc = false;
3713
3714 if (n >= STRING_MAX - 1)
3715 // stop at some sane length
3716 return NULL;
3717
3718 if (ch == C0_SYN)
3719 string[n++] = cmd_get8 ();
3720 else
2938 string[n++] = ch; 3721 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3722 }
3723
2941 string[n++] = '\0'; 3724 string[n++] = '\0';
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3725
2943 return NULL;
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3726 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3727
2946 return s; 3728 return rxvt_wcstombs (string);
2947} 3729}
2948 3730
2949/*----------------------------------------------------------------------*/ 3731/*----------------------------------------------------------------------*/
2950/* 3732/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3733 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3734 */
2953void 3735void
2954rxvt_term::process_dcs_seq () 3736rxvt_term::process_dcs_seq ()
2955{ 3737{
2956 unsigned char eh, *s; 3738 char *s;
3739 unicode_t eh;
3740
2957 /* 3741 /*
2958 * Not handled yet 3742 * Not handled yet
2959 */ 3743 */
2960 s = get_to_st (&eh); 3744 s = get_to_st (eh);
2961 if (s) 3745 if (s)
2962 free (s); 3746 free (s);
3747
2963 return; 3748 return;
2964} 3749}
2965 3750
2966/*----------------------------------------------------------------------*/ 3751/*----------------------------------------------------------------------*/
2967/* 3752/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3753 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3754 */
2970void 3755void
2971rxvt_term::process_osc_seq () 3756rxvt_term::process_osc_seq ()
2972{ 3757{
2973 unsigned char ch, eh, *s; 3758 unicode_t ch, eh;
2974 int arg; 3759 int arg;
2975 3760
2976 ch = cmd_getc (); 3761 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3762 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3763 arg = arg * 10 + (ch - '0');
2979 3764
2980 if (ch == ';') 3765 if (ch == ';')
2981 { 3766 {
2982 s = get_to_st (&eh); 3767 char *s = get_to_st (eh);
3768
2983 if (s) 3769 if (s)
2984 { 3770 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3771 process_xterm_seq (arg, s, eh);
2997 free (s); 3772 free (s);
2998 } 3773 }
2999 } 3774 }
3000} 3775}
3776
3777void
3778rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3779{
3780 if (str[0] == '?' && !str[1])
3781 {
3782 unsigned short r, g, b;
3783 pix_colors_focused[color].get (display, r, g, b);
3784 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3785 }
3786 else
3787 set_window_color (color, str);
3788}
3789
3001/* 3790/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title
3004 * 1 = change iconName
3005 * 2 = change title
3006 * 4 = change color
3007 * 12 = change text color
3008 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour
3010 * 18 = change bold character color
3011 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented)
3013 * 50 = change font
3014 *
3015 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap
3018 * 39 = change default fg color
3019 * 49 = change default bg color
3020 * 55 = dump scrollback buffer and all of screen
3021 */ 3792 */
3022void 3793void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3794rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3024{ 3795{
3025 int changed = 0; 3796 int changed = 0;
3026 int color; 3797 int color;
3027 char *buf, *name; 3798 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1];
3800 int saveop = op;
3801 dDisp;
3028 3802
3029 assert (str != NULL); 3803 assert (str != NULL);
3030 switch (op) 3804 switch (op)
3031 { 3805 {
3032 case XTerm_name: 3806 case XTerm_name:
3033 set_title (str); 3807 set_title (str);
3034 /* FALLTHROUGH */ 3808 /* FALLTHROUGH */
3035 case XTerm_iconName: 3809 case XTerm_iconName:
3036 set_iconName (str); 3810 set_icon_name (str);
3037 break; 3811 break;
3038 case XTerm_title: 3812 case XTerm_title:
3039 set_title (str); 3813 set_title (str);
3040 break; 3814 break;
3815 case XTerm_property:
3816 if (str[0] == '?')
3817 {
3818 Atom prop = display->atom (str + 1);
3819 Atom actual_type;
3820 int actual_format;
3821 unsigned long nitems;
3822 unsigned long bytes_after;
3823 unsigned char *value = 0;
3824 const char *str = "";
3825
3826 if (prop
3827 && XGetWindowProperty (disp, parent[0],
3828 prop, 0, 1<<16, 0, AnyPropertyType,
3829 &actual_type, &actual_format,
3830 &nitems, &bytes_after, &value) == Success
3831 && actual_type != None
3832 && actual_format == 8)
3833 str = (const char *)(value);
3834
3835 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3836
3837 XFree (value);
3838 }
3839 else
3840 {
3841 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3842
3843 if (eq)
3844 {
3845 *eq = 0;
3846 set_utf8_property (display->atom (str), eq + 1);
3847 }
3848 else
3849 XDeleteProperty (disp, parent[0],
3850 display->atom (str));
3851 }
3852 break;
3853
3041 case XTerm_Color: 3854 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3855 for (buf = (char *)str; buf && *buf;)
3043 { 3856 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3857 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3858 break;
3859
3046 *name++ = '\0'; 3860 *name++ = '\0';
3047 color = atoi (buf); 3861 color = atoi (buf) + minCOLOR;
3048 if (color < 0 || color >= TOTAL_COLORS) 3862
3863 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3049 break; 3864 break;
3865
3050 if ((buf = STRCHR (name, ';')) != NULL) 3866 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3867 *buf++ = '\0';
3868
3869 if (name[0] == '?' && !name[1])
3870 {
3871 unsigned short r, g, b;
3872 pix_colors_focused[color].get (display, r, g, b);
3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3874 }
3875 else
3052 set_window_color (color + minCOLOR, name); 3876 set_window_color (color, name);
3053 } 3877 }
3878 break;
3879 case XTerm_Color00:
3880 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3881 break;
3882 case XTerm_Color01:
3883 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3054 break; 3884 break;
3055#ifndef NO_CURSORCOLOR 3885#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3886 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3888 break;
3059#endif 3889#endif
3060 case XTerm_Color_pointer: 3890 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3891 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3892 break;
3893 case XTerm_Color_pointer_bg:
3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3895 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3896#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str);
3066 break;
3067 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str);
3069 break;
3070 case XTerm_Color_RV: 3897 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3899 break;
3073#endif 3900 case Rxvt_Color_BD:
3074 3901 case URxvt_Color_BD:
3075 case XTerm_Menu: 3902 process_color_seq (op, Color_BD, str, resp);
3076 /*
3077 * rxvt_menubar_dispatch () violates the constness of the string,
3078 * so DON'T do it here
3079 */
3080 break; 3903 break;
3904 case Rxvt_Color_UL:
3905 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp);
3907 break;
3908 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break;
3911#endif
3912#if TRANSPARENT && TINTING
3913 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3915 check_our_parents ();
3916 if (am_transparent)
3917 want_full_refresh = want_refresh = 1;
3918 break;
3919#endif
3920
3081 case XTerm_Pixmap: 3921 case Rxvt_Pixmap:
3082 if (*str != ';') 3922 if (*str != ';')
3083 { 3923 {
3084#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3087#endif
3088 scr_touch (true); 3927 scr_touch (true);
3928#endif
3089 } 3929 }
3930
3090 while ((str = STRCHR (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3091 { 3932 {
3092 str++; 3933 str++;
3093#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
3095#endif 3936#endif
3096
3097 } 3937 }
3938
3098 if (changed) 3939 if (changed)
3099 { 3940 {
3100#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3101 resize_pixmap (); 3942 resize_pixmap ();
3102#endif
3103 scr_touch (true); 3943 scr_touch (true);
3944#endif
3104 } 3945 }
3105 break; 3946 break;
3106 3947
3107 case XTerm_restoreFG: 3948 case Rxvt_restoreFG:
3108 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);
3109 break; 3950 break;
3110 case XTerm_restoreBG: 3951 case Rxvt_restoreBG:
3111 set_window_color (Color_bg, str); 3952 set_window_color (Color_bg, str);
3112 break; 3953 break;
3954
3113 case XTerm_logfile: 3955 case XTerm_logfile:
3956 // TODO, when secure mode?
3957 break;
3958
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3114 break; 3963 break;
3115 case XTerm_font: 3964#endif
3116 change_font (0, str);
3117 break;
3118#if 0 3965#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3120 { 3967 {
3121 int fd; 3968 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3970 {
3124 scr_dump (fd); 3971 scr_dump (fd);
3125 close (fd); 3972 close (fd);
3126 } 3973 }
3127 } 3974 }
3128 break; 3975 break;
3129#endif 3976#endif
3977 case XTerm_font:
3978 op = URxvt_font;
3979 case URxvt_font:
3980#if ENABLE_STYLES
3981 case URxvt_boldFont:
3982 case URxvt_italicFont:
3983 case URxvt_boldItalicFont:
3984#endif
3985 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp);
3990 else
3991 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
3130 3993
3994 res = strdup (str);
3995 allocated.push_back ((void *)res);
3996 set_fonts ();
3997 }
3998 break;
3999
4000#if ENABLE_FRILLS
4001 case URxvt_locale:
4002 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4004 else
4005 {
4006 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8);
4008 init_xlocale ();
4009 }
4010 break;
4011
4012 case URxvt_view_up:
4013 case URxvt_view_down:
4014 {
4015 int lines = atoi (str);
4016
4017 if (lines)
4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
4019 else
4020 scr_erase_savelines ();
4021 }
4022
4023 break;
4024#endif
4025
4026#if ENABLE_PERL
4027 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4029 ; // no responses yet
4030 break;
4031#endif
3131 } 4032 }
3132} 4033}
3133/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
3134 4035
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4036/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 4044 * so no need for fancy checking
3144 */ 4045 */
3145int 4046int
3146rxvt_term::privcases (int mode, unsigned long bit) 4047rxvt_term::privcases (int mode, unsigned long bit)
3147{ 4048{
3148 int state; 4049 int state;
3149 4050
3150 if (mode == 's') 4051 if (mode == 's')
3151 { 4052 {
3152 SavedModes |= (PrivateModes & bit); 4053 SavedModes |= (priv_modes & bit);
3153 return -1; 4054 return -1;
3154 } 4055 }
3155 else 4056 else
3156 { 4057 {
3157 if (mode == 'r') 4058 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4059 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 4060 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4061 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 4062 PrivMode (state, bit);
3162 } 4063 }
4064
3163 return state; 4065 return state;
3164} 4066}
3165 4067
3166/* we're not using priv _yet_ */ 4068/* we're not using priv _yet_ */
3167void 4069void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4070rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 4071{
3170 unsigned int i, j; 4072 unsigned int i, j;
3171 int state; 4073 int state;
4074
3172 static const struct 4075 static const struct
3173 { 4076 {
3174 const int argval; 4077 const int argval;
3175 const unsigned long bit; 4078 const unsigned long bit;
3176 } 4079 }
4080
3177 argtopriv[] = { 4081 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 4082 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 4083 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 4084 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 4085 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 4086 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 4087 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 4088 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 4090 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 4091#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 4092 { menuBar_esc, PrivMode_menuBar },
3188#endif 4093#endif
4094 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 4096#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 4097 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 4098#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 4099 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 4100 { 40, PrivMode_132OK },
4101 // 41 xterm more fixes NYI
4102 // 45 margin bell NYI
4103 // 46 start logging
3195 { 47, PrivMode_Screen }, 4104 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 4105 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 4106#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 4107 { 67, PrivMode_BackSpace },
3199#endif 4108#endif
3200 { 1000, PrivMode_MouseX11 }, 4109 { 1000, PrivMode_MouseX11 },
4110 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4111 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
4112 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 4113 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 4114 { 1011, PrivMode_Keypress }, // rxvt extension
4115 // 1035 enable modifiers for alt, numlock NYI
4116 // 1036 send ESC for meta keys NYI
4117 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 4118 { 1047, PrivMode_Screen },
4119 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4120 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4121 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 4122 };
3206 4123
3207 if (nargs == 0) 4124 if (nargs == 0)
3208 return; 4125 return;
3209 4126
… …
3224 state = privcases (mode, argtopriv[j].bit); 4141 state = privcases (mode, argtopriv[j].bit);
3225 break; 4142 break;
3226 } 4143 }
3227 4144
3228 /* extra handling for values with state unkept */ 4145 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 4146 switch (arg[i])
3231 { 4147 {
4148#if ENABLE_STYLES
4149 case 1021:
4150 set_option (Opt_intensityStyles, mode);
4151
4152 scr_touch (true);
4153 break;
4154#endif
3232 case 1048: /* alternative cursor save */ 4155 case 1048: /* alternative cursor save */
4156 case 1049:
4157 if (OPTION (Opt_secondaryScreen))
3233 if (mode == 0) 4158 if (mode == 0)
3234 scr_cursor (RESTORE); 4159 scr_cursor (RESTORE);
3235 else if (mode == 1) 4160 else if (mode == 1)
3236 scr_cursor (SAVE); 4161 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 4162 break;
4163 }
4164
4165 if (state >= 0)
4166 /* extra handling for values with valid 0 or 1 state */
4167 switch (arg[i])
4168 {
4169 /* case 1: - application cursor keys */
4170 case 2: /* VT52 mode */
4171 /* oddball mode. should be set regardless of set/reset
4172 * parameter. Return from VT52 mode with an ESC < from
4173 * within VT52 mode
4174 */
4175 PrivMode (1, PrivMode_vt52);
4176 break;
3253 case 3: /* 80/132 */ 4177 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 4178 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4179 set_widthheight (((state ? 132 : 80) * fwidth), height);
3256 (unsigned int)TermWin.height);
3257 break; 4180 break;
3258 case 4: /* smooth scrolling */ 4181 case 4: /* smooth scrolling */
3259 if (state)
3260 Options &= ~Opt_jumpScroll;
3261 else
3262 Options |= Opt_jumpScroll; 4182 set_option (Opt_jumpScroll, !state);
3263 break; 4183 break;
3264 case 5: /* reverse video */ 4184 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4185 scr_rvideo_mode (state);
3266 break; 4186 break;
3267 case 6: /* relative/absolute origins */ 4187 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4188 scr_relative_origin (state);
3269 break; 4189 break;
3270 case 7: /* autowrap */ 4190 case 7: /* autowrap */
3271 scr_autowrap (state); 4191 scr_autowrap (state);
3272 break; 4192 break;
3273 /* case 8: - auto repeat, can't do on a per window basis */ 4193 /* case 8: - auto repeat, can't do on a per window basis */
3274 case 9: /* X10 mouse reporting */ 4194 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4195 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4196 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4197 break;
3278#ifdef menuBar_esc 4198#ifdef menuBar_esc
3279 case menuBar_esc: 4199 case menuBar_esc:
3280#ifdef MENUBAR 4200#ifdef MENUBAR
3281 map_menuBar (state); 4201 map_menuBar (state);
3282#endif 4202#endif
3283 break; 4203 break;
3284#endif 4204#endif
3285#ifdef scrollBar_esc 4205#ifdef scrollBar_esc
3286 case scrollBar_esc: 4206 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4207 if (scrollbar_mapping (state))
3288 { 4208 {
3289 resize_all_windows (0, 0, 0); 4209 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4210 scr_touch (true);
3291 } 4211 }
3292 break; 4212 break;
3293#endif 4213#endif
3294 case 25: /* visible/invisible cursor */ 4214 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4215 scr_cursor_visible (state);
3296 break; 4216 break;
3297 /* case 35: - shift keys */ 4217 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4218 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4219 case 47: /* secondary screen */
3300 scr_change_screen (state); 4220 scr_change_screen (state);
3301 break; 4221 break;
3302 /* case 66: - application key pad */ 4222 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4223 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4224 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4225 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4226 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4227 break;
3308#if 0 4228#if 0
3309 case 1001: 4229 case 1001:
3310 break; /* X11 mouse highlighting */ 4230 break; /* X11 mouse highlighting */
3311#endif 4231#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4232 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state)
3314 Options &= ~Opt_scrollTtyOutput;
3315 else
3316 Options |= Opt_scrollTtyOutput; 4233 set_option (Opt_scrollTtyOutput, !state);
3317 break; 4234 break;
3318 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
3319 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4236 set_option (Opt_scrollTtyKeypress, state);
3321 else
3322 Options &= ~Opt_scrollTtyKeypress;
3323 break; 4237 break;
3324 case 1047: /* secondary screen w/ clearing */ 4238 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4239 if (OPTION (Opt_secondaryScreen))
3326 if (current_screen != PRIMARY) 4240 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4241 scr_erase_screen (2);
3328 scr_change_screen (state); 4242 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4243 break;
4244 case 1049: /* secondary screen w/ clearing first */
4245 scr_change_screen (state);
4246 if (OPTION (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY)
4248 scr_erase_screen (2);
4249 break;
4250 default:
4251 break;
3332 } 4252 }
3333 } 4253 }
3334} 4254}
3335/*}}} */ 4255/*}}} */
3336 4256
3337/*{{{ process sgr sequences */ 4257/*{{{ process sgr sequences */
3338void 4258void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4259rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4260{
3341 unsigned int i; 4261 unsigned int i;
3342 short rendset; 4262 short rendset;
3343 int rendstyle; 4263 int rendstyle;
3344 4264
3345 if (nargs == 0) 4265 if (nargs == 0)
3346 { 4266 {
3347 scr_rendition (0, ~RS_None); 4267 scr_rendition (0, ~RS_None);
3348 return; 4268 return;
3349 } 4269 }
4270
3350 for (i = 0; i < nargs; i++) 4271 for (i = 0; i < nargs; i++)
3351 { 4272 {
3352 rendset = -1; 4273 rendset = -1;
3353 switch (arg[i]) 4274 switch (arg[i])
3354 { 4275 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4277 rendset = 0, rendstyle = ~RS_None;
3357 break; 4278 break;
3358 case 1: 4279 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4280 rendset = 1, rendstyle = RS_Bold;
3360 break; 4281 break;
4282 //case 2: // low intensity
4283 case 3:
4284 rendset = 1, rendstyle = RS_Italic;
4285 break;
3361 case 4: 4286 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4287 rendset = 1, rendstyle = RS_Uline;
3363 break; 4288 break;
3364 case 5: 4289 case 5: // slowly blinking
4290 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4291 rendset = 1, rendstyle = RS_Blink;
3366 break; 4292 break;
4293 //case 6: // scoansi light background
3367 case 7: 4294 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4295 rendset = 1, rendstyle = RS_RVid;
3369 break; 4296 break;
3370 case 22: 4297 case 8:
4298 // invisible. NYI
4299 break;
4300 //case 9: // crossed out
4301 //case 10: // scoansi acs off, primary font
4302 //case 11: // scoansi acs on, first alt font
4303 //case 12: // scoansi acs on, |0x80, second alt font
4304 //...
4305 //case 19: // ninth alt font
4306 //case 20: // gothic
4307 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3371 rendset = 0, rendstyle = RS_Bold; 4308 rendset = 0, rendstyle = RS_Bold;
4309 break;
4310 case 22: // normal intensity
4311 rendset = 0, rendstyle = RS_Bold;
4312 break;
4313 case 23: // disable italic
4314 rendset = 0, rendstyle = RS_Italic;
3372 break; 4315 break;
3373 case 24: 4316 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4317 rendset = 0, rendstyle = RS_Uline;
3375 break; 4318 break;
3376 case 25: 4319 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4320 rendset = 0, rendstyle = RS_Blink;
3378 break; 4321 break;
4322 case 26: // variable spacing (iso 8613)
4323 rendset = 0, rendstyle = RS_Blink;
4324 break;
3379 case 27: 4325 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4326 rendset = 0, rendstyle = RS_RVid;
3381 break; 4327 break;
4328 //case 28: // visible. NYI
4329 //case 29: // not crossed-out
3382 } 4330 }
4331
3383 if (rendset != -1) 4332 if (rendset != -1)
3384 { 4333 {
3385 scr_rendition (rendset, rendstyle); 4334 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4335 continue; /* for (;i;) */
3387 } 4336 }
… …
3394 case 33: 4343 case 33:
3395 case 34: 4344 case 34:
3396 case 35: 4345 case 35:
3397 case 36: 4346 case 36:
3398 case 37: 4347 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4348 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4349 break;
3402#ifdef TTY_256COLOR 4350 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4351 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4352 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4353 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4354 i += 2;
3409 } 4355 }
3410 break; 4356 break;
3411#endif
3412 case 39: /* default fg */ 4357 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4358 scr_color (Color_fg, Color_fg);
3414 break; 4359 break;
3415 4360
3416 case 40: 4361 case 40:
… …
3419 case 43: 4364 case 43:
3420 case 44: 4365 case 44:
3421 case 45: 4366 case 45:
3422 case 46: 4367 case 46:
3423 case 47: 4368 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4369 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4370 break;
3427#ifdef TTY_256COLOR 4371 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4372 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4373 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4374 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4375 i += 2;
3434 } 4376 }
3435 break; 4377 break;
3436#endif
3437 case 49: /* default bg */ 4378 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4379 scr_color (Color_bg, Color_bg);
3439 break; 4380 break;
3440 4381
3441#ifndef NO_BRIGHTCOLOR 4382 //case 50: // not variable spacing
4383
4384#if ENABLE_FRILLS
3442 case 90: 4385 case 90:
3443 case 91: /* set bright fg color */ 4386 case 91: /* set bright fg color */
3444 case 92: 4387 case 92:
3445 case 93: 4388 case 93:
3446 case 94: 4389 case 94:
3447 case 95: 4390 case 95:
3448 case 96: 4391 case 96:
3449 case 97: 4392 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4393 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4394 break;
3453 case 100: 4395 case 100:
3454 case 101: /* set bright bg color */ 4396 case 101: /* set bright bg color */
3455 case 102: 4397 case 102:
3456 case 103: 4398 case 103:
3457 case 104: 4399 case 104:
3458 case 105: 4400 case 105:
3459 case 106: 4401 case 106:
3460 case 107: 4402 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4403 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4404 break;
3464#endif 4405#endif
3465
3466 } 4406 }
3467 } 4407 }
3468} 4408}
3469/*}}} */ 4409/*}}} */
3470 4410
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4411/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4412void
3473rxvt_term::process_graphics () 4413rxvt_term::process_graphics ()
3474{ 4414{
3475 unsigned char ch, cmd = cmd_getc (); 4415 unicode_t ch, cmd = cmd_getc ();
3476 4416
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4417 if (cmd == 'Q')
3479 { /* query graphics */ 4418 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4419 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4420 return;
3482 } 4421 }
3483 /* swallow other graphics sequences until terminating ':' */ 4422 /* swallow other graphics sequences until terminating ':' */
3484 do 4423 do
3485 ch = cmd_getc (); 4424 ch = cmd_getc ();
3486 while (ch != ':'); 4425 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 4426}
3533/*}}} */ 4427/*}}} */
3534 4428
3535/* ------------------------------------------------------------------------- */ 4429/* ------------------------------------------------------------------------- */
3536 4430
… …
3540 */ 4434 */
3541void 4435void
3542rxvt_term::tt_printf (const char *fmt,...) 4436rxvt_term::tt_printf (const char *fmt,...)
3543{ 4437{
3544 va_list arg_ptr; 4438 va_list arg_ptr;
3545 unsigned char buf[256]; 4439 char buf[256];
3546 4440
3547 va_start (arg_ptr, fmt); 4441 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4442 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4443 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4444 tt_write (buf, strlen (buf));
3551} 4445}
3552 4446
3553/* ---------------------------------------------------------------------- */ 4447/* ---------------------------------------------------------------------- */
3554/* Write data to the pty as typed by the user, pasted with the mouse, 4448/* Write data to the pty as typed by the user, pasted with the mouse,
3555 * or generated by us in response to a query ESC sequence. 4449 * or generated by us in response to a query ESC sequence.
3556 */ 4450 */
4451const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4452
3557void 4453void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4454rxvt_term::tt_write (const char *data, unsigned int len)
3559{ 4455{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return;
3561 4458
3562 if (len) 4459 if (pty.pty < 0)
4460 return;
4461
4462 if (v_buflen == 0)
4463 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4465
4466 if ((unsigned int)written == len)
4467 return;
4468
4469 data += written;
4470 len -= written;
3563 { 4471 }
4472
4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4474
4475 memcpy (v_buffer + v_buflen, data, len);
4476 v_buflen += len;
4477
4478 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479}
4480
4481void rxvt_term::pty_write ()
4482{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484
4485 if (written > 0)
4486 {
4487 v_buflen -= written;
4488
3564 if (v_buflen == 0) 4489 if (v_buflen == 0)
3565 { 4490 {
3566 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3567
3568 if ((unsigned int)written == len)
3569 return;
3570
3571 data += written;
3572 len -= written;
3573 }
3574
3575
3576 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3577
3578 memcpy (v_buffer + v_buflen, data, len);
3579 v_buflen += len;
3580 }
3581
3582 for (;;)
3583 {
3584 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3585
3586 if (written > 0)
3587 {
3588 v_buflen -= written;
3589
3590 if (v_buflen == 0)
3591 {
3592 free (v_buffer); 4491 free (v_buffer);
3593 v_buffer = 0; 4492 v_buffer = 0;
3594 v_buflen = 0; 4493 v_buflen = 0;
3595 4494
3596 pty_ev.set (EVENT_READ); 4495 pty_ev.set (EVENT_READ);
3597 return;
3598 }
3599
3600 memmove (v_buffer, v_buffer + written, v_buflen);
3601 }
3602 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3603 // original code just ignores this...
3604 destroy ();
3605 else
3606 {
3607 pty_ev.set (EVENT_READ | EVENT_WRITE);
3608 return; 4496 return;
3609 } 4497 }
4498
4499 memmove (v_buffer, v_buffer + written, v_buflen);
3610 } 4500 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ);
3611} 4503}
3612 4504
3613/*----------------------- end-of-file (C source) -----------------------*/ 4505/*----------------------- end-of-file (C source) -----------------------*/
3614 4506

Diff Legend

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