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.216 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.575 by root, Thu Jun 30 16:56:41 2016 UTC

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

Diff Legend

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