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

Diff Legend

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