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.200 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.601 by sf-exg, Sat May 6 06:47:29 2023 UTC

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

Diff Legend

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