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.246 by root, Fri Jan 6 18:36:21 2006 UTC vs.
Revision 1.555 by sf-exg, Sat Aug 16 10:51:23 2014 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 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 - 4 && 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 (hidden_cursor)
1040 {
1041 hidden_cursor = 0;
1042 want_refresh = 1;
1043 }
1044
1045 if (option (Opt_cursorBlink))
1046 cursor_blink_ev.again ();
1047 else
1048 cursor_blink_ev.stop ();
1049}
1050
1051void
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1052rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1050{ 1053{
1051 hidden_cursor = !hidden_cursor; 1054 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1055 want_refresh = 1;
1053 1056 refresh_check ();
1054 w.start (w.at + BLINK_INTERVAL);
1055} 1057}
1056#endif 1058#endif
1057 1059
1058#ifdef TEXT_BLINK 1060#ifdef TEXT_BLINK
1059void 1061void
1060rxvt_term::text_blink_cb (time_watcher &w) 1062rxvt_term::text_blink_cb (ev::timer &w, int revents)
1061{ 1063{
1062 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1064 if (scr_refresh_rend (RS_Blink, RS_Blink))
1063 { 1065 {
1064 hidden_text = !hidden_text; 1066 hidden_text = !hidden_text;
1065 want_refresh = 1; 1067 want_refresh = 1;
1066 w.start (w.at + TEXT_BLINK_INTERVAL); 1068 refresh_check ();
1067 } 1069 }
1070 else
1071 w.stop ();
1068} 1072}
1069#endif 1073#endif
1070 1074
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1075#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void 1076void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1077rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1074{ 1078{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1079 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1080 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1077 { 1081 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1082 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1083 refresh_check ();
1081 } 1084 }
1085 else
1086 w.stop ();
1082} 1087}
1083#endif 1088#endif
1084 1089
1085#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1086void 1091void
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1088{ 1093{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1090 { 1095 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1097 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1095 } 1099 }
1100 else
1101 w.stop ();
1096} 1102}
1097#endif 1103#endif
1098 1104
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void 1106void
1101rxvt_term::slip_wheel_cb (time_watcher &w) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1102{ 1108{
1103 if (mouse_slip_wheel_speed == 0 1109 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 { 1110 {
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; 1111 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 refresh_check ();
1113 }
1114
1115 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1114 } 1116 {
1117 mouse_slip_wheel_speed = 0;
1118 w.stop ();
1119 }
1115} 1120}
1116#endif 1121#endif
1117 1122
1118#if HAVE_SCHED_YIELD 1123#if LINUX_YIELD_HACK
1119static struct event_handler 1124static struct event_handler
1120{ 1125{
1121 check_watcher cw_yield; 1126 ev::prepare yield_ev;
1122 1127
1123 void yield (check_watcher &w) 1128 void yield_cb (ev::prepare &w, int revents)
1124 { 1129 {
1125 sched_yield (); 1130 // this should really be sched_yield(), but the linux guys thought
1131 // that giving a process calling sched_yield () less cpu time than
1132 // ones with high nice levels is a useful thing to do. It surely is is
1133 // allowed by the sus... as is returning ENOSYS.
1134 // since the linux guys additionally thought that breaking the only
1135 // known workaround against their unusable sched_yield hack is cool,
1136 // we just nanosleep a bit and hope for the best.
1137
1138 struct timespec ts = { 0, 1000 };
1139 nanosleep (&ts, 0);
1140
1126 w.stop (); 1141 w.stop ();
1127 } 1142 }
1128 1143
1129 event_handler () 1144 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1145 : yield_ev (this, &event_handler::yield_cb)
1131 { 1146 {
1132 } 1147 }
1133} event_handler; 1148} event_handler;
1134#endif 1149#endif
1135 1150
1151/* make sure all the cmd data is at beginning of cmdbuf */
1152void
1153rxvt_term::cmdbuf_reify ()
1154{
1155 if (cmdbuf_ptr == cmdbuf_base)
1156 return;
1157
1158 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1159
1160 memmove (cmdbuf_base, cmdbuf_ptr, used);
1161 cmdbuf_ptr = cmdbuf_base;
1162 cmdbuf_endp = cmdbuf_ptr + used;
1163
1164}
1165
1166#if defined (KEYSYM_RESOURCE)
1167void
1168rxvt_term::cmdbuf_append (const char *str, size_t count)
1169{
1170 cmdbuf_reify ();
1171
1172 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1173
1174 if (count > avail)
1175 return;
1176
1177 memcpy (cmdbuf_endp, str, count);
1178 cmdbuf_endp += count;
1179
1180 cmd_parse ();
1181}
1182#endif
1183
1136bool 1184bool
1137rxvt_term::pty_fill () 1185rxvt_term::pty_fill ()
1138{ 1186{
1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1187 cmdbuf_reify ();
1140 1188
1141 if (CBUFSIZ == n) 1189 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142 { 1190
1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1191 if (!avail)
1144 n = 0;
1145 } 1192 {
1146 1193 // 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; 1194 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1195 cmdbuf_endp = cmdbuf_ptr;
1196 avail = CBUFSIZ;
1197 }
1150 1198
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1199 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1152 1200
1153 if (r > 0) 1201 if (r > 0)
1154 { 1202 {
1155 cmdbuf_endp += r; 1203 cmdbuf_endp += r;
1156 return true; 1204 return true;
1157 } 1205 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1206 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1207 {
1160#if HAVE_SCHED_YIELD 1208#if LINUX_YIELD_HACK
1161 if (display->is_local) 1209 if (display->is_local)
1162 event_handler.cw_yield.start (); 1210 event_handler.yield_ev.start ();
1163#endif 1211#endif
1164 } 1212 }
1165 else 1213 else
1166 { 1214 {
1167 pty_ev.stop (); 1215 pty_ev.stop ();
1168 1216
1169 if (!OPTION (Opt_hold)) 1217 if (!option (Opt_hold))
1170 destroy (); 1218 destroy ();
1171 } 1219 }
1172 1220
1173 return false; 1221 return false;
1174} 1222}
1175 1223
1176void 1224void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1225rxvt_term::pty_cb (ev::io &w, int revents)
1178{ 1226{
1179 SET_R (this); 1227 make_current ();
1180 SET_LOCALE (locale);
1181 1228
1182 if (revents & EVENT_READ) 1229 if (revents & ev::READ)
1183 // loop, but don't allow a single term to monopolize us 1230 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1231 for (int i = CBUFCNT; i-- && pty_fill (); )
1185 if (cmd_parse ()) 1232 cmd_parse ();
1186 break;
1187 1233
1188 if (revents & EVENT_WRITE) 1234 if (revents & ev::WRITE)
1189 pty_write (); 1235 pty_write ();
1190}
1191 1236
1192void 1237 refresh_check ();
1238}
1239
1240void ecb_cold
1193rxvt_term::pointer_unblank () 1241rxvt_term::pointer_unblank ()
1194{ 1242{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1243 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1244 recolour_cursor ();
1197 1245
1198#ifdef POINTER_BLANK 1246#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1247 hidden_pointer = 0;
1200 1248
1201 if (OPTION (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1250 pointer_ev.start (pointerBlankDelay);
1203#endif 1251#endif
1204} 1252}
1205 1253
1206#ifdef POINTER_BLANK 1254#ifdef POINTER_BLANK
1207void 1255void ecb_cold
1208rxvt_term::pointer_blank () 1256rxvt_term::pointer_blank ()
1209{ 1257{
1210 if (!OPTION (Opt_pointerBlank)) 1258 if (!option (Opt_pointerBlank))
1211 return; 1259 return;
1212 1260
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1261 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1262 XFlush (dpy);
1215 1263
1216 hidden_pointer = 1; 1264 hidden_pointer = 1;
1217} 1265}
1218 1266
1219void 1267void ecb_cold
1220rxvt_term::pointer_cb (time_watcher &w) 1268rxvt_term::pointer_cb (ev::timer &w, int revents)
1221{ 1269{
1222 SET_R (this); 1270 make_current ();
1223 SET_LOCALE (locale);
1224 1271
1225 pointer_blank (); 1272 pointer_blank ();
1226} 1273}
1227#endif 1274#endif
1228 1275
1229void 1276void
1230rxvt_term::mouse_report (XButtonEvent &ev) 1277rxvt_term::mouse_report (XButtonEvent &ev)
1231{ 1278{
1232 int button_number, key_state = 0; 1279 int button_number, key_state = 0;
1233 int x, y; 1280 int x, y;
1281 int code = 32;
1234 1282
1235 x = ev.x; 1283 x = Pixel2Col (ev.x) + 1;
1236 y = ev.y; 1284 y = Pixel2Row (ev.y) + 1;
1237 pixel_position (&x, &y); 1285
1286 if (ev.type == MotionNotify)
1287 {
1288 if (x == mouse_row && y == mouse_col)
1289 return;
1290
1291 mouse_row = x;
1292 mouse_col = y;
1293 code += 32;
1294 }
1238 1295
1239 if (MEvent.button == AnyButton) 1296 if (MEvent.button == AnyButton)
1240 button_number = 3; 1297 button_number = 3;
1241 else 1298 else
1242 { 1299 {
1243 button_number = MEvent.button - Button1; 1300 button_number = MEvent.button - Button1;
1244 /* add 0x3D for wheel events, like xterm does */ 1301 /* add 0x3D for wheel events, like xterm does */
1245 if (button_number >= 3) 1302 if (button_number >= 3)
1246 button_number += (64 - 3); 1303 button_number += 64 - 3;
1247 } 1304 }
1248 1305
1249 if (priv_modes & PrivMode_MouseX10) 1306 if (priv_modes & PrivMode_MouseX10)
1250 { 1307 {
1251 /* 1308 /*
… …
1283 fputc ('A', stderr); 1340 fputc ('A', stderr);
1284 if (key_state & 32) 1341 if (key_state & 32)
1285 fputc ('2', stderr); 1342 fputc ('2', stderr);
1286 fprintf (stderr, "]: <%d>, %d/%d\n", 1343 fprintf (stderr, "]: <%d>, %d/%d\n",
1287 button_number, 1344 button_number,
1288 x + 1, 1345 x,
1289 y + 1); 1346 y);
1290#endif 1347#endif
1291 1348
1349#if ENABLE_FRILLS
1350 if (priv_modes & PrivMode_ExtMouseRight)
1351 tt_printf ("\033[%d;%d;%dM",
1352 code + button_number + key_state,
1353 x,
1354 y);
1355 else if (priv_modes & PrivMode_ExtModeMouse)
1356 tt_printf ("\033[M%c%lc%lc",
1357 code + button_number + key_state,
1358 wint_t (32 + x),
1359 wint_t (32 + y));
1360 else
1361#endif
1292 tt_printf ("\033[M%c%c%c", 1362 tt_printf ("\033[M%c%c%c",
1293 (32 + button_number + key_state), 1363 code + button_number + key_state,
1294 (32 + x + 1), 1364 32 + x,
1295 (32 + y + 1)); 1365 32 + y);
1296} 1366}
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 1367
1308/*{{{ process an X event */ 1368/*{{{ process an X event */
1309void 1369void ecb_hot
1310rxvt_term::x_cb (XEvent &ev) 1370rxvt_term::x_cb (XEvent &ev)
1311{ 1371{
1312 dDisp; 1372 make_current ();
1313 1373
1314 SET_R (this); 1374 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1375
1317#if defined(CURSOR_BLINK) 1376 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1377 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1378 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1379 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1380
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1381 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1382 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1383 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1384 unsigned int unused_mask;
1347 1385
1348 switch (ev.type) 1386 switch (ev.type)
1349 { 1387 {
1350 case KeyPress: 1388 case KeyPress:
1351#if ISO_14755 1389 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1390 break;
1357 1391
1358 case KeyRelease: 1392 case KeyRelease:
1359 { 1393 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1394 break;
1431 }
1432 1395
1433 case ButtonPress: 1396 case ButtonPress:
1434 button_press (ev.xbutton); 1397 button_press (ev.xbutton);
1435 break; 1398 break;
1436 1399
… …
1438 button_release (ev.xbutton); 1401 button_release (ev.xbutton);
1439 break; 1402 break;
1440 1403
1441 case ClientMessage: 1404 case ClientMessage:
1442 if (ev.xclient.format == 32 1405 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1406 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1407 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1411 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1415 destroy ();
1416 }
1447#if ENABLE_EWMH 1417#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1418 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1419 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1420 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1421 &ev);
1422#endif
1423 }
1424 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1452#endif 1433#endif
1453 } 1434 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break;
1490
1491 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1435 break;
1494 1436
1495 /* 1437 /*
1496 * XXX: this is not the _current_ arrangement 1438 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1439 * Here's my conclusion:
… …
1516 break; 1458 break;
1517 } 1459 }
1518 break; 1460 break;
1519 1461
1520 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1466 focus_in ();
1522 break; 1467 break;
1523 1468
1524 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1473 focus_out ();
1526 break; 1474 break;
1527 1475
1528 case ConfigureNotify: 1476 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent)
1530 { 1478 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1480 ;
1481
1482 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1483
1484 bool moved = false;
1485#ifdef HAVE_BG_PIXMAP
1486 if (bg_window_position_sensitive ())
1487 {
1488 want_position_change = true;
1489 if (bg_img == 0)
1490 moved = true;
1491 }
1492#endif
1493
1494 if (want_position_change)
1495 {
1496 int x, y;
1497
1498 if (ev.xconfigure.send_event)
1499 {
1500 x = ev.xconfigure.x;
1501 y = ev.xconfigure.y;
1502 }
1503 else
1504 get_window_origin (x, y);
1505
1506 if (x != parent_x || y != parent_y)
1507 {
1508 parent_x = x;
1509 parent_y = y;
1510 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1511 moved = true;
1512 }
1513 }
1533 1514
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1515 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1516 {
1536 seen_resize = 1; 1517 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1518 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1519 }
1539 1520 else
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1521 {
1541 if (OPTION (Opt_transparent)) 1522#ifdef HAVE_BG_PIXMAP
1542 check_our_parents (); 1523 if (moved)
1524 update_background ();
1543#endif 1525#endif
1526 }
1527
1528 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 } 1529 }
1545 break; 1530 break;
1546 1531
1547 case PropertyNotify: 1532 case PropertyNotify:
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1533 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551
1552 break; 1534 break;
1553 1535
1554 case SelectionClear: 1536 case SelectionClear:
1555 selection_clear (); 1537 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1556 break;
1557
1558 case SelectionNotify:
1559 if (selection_wait == Sel_normal)
1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1561 break; 1538 break;
1562 1539
1563 case SelectionRequest: 1540 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1542 break;
1543
1544 case MapNotify:
1545#ifdef HAVE_BG_PIXMAP
1546 // This is needed at startup for the case of no window manager
1547 // or a non-reparenting window manager and also because we
1548 // defer bg image updates if the window is not mapped. The
1549 // short delay is to optimize for multiple ConfigureNotify
1550 // events at startup when the window manager reparents the
1551 // window, so as to perform the computation after we have
1552 // received all of them.
1553 if (bg_img == 0)
1554 update_background_ev.start (0.025);
1555#endif
1556 mapped = 1;
1557#ifdef TEXT_BLINK
1558 text_blink_ev.start ();
1559#endif
1560 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1561 break;
1566 1562
1567 case UnmapNotify: 1563 case UnmapNotify:
1568 mapped = 0; 1564 mapped = 0;
1569#ifdef TEXT_BLINK 1565#ifdef TEXT_BLINK
1570 text_blink_ev.stop (); 1566 text_blink_ev.stop ();
1571#endif 1567#endif
1568 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572 break; 1569 break;
1573
1574 case MapNotify:
1575 mapped = 1;
1576#ifdef TEXT_BLINK
1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1578#endif
1579 break;
1580
1581#ifdef TRANSPARENT
1582 case ReparentNotify:
1583 rootwin_cb (ev);
1584 break;
1585#endif /* TRANSPARENT */
1586 1570
1587 case GraphicsExpose: 1571 case GraphicsExpose:
1588 case Expose: 1572 case Expose:
1589 if (ev.xany.window == vt) 1573 if (ev.xany.window == vt)
1590 { 1574 {
1591 do 1575 do
1576 {
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, false);
1579 }
1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1580 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1595 1581
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1582 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597 1583
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1584 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1585 {
1599 scr_expose (ev.xexpose.x, ev.xexpose.y, 1586 scr_expose (ev.xexpose.x, ev.xexpose.y,
1600 ev.xexpose.width, ev.xexpose.height, False); 1587 ev.xexpose.width, ev.xexpose.height, false);
1588 }
1601 1589
1602 scr_refresh (refresh_type); 1590 want_refresh = 1;
1603 } 1591 }
1604 else 1592 else
1605 { 1593 {
1606 XEvent unused_event; 1594 XEvent unused_event;
1607 1595
1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1596 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1609 ; 1597 ;
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1598 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1611 ; 1599 ;
1612 1600
1613 if (isScrollbarWindow (ev.xany.window)) 1601 if (scrollBar.state && ev.xany.window == scrollBar.win)
1614 { 1602 {
1615 scrollBar.setIdle (); 1603 scrollBar.state = SB_STATE_IDLE;
1616 scrollbar_show (0); 1604 scrollBar.show (0);
1617 } 1605 }
1618#ifdef MENUBAR
1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1620 menubar_expose ();
1621#endif
1622
1623#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window);
1626#endif
1627 } 1606 }
1628 break; 1607 break;
1629 1608
1630 case MotionNotify: 1609 case MotionNotify:
1631#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1632 if (hidden_pointer) 1611 if (hidden_pointer)
1633 pointer_unblank (); 1612 pointer_unblank ();
1634#endif 1613#endif
1635#if MENUBAR 1614 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1636 if (isMenuBarWindow (ev.xany.window)) 1615 || priv_modes & PrivMode_MouseAnyEvent)
1637 {
1638 menubar_control (ev.xbutton); 1616 mouse_report (ev.xbutton);
1639 break;
1640 }
1641#endif
1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1643 break; 1618 break;
1644 1619
1645 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1646 { 1621 {
1622 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1623 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop 1624 ; // nop
1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1650 { 1626 {
1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1652 ; 1628 ;
1653 1629
1654 XQueryPointer (disp, vt, 1630 XQueryPointer (dpy, vt,
1655 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1658 &ev.xbutton.state); 1634 &ev.xbutton.state);
1659#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
… …
1674 1650
1675#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1676 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1677 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1678 { 1654 {
1655 page_dirn scroll_selection_dir;
1679 int dist; 1656 int dist;
1680 1657
1681 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1682 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1683 */ 1660 */
1684 if (!sel_scroll_ev.active) 1661 if (!sel_scroll_ev.is_active ())
1685 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1662 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1686 1663
1687 /* save the event params so we can highlight 1664 /* save the event params so we can highlight
1688 * the selection in the pending-scroll loop 1665 * the selection in the pending-scroll loop
1689 */ 1666 */
1690 selection_save_x = ev.xbutton.x; 1667 selection_save_x = ev.xbutton.x;
… …
1698 dist = int_bwidth - ev.xbutton.y; 1675 dist = int_bwidth - ev.xbutton.y;
1699 } 1676 }
1700 else 1677 else
1701 { 1678 {
1702 scroll_selection_dir = DN; 1679 scroll_selection_dir = DN;
1703 dist = ev.xbutton.y - (int_bwidth + height); 1680 dist = ev.xbutton.y - (int_bwidth + vt_height);
1704 } 1681 }
1705 1682
1706 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1707 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1708 + 1; 1685 + 1;
1709 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1710 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1711 } 1689 }
1712 else 1690 else
1713 { 1691 {
1714 /* we are within the text window, so we 1692 /* we are within the text window, so we
1715 * shouldn't be scrolling 1693 * shouldn't be scrolling
1716 */ 1694 */
1717 if (sel_scroll_ev.active)
1718 sel_scroll_ev.stop(); 1695 sel_scroll_ev.stop();
1719 } 1696 }
1720#endif 1697#endif
1721#ifdef MOUSE_THRESHOLD 1698#ifdef MOUSE_THRESHOLD
1722 } 1699 }
1723#endif 1700#endif
1724 } 1701 }
1725 } 1702 }
1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1703 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1727 { 1704 {
1728 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1705 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1729 MotionNotify, &ev)) 1706 MotionNotify, &ev))
1730 ; 1707 ;
1731 1708
1732 XQueryPointer (disp, scrollBar.win, 1709 XQueryPointer (dpy, scrollBar.win,
1733 &unused_root, &unused_child, 1710 &unused_root, &unused_child,
1734 &unused_root_x, &unused_root_y, 1711 &unused_root_x, &unused_root_y,
1735 &ev.xbutton.x, &ev.xbutton.y, 1712 &ev.xbutton.x, &ev.xbutton.y,
1736 &unused_mask); 1713 &unused_mask);
1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1714 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1738 scrollbar_size ()); 1715 scrollBar.size ());
1739 scr_refresh (refresh_type);
1740 refresh_limit = 0; 1716 want_refresh = 1;
1741 scrollbar_show (1); 1717 scrollBar.show (1);
1742 } 1718 }
1743 break; 1719 break;
1744 } 1720 }
1745}
1746 1721
1747void 1722#if defined(CURSOR_BLINK)
1723 if (ev.type == KeyPress)
1724 cursor_blink_reset ();
1725#endif
1726
1727#if defined(POINTER_BLANK)
1728 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1729 {
1730 if (ev.type == MotionNotify
1731 || ev.type == ButtonPress
1732 || ev.type == ButtonRelease)
1733 if (hidden_pointer)
1734 pointer_unblank ();
1735
1736 if (ev.type == KeyPress && hidden_pointer == 0)
1737 pointer_blank ();
1738 }
1739#endif
1740
1741 refresh_check ();
1742}
1743
1744#if ENABLE_FRILLS
1745void ecb_cold
1746rxvt_term::set_urgency (bool enable)
1747{
1748 if (enable == urgency_hint)
1749 return;
1750
1751 if (XWMHints *h = XGetWMHints (dpy, parent))
1752 {
1753 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1754 XSetWMHints (dpy, parent, h);
1755 urgency_hint = enable;
1756 XFree (h);
1757 }
1758}
1759#endif
1760
1761void ecb_cold
1748rxvt_term::focus_in () 1762rxvt_term::focus_in ()
1749{ 1763{
1750 if (!focus) 1764 if (!focus)
1751 { 1765 {
1752 focus = 1; 1766 focus = 1;
1753 want_refresh = 1; 1767 want_refresh = 1;
1754 1768
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1757#if USE_XIM 1769#if USE_XIM
1758 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1759 { 1771 {
1760 IMSetStatusPosition (); 1772 im_set_position ();
1761 XSetICFocus (Input_Context); 1773 XSetICFocus (Input_Context);
1762 } 1774 }
1763#endif 1775#endif
1764#if CURSOR_BLINK 1776#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink)) 1777 if (option (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1778 cursor_blink_ev.again ();
1767#endif 1779#endif
1768#if OFF_FOCUS_FADING 1780#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1781 if (rs[Rs_fade])
1770 { 1782 {
1771 pix_colors = pix_colors_focused; 1783 pix_colors = pix_colors_focused;
1772 scr_recolour (); 1784 scr_recolour ();
1773 } 1785 }
1774#endif 1786#endif
1775 } 1787#if ENABLE_FRILLS
1776} 1788 if (option (Opt_urgentOnBell))
1789 set_urgency (0);
1790#endif
1777 1791
1778void 1792 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1793 }
1794}
1795
1796void ecb_cold
1779rxvt_term::focus_out () 1797rxvt_term::focus_out ()
1780{ 1798{
1781 if (focus) 1799 if (focus)
1782 { 1800 {
1783 focus = 0; 1801 focus = 0;
1784 want_refresh = 1; 1802 want_refresh = 1;
1785 1803
1786 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1804#if ENABLE_FRILLS
1787 1805 if (option (Opt_urgentOnBell))
1806 set_urgency (0);
1807#endif
1788#if ENABLE_FRILLS || ISO_14755 1808#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf) 1809 if (iso14755buf)
1790 { 1810 {
1791 iso14755buf = 0; 1811 iso14755buf = 0;
1792# if ENABLE_OVERLAY 1812# if ISO_14755
1793 scr_overlay_off (); 1813 scr_overlay_off ();
1794# endif 1814# endif
1795 } 1815 }
1796#endif 1816#endif
1797#if USE_XIM 1817#if USE_XIM
1798 if (Input_Context != NULL) 1818 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context); 1819 XUnsetICFocus (Input_Context);
1800#endif 1820#endif
1801#if CURSOR_BLINK 1821#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink)) 1822 if (option (Opt_cursorBlink))
1803 cursor_blink_ev.stop (); 1823 cursor_blink_ev.stop ();
1824
1804 hidden_cursor = 0; 1825 hidden_cursor = 0;
1805#endif 1826#endif
1806#if OFF_FOCUS_FADING 1827#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1828 if (rs[Rs_fade])
1808 { 1829 {
1809 pix_colors = pix_colors_unfocused; 1830 pix_colors = pix_colors_unfocused;
1810 scr_recolour (); 1831 scr_recolour ();
1811 } 1832 }
1812#endif 1833#endif
1834
1835 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1836 }
1837}
1838
1839void ecb_cold
1840rxvt_term::update_fade_color (unsigned int idx)
1841{
1842#if OFF_FOCUS_FADING
1843 if (rs[Rs_fade])
1813 } 1844 {
1845 rgba c;
1846 pix_colors [Color_fade].get (c);
1847 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1848 }
1849#endif
1814} 1850}
1815 1851
1816#if TRANSPARENT 1852#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1853void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1854rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1855{
1820 SET_R (this); 1856 make_current ();
1821 SET_LOCALE (locale); 1857
1858 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1859 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1860 return;
1822 1861
1823 switch (ev.type) 1862 switch (ev.type)
1824 { 1863 {
1825 case PropertyNotify: 1864 case PropertyNotify:
1826 /* 1865 /*
1827 * if user used some Esetroot compatible prog to set the root bg, 1866 * if user used some Esetroot compatible prog to set the root bg,
1828 * use the property to determine the pixmap. We use it later on. 1867 * use the property to determine the pixmap. We use it later on.
1829 */ 1868 */
1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1869 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1870 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1832 return; 1871 {
1872#if BG_IMAGE_FROM_ROOT
1873 if (option (Opt_transparent))
1874 {
1875 rxvt_img::new_from_root (this)->replace (root_img);
1876 update_background ();
1877 }
1878#endif
1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1880 }
1833 1881
1834 /* FALLTHROUGH */
1835 case ReparentNotify:
1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1837 want_refresh = want_full_refresh = 1;
1838 break; 1882 break;
1839 } 1883 }
1884
1885 refresh_check ();
1840} 1886}
1841#endif 1887#endif
1842 1888
1843void 1889void
1844rxvt_term::button_press (XButtonEvent &ev) 1890rxvt_term::button_press (XButtonEvent &ev)
… …
1853 /* 1899 /*
1854 * VT window processing of button press 1900 * VT window processing of button press
1855 */ 1901 */
1856 if (ev.window == vt) 1902 if (ev.window == vt)
1857 { 1903 {
1904 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1905 return;
1906
1858#if ISO_14755 1907#if ISO_14755
1859 // 5.4 1908 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1909 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 { 1910 {
1862 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1863 return; 1912 return;
1864 } 1913 }
1865#endif 1914#endif
1866 1915
1867 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1868 1917
1869 if (reportmode) 1918 if (reportmode)
1870 { 1919 {
1871 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1872 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
1873 MEvent.state = ev.state; 1922 MEvent.state = ev.state;
1874#ifdef MOUSE_REPORT_DOUBLECLICK 1923#ifdef MOUSE_REPORT_DOUBLECLICK
1875 if (ev.button == MEvent.button && clickintime) 1924 if (ev.button == MEvent.button && clickintime)
1876 { 1925 {
1877 /* same button, within alloted time */ 1926 /* same button, within allowed time */
1878 MEvent.clicks++; 1927 MEvent.clicks++;
1879 1928
1880 if (MEvent.clicks > 1) 1929 if (MEvent.clicks > 1)
1881 { 1930 {
1882 /* only report double clicks */ 1931 /* only report double clicks */
… …
1896 mouse_report (ev); 1945 mouse_report (ev);
1897 } 1946 }
1898#else 1947#else
1899 MEvent.button = ev.button; 1948 MEvent.button = ev.button;
1900 mouse_report (ev); 1949 mouse_report (ev);
1901#endif /* MOUSE_REPORT_DOUBLECLICK */ 1950#endif /* MOUSE_REPORT_DOUBLECLICK */
1902 1951
1903 } 1952 }
1904 else 1953 else
1905 { 1954 {
1906 if (ev.button != MEvent.button) 1955 if (ev.button != MEvent.button)
1907 MEvent.clicks = 0; 1956 MEvent.clicks = 0;
1908 1957
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1910 switch (ev.button) 1958 switch (ev.button)
1911 { 1959 {
1912 case Button1: 1960 case Button1:
1913 /* allow meta + click to select rectangular areas */ 1961 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */ 1962 /* should be done in screen.C */
1915#if ENABLE_FRILLS 1963#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask); 1964 selection.rect = !!(ev.state & ModMetaMask);
1917#else 1965#else
1918 selection.rect = false; 1966 selection.rect = false;
1919#endif 1967#endif
1920 1968
1921 /* allow shift+left click to extend selection */ 1969 /* allow shift+left click to extend selection */
1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1970 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1923 { 1971 {
1924 if (MEvent.button == Button1 && clickintime) 1972 if (MEvent.button == Button1 && clickintime)
1925 selection_rotate (ev.x, ev.y); 1973 selection_rotate (ev.x, ev.y);
1926 else 1974 else
1927 selection_extend (ev.x, ev.y, 1); 1975 selection_extend (ev.x, ev.y, 1);
1928 } 1976 }
1929 else 1977 else
1930 { 1978 {
1931 if (MEvent.button == Button1 && clickintime) 1979 if (MEvent.button == Button1 && clickintime)
1932 MEvent.clicks++; 1980 MEvent.clicks++;
1933 else 1981 else
1934 MEvent.clicks = 1; 1982 MEvent.clicks = 1;
1935 1983
1936 selection_click (MEvent.clicks, ev.x, ev.y); 1984 selection_click (MEvent.clicks, ev.x, ev.y);
1937 } 1985 }
1938 1986
1939 MEvent.button = Button1; 1987 MEvent.button = Button1;
1940 break; 1988 break;
1941 1989
1942 case Button3: 1990 case Button3:
1943 if (MEvent.button == Button3 && clickintime) 1991 if (MEvent.button == Button3 && clickintime)
1944 selection_rotate (ev.x, ev.y); 1992 selection_rotate (ev.x, ev.y);
1945 else 1993 else
1946 selection_extend (ev.x, ev.y, 1); 1994 selection_extend (ev.x, ev.y, 1);
1947 1995
1948 MEvent.button = Button3; 1996 MEvent.button = Button3;
1949 break; 1997 break;
1950 } 1998 }
1951 } 1999 }
1952 2000
1953 MEvent.time = ev.time; 2001 MEvent.time = ev.time;
1954 return; 2002 return;
1955 } 2003 }
1956 2004
1957 /* 2005 /*
1958 * Scrollbar window processing of button press 2006 * Scrollbar window processing of button press
1959 */ 2007 */
1960 if (isScrollbarWindow (ev.window)) 2008 if (scrollBar.state && ev.window == scrollBar.win)
1961 { 2009 {
1962 scrollBar.setIdle (); 2010 page_dirn direction = NO_DIR;
2011
2012 if (scrollBar.upButton (ev.y))
2013 direction = UP; /* up */
2014 else if (scrollBar.dnButton (ev.y))
2015 direction = DN; /* down */
2016
2017 scrollBar.state = SB_STATE_IDLE;
1963 /* 2018 /*
1964 * Rxvt-style scrollbar: 2019 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 2020 * move up if mouse is above slider
1966 * move dn if mouse is below slider 2021 * move dn if mouse is below slider
1967 * 2022 *
… …
1976 /* 2031 /*
1977 * Mouse report disabled scrollbar: 2032 * Mouse report disabled scrollbar:
1978 * arrow buttons - send up/down 2033 * arrow buttons - send up/down
1979 * click on scrollbar - send pageup/down 2034 * click on scrollbar - send pageup/down
1980 */ 2035 */
1981 if ((scrollBar.style == R_SB_NEXT 2036 if (direction == UP)
1982 && scrollbarnext_upButton (ev.y))
1983 || (scrollBar.style == R_SB_RXVT
1984 && scrollbarrxvt_upButton (ev.y)))
1985 tt_printf ("\033[A"); 2037 tt_printf ("\033[A");
1986 else if ((scrollBar.style == R_SB_NEXT 2038 else if (direction == DN)
1987 && scrollbarnext_dnButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_dnButton (ev.y)))
1990 tt_printf ("\033[B"); 2039 tt_printf ("\033[B");
1991 else 2040 else
1992 switch (ev.button) 2041 switch (ev.button)
1993 { 2042 {
1994 case Button2: 2043 case Button2:
… …
2001 tt_printf ("\033[5~"); 2050 tt_printf ("\033[5~");
2002 break; 2051 break;
2003 } 2052 }
2004 } 2053 }
2005 else 2054 else
2006#endif /* NO_SCROLLBAR_REPORT */ 2055#endif /* NO_SCROLLBAR_REPORT */
2007
2008 {
2009 char upordown = 0;
2010
2011 if (scrollBar.style == R_SB_NEXT)
2012 { 2056 {
2013 if (scrollbarnext_upButton (ev.y)) 2057 if (direction != NO_DIR)
2014 upordown = -1; /* up */
2015 else if (scrollbarnext_dnButton (ev.y))
2016 upordown = 1; /* down */
2017 }
2018 else if (scrollBar.style == R_SB_RXVT)
2019 {
2020 if (scrollbarrxvt_upButton (ev.y))
2021 upordown = -1; /* up */
2022 else if (scrollbarrxvt_dnButton (ev.y))
2023 upordown = 1; /* down */
2024 }
2025 if (upordown)
2026 { 2058 {
2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2060 if (!cont_scroll_ev.is_active ())
2028 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2061 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2029#endif 2062#endif
2030 if (scr_page (upordown < 0 ? UP : DN, 1)) 2063 if (scr_page (direction, 1))
2031 { 2064 {
2032 if (upordown < 0) 2065 if (direction == UP)
2033 scrollBar.setUp (); 2066 scrollBar.state = SB_STATE_UP;
2034 else 2067 else
2035 scrollBar.setDn (); 2068 scrollBar.state = SB_STATE_DOWN;
2036 } 2069 }
2037 } 2070 }
2038 else 2071 else
2039 switch (ev.button) 2072 switch (ev.button)
2040 { 2073 {
2041 case Button2: 2074 case Button2:
2042 switch (scrollbar_align) 2075 switch (scrollBar.align)
2043 { 2076 {
2044 case R_SB_ALIGN_TOP: 2077 case SB_ALIGN_TOP:
2045 csrO = 0; 2078 csrO = 0;
2046 break; 2079 break;
2047 case R_SB_ALIGN_CENTRE: 2080 case SB_ALIGN_CENTRE:
2048 csrO = (scrollBar.bot - scrollBar.top) / 2; 2081 csrO = (scrollBar.bot - scrollBar.top) / 2;
2049 break; 2082 break;
2050 case R_SB_ALIGN_BOTTOM: 2083 case SB_ALIGN_BOTTOM:
2051 csrO = scrollBar.bot - scrollBar.top; 2084 csrO = scrollBar.bot - scrollBar.top;
2052 break; 2085 break;
2053 } 2086 }
2054 2087
2055 if (scrollBar.style == R_SB_XTERM 2088 if (scrollBar.style == SB_STYLE_XTERM
2056 || scrollbar_above_slider (ev.y) 2089 || scrollBar.above_slider (ev.y)
2057 || scrollbar_below_slider (ev.y)) 2090 || scrollBar.below_slider (ev.y))
2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2091 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2059 2092
2060 scrollBar.setMotion (); 2093 scrollBar.state = SB_STATE_MOTION;
2061 break; 2094 break;
2062 2095
2063 case Button1: 2096 case Button1:
2064 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2097 if (scrollBar.align == SB_ALIGN_CENTRE)
2065 csrO = ev.y - scrollBar.top; 2098 csrO = ev.y - scrollBar.top;
2066 /* FALLTHROUGH */ 2099 /* FALLTHROUGH */
2067 2100
2068 case Button3: 2101 case Button3:
2069 if (scrollBar.style != R_SB_XTERM) 2102 if (scrollBar.style != SB_STYLE_XTERM)
2070 { 2103 {
2071 if (scrollbar_above_slider (ev.y)) 2104 if (scrollBar.above_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2105# ifdef RXVT_SCROLL_FULL
2073 scr_page (UP, nrow - 1); 2106 scr_page (UP, nrow - 1);
2074# else 2107# else
2075 scr_page (UP, nrow / 4); 2108 scr_page (UP, nrow / 4);
2076# endif 2109# endif
2077 else if (scrollbar_below_slider (ev.y)) 2110 else if (scrollBar.below_slider (ev.y))
2078# ifdef RXVT_SCROLL_FULL 2111# ifdef RXVT_SCROLL_FULL
2079 scr_page (DN, nrow - 1); 2112 scr_page (DN, nrow - 1);
2080# else 2113# else
2081 scr_page (DN, nrow / 4); 2114 scr_page (DN, nrow / 4);
2082# endif 2115# endif
2083 else 2116 else
2084 scrollBar.setMotion (); 2117 scrollBar.state = SB_STATE_MOTION;
2085 } 2118 }
2086 else 2119 else
2087 { 2120 {
2088 scr_page ((ev.button == Button1 ? DN : UP), 2121 scr_page ((ev.button == Button1 ? DN : UP),
2089 (nrow 2122 (nrow
2090 * scrollbar_position (ev.y) 2123 * scrollBar.position (ev.y)
2091 / scrollbar_size ())); 2124 / scrollBar.size ()));
2092 } 2125 }
2093 2126
2094 break; 2127 break;
2095 } 2128 }
2096 } 2129 }
2097 2130
2098 return; 2131 return;
2099 } 2132 }
2100
2101#if MENUBAR
2102 /*
2103 * Menubar window processing of button press
2104 */
2105 if (isMenuBarWindow (ev.window))
2106 menubar_control (ev);
2107#endif
2108} 2133}
2109 2134
2110void 2135void
2111rxvt_term::button_release (XButtonEvent &ev) 2136rxvt_term::button_release (XButtonEvent &ev)
2112{ 2137{
… …
2114 2139
2115 csrO = 0; /* reset csr Offset */ 2140 csrO = 0; /* reset csr Offset */
2116 if (!bypass_keystate) 2141 if (!bypass_keystate)
2117 reportmode = !! (priv_modes & PrivMode_mouse_report); 2142 reportmode = !! (priv_modes & PrivMode_mouse_report);
2118 2143
2119 if (scrollbar_isUpDn ()) 2144 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2120 { 2145 {
2121 scrollBar.setIdle (); 2146 scrollBar.state = SB_STATE_IDLE;
2122 scrollbar_show (0); 2147 scrollBar.show (0);
2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2124 refresh_type &= ~SMOOTH_REFRESH;
2125#endif
2126 } 2148 }
2127 2149
2128#ifdef SELECTION_SCROLLING 2150#ifdef SELECTION_SCROLLING
2129 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop(); 2151 sel_scroll_ev.stop();
2131#endif 2152#endif
2132 2153
2133 if (ev.window == vt) 2154 if (ev.window == vt)
2134 { 2155 {
2156 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2157 return;
2158
2135#if ISO_14755 2159#if ISO_14755
2136 // 5.4 2160 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2161 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return; 2162 return;
2139#endif 2163#endif
2164
2140 if (reportmode) 2165 if (reportmode)
2141 { 2166 {
2142 /* mouse report from vt window */ 2167 /* mouse report from vt window */
2143 /* don't report release of wheel "buttons" */ 2168 /* don't report release of wheel "buttons" */
2144 if (ev.button >= 4) 2169 if (ev.button >= 4)
… …
2146#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2147 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2148 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2149 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2150 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2151 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2152 { 2177 {
2153 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2154 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2155 mouse_report (ev); 2180 mouse_report (ev);
2156 } 2181 }
2157#else /* MOUSE_REPORT_DOUBLECLICK */ 2182#else /* MOUSE_REPORT_DOUBLECLICK */
2158 MEvent.button = AnyButton; 2183 MEvent.button = AnyButton;
2159 mouse_report (ev); 2184 mouse_report (ev);
2160#endif /* MOUSE_REPORT_DOUBLECLICK */ 2185#endif /* MOUSE_REPORT_DOUBLECLICK */
2161 return; 2186 return;
2162 } 2187 }
2163 2188
2164 /* 2189 /*
2165 * dumb hack to compensate for the failure of click-and-drag 2190 * dumb hack to compensate for the failure of click-and-drag
… …
2168 if (priv_modes & PrivMode_mouse_report 2193 if (priv_modes & PrivMode_mouse_report
2169 && bypass_keystate 2194 && bypass_keystate
2170 && ev.button == Button1 && MEvent.clicks <= 1) 2195 && ev.button == Button1 && MEvent.clicks <= 1)
2171 selection_extend (ev.x, ev.y, 0); 2196 selection_extend (ev.x, ev.y, 0);
2172 2197
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2175
2176 switch (ev.button) 2198 switch (ev.button)
2177 { 2199 {
2178 case Button1: 2200 case Button1:
2179 case Button3: 2201 case Button3:
2180 selection_make (ev.time); 2202 selection_make (ev.time);
2181 break; 2203 break;
2204
2182 case Button2: 2205 case Button2:
2183 selection_request (ev.time, ev.x, ev.y); 2206 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2207 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2184 break; 2208 break;
2209
2185#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2186 case Button4: 2211 case Button4:
2187 case Button5: 2212 case Button5:
2188 { 2213 {
2189 int i; 2214 int lines;
2190 page_dirn v; 2215 page_dirn dirn;
2191 2216
2192 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2193 2218
2194 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2195 i = 1; 2220 lines = 1;
2196 else if (OPTION (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2197 i = nrow - 1; 2222 lines = nrow - 1;
2198 else 2223 else
2199 i = 5; 2224 lines = 5;
2200 2225
2201# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2202 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2203 { 2228 {
2204 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2205 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2206 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2207 2231
2208 if (slip_wheel_ev.at < NOW) 2232 if (!slip_wheel_ev.is_active ())
2209 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2210
2211 slip_wheel_ev.start ();
2212 } 2234 }
2213 else 2235 else
2236# endif
2214 { 2237 {
2215# endif
2216# ifdef JUMP_MOUSE_WHEEL
2217 scr_page (v, i); 2238 scr_page (dirn, lines);
2218 scr_refresh (SMOOTH_REFRESH);
2219 scrollbar_show (1); 2239 scrollBar.show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING
2229 } 2240 }
2230#endif
2231 } 2241 }
2232 break; 2242 break;
2233#endif 2243#endif
2234 } 2244 }
2235 } 2245 }
2236#ifdef MENUBAR
2237 else if (isMenuBarWindow (ev.window))
2238 menubar_control (ev);
2239#endif
2240} 2246}
2241
2242#ifdef TRANSPARENT
2243#if TINTING
2244/* taken from aterm-0.4.2 */
2245
2246typedef uint32_t RUINT32T;
2247
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{
2250 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i;
2256
2257 Visual *visual = display->visual;
2258
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260
2261 /* for convenience */
2262 mask_r = visual->red_mask;
2263 mask_g = visual->green_mask;
2264 mask_b = visual->blue_mask;
2265
2266 /* boring lookup table pre-initialization */
2267 switch (srcImage->bits_per_pixel) {
2268 case 15:
2269 if ((mask_r != 0x7c00) ||
2270 (mask_g != 0x03e0) ||
2271 (mask_b != 0x001f))
2272 return;
2273 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2274 lookup_r = lookup;
2275 lookup_g = lookup+32;
2276 lookup_b = lookup+32+32;
2277 sh_r = 10;
2278 sh_g = 5;
2279 sh_b = 0;
2280 break;
2281 case 16:
2282 if ((mask_r != 0xf800) ||
2283 (mask_g != 0x07e0) ||
2284 (mask_b != 0x001f))
2285 return;
2286 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2287 lookup_r = lookup;
2288 lookup_g = lookup+32;
2289 lookup_b = lookup+32+64;
2290 sh_r = 11;
2291 sh_g = 5;
2292 sh_b = 0;
2293 break;
2294 case 24:
2295 if ((mask_r != 0xff0000) ||
2296 (mask_g != 0x00ff00) ||
2297 (mask_b != 0x0000ff))
2298 return;
2299 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2300 lookup_r = lookup;
2301 lookup_g = lookup+256;
2302 lookup_b = lookup+256+256;
2303 sh_r = 16;
2304 sh_g = 8;
2305 sh_b = 0;
2306 break;
2307 case 32:
2308 if ((mask_r != 0xff0000) ||
2309 (mask_g != 0x00ff00) ||
2310 (mask_b != 0x0000ff))
2311 return;
2312 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2313 lookup_r = lookup;
2314 lookup_g = lookup+256;
2315 lookup_b = lookup+256+256;
2316 sh_r = 16;
2317 sh_g = 8;
2318 sh_b = 0;
2319 break;
2320 default:
2321 return; /* we do not support this color depth */
2322 }
2323
2324 /* prepare limits for color transformation (each channel is handled separately) */
2325 if (shade < 0) {
2326 shade = -shade;
2327 if (shade < 0) shade = 0;
2328 if (shade > 100) shade = 100;
2329
2330 lower_lim_r = 65535-rm;
2331 lower_lim_g = 65535-gm;
2332 lower_lim_b = 65535-bm;
2333
2334 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2335 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2336 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2337
2338 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2339 } else {
2340 if (shade < 0) shade = 0;
2341 if (shade > 100) shade = 100;
2342
2343 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2344
2345 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2346 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2347 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2348 }
2349
2350 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2351 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2352 {
2353 unsigned int tmp;
2354
2355 tmp = lower_lim_r;
2356 lower_lim_r = lower_lim_b;
2357 lower_lim_b = tmp;
2358
2359 tmp = upper_lim_r;
2360 upper_lim_r = upper_lim_b;
2361 upper_lim_b = tmp;
2362 }
2363
2364 /* fill our lookup tables */
2365 for (i = 0; i <= mask_r>>sh_r; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2369 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2370 lookup_r[i] = (tmp/65535)<<sh_r;
2371 }
2372 for (i = 0; i <= mask_g>>sh_g; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2376 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2377 lookup_g[i] = (tmp/65535)<<sh_g;
2378 }
2379 for (i = 0; i <= mask_b>>sh_b; i++)
2380 {
2381 RUINT32T tmp;
2382 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2383 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2384 lookup_b[i] = (tmp/65535)<<sh_b;
2385 }
2386
2387 /* apply table to input image (replacing colors by newly calculated ones) */
2388 switch (srcImage->bits_per_pixel)
2389 {
2390 case 15:
2391 {
2392 unsigned short *p1, *pf, *p, *pl;
2393 p1 = (unsigned short *) srcImage->data;
2394 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0x7c00)>>10] |
2402 lookup_g[(*p & 0x03e0)>> 5] |
2403 lookup_b[(*p & 0x001f)];
2404 }
2405 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 16:
2410 {
2411 unsigned short *p1, *pf, *p, *pl;
2412 p1 = (unsigned short *) srcImage->data;
2413 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414 while (p1 < pf)
2415 {
2416 p = p1;
2417 pl = p1 + srcImage->width;
2418 for (; p < pl; p++)
2419 {
2420 *p = lookup_r[(*p & 0xf800)>>11] |
2421 lookup_g[(*p & 0x07e0)>> 5] |
2422 lookup_b[(*p & 0x001f)];
2423 }
2424 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2425 }
2426 break;
2427 }
2428 case 24:
2429 {
2430 unsigned char *p1, *pf, *p, *pl;
2431 p1 = (unsigned char *) srcImage->data;
2432 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2433 while (p1 < pf)
2434 {
2435 p = p1;
2436 pl = p1 + srcImage->width * 3;
2437 for (; p < pl; p += 3)
2438 {
2439 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2440 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2441 p[2] = lookup_r[(p[2] & 0x0000ff)];
2442 }
2443 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2444 }
2445 break;
2446 }
2447 case 32:
2448 {
2449 RUINT32T *p1, *pf, *p, *pl;
2450 p1 = (RUINT32T *) srcImage->data;
2451 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2452
2453 while (p1 < pf)
2454 {
2455 p = p1;
2456 pl = p1 + srcImage->width;
2457 for (; p < pl; p++)
2458 {
2459 *p = lookup_r[(*p & 0xff0000)>>16] |
2460 lookup_g[(*p & 0x00ff00)>> 8] |
2461 lookup_b[(*p & 0x0000ff)] |
2462 (*p & ~0xffffff);
2463 }
2464 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2465 }
2466 break;
2467 }
2468 }
2469
2470 free (lookup);
2471}
2472#endif
2473
2474/*
2475 * Check our parents are still who we think they are.
2476 * Do transparency updates if required
2477 */
2478int
2479rxvt_term::check_our_parents ()
2480{
2481 int i, pchanged, aformat, have_pixmap, rootdepth;
2482 unsigned long nitems, bytes_after;
2483 Atom atype;
2484 unsigned char *prop = NULL;
2485 Window root, oldp, *list;
2486 Pixmap rootpixmap = None;
2487 XWindowAttributes wattr, wrootattr;
2488 dDisp;
2489
2490 pchanged = 0;
2491
2492 if (!OPTION (Opt_transparent))
2493 return pchanged; /* Don't try any more */
2494
2495 XGetWindowAttributes (disp, display->root, &wrootattr);
2496 rootdepth = wrootattr.depth;
2497
2498 XGetWindowAttributes (disp, parent[0], &wattr);
2499
2500 if (rootdepth != wattr.depth)
2501 {
2502 if (am_transparent)
2503 {
2504 pchanged = 1;
2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2506 am_transparent = am_pixmap_trans = 0;
2507 }
2508
2509 return pchanged; /* Don't try any more */
2510 }
2511
2512 /* Get all X ops out of the queue so that our information is up-to-date. */
2513 XSync (disp, False);
2514
2515 /*
2516 * Make the frame window set by the window manager have
2517 * the root background. Some window managers put multiple nested frame
2518 * windows for each client, so we have to take care about that.
2519 */
2520 i = (xa[XA_XROOTPMAP_ID]
2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2523 &nitems, &bytes_after, &prop) == Success);
2524
2525 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success);
2530
2531 if (!i || prop == NULL
2532#if TINTING
2533 || !rs[Rs_color + Color_tint]
2534#endif
2535 )
2536 have_pixmap = 0;
2537 else
2538 {
2539 have_pixmap = 1;
2540 rootpixmap = *(Pixmap *)prop;
2541 XFree (prop);
2542 }
2543
2544 if (have_pixmap)
2545 {
2546 /*
2547 * Copy display->root pixmap transparency
2548 */
2549 int sx, sy, nx, ny;
2550 unsigned int nw, nh;
2551 Window cr;
2552 XImage *image;
2553 GC gc;
2554 XGCValues gcvalue;
2555
2556 XTranslateCoordinates (disp, parent[0], display->root,
2557 0, 0, &sx, &sy, &cr);
2558 nw = (unsigned int)szHint.width;
2559 nh = (unsigned int)szHint.height;
2560 nx = ny = 0;
2561
2562 if (sx < 0)
2563 {
2564 nw += sx;
2565 nx = -sx;
2566 sx = 0;
2567 }
2568
2569 if (sy < 0)
2570 {
2571 nh += sy;
2572 ny = -sy;
2573 sy = 0;
2574 }
2575
2576 min_it (nw, (unsigned int) (wrootattr.width - sx));
2577 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578
2579 XSync (disp, False);
2580 allowedxerror = -1;
2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2582
2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2584 /* XXX: may need a delay here? */
2585 allowedxerror = 0;
2586
2587 if (image == NULL)
2588 {
2589 if (am_transparent && am_pixmap_trans)
2590 {
2591 pchanged = 1;
2592 if (pixmap != None)
2593 {
2594 XFreePixmap (disp, pixmap);
2595 pixmap = None;
2596 }
2597 }
2598
2599 am_pixmap_trans = 0;
2600 }
2601 else
2602 {
2603 if (pixmap != None)
2604 XFreePixmap (disp, pixmap);
2605
2606#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint))
2608 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2613
2614 ShadeXImage (display, image, shade, rm, gm, bm);
2615 }
2616#endif
2617
2618 pixmap = XCreatePixmap (disp, vt,
2619 szHint.width, szHint.height, image->depth);
2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2621 XPutImage (disp, pixmap, gc, image, 0, 0,
2622 nx, ny, image->width, image->height);
2623 XFreeGC (disp, gc);
2624 XDestroyImage (image);
2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2626 XClearWindow (disp, parent[0]);
2627
2628 if (!am_transparent || !am_pixmap_trans)
2629 pchanged = 1;
2630
2631 am_transparent = am_pixmap_trans = 1;
2632 }
2633 }
2634
2635 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2637 else
2638 {
2639 unsigned int n;
2640 /*
2641 * InheritPixmap transparency
2642 */
2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2644 {
2645 oldp = parent[i];
2646 XQueryTree (disp, parent[i - 1], &root,
2647 &parent[i], &list, &n);
2648 XFree (list);
2649
2650 if (parent[i] == display->root)
2651 {
2652 if (oldp != None)
2653 pchanged = 1;
2654
2655 break;
2656 }
2657
2658 if (oldp != parent[i])
2659 pchanged = 1;
2660 }
2661
2662 n = 0;
2663
2664 if (pchanged)
2665 {
2666 for (; n < (unsigned int)i; n++)
2667 {
2668 XGetWindowAttributes (disp, parent[n], &wattr);
2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2670 {
2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2672 break;
2673 }
2674 }
2675 }
2676
2677 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2678 {
2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2681 am_transparent = 0;
2682 /* XXX: also turn off Opt_transparent? */
2683 }
2684 else
2685 {
2686#if WAIT_FOR_WM
2687 /* wait (an arbitrary period) for the WM to do its thing
2688 * needed for fvwm2.2.2 (and before?) */
2689 sleep (1);
2690#endif
2691 for (n = 0; n < (unsigned int)i; n++)
2692 {
2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2694 XClearWindow (disp, parent[n]);
2695 }
2696
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2698 am_transparent = 1;
2699 }
2700
2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2702 parent[i] = None;
2703 }
2704
2705 if (scrollBar.win)
2706 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle ();
2709 scrollbar_show (0);
2710 }
2711
2712 if (am_transparent)
2713 {
2714 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans)
2716 flush ();
2717 }
2718
2719 return pchanged;
2720}
2721#endif
2722 2247
2723/*}}} */ 2248/*}}} */
2724 2249
2725bool 2250void ecb_hot
2726rxvt_term::cmd_parse () 2251rxvt_term::cmd_parse ()
2727{ 2252{
2728 bool flag = false;
2729 wchar_t ch = NOCHAR; 2253 wchar_t ch = NOCHAR;
2730 char *seq_begin; // remember start of esc-sequence here 2254 char *seq_begin; // remember start of esc-sequence here
2731 2255
2732 for (;;) 2256 for (;;)
2733 { 2257 {
2734 if (ch == NOCHAR) 2258 if (ecb_unlikely (ch == NOCHAR))
2735 { 2259 {
2736 seq_begin = cmdbuf_ptr; 2260 seq_begin = cmdbuf_ptr;
2737 ch = next_char (); 2261 ch = next_char ();
2738 2262
2739 if (ch == NOCHAR) 2263 if (ch == NOCHAR)
2740 break; 2264 break;
2741 } 2265 }
2742 2266
2743 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2267 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2744 { 2268 {
2745 if (!seen_input) 2269 if (ecb_unlikely (!seen_input))
2746 { 2270 {
2747 seen_input = 1; 2271 seen_input = 1;
2748 // many badly-written programs (e.g. jed) contain a race condition: 2272 // many badly-written programs (e.g. jed) contain a race condition:
2749 // they first read the screensize and then install a SIGWINCH handler. 2273 // they first read the screensize and then install a SIGWINCH handler.
2750 // some window managers resize the window early, and these programs 2274 // some window managers resize the window early, and these programs
… …
2763 wchar_t *str = buf; 2287 wchar_t *str = buf;
2764 wchar_t *eol = str + min (ncol, UBUFSIZ); 2288 wchar_t *eol = str + min (ncol, UBUFSIZ);
2765 2289
2766 for (;;) 2290 for (;;)
2767 { 2291 {
2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2292 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2769 break; 2293 break;
2770 2294
2771 *str++ = ch; 2295 *str++ = ch;
2772 2296
2773 if (ch == C0_LF || str >= eol) 2297 if (ecb_unlikely (ch == C0_LF || str >= eol))
2774 { 2298 {
2775 if (ch == C0_LF) 2299 if (ch == C0_LF)
2776 nlines++; 2300 nlines++;
2777 2301
2778 refresh_count++; 2302 refresh_count++;
2779 2303
2780 if (!OPTION (Opt_jumpScroll) 2304 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2781 || (refresh_count >= refresh_limit * (nrow - 1)))
2782 { 2305 {
2783 refreshnow = true;
2784 refresh_count = 0; 2306 refresh_count = 0;
2307
2308 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2309 {
2310 refreshnow = true;
2785 ch = NOCHAR; 2311 ch = NOCHAR;
2786 break; 2312 break;
2313 }
2787 } 2314 }
2788 2315
2789 // scr_add_lines only works for nlines <= nrow - 1. 2316 // scr_add_lines only works for nlines <= nrow - 1.
2790 if (nlines >= nrow - 1) 2317 if (nlines >= nrow - 1)
2791 { 2318 {
2319 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2320 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2793 scr_add_lines (buf, str - buf, nlines); 2321 scr_add_lines (buf, str - buf, nlines);
2794 2322
2795 nlines = 0; 2323 nlines = 0;
2796 str = buf; 2324 str = buf;
2797 eol = str + min (ncol, UBUFSIZ); 2325 eol = str + min (ncol, UBUFSIZ);
… …
2812 2340
2813 seq_begin = cmdbuf_ptr; 2341 seq_begin = cmdbuf_ptr;
2814 ch = next_char (); 2342 ch = next_char ();
2815 } 2343 }
2816 2344
2345 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2346 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2818 scr_add_lines (buf, str - buf, nlines); 2347 scr_add_lines (buf, str - buf, nlines);
2819 2348
2820 /* 2349 /*
2821 * If there have been a lot of new lines, then update the screen 2350 * If there have been a lot of new lines, then update the screen
2822 * What the heck I'll cheat and only refresh less than every page-full. 2351 * What the heck we'll cheat and only refresh less than every page-full.
2823 * the number of pages between refreshes is refresh_limit, which 2352 * if skipScroll is enabled.
2824 * is incremented here because we must be doing flat-out scrolling.
2825 */ 2353 */
2826 if (refreshnow) 2354 if (refreshnow)
2827 { 2355 {
2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2829 refresh_limit++;
2830 else
2831 {
2832 flag = true;
2833 scr_refresh (refresh_type); 2356 scr_refresh ();
2834 flush_ev.stop (); 2357 want_refresh = 1;
2835 }
2836 } 2358 }
2837
2838 } 2359 }
2839 else 2360 else
2840 { 2361 {
2841 try 2362 try
2842 { 2363 {
… …
2850 } 2371 }
2851 2372
2852 ch = NOCHAR; 2373 ch = NOCHAR;
2853 } 2374 }
2854 } 2375 }
2855
2856 return flag;
2857} 2376}
2858 2377
2859// read the next character 2378// read the next character
2860wchar_t 2379wchar_t ecb_hot
2861rxvt_term::next_char () 2380rxvt_term::next_char () NOTHROW
2862{ 2381{
2863 while (cmdbuf_ptr < cmdbuf_endp) 2382 while (cmdbuf_ptr < cmdbuf_endp)
2864 { 2383 {
2865 // assume 7-bit to be ascii ALWAYS 2384 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2385 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2867 return *cmdbuf_ptr++; 2386 return *cmdbuf_ptr++;
2868 2387
2869 wchar_t wc; 2388 wchar_t wc;
2870 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2389 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2871 2390
… …
2875 cmdbuf_ptr = cmdbuf_endp; 2394 cmdbuf_ptr = cmdbuf_endp;
2876 break; 2395 break;
2877 } 2396 }
2878 2397
2879 if (len == (size_t)-1) 2398 if (len == (size_t)-1)
2399 {
2400 mbstate.reset (); // reset now undefined conversion state
2401 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2402 // in which case we "erroneously" return the next byte which might be valid.
2880 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2403 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2404 }
2881 2405
2882 // assume wchar == unicode 2406 // assume wchar == unicode
2883 cmdbuf_ptr += len; 2407 cmdbuf_ptr += len;
2884 return wc & UNICODE_MASK; 2408 return wc & UNICODE_MASK;
2885 } 2409 }
2886 2410
2887 return NOCHAR; 2411 return NOCHAR;
2888} 2412}
2889 2413
2890// read the next octet 2414// read the next octet
2891uint32_t 2415uint32_t ecb_hot
2892rxvt_term::next_octet () 2416rxvt_term::next_octet () NOTHROW
2893{ 2417{
2894 return cmdbuf_ptr < cmdbuf_endp 2418 return cmdbuf_ptr < cmdbuf_endp
2895 ? (unsigned char)*cmdbuf_ptr++ 2419 ? (unsigned char)*cmdbuf_ptr++
2896 : NOCHAR; 2420 : NOCHAR;
2897} 2421}
2898 2422
2899/* rxvt_cmd_getc () - Return next input character */ 2423static class out_of_input out_of_input;
2900/* 2424
2901 * Return the next input character after first passing any keyboard input 2425wchar_t ecb_hot
2902 * to the command. 2426rxvt_term::cmd_getc () THROW ((class out_of_input))
2903 */
2904wchar_t
2905rxvt_term::cmd_getc ()
2906{ 2427{
2907 wchar_t c = next_char (); 2428 wchar_t c = next_char ();
2908 2429
2909 if (c == NOCHAR) 2430 if (c == NOCHAR)
2910 throw out_of_input; 2431 throw out_of_input;
2911 2432
2912 return c; 2433 return c;
2913} 2434}
2914 2435
2915uint32_t 2436uint32_t ecb_hot
2916rxvt_term::cmd_get8 () 2437rxvt_term::cmd_get8 () THROW ((class out_of_input))
2917{ 2438{
2918 uint32_t c = next_octet (); 2439 uint32_t c = next_octet ();
2919 2440
2920 if (c == NOCHAR) 2441 if (c == NOCHAR)
2921 throw out_of_input; 2442 throw out_of_input;
… …
2924} 2445}
2925 2446
2926/*{{{ print pipe */ 2447/*{{{ print pipe */
2927/*----------------------------------------------------------------------*/ 2448/*----------------------------------------------------------------------*/
2928#ifdef PRINTPIPE 2449#ifdef PRINTPIPE
2929FILE * 2450FILE * ecb_cold
2930rxvt_term::popen_printer () 2451rxvt_term::popen_printer ()
2931{ 2452{
2932 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2453 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2933 2454
2934 if (stream == NULL) 2455 if (stream == NULL)
2935 rxvt_warn ("can't open printer pipe, not printing.\n"); 2456 rxvt_warn ("can't open printer pipe, not printing.\n");
2936 2457
2937 return stream; 2458 return stream;
2938} 2459}
2939 2460
2940int 2461int ecb_cold
2941rxvt_term::pclose_printer (FILE *stream) 2462rxvt_term::pclose_printer (FILE *stream)
2942{ 2463{
2943 fflush (stream); 2464 fflush (stream);
2944 return pclose (stream); 2465 return pclose (stream);
2945} 2466}
2946 2467
2947/* 2468/*
2948 * simulate attached vt100 printer 2469 * simulate attached vt100 printer
2949 */ 2470 */
2950void 2471void ecb_cold
2951rxvt_term::process_print_pipe () 2472rxvt_term::process_print_pipe ()
2952{ 2473{
2953 int done; 2474 FILE *fd = popen_printer ();
2954 FILE *fd;
2955 2475
2956 if ((fd = popen_printer ()) == NULL) 2476 if (!fd)
2957 return; 2477 return;
2958 2478
2959 /* 2479 /*
2960 * Send all input to the printer until either ESC[4i or ESC[?4i 2480 * Send all input to the printer until either ESC[4i or ESC[?4i
2961 * is received. 2481 * is received.
2962 */ 2482 */
2963 for (done = 0; !done;) 2483 for (int done = 0; !done; )
2964 { 2484 {
2965 unsigned char buf[8]; 2485 unsigned char buf[8];
2966 unicode_t ch; 2486 unicode_t ch;
2967 unsigned int i, len; 2487 unsigned int i, len;
2968 2488
… …
2987 { 2507 {
2988 if ((buf[len++] = cmd_getc ()) == 'i') 2508 if ((buf[len++] = cmd_getc ()) == 'i')
2989 break; /* done = 1 */ 2509 break; /* done = 1 */
2990 } 2510 }
2991 } 2511 }
2992 2512
2993 for (i = 0; i < len; i++) 2513 for (i = 0; i < len; i++)
2994 if (putc (buf[i], fd) == EOF) 2514 if (putc (buf[i], fd) == EOF)
2995 { 2515 {
2996 done = 1; 2516 done = 1;
2997 break; 2517 break;
… …
2999 } 2519 }
3000 } 2520 }
3001 2521
3002 pclose_printer (fd); 2522 pclose_printer (fd);
3003} 2523}
3004#endif /* PRINTPIPE */ 2524#endif /* PRINTPIPE */
3005/*}}} */ 2525/*}}} */
3006 2526
3007/* *INDENT-OFF* */
3008enum { 2527enum {
3009 C1_40 = 0x40, 2528 C1_40 = 0x40,
3010 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2529 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
3011 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2530 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
3012 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2531 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
3013 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2532 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
3014}; 2533};
3015/* *INDENT-ON* */
3016 2534
3017/*{{{ process non-printing single characters */ 2535/*{{{ process non-printing single characters */
3018void 2536void ecb_hot
3019rxvt_term::process_nonprinting (unicode_t ch) 2537rxvt_term::process_nonprinting (unicode_t ch)
3020{ 2538{
3021 switch (ch) 2539 switch (ch)
3022 { 2540 {
3023 case C0_ESC: 2541 case C0_ESC:
… …
3059 process_dcs_seq (); 2577 process_dcs_seq ();
3060 break; 2578 break;
3061 case 0x9b: /* CSI */ 2579 case 0x9b: /* CSI */
3062 process_csi_seq (); 2580 process_csi_seq ();
3063 break; 2581 break;
3064 case 0x9d: /* CSI */ 2582 case 0x9d: /* OSC */
3065 process_osc_seq (); 2583 process_osc_seq ();
3066 break; 2584 break;
3067#endif 2585#endif
3068 } 2586 }
3069} 2587}
3070/*}}} */ 2588/*}}} */
3071 2589
3072 2590
3073/*{{{ process VT52 escape sequences */ 2591/*{{{ process VT52 escape sequences */
3074void 2592void ecb_cold
3075rxvt_term::process_escape_vt52 (unicode_t ch) 2593rxvt_term::process_escape_vt52 (unicode_t ch)
3076{ 2594{
3077 int row, col; 2595 int row, col;
3078 2596
3079 switch (ch) 2597 switch (ch)
… …
3113 break; 2631 break;
3114 case 'Z': /* identify the terminal type */ 2632 case 'Z': /* identify the terminal type */
3115 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2633 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3116 break; 2634 break;
3117 case '<': /* turn off VT52 mode */ 2635 case '<': /* turn off VT52 mode */
3118 PrivMode (0, PrivMode_vt52); 2636 priv_modes &= ~PrivMode_vt52;
3119 break; 2637 break;
3120 case 'F': /* use special graphics character set */ 2638 case 'F': /* use special graphics character set */
3121 case 'G': /* use regular character set */ 2639 case 'G': /* use regular character set */
3122 /* unimplemented */ 2640 /* unimplemented */
3123 break; 2641 break;
… …
3129} 2647}
3130/*}}} */ 2648/*}}} */
3131 2649
3132 2650
3133/*{{{ process escape sequences */ 2651/*{{{ process escape sequences */
3134void 2652void ecb_hot
3135rxvt_term::process_escape_seq () 2653rxvt_term::process_escape_seq ()
3136{ 2654{
3137 unicode_t ch = cmd_getc (); 2655 unicode_t ch = cmd_getc ();
3138 2656
3139 if (priv_modes & PrivMode_vt52) 2657 if (priv_modes & PrivMode_vt52)
… …
3142 return; 2660 return;
3143 } 2661 }
3144 2662
3145 switch (ch) 2663 switch (ch)
3146 { 2664 {
3147 /* case 1: do_tek_mode (); break; */
3148 case '#': 2665 case '#':
3149 if (cmd_getc () == '8') 2666 if (cmd_getc () == '8')
3150 scr_E (); 2667 scr_E ();
3151 break; 2668 break;
3152 case '(': 2669 case '(':
… …
3159 scr_charset_set (2, (unsigned int)cmd_getc ()); 2676 scr_charset_set (2, (unsigned int)cmd_getc ());
3160 break; 2677 break;
3161 case '+': 2678 case '+':
3162 scr_charset_set (3, (unsigned int)cmd_getc ()); 2679 scr_charset_set (3, (unsigned int)cmd_getc ());
3163 break; 2680 break;
3164#if ENABLE_FRILLS 2681#if !ENABLE_MINIMAL
3165 case '6': 2682 case '6':
3166 scr_backindex (); 2683 scr_backindex ();
3167 break; 2684 break;
3168#endif 2685#endif
3169 case '7': 2686 case '7':
3170 scr_cursor (SAVE); 2687 scr_cursor (SAVE);
3171 break; 2688 break;
3172 case '8': 2689 case '8':
3173 scr_cursor (RESTORE); 2690 scr_cursor (RESTORE);
3174 break; 2691 break;
3175#if ENABLE_FRILLS 2692#if !ENABLE_MINIMAL
3176 case '9': 2693 case '9':
3177 scr_forwardindex (); 2694 scr_forwardindex ();
3178 break; 2695 break;
3179#endif 2696#endif
2697 // DECPAM/DECPNM
3180 case '=': 2698 case '=':
2699 priv_modes |= PrivMode_aplKP;
2700 break;
3181 case '>': 2701 case '>':
3182 PrivMode ((ch == '='), PrivMode_aplKP); 2702 priv_modes &= ~PrivMode_aplKP;
3183 break; 2703 break;
3184 2704
3185 case C1_40: 2705 case C1_40:
3186 cmd_getc (); 2706 cmd_getc ();
3187 break; 2707 break;
… …
3191 2711
3192 /* 8.3.87: NEXT LINE */ 2712 /* 8.3.87: NEXT LINE */
3193 case C1_NEL: /* ESC E */ 2713 case C1_NEL: /* ESC E */
3194 { 2714 {
3195 wchar_t nlcr[] = { C0_LF, C0_CR }; 2715 wchar_t nlcr[] = { C0_LF, C0_CR };
3196 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2716 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3197 } 2717 }
3198 break; 2718 break;
3199 2719
3200 /* kidnapped escape sequence: Should be 8.3.48 */ 2720 /* kidnapped escape sequence: Should be 8.3.48 */
3201 case C1_ESA: /* ESC G */ 2721 case C1_ESA: /* ESC G */
3202 process_graphics (); 2722 // used by original rxvt for rob nations own graphics mode
2723 if (cmd_getc () == 'Q')
2724 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3203 break; 2725 break;
3204 2726
3205 /* 8.3.63: CHARACTER TABULATION SET */ 2727 /* 8.3.63: CHARACTER TABULATION SET */
3206 case C1_HTS: /* ESC H */ 2728 case C1_HTS: /* ESC H */
3207 scr_set_tab (1); 2729 scr_set_tab (1);
… …
3211 case C1_RI: /* ESC M */ 2733 case C1_RI: /* ESC M */
3212 scr_index (DN); 2734 scr_index (DN);
3213 break; 2735 break;
3214 2736
3215 /* 8.3.142: SINGLE-SHIFT TWO */ 2737 /* 8.3.142: SINGLE-SHIFT TWO */
3216 /*case C1_SS2: scr_single_shift (2); break; */ 2738 /* case C1_SS2: break; */
3217 2739
3218 /* 8.3.143: SINGLE-SHIFT THREE */ 2740 /* 8.3.143: SINGLE-SHIFT THREE */
3219 /*case C1_SS3: scr_single_shift (3); break; */ 2741 /* case C1_SS3: break; */
3220 2742
3221 /* 8.3.27: DEVICE CONTROL STRING */ 2743 /* 8.3.27: DEVICE CONTROL STRING */
3222 case C1_DCS: /* ESC P */ 2744 case C1_DCS: /* ESC P */
3223 process_dcs_seq (); 2745 process_dcs_seq ();
3224 break; 2746 break;
… …
3226 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2748 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3227 case C1_SCI: /* ESC Z */ 2749 case C1_SCI: /* ESC Z */
3228 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2750 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3229 break; /* steal obsolete ESC [ c */ 2751 break; /* steal obsolete ESC [ c */
3230 2752
3231 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2753 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3232 case C1_CSI: /* ESC [ */ 2754 case C1_CSI: /* ESC [ */
3233 process_csi_seq (); 2755 process_csi_seq ();
3234 break; 2756 break;
3235 2757
3236 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2758 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3237 case C1_OSC: /* ESC ] */ 2759 case C1_OSC: /* ESC ] */
3238 process_osc_seq (); 2760 process_osc_seq ();
3239 break; 2761 break;
3240 2762
3241 /* 8.3.106: RESET TO INITIAL STATE */ 2763 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3242 case 'c': 2764 case 'c':
3243 mbstate.reset (); 2765 mbstate.reset ();
3244 scr_poweron (); 2766 scr_poweron ();
3245 scrollbar_show (1); 2767 scrollBar.show (1);
3246 break; 2768 break;
3247 2769
3248 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2770 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3249 case 'n': 2771 case 'n':
3250 scr_charset_choose (2); 2772 scr_charset_choose (2);
… …
3257 } 2779 }
3258} 2780}
3259/*}}} */ 2781/*}}} */
3260 2782
3261/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2783/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3262/* *INDENT-OFF* */
3263enum { 2784enum {
3264 CSI_ICH = 0x40, 2785 CSI_ICH = 0x40,
3265 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2786 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3266 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2787 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3267 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2788 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3270 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2791 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3271 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2792 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3272 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2793 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3273}; 2794};
3274 2795
3275#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2796#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3276 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2797 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3277 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2798 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3278#define get_byte_array_bit(array, bit) \ 2799#define get_byte_array_bit(array, bit) \
3279 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2800 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3280 2801
3281const unsigned char csi_defaults[] = 2802static const unsigned char csi_defaults[] =
3282 { 2803 {
3283 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2804 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3284 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2805 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3285 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2806 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3286 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2807 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3287 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2808 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3288 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2809 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3289 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2810 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3290 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2811 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3291 }; 2812 };
3292/* *INDENT-ON* */
3293 2813
3294void 2814void ecb_hot
3295rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
3296{ 2816{
3297 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
3298 unsigned int nargs, p; 2818 unsigned int nargs, p;
3299 int n, ndef; 2819 int n, ndef;
3300 int arg[ESC_ARGS]; 2820 int arg[ESC_ARGS] = { };
3301 2821
3302 for (nargs = ESC_ARGS; nargs > 0;) 2822 nargs = 0;
3303 arg[--nargs] = 0;
3304 2823
3305 priv = 0; 2824 priv = 0;
3306 ch = cmd_getc (); 2825 ch = cmd_getc ();
3307 if (ch >= '<' && ch <= '?') 2826 if ((ch >= '<' && ch <= '?') || ch == '!')
2827 {
3308 { /* '<' '=' '>' '?' */ 2828 /* '<' '=' '>' '?' '!' */
3309 priv = ch; 2829 priv = ch;
3310 ch = cmd_getc (); 2830 ch = cmd_getc ();
3311 } 2831 }
3312 2832
2833 prev_ch = 0;
3313 /* read any numerical arguments */ 2834 /* read any numerical arguments */
3314 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
3315 { 2836 {
3316 if (isdigit (ch)) 2837 if (isdigit (ch))
3317 { 2838 {
… …
3327 n = -1; 2848 n = -1;
3328 } 2849 }
3329 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
3330 process_nonprinting (ch); 2851 process_nonprinting (ch);
3331 2852
2853 prev_ch = ch;
3332 ch = cmd_getc (); 2854 ch = cmd_getc ();
3333 } 2855 }
3334 2856
3335 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
3336 return; 2858 return;
… …
3342 ndef = get_byte_array_bit (csi_defaults, i); 2864 ndef = get_byte_array_bit (csi_defaults, i);
3343 for (p = 0; p < nargs; p++) 2865 for (p = 0; p < nargs; p++)
3344 if (arg[p] == -1) 2866 if (arg[p] == -1)
3345 arg[p] = ndef; 2867 arg[p] = ndef;
3346 2868
3347#ifdef DEBUG_CMD
3348 fprintf (stderr, "CSI ");
3349 for (p = 0; p < nargs; p++)
3350 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3351 fprintf (stderr, "%c\n", ch);
3352#endif
3353
3354 /* 2869 /*
3355 * private mode handling 2870 * private mode handling
3356 */ 2871 */
3357 if (priv) 2872 if (priv)
3358 { 2873 {
3359 switch (priv) 2874 switch (priv)
3360 { 2875 {
3361 case '>': 2876 case '>':
3362 if (ch == CSI_DA) /* secondary device attributes */ 2877 if (ch == CSI_DA) /* secondary device attributes */
3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2878 {
2879 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2880 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2881 //
2882 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2883 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2884 // versions.
2885 //
2886 tt_printf ("\033[>%d;95;0c", 'U');
2887 }
3364 break; 2888 break;
2889
3365 case '?': 2890 case '?':
3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2891 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3367 process_terminal_mode (ch, priv, nargs, arg); 2892 process_terminal_mode (ch, priv, nargs, arg);
3368 break; 2893 break;
2894
2895 case '!':
2896 if (ch == CSI_70)
2897 {
2898 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2899 scr_soft_reset ();
2900
2901 static const int pm_h[] = { 7, 25 };
2902 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2903
2904 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2905 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3369 } 2906 }
2907 break;
2908 }
2909
3370 return; 2910 return;
3371 } 2911 }
3372 2912
3373 switch (ch) 2913 switch (ch)
3374 { 2914 {
… …
3388 } 2928 }
3389 break; 2929 break;
3390#endif 2930#endif
3391 2931
3392 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2932 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3393 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2933 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3394 arg[0] = -arg[0]; 2934 arg[0] = -arg[0];
3395 /* FALLTHROUGH */ 2935 /* FALLTHROUGH */
3396 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2936 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3397 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2937 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3398 scr_gotorc (arg[0], 0, RELATIVE); 2938 scr_gotorc (arg[0], 0, RELATIVE);
3399 break; 2939 break;
3400 2940
3401 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2941 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3402 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2942 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3494 break; 3034 break;
3495 case 6: /* CPR requested */ 3035 case 6: /* CPR requested */
3496 scr_report_position (); 3036 scr_report_position ();
3497 break; 3037 break;
3498 case 7: /* unofficial extension */ 3038 case 7: /* unofficial extension */
3499 if (OPTION (Opt_insecure)) 3039 if (option (Opt_insecure))
3500 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3040 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3501 break; 3041 break;
3502 case 8: /* unofficial extension */ 3042 case 8: /* unofficial extension */
3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3043 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3504 break; 3044 break;
… …
3552 scr_insert_mode (1); 3092 scr_insert_mode (1);
3553 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3554 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3555 break; 3095 break;
3556 3096
3097 case CSI_71: // DESCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3557 /* 3102 /*
3558 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3559 */ 3104 */
3560 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3561 if (nargs == 1) 3106 if (nargs == 1)
… …
3571 break; 3116 break;
3572 case CSI_75: 3117 case CSI_75:
3573 scr_cursor (RESTORE); 3118 scr_cursor (RESTORE);
3574 break; 3119 break;
3575 3120
3576#if ENABLE_FRILLS 3121#if !ENABLE_MINIMAL
3577 case CSI_74: 3122 case CSI_74:
3578 process_window_ops (arg, nargs); 3123 process_window_ops (arg, nargs);
3579 break; 3124 break;
3580#endif 3125#endif
3581 3126
… …
3588 break; 3133 break;
3589 } 3134 }
3590} 3135}
3591/*}}} */ 3136/*}}} */
3592 3137
3593#if ENABLE_FRILLS 3138#if !ENABLE_MINIMAL
3594/* ARGSUSED */
3595void 3139void
3596rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3140rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3597{ 3141{
3598 int x, y; 3142 int x, y;
3599 XWindowAttributes wattr; 3143 XWindowAttributes wattr;
3600 Window wdummy; 3144 Window wdummy;
3601 dDisp; 3145
3146 dLocal (Display *, dpy);
3602 3147
3603 if (nargs == 0) 3148 if (nargs == 0)
3604 return; 3149 return;
3605 3150
3606 switch (args[0]) 3151 switch (args[0])
3607 { 3152 {
3608 /* 3153 /*
3609 * commands 3154 * commands
3610 */ 3155 */
3611 case 1: /* deiconify window */ 3156 case 1: /* deiconify window */
3612 XMapWindow (disp, parent[0]); 3157 XMapWindow (dpy, parent);
3613 break; 3158 break;
3614 case 2: /* iconify window */ 3159 case 2: /* iconify window */
3615 XIconifyWindow (disp, parent[0], display->screen); 3160 XIconifyWindow (dpy, parent, display->screen);
3616 break; 3161 break;
3617 case 3: /* set position (pixels) */ 3162 case 3: /* set position (pixels) */
3618 XMoveWindow (disp, parent[0], args[1], args[2]); 3163 XMoveWindow (dpy, parent, args[1], args[2]);
3619 break; 3164 break;
3620 case 4: /* set size (pixels) */ 3165 case 4: /* set size (pixels) */
3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3166 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3622 break; 3167 break;
3623 case 5: /* raise window */ 3168 case 5: /* raise window */
3624 XRaiseWindow (disp, parent[0]); 3169 XRaiseWindow (dpy, parent);
3625 break; 3170 break;
3626 case 6: /* lower window */ 3171 case 6: /* lower window */
3627 XLowerWindow (disp, parent[0]); 3172 XLowerWindow (dpy, parent);
3628 break; 3173 break;
3629 case 7: /* refresh window */ 3174 case 7: /* refresh window */
3630 scr_touch (true); 3175 scr_touch (true);
3631 break; 3176 break;
3632 case 8: /* set size (chars) */ 3177 case 8: /* set size (chars) */
… …
3635 break; 3180 break;
3636 3181
3637 //case 9: NYI, TODO, restore maximized window or maximize window 3182 //case 9: NYI, TODO, restore maximized window or maximize window
3638 default: 3183 default:
3639 if (args[0] >= 24) /* set height (chars) */ 3184 if (args[0] >= 24) /* set height (chars) */
3640 set_widthheight ((unsigned int)width, 3185 set_widthheight ((unsigned int)vt_width,
3641 (unsigned int) (args[1] * fheight)); 3186 (unsigned int) (args[1] * fheight));
3642 break; 3187 break;
3643
3644 3188
3645 /* 3189 /*
3646 * reports - some output format copied from XTerm 3190 * reports - some output format copied from XTerm
3647 */ 3191 */
3648 case 11: /* report window state */ 3192 case 11: /* report window state */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3193 XGetWindowAttributes (dpy, parent, &wattr);
3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3194 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3651 break; 3195 break;
3652 case 13: /* report window position */ 3196 case 13: /* report window position */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3197 XGetWindowAttributes (dpy, parent, &wattr);
3654 XTranslateCoordinates (disp, parent[0], wattr.root, 3198 XTranslateCoordinates (dpy, parent, wattr.root,
3655 -wattr.border_width, -wattr.border_width, 3199 -wattr.border_width, -wattr.border_width,
3656 &x, &y, &wdummy); 3200 &x, &y, &wdummy);
3657 tt_printf ("\033[3;%d;%dt", x, y); 3201 tt_printf ("\033[3;%d;%dt", x, y);
3658 break; 3202 break;
3659 case 14: /* report window size (pixels) */ 3203 case 14: /* report window size (pixels) */
3660 XGetWindowAttributes (disp, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3205 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3662 break; 3206 break;
3663 case 18: /* report text area size (chars) */ 3207 case 18: /* report text area size (chars) */
3664 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3208 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3665 break; 3209 break;
… …
3667 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3211 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3668 break; 3212 break;
3669 case 20: /* report icon label */ 3213 case 20: /* report icon label */
3670 { 3214 {
3671 char *s; 3215 char *s;
3672 XGetIconName (disp, parent[0], &s); 3216 XGetIconName (dpy, parent, &s);
3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3217 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s); 3218 XFree (s);
3675 } 3219 }
3676 break; 3220 break;
3677 case 21: /* report window title */ 3221 case 21: /* report window title */
3678 { 3222 {
3679 char *s; 3223 char *s;
3680 XFetchName (disp, parent[0], &s); 3224 XFetchName (dpy, parent, &s);
3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3225 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s); 3226 XFree (s);
3683 } 3227 }
3684 break; 3228 break;
3685 } 3229 }
3686} 3230}
… …
3695rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3696{ 3240{
3697 unicode_t ch; 3241 unicode_t ch;
3698 bool seen_esc = false; 3242 bool seen_esc = false;
3699 unsigned int n = 0; 3243 unsigned int n = 0;
3700 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3701 3245
3702 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3703 { 3247 {
3704 if (seen_esc) 3248 if (seen_esc)
3705 { 3249 {
… …
3713 seen_esc = true; 3257 seen_esc = true;
3714 continue; 3258 continue;
3715 } 3259 }
3716 else if (ch == C0_BEL || ch == CHAR_ST) 3260 else if (ch == C0_BEL || ch == CHAR_ST)
3717 break; 3261 break;
3262 else if (ch == C0_SYN)
3263 ch = cmd_get8 ();
3718 else if (ch < 0x20) 3264 else if (ch < 0x20)
3719 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3720 3266
3721 seen_esc = false; 3267 seen_esc = false;
3722 3268
3723 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3724 // stop at some sane length 3270 // stop at some sane length
3725 return NULL; 3271 return NULL;
3726 3272
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
3730 string[n++] = ch; 3273 string[n++] = ch;
3731 } 3274 }
3732 3275
3733 string[n++] = '\0'; 3276 string[n++] = '\0';
3734 3277
3735 ends_how = (ch == 0x5c ? C0_ESC : ch); 3278 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3742 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3285 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3743 */ 3286 */
3744void 3287void
3745rxvt_term::process_dcs_seq () 3288rxvt_term::process_dcs_seq ()
3746{ 3289{
3747 char *s;
3748 unicode_t eh;
3749
3750 /* 3290 /*
3751 * Not handled yet 3291 * Not handled yet
3752 */ 3292 */
3293
3294 unicode_t eh;
3753 s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3754 if (s) 3296 if (s)
3755 free (s); 3297 free (s);
3756 3298
3757 return; 3299 return;
3758} 3300}
… …
3762 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3304 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3763 */ 3305 */
3764void 3306void
3765rxvt_term::process_osc_seq () 3307rxvt_term::process_osc_seq ()
3766{ 3308{
3767 unicode_t ch, eh;
3768 int arg; 3309 int arg;
3769 3310
3770 ch = cmd_getc (); 3311 unicode_t ch = cmd_getc ();
3771 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3772 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3773 3314
3774 if (ch == ';') 3315 if (ch == ';')
3775 { 3316 {
3317 unicode_t eh;
3776 char *s = get_to_st (eh); 3318 char *s = get_to_st (eh);
3777 3319
3778 if (s) 3320 if (s)
3779 { 3321 {
3780 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, eh);
… …
3786void 3328void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3329rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{ 3330{
3789 if (str[0] == '?' && !str[1]) 3331 if (str[0] == '?' && !str[1])
3790 { 3332 {
3791 unsigned short r, g, b; 3333 rgba c;
3792 pix_colors_focused[color].get (display, r, g, b); 3334 pix_colors_focused[color].get (c);
3335
3336#if XFT
3337 if (c.a != rgba::MAX_CC)
3338 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3339 else
3340#endif
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3341 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3794 } 3342 }
3795 else 3343 else
3796 set_window_color (color, str); 3344 set_window_color (color, str);
3797} 3345}
3798 3346
3799/* 3347/*
3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3348 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3801 */ 3349 */
3802void 3350void
3803rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3351rxvt_term::process_xterm_seq (int op, char *str, char resp)
3804{ 3352{
3805 int changed = 0;
3806 int color; 3353 int color;
3807 char *buf, *name; 3354 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1]; 3355 bool query = str[0] == '?' && !str[1];
3809 int saveop = op; 3356 int saveop = op;
3810 dDisp; 3357
3358 dLocal (Display *, dpy);
3811 3359
3812 assert (str != NULL); 3360 assert (str != NULL);
3361
3362 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3363 return;
3364
3813 switch (op) 3365 switch (op)
3814 { 3366 {
3815 case XTerm_name: 3367 case XTerm_name:
3816 set_title (str); 3368 set_title (str);
3817 /* FALLTHROUGH */ 3369 /* FALLTHROUGH */
… …
3831 unsigned long bytes_after; 3383 unsigned long bytes_after;
3832 unsigned char *value = 0; 3384 unsigned char *value = 0;
3833 const char *str = ""; 3385 const char *str = "";
3834 3386
3835 if (prop 3387 if (prop
3836 && XGetWindowProperty (disp, parent[0], 3388 && XGetWindowProperty (dpy, parent,
3837 prop, 0, 1<<16, 0, AnyPropertyType, 3389 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format, 3390 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None 3392 && actual_type != None
3841 && actual_format == 8) 3393 && actual_format == 8)
3842 str = (const char *)(value); 3394 str = (const char *)(value);
3843 3395
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3845 3397
3846 XFree (value); 3398 XFree (value);
3847 } 3399 }
3848 else 3400 else
3849 { 3401 {
3850 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3402 char *eq = strchr (str, '=');
3851 3403
3852 if (eq) 3404 if (eq)
3853 { 3405 {
3854 *eq = 0; 3406 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1); 3407 set_utf8_property (display->atom (str), eq + 1);
3856 } 3408 }
3857 else 3409 else
3858 XDeleteProperty (disp, parent[0], 3410 XDeleteProperty (dpy, parent,
3859 display->atom (str)); 3411 display->atom (str));
3860 } 3412 }
3861 break; 3413 break;
3862 3414
3863 case XTerm_Color: 3415 case XTerm_Color:
… …
3865 { 3417 {
3866 if ((name = strchr (buf, ';')) == NULL) 3418 if ((name = strchr (buf, ';')) == NULL)
3867 break; 3419 break;
3868 3420
3869 *name++ = '\0'; 3421 *name++ = '\0';
3870 color = atoi (buf); 3422 color = atoi (buf) + minCOLOR;
3871 3423
3872 if (color < 0 || color >= TOTAL_COLORS) 3424 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3873 break; 3425 break;
3874 3426
3875 if ((buf = strchr (name, ';')) != NULL) 3427 if ((buf = strchr (name, ';')) != NULL)
3876 *buf++ = '\0'; 3428 *buf++ = '\0';
3877 3429
3878 if (name[0] == '?' && !name[1]) 3430 process_color_seq (op, color, name, resp);
3431 }
3432 break;
3433 case Rxvt_restoreFG:
3434 case XTerm_Color00:
3435 process_color_seq (op, Color_fg, str, resp);
3436 break;
3437 case Rxvt_restoreBG:
3438 case XTerm_Color01:
3439 process_color_seq (op, Color_bg, str, resp);
3440 break;
3441#ifndef NO_CURSORCOLOR
3442 case XTerm_Color_cursor:
3443 process_color_seq (op, Color_cursor, str, resp);
3444 break;
3445#endif
3446 case XTerm_Color_pointer_fg:
3447 process_color_seq (op, Color_pointer_fg, str, resp);
3448 break;
3449 case XTerm_Color_pointer_bg:
3450 process_color_seq (op, Color_pointer_bg, str, resp);
3451 break;
3452#ifdef OPTION_HC
3453 case XTerm_Color_HC:
3454 process_color_seq (op, Color_HC, str, resp);
3455 break;
3456 case XTerm_Color_HTC:
3457 process_color_seq (op, Color_HTC, str, resp);
3458 break;
3459#endif
3460#ifndef NO_BOLD_UNDERLINE_REVERSE
3461 case URxvt_Color_BD:
3462 process_color_seq (op, Color_BD, str, resp);
3463 break;
3464 case URxvt_Color_UL:
3465 process_color_seq (op, Color_UL, str, resp);
3466 break;
3467 case URxvt_Color_IT:
3468 process_color_seq (op, Color_IT, str, resp);
3469 break;
3470#endif
3471 case URxvt_Color_border:
3472 process_color_seq (op, Color_border, str, resp);
3473 break;
3474
3475#if BG_IMAGE_FROM_ROOT
3476 case URxvt_Color_tint:
3477 process_color_seq (op, Color_tint, str, resp);
3478 {
3479 bool changed = false;
3480
3481 if (ISSET_PIXCOLOR (Color_tint))
3482 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3483
3484 if (changed)
3485 update_background ();
3486 }
3487
3488 break;
3489#endif
3490
3491#if BG_IMAGE_FROM_FILE
3492 case Rxvt_Pixmap:
3493 if (!strcmp (str, "?"))
3494 {
3495 char str[256];
3496 int h_scale = fimage.h_scale;
3497 int v_scale = fimage.v_scale;
3498 int h_align = fimage.h_align;
3499 int v_align = fimage.v_align;
3500
3501 sprintf (str, "[%dx%d+%d+%d]",
3502 h_scale, v_scale,
3503 h_align, v_align);
3504 process_xterm_seq (XTerm_title, str, CHAR_ST);
3505 }
3506 else
3507 {
3508 bool changed = false;
3509
3510 if (*str != ';')
3879 { 3511 {
3880 unsigned short r, g, b; 3512 try
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3513 {
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3514 fimage.set_file_geometry (this, str);
3515 changed = true;
3516 }
3517 catch (const class rxvt_failure_exception &e)
3518 {
3519 }
3883 } 3520 }
3884 else 3521 else
3885 set_window_color (color + minCOLOR, name); 3522 {
3523 str++;
3524 if (fimage.set_geometry (str, true))
3525 changed = true;
3526 }
3527
3528 if (changed)
3529 {
3530 if (bg_window_position_sensitive ())
3531 {
3532 int x, y;
3533 get_window_origin (x, y);
3534 parent_x = x;
3535 parent_y = y;
3536 }
3537 update_background ();
3538 }
3886 } 3539 }
3887 break; 3540 break;
3888 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3890 break;
3891 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3893 break;
3894#ifndef NO_CURSORCOLOR
3895 case XTerm_Color_cursor:
3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3897 break;
3898#endif 3541#endif
3899 case XTerm_Color_pointer_fg:
3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3901 break;
3902 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3904 break;
3905#ifndef NO_BOLD_UNDERLINE_REVERSE
3906 case XTerm_Color_BD:
3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3908 break;
3909 case XTerm_Color_UL:
3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3911 break;
3912 case XTerm_Color_RV:
3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3914 break;
3915 case URxvt_Color_IT:
3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3917 break;
3918#endif
3919#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3922 check_our_parents ();
3923 if (am_transparent)
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927
3928 case XTerm_Pixmap:
3929 if (*str != ';')
3930 {
3931#if XPM_BACKGROUND
3932 scale_pixmap (""); /* reset to default scaling */
3933 set_bgPixmap (str); /* change pixmap */
3934#endif
3935 scr_touch (true);
3936 }
3937 while ((str = strchr (str, ';')) != NULL)
3938 {
3939 str++;
3940#if XPM_BACKGROUND
3941 changed += scale_pixmap (str);
3942#endif
3943 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949#endif
3950 scr_touch (true);
3951 }
3952 break;
3953
3954 case XTerm_restoreFG:
3955 set_window_color (Color_fg, str);
3956 break;
3957 case XTerm_restoreBG:
3958 set_window_color (Color_bg, str);
3959 break;
3960 3542
3961 case XTerm_logfile: 3543 case XTerm_logfile:
3962 // TODO, when secure mode? 3544 // TODO, when secure mode?
3963 break; 3545 break;
3964 3546
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3547#if 0
3972 case XTerm_dumpscreen: /* no error notices */ 3548 case Rxvt_dumpscreen: /* no error notices */
3973 { 3549 {
3974 int fd; 3550 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3551 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3976 { 3552 {
3977 scr_dump (fd); 3553 scr_dump (fd);
… …
3988 case URxvt_italicFont: 3564 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3565 case URxvt_boldItalicFont:
3990#endif 3566#endif
3991 if (query) 3567 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3568 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3569 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3570 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3571 resp);
3996 else 3572 else
3997 { 3573 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3574 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3577 allocated.push_back ((void *)res);
4002 set_fonts (); 3578 set_fonts ();
4003 } 3579 }
4004 break; 3580 break;
4005 3581
4006#if ENABLE_FRILLS 3582 case URxvt_version:
3583 if (query)
3584 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3585 op,
3586 rs[Rs_name], VERSION[0], VERSION[2],
3587 resp);
3588 break;
3589
3590#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3591 case URxvt_locale:
4008 if (query) 3592 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3593 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 3594 else
4011 { 3595 {
4012 set_locale (str); 3596 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3597 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3598 init_xlocale ();
4015 } 3599 }
4016 break; 3600 break;
4017 3601
4018 case URxvt_view_up: 3602 case URxvt_view_up:
… …
4029 break; 3613 break;
4030#endif 3614#endif
4031 3615
4032#if ENABLE_PERL 3616#if ENABLE_PERL
4033 case URxvt_perl: 3617 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3618 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4035 ; // no responses yet
4036 break; 3619 break;
4037#endif 3620#endif
4038 } 3621 }
4039} 3622}
4040/*----------------------------------------------------------------------*/ 3623/*----------------------------------------------------------------------*/
… …
4047 * 's' = save 3630 * 's' = save
4048 * 'r' = restore 3631 * 'r' = restore
4049 * 't' = toggle 3632 * 't' = toggle
4050 * so no need for fancy checking 3633 * so no need for fancy checking
4051 */ 3634 */
4052int 3635int ecb_cold
4053rxvt_term::privcases (int mode, unsigned long bit) 3636rxvt_term::privcases (int mode, unsigned long bit)
4054{ 3637{
4055 int state; 3638 int state;
4056 3639
4057 if (mode == 's') 3640 if (mode == 's')
4058 { 3641 {
4059 SavedModes |= (priv_modes & bit); 3642 if (priv_modes & bit)
3643 SavedModes |= bit;
3644 else
3645 SavedModes &= ~bit;
4060 return -1; 3646 return -1;
4061 } 3647 }
4062 else 3648 else
4063 { 3649 {
4064 if (mode == 'r') 3650 if (mode == 'r')
4065 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3651 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4066 else 3652 else
4067 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3653 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4068 PrivMode (state, bit); 3654
3655 if (state)
3656 priv_modes |= bit;
3657 else
3658 priv_modes &= ~bit;
4069 } 3659 }
4070 3660
4071 return state; 3661 return state;
4072} 3662}
4073 3663
4074/* we're not using priv _yet_ */ 3664/* we're not using priv _yet_ */
4075void 3665void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3666rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4077{ 3667{
4078 unsigned int i, j; 3668 unsigned int i, j;
4079 int state; 3669 int state;
4080 3670
4081 static const struct 3671 static const struct
4082 { 3672 {
4083 const int argval; 3673 const int argval;
4084 const unsigned long bit; 3674 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3675 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3676 { 1, PrivMode_aplCUR }, // DECCKM
4089 { 2, PrivMode_vt52 }, 3677 { 2, PrivMode_vt52 }, // DECANM
4090 { 3, PrivMode_132 }, 3678 { 3, PrivMode_132 }, // DECCOLM
4091 { 4, PrivMode_smoothScroll }, 3679 { 4, PrivMode_smoothScroll }, // DECSCLM
4092 { 5, PrivMode_rVideo }, 3680 { 5, PrivMode_rVideo }, // DECSCNM
4093 { 6, PrivMode_relOrigin }, 3681 { 6, PrivMode_relOrigin }, // DECOM
4094 { 7, PrivMode_Autowrap }, 3682 { 7, PrivMode_Autowrap }, // DECAWM
4095 // 8, bi-directional support mode 3683 // 8, auto-repeat keys // DECARM
4096 { 9, PrivMode_MouseX10 }, 3684 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc 3685 // 18 end FF to printer after print screen
4098 { menuBar_esc, PrivMode_menuBar }, 3686 // 19 Print screen prints full screen/scroll region
4099#endif
4100 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4102#ifdef scrollBar_esc 3688#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3689 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3690#endif
4105 { 35, PrivMode_ShiftKeys }, // rxvt extension 3691 { 35, PrivMode_ShiftKeys }, // rxvt extension
3692 // 38, tektronix mode // DECTEK
4106 { 40, PrivMode_132OK }, 3693 { 40, PrivMode_132OK },
4107 // 41 xterm more fixes NYI 3694 // 41 xterm more fixes NYI
4108 // 45 margin bell NYI 3695 // 45 margin bell NYI
4109 // 46 start logging 3696 // 46 start logging
4110 { 47, PrivMode_Screen }, 3697 { 47, PrivMode_Screen },
4111 { 66, PrivMode_aplKP }, 3698 { 66, PrivMode_aplKP }, // DECNKM
4112#ifndef NO_BACKSPACE_KEY 3699#ifndef NO_BACKSPACE_KEY
4113 { 67, PrivMode_BackSpace }, 3700 { 67, PrivMode_BackSpace }, // DECBKM
4114#endif 3701#endif
4115 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
4116 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3703 { 1002, PrivMode_MouseBtnEvent },
4117 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3704 { 1003, PrivMode_MouseAnyEvent },
4118 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3705#if ENABLE_FRILLS
3706 { 1005, PrivMode_ExtModeMouse },
3707#endif
4119 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3708 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4120 { 1011, PrivMode_Keypress }, // rxvt extension 3709 { 1011, PrivMode_Keypress }, // rxvt extension
3710#if ENABLE_FRILLS
3711 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3712#endif
4121 // 1035 enable modifiers for alt, numlock NYI 3713 // 1035 enable modifiers for alt, numlock NYI
4122 // 1036 send ESC for meta keys NYI 3714 // 1036 send ESC for meta keys NYI
4123 // 1037 send DEL for keypad delete NYI 3715 // 1037 send DEL for keypad delete NYI
4124 { 1047, PrivMode_Screen }, 3716 { 1047, PrivMode_Screen },
4125 // 1048 save and restore cursor 3717 // 1048 save and restore cursor, implemented in code
4126 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3718 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4127 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3719 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3720 { 2004, PrivMode_BracketPaste },
4128 }; 3721 };
4129 3722
4130 if (nargs == 0) 3723 if (nargs == 0)
4131 return; 3724 return;
4132 3725
… …
4139 for (i = 0; i < nargs; i++) 3732 for (i = 0; i < nargs; i++)
4140 { 3733 {
4141 state = -1; 3734 state = -1;
4142 3735
4143 /* basic handling */ 3736 /* basic handling */
4144 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3737 for (j = 0; j < ecb_array_length (argtopriv); j++)
4145 if (argtopriv[j].argval == arg[i]) 3738 if (argtopriv[j].argval == arg[i])
4146 { 3739 {
4147 state = privcases (mode, argtopriv[j].bit); 3740 state = privcases (mode, argtopriv[j].bit);
4148 break; 3741 break;
4149 } 3742 }
… …
4151 /* extra handling for values with state unkept */ 3744 /* extra handling for values with state unkept */
4152 switch (arg[i]) 3745 switch (arg[i])
4153 { 3746 {
4154#if ENABLE_STYLES 3747#if ENABLE_STYLES
4155 case 1021: 3748 case 1021:
4156 if (mode) 3749 set_option (Opt_intensityStyles, mode);
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160 3750
4161 scr_touch (true); 3751 scr_touch (true);
4162 break; 3752 break;
4163#endif 3753#endif
4164 case 1048: /* alternative cursor save */ 3754 case 1048: /* alternative cursor save */
4165 case 1049:
4166 if (OPTION (Opt_secondaryScreen)) 3755 if (option (Opt_secondaryScreen))
4167 if (mode == 0) 3756 if (mode == 0)
4168 scr_cursor (RESTORE); 3757 scr_cursor (RESTORE);
4169 else if (mode == 1) 3758 else if (mode == 1)
4170 scr_cursor (SAVE); 3759 scr_cursor (SAVE);
4171 break; 3760 break;
… …
4179 case 2: /* VT52 mode */ 3768 case 2: /* VT52 mode */
4180 /* oddball mode. should be set regardless of set/reset 3769 /* oddball mode. should be set regardless of set/reset
4181 * parameter. Return from VT52 mode with an ESC < from 3770 * parameter. Return from VT52 mode with an ESC < from
4182 * within VT52 mode 3771 * within VT52 mode
4183 */ 3772 */
4184 PrivMode (1, PrivMode_vt52); 3773 priv_modes |= PrivMode_vt52;
4185 break; 3774 break;
4186 case 3: /* 80/132 */ 3775 case 3: /* 80/132 */
4187 if (priv_modes & PrivMode_132OK) 3776 if (priv_modes & PrivMode_132OK)
4188 set_widthheight (((state ? 132 : 80) * fwidth), height); 3777 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4189 break; 3778 break;
4190 case 4: /* smooth scrolling */ 3779 case 4: /* smooth scrolling */
4191 if (!state) 3780 set_option (Opt_jumpScroll, !state);
4192 SET_OPTION (Opt_jumpScroll);
4193 else
4194 CLR_OPTION (Opt_jumpScroll);
4195 break; 3781 break;
4196 case 5: /* reverse video */ 3782 case 5: /* reverse video */
4197 scr_rvideo_mode (state); 3783 scr_rvideo_mode (state);
4198 break; 3784 break;
4199 case 6: /* relative/absolute origins */ 3785 case 6: /* relative/absolute origins */
… …
4203 scr_autowrap (state); 3789 scr_autowrap (state);
4204 break; 3790 break;
4205 /* case 8: - auto repeat, can't do on a per window basis */ 3791 /* case 8: - auto repeat, can't do on a per window basis */
4206 case 9: /* X10 mouse reporting */ 3792 case 9: /* X10 mouse reporting */
4207 if (state) /* orthogonal */ 3793 if (state) /* orthogonal */
4208 priv_modes &= ~PrivMode_MouseX11; 3794 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4209 break; 3795 break;
4210#ifdef menuBar_esc
4211 case menuBar_esc:
4212#ifdef MENUBAR
4213 map_menuBar (state);
4214#endif
4215 break;
4216#endif
4217#ifdef scrollBar_esc 3796#ifdef scrollBar_esc
4218 case scrollBar_esc: 3797 case scrollBar_esc:
4219 if (scrollbar_mapping (state)) 3798 scrollBar.map (state);
4220 {
4221 resize_all_windows (0, 0, 0); 3799 resize_all_windows (0, 0, 0);
4222 scr_touch (true); 3800 scr_touch (true);
4223 }
4224 break; 3801 break;
4225#endif 3802#endif
4226 case 25: /* visible/invisible cursor */ 3803 case 25: /* visible/invisible cursor */
4227 scr_cursor_visible (state); 3804 scr_cursor_visible (state);
4228 break; 3805 break;
… …
4233 break; 3810 break;
4234 /* case 66: - application key pad */ 3811 /* case 66: - application key pad */
4235 /* case 67: - backspace key */ 3812 /* case 67: - backspace key */
4236 case 1000: /* X11 mouse reporting */ 3813 case 1000: /* X11 mouse reporting */
4237 if (state) /* orthogonal */ 3814 if (state) /* orthogonal */
4238 priv_modes &= ~PrivMode_MouseX10; 3815 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4239 break; 3816 break;
4240#if 0
4241 case 1001: 3817 case 1002:
4242 break; /* X11 mouse highlighting */ 3818 case 1003:
4243#endif 3819 if (state)
3820 {
3821 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3822 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3823 mouse_row = mouse_col = 0;
3824 vt_emask_mouse = PointerMotionMask;
3825 }
3826 else
3827 vt_emask_mouse = NoEventMask;
3828
3829 vt_select_input ();
3830 break;
4244 case 1010: /* scroll to bottom on TTY output inhibit */ 3831 case 1010: /* scroll to bottom on TTY output inhibit */
4245 if (!state) 3832 set_option (Opt_scrollTtyOutput, !state);
4246 SET_OPTION (Opt_scrollTtyOutput);
4247 else
4248 CLR_OPTION (Opt_scrollTtyOutput);
4249 break; 3833 break;
4250 case 1011: /* scroll to bottom on key press */ 3834 case 1011: /* scroll to bottom on key press */
4251 if (state) 3835 set_option (Opt_scrollTtyKeypress, state);
4252 SET_OPTION (Opt_scrollTtyKeypress);
4253 else
4254 CLR_OPTION (Opt_scrollTtyKeypress);
4255 break; 3836 break;
4256 case 1047: /* secondary screen w/ clearing last */ 3837 case 1047: /* secondary screen w/ clearing last */
4257 if (OPTION (Opt_secondaryScreen)) 3838 if (option (Opt_secondaryScreen))
4258 if (current_screen != PRIMARY) 3839 if (!state)
4259 scr_erase_screen (2); 3840 scr_erase_screen (2);
3841
4260 scr_change_screen (state); 3842 scr_change_screen (state);
4261 break; 3843 break;
4262 case 1049: /* secondary screen w/ clearing first */ 3844 case 1049: /* secondary screen w/ clearing first */
3845 if (option (Opt_secondaryScreen))
3846 if (state)
3847 scr_cursor (SAVE);
3848
4263 scr_change_screen (state); 3849 scr_change_screen (state);
3850
4264 if (OPTION (Opt_secondaryScreen)) 3851 if (option (Opt_secondaryScreen))
4265 if (current_screen != PRIMARY) 3852 if (state)
4266 scr_erase_screen (2); 3853 scr_erase_screen (2);
3854 else
3855 scr_cursor (RESTORE);
4267 break; 3856 break;
4268 default: 3857 default:
4269 break; 3858 break;
4270 } 3859 }
4271 } 3860 }
4272} 3861}
4273/*}}} */ 3862/*}}} */
4274 3863
4275/*{{{ process sgr sequences */ 3864/*{{{ process sgr sequences */
4276void 3865void ecb_hot
4277rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3866rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4278{ 3867{
4279 unsigned int i; 3868 unsigned int i;
4280 short rendset; 3869 short rendset;
4281 int rendstyle; 3870 int rendstyle;
… …
4397 scr_color (Color_bg, Color_bg); 3986 scr_color (Color_bg, Color_bg);
4398 break; 3987 break;
4399 3988
4400 //case 50: // not variable spacing 3989 //case 50: // not variable spacing
4401 3990
4402#if ENABLE_FRILLS 3991#if !ENABLE_MINIMAL
4403 case 90: 3992 case 90:
4404 case 91: /* set bright fg color */ 3993 case 91: /* set bright fg color */
4405 case 92: 3994 case 92:
4406 case 93: 3995 case 93:
4407 case 94: 3996 case 94:
… …
4422 break; 4011 break;
4423#endif 4012#endif
4424 } 4013 }
4425 } 4014 }
4426} 4015}
4016
4017void
4018rxvt_term::set_cursor_style (int style)
4019{
4020 if (!IN_RANGE_INC (style, 0, 4))
4021 return;
4022
4023 set_option (Opt_cursorUnderline, style >= 3);
4024
4025#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1));
4027 cursor_blink_reset ();
4028#endif
4029
4030 want_refresh = 1;
4031}
4427/*}}} */ 4032/*}}} */
4428 4033
4429/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4430void
4431rxvt_term::process_graphics ()
4432{
4433 unicode_t ch, cmd = cmd_getc ();
4434
4435 if (cmd == 'Q')
4436 { /* query graphics */
4437 tt_printf ("\033G0\012"); /* no graphics */
4438 return;
4439 }
4440 /* swallow other graphics sequences until terminating ':' */
4441 do
4442 ch = cmd_getc ();
4443 while (ch != ':');
4444}
4445/*}}} */
4446
4447/* ------------------------------------------------------------------------- */ 4034/* ---------------------------------------------------------------------- */
4035/* Write data to the pty as typed by the user, pasted with the mouse,
4036 * or generated by us in response to a query ESC sequence.
4037 */
4448 4038
4449/* 4039/*
4450 * Send printf () formatted output to the command. 4040 * Send printf () formatted output to the command.
4451 * Only use for small amounts of data. 4041 * Only use for small amounts of data.
4452 */ 4042 */
… …
4460 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4050 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4461 va_end (arg_ptr); 4051 va_end (arg_ptr);
4462 tt_write (buf, strlen (buf)); 4052 tt_write (buf, strlen (buf));
4463} 4053}
4464 4054
4465/* ---------------------------------------------------------------------- */
4466/* Write data to the pty as typed by the user, pasted with the mouse, 4055/* Write data to the pty as typed by the user. */
4467 * or generated by us in response to a query ESC sequence. 4056void
4468 */ 4057rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4058{
4059 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4060 return;
4061
4062 if (option (Opt_scrollTtyKeypress))
4063 if (view_start)
4064 {
4065 view_start = 0;
4066 want_refresh = 1;
4067 }
4068
4069 tt_write_ (data, len);
4070}
4470 4071
4471void 4072void
4472rxvt_term::tt_write (const char *data, unsigned int len) 4073rxvt_term::tt_write (const char *data, unsigned int len)
4473{ 4074{
4474 if (pty.pty < 0) 4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4475 return; 4076 return;
4476 4077
4078 tt_write_ (data, len);
4079}
4080
4081static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4082
4083void
4084rxvt_term::tt_write_ (const char *data, unsigned int len)
4085{
4086 if (pty->pty < 0)
4087 return;
4088
4477 if (v_buflen == 0) 4089 if (v_buflen == 0)
4478 { 4090 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4091 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4480 4092
4093 max_it (written, 0);
4094
4481 if ((unsigned int)written == len) 4095 if (written == len)
4482 return; 4096 return;
4483 4097
4484 data += written; 4098 data += written;
4485 len -= written; 4099 len -= written;
4486 } 4100 }
4487 4101
4488 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4102 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4489 4103
4490 memcpy (v_buffer + v_buflen, data, len); 4104 memcpy (v_buffer + v_buflen, data, len);
4491 v_buflen += len; 4105 v_buflen += len;
4492 4106
4493 pty_ev.set (EVENT_READ | EVENT_WRITE); 4107 pty_ev.set (ev::READ | ev::WRITE);
4494} 4108}
4495 4109
4496void rxvt_term::pty_write () 4110void rxvt_term::pty_write ()
4497{ 4111{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4112 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499 4113
4500 if (written > 0) 4114 if (written > 0)
4501 { 4115 {
4502 v_buflen -= written; 4116 v_buflen -= written;
4503 4117
4504 if (v_buflen == 0) 4118 if (v_buflen == 0)
4505 { 4119 {
4506 free (v_buffer); 4120 free (v_buffer);
4507 v_buffer = 0; 4121 v_buffer = 0;
4508 v_buflen = 0;
4509 4122
4510 pty_ev.set (EVENT_READ); 4123 pty_ev.set (ev::READ);
4511 return; 4124 return;
4512 } 4125 }
4513 4126
4514 memmove (v_buffer, v_buffer + written, v_buflen); 4127 memmove (v_buffer, v_buffer + written, v_buflen);
4515 } 4128 }
4516 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4129 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4517 pty_ev.set (EVENT_READ); 4130 pty_ev.set (ev::READ);
4518} 4131}
4519 4132
4520/*----------------------- end-of-file (C source) -----------------------*/ 4133/*----------------------- end-of-file (C source) -----------------------*/
4521 4134

Diff Legend

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