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

Diff Legend

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