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

Diff Legend

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