ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.190 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.604 by sf-exg, Sat Feb 3 15:47:24 2024 UTC

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

Diff Legend

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