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

Diff Legend

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