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

Diff Legend

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