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.233 by root, Wed Jan 4 01:16:34 2006 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 UTC

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

Diff Legend

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