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

Diff Legend

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