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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.586 by sf-exg, Fri May 7 19:03:11 2021 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 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, 0);
… …
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 (1. / 60.); // refresh at max. 60 Hz normally
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 (display->display, 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 (display->display, vt, display->blank_cursor); 1264 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 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_ExtMouseRight)
1356 tt_printf ("\033[%d;%d;%dM",
1357 code,
1358 x,
1359 y);
1360 else if (priv_modes & PrivMode_ExtModeMouse)
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
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280 1372
1281/*{{{ process an X event */ 1373/*{{{ process an X event */
1282void 1374void ecb_hot
1283rxvt_term::x_cb (XEvent &ev) 1375rxvt_term::x_cb (XEvent &ev)
1284{ 1376{
1285 make_current (); 1377 make_current ();
1286 1378
1287 dDisp; 1379 dLocal (Display *, dpy);
1288 1380
1289 if (ev.xany.window == vt 1381 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1382 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1383 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1384 return;
… …
1297 unsigned int unused_mask; 1389 unsigned int unused_mask;
1298 1390
1299 switch (ev.type) 1391 switch (ev.type)
1300 { 1392 {
1301 case KeyPress: 1393 case KeyPress:
1302#if ISO_14755 1394 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1395 break;
1308 1396
1309 case KeyRelease: 1397 case KeyRelease:
1310 { 1398 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1399 break;
1382 }
1383 1400
1384 case ButtonPress: 1401 case ButtonPress:
1385 button_press (ev.xbutton); 1402 button_press (ev.xbutton);
1386 break; 1403 break;
1387 1404
… …
1402 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)))
1403 destroy (); 1420 destroy ();
1404 } 1421 }
1405#if ENABLE_EWMH 1422#if ENABLE_EWMH
1406 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])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1424 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1425 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1426 &ev);
1410#endif 1427#endif
1411 } 1428 }
1412 } 1429 }
… …
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1436 focus_out ();
1420 } 1437 }
1421#endif 1438#endif
1422 } 1439 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1440 break;
1428 1441
1429 /* 1442 /*
1430 * XXX: this is not the _current_ arrangement 1443 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1444 * Here's my conclusion:
… …
1450 break; 1463 break;
1451 } 1464 }
1452 break; 1465 break;
1453 1466
1454 case FocusIn: 1467 case FocusIn:
1468 if (ev.xfocus.detail != NotifyInferior
1469 && ev.xfocus.detail != NotifyPointer
1470 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1471 focus_in ();
1456 break; 1472 break;
1457 1473
1458 case FocusOut: 1474 case FocusOut:
1475 if (ev.xfocus.detail != NotifyInferior
1476 && ev.xfocus.detail != NotifyPointer
1477 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1478 focus_out ();
1460 break; 1479 break;
1461 1480
1462 case ConfigureNotify: 1481 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent)
1464 { 1483 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 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 }
1467 1508
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1510 {
1470 seen_resize = 1; 1511 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1513 }
1473 1514
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1516 }
1481 break; 1517 break;
1482 1518
1483 case PropertyNotify: 1519 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1520 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1485 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1486 && ev.xproperty.state == PropertyNewValue)
1487 selection_property (ev.xproperty.window, ev.xproperty.atom);
1488
1489 break; 1521 break;
1490 1522
1491 case SelectionClear: 1523 case SelectionClear:
1492 selection_clear (); 1524 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1493 break;
1494
1495 case SelectionNotify:
1496 if (selection_wait == Sel_normal)
1497 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1498 break; 1525 break;
1499 1526
1500 case SelectionRequest: 1527 case SelectionRequest:
1501 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1502 break; 1529 break;
1503 1530
1504 case MapNotify: 1531 case MapNotify:
1505 mapped = 1; 1532 mapped = 1;
1506#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1534 text_blink_ev.start ();
1508#endif 1535#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1537 break;
1511 1538
1512 case UnmapNotify: 1539 case UnmapNotify:
… …
1514#ifdef TEXT_BLINK 1541#ifdef TEXT_BLINK
1515 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1516#endif 1543#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1545 break;
1519
1520#ifdef TRANSPARENT
1521 case ReparentNotify:
1522 rootwin_cb (ev);
1523 break;
1524#endif /* TRANSPARENT */
1525 1546
1526 case GraphicsExpose: 1547 case GraphicsExpose:
1527 case Expose: 1548 case Expose:
1528 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1529 { 1550 {
1530 do 1551 do
1552 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1555 }
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1557
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1559
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, false);
1564 }
1540 1565
1541 want_refresh = 1; 1566 want_refresh = 1;
1542 } 1567 }
1543 else 1568 else
1544 { 1569 {
1545 XEvent unused_event; 1570 XEvent unused_event;
1546 1571
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1573 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1575 ;
1551 1576
1552 if (isScrollbarWindow (ev.xany.window)) 1577 if (scrollBar.state && ev.xany.window == scrollBar.win)
1553 { 1578 {
1554 scrollBar.setIdle (); 1579 scrollBar.state = SB_STATE_IDLE;
1555 scrollbar_show (0); 1580 scrollBar.show (0);
1556 } 1581 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1582 }
1563 break; 1583 break;
1564 1584
1565 case MotionNotify: 1585 case MotionNotify:
1566#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1567 if (hidden_pointer) 1587 if (hidden_pointer)
1568 pointer_unblank (); 1588 pointer_unblank ();
1569#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);
1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1571 break; 1595 break;
1572 1596
1573 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
1574 { 1598 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1601 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1603 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1605 ;
1582 1606
1583 XQueryPointer (disp, vt, 1607 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1611 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1589 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1590 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1591 { 1616 {
1592#endif
1593#if ISO_14755 1617#if ISO_14755
1594 // 5.4 1618 // 5.4
1595 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1596 { 1620 {
1597 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1603 1627
1604#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1605 if (ev.xbutton.y < int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1606 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1607 { 1631 {
1632 page_dirn scroll_selection_dir;
1608 int dist; 1633 int dist;
1609 1634
1610 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1612 */ 1637 */
1613 if (!sel_scroll_ev.active) 1638 if (!sel_scroll_ev.is_active ())
1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1615 1640
1616 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1617 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1618 */ 1643 */
1619 selection_save_x = ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
… …
1627 dist = int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1628 } 1653 }
1629 else 1654 else
1630 { 1655 {
1631 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1632 dist = ev.xbutton.y - (int_bwidth + height); 1657 dist = ev.xbutton.y - (int_bwidth + vt_height);
1633 } 1658 }
1634 1659
1635 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1636 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1637 + 1; 1662 + 1;
1638 min_it (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1639 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1665 scroll_selection_lines *= scroll_selection_dir;
1640 } 1666 }
1641 else 1667 else
1642 { 1668 {
1643 /* we are within the text window, so we 1669 /* we are within the text window, so we
1644 * shouldn't be scrolling 1670 * shouldn't be scrolling
1645 */ 1671 */
1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1648 } 1673 }
1649#endif 1674#endif
1650#ifdef MOUSE_THRESHOLD
1651 } 1675 }
1652#endif
1653 } 1676 }
1654 } 1677 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1656 { 1679 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1681 MotionNotify, &ev))
1659 ; 1682 ;
1660 1683
1661 XQueryPointer (disp, scrollBar.win, 1684 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1687 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1688 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1690 scrollBar.size ());
1668 want_refresh = 1; 1691 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1692 scrollBar.show (1);
1671 } 1693 }
1672 break; 1694 break;
1673 } 1695 }
1674 1696
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (ev.type == KeyPress)
1679 { 1699 cursor_blink_reset ();
1680 if (hidden_cursor)
1681 {
1682 hidden_cursor = 0;
1683 want_refresh = 1;
1684 }
1685
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1687 }
1688#endif 1700#endif
1689 1701
1690#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1704 {
1693 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1698 1710
1699 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank (); 1712 pointer_blank ();
1701 } 1713 }
1702#endif 1714#endif
1703}
1704 1715
1705void 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
1706rxvt_term::focus_in () 1737rxvt_term::focus_in ()
1707{ 1738{
1708 if (!focus) 1739 if (!focus)
1709 { 1740 {
1710 focus = 1; 1741 focus = 1;
1711 want_refresh = 1; 1742 want_refresh = 1;
1712 1743
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1714
1715#if USE_XIM 1744#if USE_XIM
1716 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1717 { 1746 {
1718 IMSetStatusPosition (); 1747 im_set_position ();
1719 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1720 } 1749 }
1721#endif 1750#endif
1722#if CURSOR_BLINK 1751#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1753 cursor_blink_ev.again ();
1725#endif 1754#endif
1726#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1728 { 1757 {
1729 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1759 scr_recolor ();
1731 } 1760 }
1732#endif 1761#endif
1733 } 1762#if ENABLE_FRILLS
1734} 1763 if (option (Opt_urgentOnBell))
1764 set_urgency (0);
1735 1765
1736void 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
1737rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1738{ 1776{
1739 if (focus) 1777 if (focus)
1740 { 1778 {
1741 focus = 0; 1779 focus = 0;
1742 want_refresh = 1; 1780 want_refresh = 1;
1743 1781
1744 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1782#if ENABLE_FRILLS
1783 if (option (Opt_urgentOnBell))
1784 set_urgency (0);
1745 1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1788#endif
1746#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1790 if (iso14755buf)
1748 { 1791 {
1749 iso14755buf = 0; 1792 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1793# if ISO_14755
1751 scr_overlay_off (); 1794 scr_overlay_off ();
1752# endif 1795# endif
1753 } 1796 }
1754#endif 1797#endif
1755#if USE_XIM 1798#if USE_XIM
1756 if (Input_Context != NULL) 1799 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1800 XUnsetICFocus (Input_Context);
1758#endif 1801#endif
1759#if CURSOR_BLINK 1802#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1803 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1804 cursor_blink_ev.stop ();
1805
1762 hidden_cursor = 0; 1806 hidden_cursor = 0;
1763#endif 1807#endif
1764#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1766 { 1810 {
1767 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1768 scr_recolour (); 1812 scr_recolor ();
1769 } 1813 }
1770#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])
1771 } 1825 {
1772} 1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1773 1828
1774#if TRANSPARENT 1829 rgba c;
1775void 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
1776rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1839{
1778 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;
1779 1845
1780 switch (ev.type) 1846 switch (ev.type)
1781 { 1847 {
1782 case PropertyNotify: 1848 case PropertyNotify:
1783 /* 1849 /*
1784 * 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,
1785 * 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.
1786 */ 1852 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1855 {
1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1857 }
1790 1858
1791 /* FALLTHROUGH */
1792 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1859 break;
1796 } 1860 }
1861
1862 refresh_check ();
1797} 1863}
1798#endif 1864#endif
1799 1865
1800void 1866void
1801rxvt_term::button_press (XButtonEvent &ev) 1867rxvt_term::button_press (XButtonEvent &ev)
… …
1822 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1823 return; 1889 return;
1824 } 1890 }
1825#endif 1891#endif
1826 1892
1827 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1828 1894
1829 if (reportmode) 1895 if (reportmode)
1830 { 1896 {
1831 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1832 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
1833 MEvent.state = ev.state; 1899 MEvent.state = ev.state;
1834#ifdef MOUSE_REPORT_DOUBLECLICK 1900#ifdef MOUSE_REPORT_DOUBLECLICK
1835 if (ev.button == MEvent.button && clickintime) 1901 if (ev.button == MEvent.button && clickintime)
1836 { 1902 {
1837 /* same button, within alloted time */ 1903 /* same button, within allowed time */
1838 MEvent.clicks++; 1904 MEvent.clicks++;
1839 1905
1840 if (MEvent.clicks > 1) 1906 if (MEvent.clicks > 1)
1841 { 1907 {
1842 /* only report double clicks */ 1908 /* only report double clicks */
… …
1856 mouse_report (ev); 1922 mouse_report (ev);
1857 } 1923 }
1858#else 1924#else
1859 MEvent.button = ev.button; 1925 MEvent.button = ev.button;
1860 mouse_report (ev); 1926 mouse_report (ev);
1861#endif /* MOUSE_REPORT_DOUBLECLICK */ 1927#endif /* MOUSE_REPORT_DOUBLECLICK */
1862 1928
1863 } 1929 }
1864 else 1930 else
1865 { 1931 {
1866 if (ev.button != MEvent.button) 1932 if (ev.button != MEvent.button)
… …
1914 } 1980 }
1915 1981
1916 /* 1982 /*
1917 * Scrollbar window processing of button press 1983 * Scrollbar window processing of button press
1918 */ 1984 */
1919 if (isScrollbarWindow (ev.window)) 1985 if (scrollBar.state && ev.window == scrollBar.win)
1920 { 1986 {
1921 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;
1922 /* 1995 /*
1923 * Rxvt-style scrollbar: 1996 * Rxvt-style scrollbar:
1924 * move up if mouse is above slider 1997 * move up if mouse is above slider
1925 * move dn if mouse is below slider 1998 * move dn if mouse is below slider
1926 * 1999 *
… …
1935 /* 2008 /*
1936 * Mouse report disabled scrollbar: 2009 * Mouse report disabled scrollbar:
1937 * arrow buttons - send up/down 2010 * arrow buttons - send up/down
1938 * click on scrollbar - send pageup/down 2011 * click on scrollbar - send pageup/down
1939 */ 2012 */
1940 if ((scrollBar.style == R_SB_NEXT 2013 if (direction == UP)
1941 && scrollbarnext_upButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_upButton (ev.y)))
1944 tt_printf ("\033[A"); 2014 tt_printf ("\033[A");
1945 else if ((scrollBar.style == R_SB_NEXT 2015 else if (direction == DN)
1946 && scrollbarnext_dnButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_dnButton (ev.y)))
1949 tt_printf ("\033[B"); 2016 tt_printf ("\033[B");
1950 else 2017 else
1951 switch (ev.button) 2018 switch (ev.button)
1952 { 2019 {
1953 case Button2: 2020 case Button2:
… …
1960 tt_printf ("\033[5~"); 2027 tt_printf ("\033[5~");
1961 break; 2028 break;
1962 } 2029 }
1963 } 2030 }
1964 else 2031 else
1965#endif /* NO_SCROLLBAR_REPORT */ 2032#endif /* NO_SCROLLBAR_REPORT */
1966
1967 {
1968 char upordown = 0;
1969
1970 if (scrollBar.style == R_SB_NEXT)
1971 { 2033 {
1972 if (scrollbarnext_upButton (ev.y)) 2034 if (direction != NO_DIR)
1973 upordown = -1; /* up */
1974 else if (scrollbarnext_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 else if (scrollBar.style == R_SB_RXVT)
1978 {
1979 if (scrollbarrxvt_upButton (ev.y))
1980 upordown = -1; /* up */
1981 else if (scrollbarrxvt_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 if (upordown)
1985 { 2035 {
1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2036#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2037 if (!cont_scroll_ev.is_active ())
1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2038 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1988#endif 2039#endif
1989 if (scr_page (upordown < 0 ? UP : DN, 1)) 2040 if (scr_page (direction, 1))
1990 { 2041 {
1991 if (upordown < 0) 2042 if (direction == UP)
1992 scrollBar.setUp (); 2043 scrollBar.state = SB_STATE_UP;
1993 else 2044 else
1994 scrollBar.setDn (); 2045 scrollBar.state = SB_STATE_DOWN;
1995 } 2046 }
1996 } 2047 }
1997 else 2048 else
1998 switch (ev.button) 2049 switch (ev.button)
1999 { 2050 {
2000 case Button2: 2051 case Button2:
2001 switch (scrollbar_align) 2052 switch (scrollBar.align)
2002 { 2053 {
2003 case R_SB_ALIGN_TOP: 2054 case SB_ALIGN_TOP:
2004 csrO = 0; 2055 csrO = 0;
2005 break; 2056 break;
2006 case R_SB_ALIGN_CENTRE: 2057 case SB_ALIGN_CENTRE:
2007 csrO = (scrollBar.bot - scrollBar.top) / 2; 2058 csrO = (scrollBar.bot - scrollBar.top) / 2;
2008 break; 2059 break;
2009 case R_SB_ALIGN_BOTTOM: 2060 case SB_ALIGN_BOTTOM:
2010 csrO = scrollBar.bot - scrollBar.top; 2061 csrO = scrollBar.bot - scrollBar.top;
2011 break; 2062 break;
2012 } 2063 }
2013 2064
2014 if (scrollBar.style == R_SB_XTERM 2065 if (scrollBar.style == SB_STYLE_XTERM
2015 || scrollbar_above_slider (ev.y) 2066 || scrollBar.above_slider (ev.y)
2016 || scrollbar_below_slider (ev.y)) 2067 || scrollBar.below_slider (ev.y))
2017 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2068 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2018 2069
2019 scrollBar.setMotion (); 2070 scrollBar.state = SB_STATE_MOTION;
2020 break; 2071 break;
2021 2072
2022 case Button1: 2073 case Button1:
2023 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2074 if (scrollBar.align == SB_ALIGN_CENTRE)
2024 csrO = ev.y - scrollBar.top; 2075 csrO = ev.y - scrollBar.top;
2025 /* FALLTHROUGH */ 2076 /* FALLTHROUGH */
2026 2077
2027 case Button3: 2078 case Button3:
2028 if (scrollBar.style != R_SB_XTERM) 2079 if (scrollBar.style != SB_STYLE_XTERM)
2029 { 2080 {
2030 if (scrollbar_above_slider (ev.y)) 2081 if (scrollBar.above_slider (ev.y))
2031# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
2032 scr_page (UP, nrow - 1); 2083 scr_page (UP, nrow - 1);
2033# else 2084# else
2034 scr_page (UP, nrow / 4); 2085 scr_page (UP, nrow / 4);
2035# endif 2086# endif
2036 else if (scrollbar_below_slider (ev.y)) 2087 else if (scrollBar.below_slider (ev.y))
2037# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2038 scr_page (DN, nrow - 1); 2089 scr_page (DN, nrow - 1);
2039# else 2090# else
2040 scr_page (DN, nrow / 4); 2091 scr_page (DN, nrow / 4);
2041# endif 2092# endif
2042 else 2093 else
2043 scrollBar.setMotion (); 2094 scrollBar.state = SB_STATE_MOTION;
2044 } 2095 }
2045 else 2096 else
2046 { 2097 {
2047 scr_page ((ev.button == Button1 ? DN : UP), 2098 scr_page ((ev.button == Button1 ? DN : UP),
2048 (nrow 2099 (nrow
2049 * scrollbar_position (ev.y) 2100 * scrollBar.position (ev.y)
2050 / scrollbar_size ())); 2101 / scrollBar.size ()));
2051 } 2102 }
2052 2103
2053 break; 2104 break;
2054 } 2105 }
2055 } 2106 }
… …
2065 2116
2066 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
2067 if (!bypass_keystate) 2118 if (!bypass_keystate)
2068 reportmode = !! (priv_modes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
2069 2120
2070 if (scrollbar_isUpDn ()) 2121 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2071 { 2122 {
2072 scrollBar.setIdle (); 2123 scrollBar.state = SB_STATE_IDLE;
2073 scrollbar_show (0); 2124 scrollBar.show (0);
2074 } 2125 }
2075 2126
2076#ifdef SELECTION_SCROLLING 2127#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2128 sel_scroll_ev.stop();
2079#endif 2129#endif
2080 2130
2081 if (ev.window == vt) 2131 if (ev.window == vt)
2082 { 2132 {
2083 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)))
… …
2098#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2099 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2100 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2101 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2102 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2103 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2104 { 2154 {
2105 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2106 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2107 mouse_report (ev); 2157 mouse_report (ev);
2108 } 2158 }
2109#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2110 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2111 mouse_report (ev); 2161 mouse_report (ev);
2112#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2113 return; 2163 return;
2114 } 2164 }
2115 2165
2116 /* 2166 /*
2117 * dumb hack to compensate for the failure of click-and-drag 2167 * dumb hack to compensate for the failure of click-and-drag
… …
2128 case Button3: 2178 case Button3:
2129 selection_make (ev.time); 2179 selection_make (ev.time);
2130 break; 2180 break;
2131 2181
2132 case Button2: 2182 case Button2:
2133 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?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2184 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2185 break;
2136 2186
2137#ifdef MOUSE_WHEEL 2187#ifdef MOUSE_WHEEL
2138 case Button4: 2188 case Button4:
2139 case Button5: 2189 case Button5:
2140 { 2190 {
2141 int i; 2191 int lines;
2142 page_dirn v; 2192 page_dirn dirn;
2143 2193
2144 v = ev.button == Button4 ? UP : DN; 2194 dirn = ev.button == Button4 ? UP : DN;
2145 2195
2146 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2147 i = 1; 2197 lines = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2198 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2199 lines = nrow - 1;
2150 else 2200 else
2151 i = 5; 2201 lines = 5;
2152 2202
2153# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2154 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2155 { 2205 {
2156 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += dirn;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2207 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159 2208
2160 if (slip_wheel_ev.at < NOW) 2209 if (!slip_wheel_ev.is_active ())
2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2210 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2162
2163 slip_wheel_ev.start ();
2164 } 2211 }
2165 else 2212 else
2213# endif
2166 { 2214 {
2167# endif
2168 scr_page (v, i); 2215 scr_page (dirn, lines);
2169 scrollbar_show (1); 2216 scrollBar.show (1);
2170# ifdef MOUSE_SLIP_WHEELING
2171 } 2217 }
2172# endif
2173 } 2218 }
2174 break; 2219 break;
2175#endif 2220#endif
2176 } 2221 }
2177 } 2222 }
2178} 2223}
2179 2224
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655
2656/*}}} */ 2225/*}}} */
2657 2226
2658bool 2227void ecb_hot
2659rxvt_term::cmd_parse () 2228rxvt_term::cmd_parse ()
2660{ 2229{
2661 bool flag = false;
2662 wchar_t ch = NOCHAR; 2230 wchar_t ch = NOCHAR;
2663 char *seq_begin; // remember start of esc-sequence here 2231 char *seq_begin; // remember start of esc-sequence here
2664 2232
2665 for (;;) 2233 for (;;)
2666 { 2234 {
2667 if (ch == NOCHAR) 2235 if (ecb_unlikely (ch == NOCHAR))
2668 { 2236 {
2669 seq_begin = cmdbuf_ptr; 2237 seq_begin = cmdbuf_ptr;
2670 ch = next_char (); 2238 ch = next_char ();
2671 2239
2672 if (ch == NOCHAR) 2240 if (ch == NOCHAR)
2673 break; 2241 break;
2674 } 2242 }
2675 2243
2676 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))
2677 { 2245 {
2678 if (!seen_input) 2246 if (ecb_unlikely (!seen_input))
2679 { 2247 {
2680 seen_input = 1; 2248 seen_input = 1;
2681 // many badly-written programs (e.g. jed) contain a race condition: 2249 // many badly-written programs (e.g. jed) contain a race condition:
2682 // they first read the screensize and then install a SIGWINCH handler. 2250 // they first read the screensize and then install a SIGWINCH handler.
2683 // some window managers resize the window early, and these programs 2251 // some window managers resize the window early, and these programs
… …
2696 wchar_t *str = buf; 2264 wchar_t *str = buf;
2697 wchar_t *eol = str + min (ncol, UBUFSIZ); 2265 wchar_t *eol = str + min (ncol, UBUFSIZ);
2698 2266
2699 for (;;) 2267 for (;;)
2700 { 2268 {
2701 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)))
2702 break; 2270 break;
2703 2271
2704 *str++ = ch; 2272 *str++ = ch;
2705 2273
2706 if (ch == C0_LF || str >= eol) 2274 if (ecb_unlikely (ch == C0_LF || str >= eol))
2707 { 2275 {
2708 if (ch == C0_LF) 2276 if (ch == C0_LF)
2709 nlines++; 2277 nlines++;
2710 2278
2711 refresh_count++; 2279 refresh_count++;
2712 2280
2713 if (!OPTION (Opt_jumpScroll) 2281 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2282 {
2716 refreshnow = true;
2717 refresh_count = 0; 2283 refresh_count = 0;
2284
2285 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2286 {
2287 refreshnow = true;
2718 ch = NOCHAR; 2288 ch = NOCHAR;
2719 break; 2289 break;
2290 }
2720 } 2291 }
2721 2292
2722 // scr_add_lines only works for nlines <= nrow - 1. 2293 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2294 if (nlines >= nrow - 1)
2724 { 2295 {
… …
2752 && 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))))
2753 scr_add_lines (buf, str - buf, nlines); 2324 scr_add_lines (buf, str - buf, nlines);
2754 2325
2755 /* 2326 /*
2756 * 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
2757 * 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.
2758 * the number of pages between refreshes is refresh_limit, which 2329 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2330 */
2761 if (refreshnow) 2331 if (refreshnow)
2762 { 2332 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true;
2768 scr_refresh (); 2333 scr_refresh ();
2769 want_refresh = 1; 2334 want_refresh = 1;
2770 }
2771 } 2335 }
2772
2773 } 2336 }
2774 else 2337 else
2775 { 2338 {
2776 try 2339 try
2777 { 2340 {
… …
2785 } 2348 }
2786 2349
2787 ch = NOCHAR; 2350 ch = NOCHAR;
2788 } 2351 }
2789 } 2352 }
2790
2791 return flag;
2792} 2353}
2793 2354
2794// read the next character 2355// read the next character
2795wchar_t 2356wchar_t ecb_hot
2796rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () NOTHROW
2797{ 2358{
2798 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2799 { 2360 {
2800 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2801 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2802 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2803 2364
2804 wchar_t wc; 2365 wchar_t wc;
2805 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);
2806 2367
… …
2810 cmdbuf_ptr = cmdbuf_endp; 2371 cmdbuf_ptr = cmdbuf_endp;
2811 break; 2372 break;
2812 } 2373 }
2813 2374
2814 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.
2815 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 }
2816 2382
2817 // assume wchar == unicode 2383 // assume wchar == unicode
2818 cmdbuf_ptr += len; 2384 cmdbuf_ptr += len;
2819 return wc & UNICODE_MASK; 2385 return wc & UNICODE_MASK;
2820 } 2386 }
2821 2387
2822 return NOCHAR; 2388 return NOCHAR;
2823} 2389}
2824 2390
2825// read the next octet 2391// read the next octet
2826uint32_t 2392uint32_t ecb_hot
2827rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () NOTHROW
2828{ 2394{
2829 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2830 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2831 : NOCHAR; 2397 : NOCHAR;
2832} 2398}
2833 2399
2834static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2835 2401
2836/* rxvt_cmd_getc () - Return next input character */ 2402wchar_t ecb_hot
2837/*
2838 * Return the next input character after first passing any keyboard input
2839 * to the command.
2840 */
2841wchar_t
2842rxvt_term::cmd_getc () THROW ((class out_of_input)) 2403rxvt_term::cmd_getc () THROW ((class out_of_input))
2843{ 2404{
2844 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2845 2406
2846 if (c == NOCHAR) 2407 if (c == NOCHAR)
2847 throw out_of_input; 2408 throw out_of_input;
2848 2409
2849 return c; 2410 return c;
2850} 2411}
2851 2412
2852uint32_t 2413uint32_t ecb_hot
2853rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 () THROW ((class out_of_input))
2854{ 2415{
2855 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2856 2417
2857 if (c == NOCHAR) 2418 if (c == NOCHAR)
… …
2861} 2422}
2862 2423
2863/*{{{ print pipe */ 2424/*{{{ print pipe */
2864/*----------------------------------------------------------------------*/ 2425/*----------------------------------------------------------------------*/
2865#ifdef PRINTPIPE 2426#ifdef PRINTPIPE
2866FILE * 2427FILE * ecb_cold
2867rxvt_term::popen_printer () 2428rxvt_term::popen_printer ()
2868{ 2429{
2869 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2430 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2870 2431
2871 if (stream == NULL) 2432 if (stream == NULL)
2872 rxvt_warn ("can't open printer pipe, not printing.\n"); 2433 rxvt_warn ("can't open printer pipe, not printing.\n");
2873 2434
2874 return stream; 2435 return stream;
2875} 2436}
2876 2437
2877int 2438int ecb_cold
2878rxvt_term::pclose_printer (FILE *stream) 2439rxvt_term::pclose_printer (FILE *stream)
2879{ 2440{
2880 fflush (stream); 2441 fflush (stream);
2881 return pclose (stream); 2442 return pclose (stream);
2882} 2443}
2883 2444
2884/* 2445/*
2885 * simulate attached vt100 printer 2446 * simulate attached vt100 printer
2886 */ 2447 */
2887void 2448void ecb_cold
2888rxvt_term::process_print_pipe () 2449rxvt_term::process_print_pipe ()
2889{ 2450{
2890 int done; 2451 FILE *fd = popen_printer ();
2891 FILE *fd;
2892 2452
2893 if ((fd = popen_printer ()) == NULL) 2453 if (!fd)
2894 return; 2454 return;
2895 2455
2896 /* 2456 /*
2897 * 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
2898 * is received. 2458 * is received.
2899 */ 2459 */
2900 for (done = 0; !done;) 2460 for (int done = 0; !done; )
2901 { 2461 {
2902 unsigned char buf[8]; 2462 unsigned char buf[8];
2903 unicode_t ch; 2463 unicode_t ch;
2904 unsigned int i, len; 2464 unsigned int i, len;
2905 2465
… …
2924 { 2484 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2485 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2486 break; /* done = 1 */
2927 } 2487 }
2928 } 2488 }
2929 2489
2930 for (i = 0; i < len; i++) 2490 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2491 if (putc (buf[i], fd) == EOF)
2932 { 2492 {
2933 done = 1; 2493 done = 1;
2934 break; 2494 break;
… …
2936 } 2496 }
2937 } 2497 }
2938 2498
2939 pclose_printer (fd); 2499 pclose_printer (fd);
2940} 2500}
2941#endif /* PRINTPIPE */ 2501#endif /* PRINTPIPE */
2942/*}}} */ 2502/*}}} */
2943 2503
2944/* *INDENT-OFF* */
2945enum { 2504enum {
2946 C1_40 = 0x40, 2505 C1_40 = 0x40,
2947 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,
2948 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,
2949 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,
2950 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,
2951}; 2510};
2952/* *INDENT-ON* */
2953 2511
2954/*{{{ process non-printing single characters */ 2512/*{{{ process non-printing single characters */
2955void 2513void ecb_hot
2956rxvt_term::process_nonprinting (unicode_t ch) 2514rxvt_term::process_nonprinting (unicode_t ch)
2957{ 2515{
2958 switch (ch) 2516 switch (ch)
2959 { 2517 {
2960 case C0_ESC: 2518 case C0_ESC:
… …
2990 scr_charset_choose (0); 2548 scr_charset_choose (0);
2991 break; 2549 break;
2992 2550
2993#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2994 // 8-bit controls 2552 // 8-bit controls
2995 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2996 process_dcs_seq (); 2554 process_dcs_seq ();
2997 break; 2555 break;
2998 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2999 process_csi_seq (); 2557 process_csi_seq ();
3000 break; 2558 break;
3001 case 0x9d: /* CSI */ 2559 case 0x9d: /* OSC */
3002 process_osc_seq (); 2560 process_osc_seq ();
3003 break; 2561 break;
3004#endif 2562#endif
3005 } 2563 }
3006} 2564}
3007/*}}} */ 2565/*}}} */
3008 2566
3009 2567
3010/*{{{ process VT52 escape sequences */ 2568/*{{{ process VT52 escape sequences */
3011void 2569void ecb_cold
3012rxvt_term::process_escape_vt52 (unicode_t ch) 2570rxvt_term::process_escape_vt52 (unicode_t ch)
3013{ 2571{
3014 int row, col; 2572 int row, col;
3015 2573
3016 switch (ch) 2574 switch (ch)
… …
3050 break; 2608 break;
3051 case 'Z': /* identify the terminal type */ 2609 case 'Z': /* identify the terminal type */
3052 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2610 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3053 break; 2611 break;
3054 case '<': /* turn off VT52 mode */ 2612 case '<': /* turn off VT52 mode */
3055 PrivMode (0, PrivMode_vt52); 2613 priv_modes &= ~PrivMode_vt52;
3056 break; 2614 break;
3057 case 'F': /* use special graphics character set */ 2615 case 'F': /* use special graphics character set */
3058 case 'G': /* use regular character set */ 2616 case 'G': /* use regular character set */
3059 /* unimplemented */ 2617 /* unimplemented */
3060 break; 2618 break;
… …
3066} 2624}
3067/*}}} */ 2625/*}}} */
3068 2626
3069 2627
3070/*{{{ process escape sequences */ 2628/*{{{ process escape sequences */
3071void 2629void ecb_hot
3072rxvt_term::process_escape_seq () 2630rxvt_term::process_escape_seq ()
3073{ 2631{
3074 unicode_t ch = cmd_getc (); 2632 unicode_t ch = cmd_getc ();
3075 2633
3076 if (priv_modes & PrivMode_vt52) 2634 if (priv_modes & PrivMode_vt52)
… …
3079 return; 2637 return;
3080 } 2638 }
3081 2639
3082 switch (ch) 2640 switch (ch)
3083 { 2641 {
3084 /* case 1: do_tek_mode (); break; */
3085 case '#': 2642 case '#':
3086 if (cmd_getc () == '8') 2643 if (cmd_getc () == '8')
3087 scr_E (); 2644 scr_E ();
3088 break; 2645 break;
3089 case '(': 2646 case '(':
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2653 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2654 break;
3098 case '+': 2655 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2656 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2657 break;
3101#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3102 case '6': 2659 case '6':
3103 scr_backindex (); 2660 scr_backindex ();
3104 break; 2661 break;
3105#endif 2662#endif
3106 case '7': 2663 case '7':
3107 scr_cursor (SAVE); 2664 scr_cursor (SAVE);
3108 break; 2665 break;
3109 case '8': 2666 case '8':
3110 scr_cursor (RESTORE); 2667 scr_cursor (RESTORE);
3111 break; 2668 break;
3112#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
3113 case '9': 2670 case '9':
3114 scr_forwardindex (); 2671 scr_forwardindex ();
3115 break; 2672 break;
3116#endif 2673#endif
2674 // DECPAM/DECPNM
3117 case '=': 2675 case '=':
2676 priv_modes |= PrivMode_aplKP;
2677 break;
3118 case '>': 2678 case '>':
3119 PrivMode ((ch == '='), PrivMode_aplKP); 2679 priv_modes &= ~PrivMode_aplKP;
3120 break; 2680 break;
3121 2681
3122 case C1_40: 2682 case C1_40:
3123 cmd_getc (); 2683 cmd_getc ();
3124 break; 2684 break;
… …
3128 2688
3129 /* 8.3.87: NEXT LINE */ 2689 /* 8.3.87: NEXT LINE */
3130 case C1_NEL: /* ESC E */ 2690 case C1_NEL: /* ESC E */
3131 { 2691 {
3132 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
3133 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3134 } 2694 }
3135 break; 2695 break;
3136 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
3137 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
3138 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
3139 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 */
3140 break; 2703 break;
2704#endif
3141 2705
3142 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
3143 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
3144 scr_set_tab (1); 2708 scr_set_tab (1);
3145 break; 2709 break;
… …
3148 case C1_RI: /* ESC M */ 2712 case C1_RI: /* ESC M */
3149 scr_index (DN); 2713 scr_index (DN);
3150 break; 2714 break;
3151 2715
3152 /* 8.3.142: SINGLE-SHIFT TWO */ 2716 /* 8.3.142: SINGLE-SHIFT TWO */
3153 /*case C1_SS2: scr_single_shift (2); break; */ 2717 /* case C1_SS2: break; */
3154 2718
3155 /* 8.3.143: SINGLE-SHIFT THREE */ 2719 /* 8.3.143: SINGLE-SHIFT THREE */
3156 /*case C1_SS3: scr_single_shift (3); break; */ 2720 /* case C1_SS3: break; */
3157 2721
3158 /* 8.3.27: DEVICE CONTROL STRING */ 2722 /* 8.3.27: DEVICE CONTROL STRING */
3159 case C1_DCS: /* ESC P */ 2723 case C1_DCS: /* ESC P */
3160 process_dcs_seq (); 2724 process_dcs_seq ();
3161 break; 2725 break;
… …
3163 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2727 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3164 case C1_SCI: /* ESC Z */ 2728 case C1_SCI: /* ESC Z */
3165 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2729 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3166 break; /* steal obsolete ESC [ c */ 2730 break; /* steal obsolete ESC [ c */
3167 2731
3168 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2732 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3169 case C1_CSI: /* ESC [ */ 2733 case C1_CSI: /* ESC [ */
3170 process_csi_seq (); 2734 process_csi_seq ();
3171 break; 2735 break;
3172 2736
3173 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2737 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3174 case C1_OSC: /* ESC ] */ 2738 case C1_OSC: /* ESC ] */
3175 process_osc_seq (); 2739 process_osc_seq ();
3176 break; 2740 break;
3177 2741
3178 /* 8.3.106: RESET TO INITIAL STATE */ 2742 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3179 case 'c': 2743 case 'c':
3180 mbstate.reset (); 2744 mbstate.reset ();
3181 scr_poweron (); 2745 scr_poweron ();
3182 scrollbar_show (1); 2746 scrollBar.show (1);
3183 break; 2747 break;
3184 2748
3185 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2749 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3186 case 'n': 2750 case 'n':
3187 scr_charset_choose (2); 2751 scr_charset_choose (2);
… …
3194 } 2758 }
3195} 2759}
3196/*}}} */ 2760/*}}} */
3197 2761
3198/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2762/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3199/* *INDENT-OFF* */
3200enum { 2763enum {
3201 CSI_ICH = 0x40, 2764 CSI_ICH = 0x40,
3202 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,
3203 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 ,
3204 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,
… …
3207 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,
3208 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 ,
3209 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
3210}; 2773};
3211 2774
3212#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2775#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3213 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3214 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3215#define get_byte_array_bit(array, bit) \ 2778#define get_byte_array_bit(array, bit) \
3216 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2779 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3217 2780
3218const unsigned char csi_defaults[] = 2781static const unsigned char csi_defaults[] =
3219 { 2782 {
3220 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, */
3221 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, */
3222 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, */
3223 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, [, \, ], ^, _, */
3224 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, */
3225 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, */
3226 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, */
3227 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, {, |, }, ~, */
3228 }; 2791 };
3229/* *INDENT-ON* */
3230 2792
3231void 2793void ecb_hot
3232rxvt_term::process_csi_seq () 2794rxvt_term::process_csi_seq ()
3233{ 2795{
3234 unicode_t ch, priv, i; 2796 unicode_t ch, priv, prev_ch, i;
3235 unsigned int nargs, p; 2797 unsigned int nargs, p;
3236 int n, ndef; 2798 int n, ndef;
3237 int arg[ESC_ARGS]; 2799 int arg[ESC_ARGS] = { };
3238 2800
3239 for (nargs = ESC_ARGS; nargs > 0;) 2801 nargs = 0;
3240 arg[--nargs] = 0;
3241 2802
3242 priv = 0; 2803 priv = 0;
3243 ch = cmd_getc (); 2804 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2805 if ((ch >= '<' && ch <= '?') || ch == '!')
2806 {
3245 { /* '<' '=' '>' '?' */ 2807 /* '<' '=' '>' '?' '!' */
3246 priv = ch; 2808 priv = ch;
3247 ch = cmd_getc (); 2809 ch = cmd_getc ();
3248 } 2810 }
3249 2811
2812 prev_ch = 0;
3250 /* read any numerical arguments */ 2813 /* read any numerical arguments */
3251 for (n = -1; ch < CSI_ICH; ) 2814 for (n = -1; ch < CSI_ICH; )
3252 { 2815 {
3253 if (isdigit (ch)) 2816 if (isdigit (ch))
3254 { 2817 {
… …
3264 n = -1; 2827 n = -1;
3265 } 2828 }
3266 else if (IS_CONTROL (ch)) 2829 else if (IS_CONTROL (ch))
3267 process_nonprinting (ch); 2830 process_nonprinting (ch);
3268 2831
2832 prev_ch = ch;
3269 ch = cmd_getc (); 2833 ch = cmd_getc ();
3270 } 2834 }
3271 2835
3272 if (ch > CSI_7F) 2836 if (ch > CSI_7F)
3273 return; 2837 return;
… …
3289 switch (priv) 2853 switch (priv)
3290 { 2854 {
3291 case '>': 2855 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2856 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2857 {
3294 // 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,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2859 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2860 //
3297 // 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
3298 // 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
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2863 // versions.
3300 // 2864 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2865 tt_printf ("\033[>%d;95;0c", 'U');
3302 } 2866 }
3303 break; 2867 break;
2868
3304 case '?': 2869 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
3307 break; 2872 break;
2873
2874 case '!':
2875 if (ch == CSI_70)
2876 {
2877 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2878 scr_soft_reset ();
2879
2880 static const int pm_h[] = { 7, 25 };
2881 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2882
2883 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2884 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3308 } 2885 }
2886 break;
2887 }
2888
3309 return; 2889 return;
3310 } 2890 }
3311 2891
3312 switch (ch) 2892 switch (ch)
3313 { 2893 {
… …
3327 } 2907 }
3328 break; 2908 break;
3329#endif 2909#endif
3330 2910
3331 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2911 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3332 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2912 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3333 arg[0] = -arg[0]; 2913 arg[0] = -arg[0];
3334 /* FALLTHROUGH */ 2914 /* FALLTHROUGH */
3335 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2915 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3336 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2916 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3337 scr_gotorc (arg[0], 0, RELATIVE); 2917 scr_gotorc (arg[0], 0, RELATIVE);
3338 break; 2918 break;
3339 2919
3340 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2920 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3341 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2921 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3342#ifdef ISO6429 2922#ifdef ISO6429
3343 arg[0] = -arg[0]; 2923 arg[0] = -arg[0];
3344#else /* emulate common DEC VTs */ 2924#else /* emulate common DEC VTs */
3345 arg[0] = arg[0] ? -arg[0] : -1; 2925 arg[0] = arg[0] ? -arg[0] : -1;
3346#endif 2926#endif
… …
3433 break; 3013 break;
3434 case 6: /* CPR requested */ 3014 case 6: /* CPR requested */
3435 scr_report_position (); 3015 scr_report_position ();
3436 break; 3016 break;
3437 case 7: /* unofficial extension */ 3017 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 3018 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3019 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 3020 break;
3441 case 8: /* unofficial extension */ 3021 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3022 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 3023 break;
… …
3491 scr_insert_mode (1); 3071 scr_insert_mode (1);
3492 else if (arg[0] == 20) 3072 else if (arg[0] == 20)
3493 priv_modes |= PrivMode_LFNL; 3073 priv_modes |= PrivMode_LFNL;
3494 break; 3074 break;
3495 3075
3076 case CSI_71: // DECSCUSR: set cursor style
3077 if (prev_ch == ' ')
3078 set_cursor_style (arg[0]);
3079 break;
3080
3496 /* 3081 /*
3497 * PRIVATE USE beyond this point. All CSI_7? sequences here 3082 * PRIVATE USE beyond this point. All CSI_7? sequences here
3498 */ 3083 */
3499 case CSI_72: /* DECSTBM: set top and bottom margins */ 3084 case CSI_72: /* DECSTBM: set top and bottom margins */
3500 if (nargs == 1) 3085 if (nargs == 1)
… …
3510 break; 3095 break;
3511 case CSI_75: 3096 case CSI_75:
3512 scr_cursor (RESTORE); 3097 scr_cursor (RESTORE);
3513 break; 3098 break;
3514 3099
3515#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3516 case CSI_74: 3101 case CSI_74:
3517 process_window_ops (arg, nargs); 3102 process_window_ops (arg, nargs);
3518 break; 3103 break;
3519#endif 3104#endif
3520 3105
… …
3527 break; 3112 break;
3528 } 3113 }
3529} 3114}
3530/*}}} */ 3115/*}}} */
3531 3116
3532#if ENABLE_FRILLS 3117#if !ENABLE_MINIMAL
3533/* ARGSUSED */
3534void 3118void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3120{
3537 int x, y; 3121 int x, y;
3538 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3539 Window wdummy; 3123 Window wdummy;
3540 dDisp; 3124
3125 dLocal (Display *, dpy);
3541 3126
3542 if (nargs == 0) 3127 if (nargs == 0)
3543 return; 3128 return;
3544 3129
3545 switch (args[0]) 3130 switch (args[0])
3546 { 3131 {
3547 /* 3132 /*
3548 * commands 3133 * commands
3549 */ 3134 */
3550 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3136 XMapWindow (dpy, parent);
3552 break; 3137 break;
3553 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent, display->screen);
3555 break; 3140 break;
3556 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent, args[1], args[2]);
3558 break; 3143 break;
3559 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3146 break;
3562 case 5: /* raise window */ 3147 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3148 XRaiseWindow (dpy, parent);
3564 break; 3149 break;
3565 case 6: /* lower window */ 3150 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3151 XLowerWindow (dpy, parent);
3567 break; 3152 break;
3568 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3569 scr_touch (true); 3154 scr_touch (true);
3570 break; 3155 break;
3571 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3574 break; 3159 break;
3575 3160
3576 //case 9: NYI, TODO, restore maximized window or maximize window 3161 //case 9: NYI, TODO, restore maximized window or maximize window
3577 default: 3162 default:
3578 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)vt_width,
3580 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3581 break; 3166 break;
3582
3583 3167
3584 /* 3168 /*
3585 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3586 */ 3170 */
3587 case 11: /* report window state */ 3171 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3174 break;
3591 case 13: /* report window position */ 3175 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent, &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent, wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3181 break;
3598 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3185 break;
3602 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3188 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3191 break;
3608 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3609 { 3193 {
3610 char *s; 3194 char *s;
3611 XGetIconName (disp, parent[0], &s); 3195 XGetIconName (dpy, parent, &s);
3612 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3613 XFree (s); 3197 XFree (s);
3614 } 3198 }
3615 break; 3199 break;
3616 case 21: /* report window title */ 3200 case 21: /* report window title */
3617 { 3201 {
3618 char *s; 3202 char *s;
3619 XFetchName (disp, parent[0], &s); 3203 XFetchName (dpy, parent, &s);
3620 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3205 XFree (s);
3622 } 3206 }
3623 break; 3207 break;
3624 } 3208 }
3625} 3209}
… …
3634rxvt_term::get_to_st (unicode_t &ends_how) 3218rxvt_term::get_to_st (unicode_t &ends_how)
3635{ 3219{
3636 unicode_t ch; 3220 unicode_t ch;
3637 bool seen_esc = false; 3221 bool seen_esc = false;
3638 unsigned int n = 0; 3222 unsigned int n = 0;
3639 wchar_t string[STRING_MAX]; 3223 wchar_t string[CBUFSIZ];
3640 3224
3641 while ((ch = cmd_getc ()) != NOCHAR) 3225 while ((ch = cmd_getc ()) != NOCHAR)
3642 { 3226 {
3643 if (seen_esc) 3227 if (seen_esc)
3644 { 3228 {
… …
3652 seen_esc = true; 3236 seen_esc = true;
3653 continue; 3237 continue;
3654 } 3238 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3243 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3659 3245
3660 seen_esc = false; 3246 seen_esc = false;
3661 3247
3662 if (n >= STRING_MAX - 1) 3248 if (n >= sizeof (string) - 1)
3663 // stop at some sane length 3249 // stop at some sane length
3664 return NULL; 3250 return NULL;
3665 3251
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3252 string[n++] = ch;
3670 } 3253 }
3671 3254
3672 string[n++] = '\0'; 3255 string[n++] = '\0';
3673 3256
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3681 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3264 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3682 */ 3265 */
3683void 3266void
3684rxvt_term::process_dcs_seq () 3267rxvt_term::process_dcs_seq ()
3685{ 3268{
3686 char *s;
3687 unicode_t eh;
3688
3689 /* 3269 /*
3690 * Not handled yet 3270 * Not handled yet
3691 */ 3271 */
3272
3273 unicode_t eh;
3692 s = get_to_st (eh); 3274 char *s = get_to_st (eh);
3693 if (s) 3275 if (s)
3694 free (s); 3276 free (s);
3695 3277
3696 return; 3278 return;
3697} 3279}
… …
3701 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3283 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3702 */ 3284 */
3703void 3285void
3704rxvt_term::process_osc_seq () 3286rxvt_term::process_osc_seq ()
3705{ 3287{
3706 unicode_t ch, eh;
3707 int arg; 3288 int arg;
3708 3289
3709 ch = cmd_getc (); 3290 unicode_t ch = cmd_getc ();
3710 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3291 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3711 arg = arg * 10 + (ch - '0'); 3292 arg = arg * 10 + (ch - '0');
3712 3293
3713 if (ch == ';') 3294 if (ch == ';')
3714 { 3295 {
3296 unicode_t eh;
3715 char *s = get_to_st (eh); 3297 char *s = get_to_st (eh);
3716 3298
3717 if (s) 3299 if (s)
3718 { 3300 {
3719 process_xterm_seq (arg, s, eh); 3301 process_xterm_seq (arg, s, eh);
3720 free (s); 3302 free (s);
3721 } 3303 }
3722 } 3304 }
3723} 3305}
3724 3306
3307static unsigned int
3308colorcube_index (unsigned int idx_r,
3309 unsigned int idx_g,
3310 unsigned int idx_b)
3311{
3312 assert (idx_r < Red_levels);
3313 assert (idx_g < Green_levels);
3314 assert (idx_b < Blue_levels);
3315
3316 return idx_r * Blue_levels * Green_levels +
3317 idx_g * Blue_levels +
3318 idx_b;
3319}
3320
3321/*
3322 * Find the nearest color slot in the hidden color cube,
3323 * adapt its value to the 32bit RGBA color.
3324 */
3325unsigned int
3326rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3327{
3328 r &= 0xff;
3329 g &= 0xff;
3330 b &= 0xff;
3331 a &= 0xff;
3332
3333 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3334
3335 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3336 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3337 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3338 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3339
3340 /* we allow one of the 6 directly neighbouring colours */
3341 /* to replace the current color, if they not used recently */
3342 static const signed char dxyz[][3] = {
3343 0, 0, 0,
3344 0, 0, +1,
3345 0, 0, -1,
3346 0, +1, 0,
3347 0, -1, 0,
3348 +1, 0, 0,
3349 -1, 0, 0,
3350 };
3351
3352 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3353 {
3354 int r = idx_r + dxyz[n][0];
3355 int g = idx_g + dxyz[n][1];
3356 int b = idx_b + dxyz[n][2];
3357
3358 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3359 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3360 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3361
3362 unsigned int index = colorcube_index (r, g, b);
3363
3364 if (rgb24_color[index] == color)
3365 {
3366 rgb24_seqno[index] = ++rgb24_sequence;
3367 return index + minTermCOLOR24;
3368 }
3369
3370 // minor issue: could update index 0 few more times
3371 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3372 {
3373 idx = index;
3374 goto update;
3375 }
3376
3377 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3378 // but also handles wrap around values good enough
3379 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3380 idx = index;
3381 }
3382
3383update:
3384 rgb24_color[idx] = color;
3385 rgb24_seqno[idx] = ++rgb24_sequence;
3386
3387 idx += minTermCOLOR24;
3388 pix_colors_focused [idx].free (this);
3389 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3390 update_fade_color (idx, false);
3391
3392 return idx;
3393}
3394
3725void 3395void
3726rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3396rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3727{ 3397{
3728 if (str[0] == '?' && !str[1]) 3398 if (str[0] == '?' && !str[1])
3729 { 3399 {
3730 unsigned short r, g, b; 3400 rgba c;
3731 pix_colors_focused[color].get (display, r, g, b); 3401 pix_colors_focused[color].get (c);
3402
3403#if XFT
3404 if (c.a != rgba::MAX_CC)
3405 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3406 else
3407#endif
3732 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3408 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3733 } 3409 }
3734 else 3410 else
3735 set_window_color (color, str); 3411 set_window_color (color, str);
3736} 3412}
3737 3413
3738/* 3414/*
3739 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3415 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3740 */ 3416 */
3741void 3417void
3742rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3418rxvt_term::process_xterm_seq (int op, char *str, char resp)
3743{ 3419{
3744 int color; 3420 int color;
3745 char *buf, *name; 3421 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3422 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3423 int saveop = op;
3748 dDisp; 3424
3425 dLocal (Display *, dpy);
3749 3426
3750 assert (str != NULL); 3427 assert (str != NULL);
3428
3429 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3430 return;
3431
3751 switch (op) 3432 switch (op)
3752 { 3433 {
3753 case XTerm_name: 3434 case XTerm_name:
3754 set_title (str); 3435 set_title (str);
3755 /* FALLTHROUGH */ 3436 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3450 unsigned long bytes_after;
3770 unsigned char *value = 0; 3451 unsigned char *value = 0;
3771 const char *str = ""; 3452 const char *str = "";
3772 3453
3773 if (prop 3454 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3455 && XGetWindowProperty (dpy, parent,
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3456 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3457 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3458 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3459 && actual_type != None
3779 && actual_format == 8) 3460 && actual_format == 8)
3780 str = (const char *)(value); 3461 str = (const char *)(value);
3781 3462
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3463 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3783 3464
3784 XFree (value); 3465 XFree (value);
3785 } 3466 }
3786 else 3467 else
3787 { 3468 {
3788 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3469 char *eq = strchr (str, '=');
3789 3470
3790 if (eq) 3471 if (eq)
3791 { 3472 {
3792 *eq = 0; 3473 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3474 set_utf8_property (display->atom (str), eq + 1);
3794 } 3475 }
3795 else 3476 else
3796 XDeleteProperty (disp, parent[0], 3477 XDeleteProperty (dpy, parent,
3797 display->atom (str)); 3478 display->atom (str));
3798 } 3479 }
3799 break; 3480 break;
3800 3481
3801 case XTerm_Color: 3482 case XTerm_Color:
… …
3811 break; 3492 break;
3812 3493
3813 if ((buf = strchr (name, ';')) != NULL) 3494 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3495 *buf++ = '\0';
3815 3496
3816 if (name[0] == '?' && !name[1]) 3497 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3498 }
3825 break; 3499 break;
3500 case Rxvt_restoreFG:
3826 case XTerm_Color00: 3501 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3502 process_color_seq (op, Color_fg, str, resp);
3828 break; 3503 break;
3504 case Rxvt_restoreBG:
3829 case XTerm_Color01: 3505 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3506 process_color_seq (op, Color_bg, str, resp);
3831 break; 3507 break;
3832#ifndef NO_CURSORCOLOR 3508#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3509 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3510 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3511 break;
3836#endif 3512#endif
3837 case XTerm_Color_pointer_fg: 3513 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3514 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3515 break;
3840 case XTerm_Color_pointer_bg: 3516 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3517 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3518 break;
3519#ifdef OPTION_HC
3520 case XTerm_Color_HC:
3521 process_color_seq (op, Color_HC, str, resp);
3522 break;
3523 case XTerm_Color_HTC:
3524 process_color_seq (op, Color_HTC, str, resp);
3525 break;
3526#endif
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3527#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3846 break;
3847 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3528 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3529 process_color_seq (op, Color_BD, str, resp);
3850 break; 3530 break;
3851 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3531 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3532 process_color_seq (op, Color_UL, str, resp);
3854 break; 3533 break;
3855 case URxvt_Color_IT: 3534 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3535 process_color_seq (op, Color_IT, str, resp);
3857 break; 3536 break;
3858#endif 3537#endif
3859#if TRANSPARENT && TINTING
3860 case URxvt_Color_tint: 3538 case URxvt_Color_border:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3539 process_color_seq (op, Color_border, str, resp);
3862 check_our_parents ();
3863 if (am_transparent)
3864 want_full_refresh = want_refresh = 1;
3865 break;
3866#endif
3867
3868 case Rxvt_Pixmap:
3869 {
3870 if (*str != ';')
3871 {
3872#if XPM_BACKGROUND
3873 scale_pixmap (""); /* reset to default scaling */
3874 set_bgPixmap (str); /* change pixmap */
3875 scr_touch (true);
3876#endif
3877 }
3878
3879 int changed = 0;
3880
3881 while ((str = strchr (str, ';')) != NULL)
3882 {
3883 str++;
3884#if XPM_BACKGROUND
3885 changed += scale_pixmap (str);
3886#endif
3887 }
3888
3889 if (changed)
3890 {
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 }
3896 }
3897 break;
3898
3899 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str);
3901 break;
3902 case Rxvt_restoreBG:
3903 set_window_color (Color_bg, str);
3904 break; 3540 break;
3905 3541
3906 case XTerm_logfile: 3542 case XTerm_logfile:
3907 // TODO, when secure mode? 3543 // TODO, when secure mode?
3908 break; 3544 break;
… …
3927 case URxvt_italicFont: 3563 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3564 case URxvt_boldItalicFont:
3929#endif 3565#endif
3930 if (query) 3566 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3567 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3568 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3569 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3570 resp);
3935 else 3571 else
3936 { 3572 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3573 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 3576 allocated.push_back ((void *)res);
3941 set_fonts (); 3577 set_fonts ();
3942 } 3578 }
3943 break; 3579 break;
3944 3580
3945#if ENABLE_FRILLS 3581 case URxvt_version:
3582 if (query)
3583 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3584 op,
3585 rs[Rs_name], VERSION[0], VERSION[2],
3586 resp);
3587 break;
3588
3589#if !ENABLE_MINIMAL
3946 case URxvt_locale: 3590 case URxvt_locale:
3947 if (query) 3591 if (query)
3948 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3592 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3949 else 3593 else
3950 { 3594 {
3951 set_locale (str); 3595 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3596 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3597 init_xlocale ();
… …
3968 break; 3612 break;
3969#endif 3613#endif
3970 3614
3971#if ENABLE_PERL 3615#if ENABLE_PERL
3972 case URxvt_perl: 3616 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3617 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3974 ; // no responses yet
3975 break; 3618 break;
3976#endif 3619#endif
3977 } 3620 }
3978} 3621}
3979/*----------------------------------------------------------------------*/ 3622/*----------------------------------------------------------------------*/
… …
3986 * 's' = save 3629 * 's' = save
3987 * 'r' = restore 3630 * 'r' = restore
3988 * 't' = toggle 3631 * 't' = toggle
3989 * so no need for fancy checking 3632 * so no need for fancy checking
3990 */ 3633 */
3991int 3634int ecb_cold
3992rxvt_term::privcases (int mode, unsigned long bit) 3635rxvt_term::privcases (int mode, unsigned long bit)
3993{ 3636{
3994 int state; 3637 int state;
3995 3638
3996 if (mode == 's') 3639 if (mode == 's')
3997 { 3640 {
3998 SavedModes |= (priv_modes & bit); 3641 if (priv_modes & bit)
3642 SavedModes |= bit;
3643 else
3644 SavedModes &= ~bit;
3999 return -1; 3645 return -1;
4000 } 3646 }
4001 else 3647 else
4002 { 3648 {
4003 if (mode == 'r') 3649 if (mode == 'r')
4004 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3650 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4005 else 3651 else
4006 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3652 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4007 PrivMode (state, bit); 3653
3654 if (state)
3655 priv_modes |= bit;
3656 else
3657 priv_modes &= ~bit;
4008 } 3658 }
4009 3659
4010 return state; 3660 return state;
4011} 3661}
4012 3662
4013/* we're not using priv _yet_ */ 3663/* we're not using priv _yet_ */
4014void 3664void
4015rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3665rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4016{ 3666{
4017 unsigned int i, j; 3667 unsigned int i, j;
4018 int state; 3668 int state;
4019 3669
4020 static const struct 3670 static const struct
4021 { 3671 {
4022 const int argval; 3672 const int argval;
4023 const unsigned long bit; 3673 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3674 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3675 { 1, PrivMode_aplCUR }, // DECCKM
4028 { 2, PrivMode_vt52 }, 3676 { 2, PrivMode_vt52 }, // DECANM
4029 { 3, PrivMode_132 }, 3677 { 3, PrivMode_132 }, // DECCOLM
4030 { 4, PrivMode_smoothScroll }, 3678 { 4, PrivMode_smoothScroll }, // DECSCLM
4031 { 5, PrivMode_rVideo }, 3679 { 5, PrivMode_rVideo }, // DECSCNM
4032 { 6, PrivMode_relOrigin }, 3680 { 6, PrivMode_relOrigin }, // DECOM
4033 { 7, PrivMode_Autowrap }, 3681 { 7, PrivMode_Autowrap }, // DECAWM
4034 // 8, bi-directional support mode 3682 // 8, auto-repeat keys // DECARM
4035 { 9, PrivMode_MouseX10 }, 3683 { 9, PrivMode_MouseX10 },
4036 // 18, 19 printing-related
4037 { 25, PrivMode_VisibleCursor }, 3684 { 12, PrivMode_BlinkingCursor },
3685 // 18 end FF to printer after print screen
3686 // 19 Print screen prints full screen/scroll region
3687 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4038#ifdef scrollBar_esc 3688#ifdef scrollBar_esc
4039 { scrollBar_esc, PrivMode_scrollBar }, 3689 { scrollBar_esc, PrivMode_scrollBar },
4040#endif 3690#endif
4041 { 35, PrivMode_ShiftKeys }, // rxvt extension 3691 { 35, PrivMode_ShiftKeys }, // rxvt extension
3692 // 38, tektronix mode // DECTEK
4042 { 40, PrivMode_132OK }, 3693 { 40, PrivMode_132OK },
4043 // 41 xterm more fixes NYI 3694 // 41 xterm more fixes NYI
4044 // 45 margin bell NYI 3695 // 45 margin bell NYI
4045 // 46 start logging 3696 // 46 start logging
4046 { 47, PrivMode_Screen }, 3697 { 47, PrivMode_Screen },
4047 { 66, PrivMode_aplKP }, 3698 { 66, PrivMode_aplKP }, // DECNKM
4048#ifndef NO_BACKSPACE_KEY 3699#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3700 { 67, PrivMode_BackSpace }, // DECBKM
4050#endif 3701#endif
4051 { 1000, PrivMode_MouseX11 }, 3702 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3703 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3704 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3705#if ENABLE_FRILLS
3706 { 1004, PrivMode_FocusEvent },
3707 { 1005, PrivMode_ExtModeMouse },
3708 { 1006, PrivMode_ExtMouseSGR },
3709#endif
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3710 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3711 { 1011, PrivMode_Keypress }, // rxvt extension
3712#if ENABLE_FRILLS
3713 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3714#endif
4057 // 1035 enable modifiers for alt, numlock NYI 3715 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3716 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3717 // 1037 send DEL for keypad delete NYI
4060 { 1047, PrivMode_Screen }, 3718 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor 3719 // 1048 save and restore cursor, implemented in code
4062 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3720 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3721 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3722 { 2004, PrivMode_BracketPaste },
4064 }; 3723 };
4065 3724
4066 if (nargs == 0) 3725 if (nargs == 0)
4067 return; 3726 return;
4068 3727
… …
4075 for (i = 0; i < nargs; i++) 3734 for (i = 0; i < nargs; i++)
4076 { 3735 {
4077 state = -1; 3736 state = -1;
4078 3737
4079 /* basic handling */ 3738 /* basic handling */
4080 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3739 for (j = 0; j < ecb_array_length (argtopriv); j++)
4081 if (argtopriv[j].argval == arg[i]) 3740 if (argtopriv[j].argval == arg[i])
4082 { 3741 {
4083 state = privcases (mode, argtopriv[j].bit); 3742 state = privcases (mode, argtopriv[j].bit);
4084 break; 3743 break;
4085 } 3744 }
… …
4093 3752
4094 scr_touch (true); 3753 scr_touch (true);
4095 break; 3754 break;
4096#endif 3755#endif
4097 case 1048: /* alternative cursor save */ 3756 case 1048: /* alternative cursor save */
4098 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3757 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3758 if (mode == 0)
4101 scr_cursor (RESTORE); 3759 scr_cursor (RESTORE);
4102 else if (mode == 1) 3760 else if (mode == 1)
4103 scr_cursor (SAVE); 3761 scr_cursor (SAVE);
4104 break; 3762 break;
… …
4112 case 2: /* VT52 mode */ 3770 case 2: /* VT52 mode */
4113 /* oddball mode. should be set regardless of set/reset 3771 /* oddball mode. should be set regardless of set/reset
4114 * parameter. Return from VT52 mode with an ESC < from 3772 * parameter. Return from VT52 mode with an ESC < from
4115 * within VT52 mode 3773 * within VT52 mode
4116 */ 3774 */
4117 PrivMode (1, PrivMode_vt52); 3775 priv_modes |= PrivMode_vt52;
4118 break; 3776 break;
4119 case 3: /* 80/132 */ 3777 case 3: /* 80/132 */
4120 if (priv_modes & PrivMode_132OK) 3778 if (priv_modes & PrivMode_132OK)
4121 set_widthheight (((state ? 132 : 80) * fwidth), height); 3779 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4122 break; 3780 break;
4123 case 4: /* smooth scrolling */ 3781 case 4: /* smooth scrolling */
4124 set_option (Opt_jumpScroll, !state); 3782 set_option (Opt_jumpScroll, !state);
4125 break; 3783 break;
4126 case 5: /* reverse video */ 3784 case 5: /* reverse video */
… …
4133 scr_autowrap (state); 3791 scr_autowrap (state);
4134 break; 3792 break;
4135 /* case 8: - auto repeat, can't do on a per window basis */ 3793 /* case 8: - auto repeat, can't do on a per window basis */
4136 case 9: /* X10 mouse reporting */ 3794 case 9: /* X10 mouse reporting */
4137 if (state) /* orthogonal */ 3795 if (state) /* orthogonal */
4138 priv_modes &= ~PrivMode_MouseX11; 3796 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4139 break; 3797 break;
4140#ifdef scrollBar_esc 3798#ifdef scrollBar_esc
4141 case scrollBar_esc: 3799 case scrollBar_esc:
4142 if (scrollbar_mapping (state)) 3800 scrollBar.map (state);
4143 {
4144 resize_all_windows (0, 0, 0); 3801 resize_all_windows (0, 0, 0);
4145 scr_touch (true); 3802 scr_touch (true);
4146 } 3803 break;
3804#endif
3805#ifdef CURSOR_BLINK
3806 case 12:
3807 cursor_blink_reset ();
4147 break; 3808 break;
4148#endif 3809#endif
4149 case 25: /* visible/invisible cursor */ 3810 case 25: /* visible/invisible cursor */
4150 scr_cursor_visible (state); 3811 scr_cursor_visible (state);
4151 break; 3812 break;
… …
4156 break; 3817 break;
4157 /* case 66: - application key pad */ 3818 /* case 66: - application key pad */
4158 /* case 67: - backspace key */ 3819 /* case 67: - backspace key */
4159 case 1000: /* X11 mouse reporting */ 3820 case 1000: /* X11 mouse reporting */
4160 if (state) /* orthogonal */ 3821 if (state) /* orthogonal */
4161 priv_modes &= ~PrivMode_MouseX10; 3822 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4162 break; 3823 break;
4163#if 0
4164 case 1001: 3824 case 1002:
4165 break; /* X11 mouse highlighting */ 3825 case 1003:
4166#endif 3826 if (state)
3827 {
3828 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3829 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3830 mouse_row = mouse_col = 0;
3831 vt_emask_mouse = PointerMotionMask;
3832 }
3833 else
3834 vt_emask_mouse = NoEventMask;
3835
3836 vt_select_input ();
3837 break;
4167 case 1010: /* scroll to bottom on TTY output inhibit */ 3838 case 1010: /* scroll to bottom on TTY output inhibit */
4168 set_option (Opt_scrollTtyOutput, !state); 3839 set_option (Opt_scrollTtyOutput, !state);
4169 break; 3840 break;
4170 case 1011: /* scroll to bottom on key press */ 3841 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3842 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3843 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3844 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3845 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3846 if (!state)
4176 scr_erase_screen (2); 3847 scr_erase_screen (2);
3848
4177 scr_change_screen (state); 3849 scr_change_screen (state);
4178 break; 3850 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3851 case 1049: /* secondary screen w/ clearing first */
3852 if (option (Opt_secondaryScreen))
3853 if (state)
3854 scr_cursor (SAVE);
3855
4180 scr_change_screen (state); 3856 scr_change_screen (state);
3857
4181 if (OPTION (Opt_secondaryScreen)) 3858 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3859 if (state)
4183 scr_erase_screen (2); 3860 scr_erase_screen (2);
3861 else
3862 scr_cursor (RESTORE);
4184 break; 3863 break;
4185 default: 3864 default:
4186 break; 3865 break;
4187 } 3866 }
4188 } 3867 }
4189} 3868}
4190/*}}} */ 3869/*}}} */
4191 3870
4192/*{{{ process sgr sequences */ 3871/*{{{ process sgr sequences */
4193void 3872void ecb_hot
4194rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3873rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4195{ 3874{
4196 unsigned int i; 3875 unsigned int i;
4197 short rendset; 3876 short rendset;
4198 int rendstyle; 3877 int rendstyle;
… …
4240 //case 19: // ninth alt font 3919 //case 19: // ninth alt font
4241 //case 20: // gothic 3920 //case 20: // gothic
4242 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3921 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4243 rendset = 0, rendstyle = RS_Bold; 3922 rendset = 0, rendstyle = RS_Bold;
4244 break; 3923 break;
4245 case 22: // normal intensity 3924 case 22: // bold off (vt220)
4246 rendset = 0, rendstyle = RS_Bold; 3925 rendset = 0, rendstyle = RS_Bold;
4247 break; 3926 break;
4248 case 23: // disable italic 3927 case 23: // disable italic
4249 rendset = 0, rendstyle = RS_Italic; 3928 rendset = 0, rendstyle = RS_Italic;
4250 break; 3929 break;
4251 case 24: 3930 case 24: // underline off (vt220)
4252 rendset = 0, rendstyle = RS_Uline; 3931 rendset = 0, rendstyle = RS_Uline;
4253 break; 3932 break;
4254 case 25: 3933 case 25: // blink off (vt220)
4255 rendset = 0, rendstyle = RS_Blink; 3934 rendset = 0, rendstyle = RS_Blink;
4256 break; 3935 break;
4257 case 26: // variable spacing (iso 8613) 3936 case 26: // variable spacing (iso 8613)
4258 rendset = 0, rendstyle = RS_Blink; 3937 rendset = 0, rendstyle = RS_Blink;
4259 break; 3938 break;
4260 case 27: 3939 case 27: // reverse off (vt220)
4261 rendset = 0, rendstyle = RS_RVid; 3940 rendset = 0, rendstyle = RS_RVid;
4262 break; 3941 break;
4263 //case 28: // visible. NYI 3942 //case 28: // visible. NYI
4264 //case 29: // not crossed-out 3943 //case 29: // not crossed-out
4265 } 3944 }
… …
4280 case 35: 3959 case 35:
4281 case 36: 3960 case 36:
4282 case 37: 3961 case 37:
4283 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3962 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4284 break; 3963 break;
4285 case 38: // set fg color, ISO 8613-6
4286 if (nargs > i + 2 && arg[i + 1] == 5)
4287 {
4288 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4289 i += 2;
4290 }
4291 break;
4292 case 39: /* default fg */ 3964 case 39: /* default fg */
4293 scr_color (Color_fg, Color_fg); 3965 scr_color (Color_fg, Color_fg);
4294 break; 3966 break;
4295 3967
4296 case 40: 3968 case 40:
… …
4301 case 45: 3973 case 45:
4302 case 46: 3974 case 46:
4303 case 47: 3975 case 47:
4304 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3976 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4305 break; 3977 break;
4306 case 48: // set bg color, ISO 8613-6
4307 if (nargs > i + 2 && arg[i + 1] == 5)
4308 {
4309 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4310 i += 2;
4311 }
4312 break;
4313 case 49: /* default bg */ 3978 case 49: /* default bg */
4314 scr_color (Color_bg, Color_bg); 3979 scr_color (Color_bg, Color_bg);
4315 break; 3980 break;
4316 3981
3982 case 38: // set fg color, ISO 8613-6
3983 case 48: // set bg color, ISO 8613-6
3984 {
3985 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3986 unsigned int idx;
3987
3988 if (nargs > i + 2 && arg[i + 1] == 5)
3989 {
3990 idx = minCOLOR + arg[i + 2];
3991 i += 2;
3992
3993 scr_color (idx, fgbg);
3994 }
3995 else if (nargs > i + 4 && arg[i + 1] == 2)
3996 {
3997 unsigned int r = arg[i + 2];
3998 unsigned int g = arg[i + 3];
3999 unsigned int b = arg[i + 4];
4000 unsigned int a = 0xff;
4001
4002 idx = map_rgb24_color (r, g, b, a);
4003
4004 i += 4;
4005
4006 scr_color (idx, fgbg);
4007 }
4008 }
4009 break;
4010
4317 //case 50: // not variable spacing 4011 //case 50: // not variable spacing
4318 4012
4319#if ENABLE_FRILLS 4013#if !ENABLE_MINIMAL
4320 case 90: 4014 case 90:
4321 case 91: /* set bright fg color */ 4015 case 91: /* set bright fg color */
4322 case 92: 4016 case 92:
4323 case 93: 4017 case 93:
4324 case 94: 4018 case 94:
… …
4339 break; 4033 break;
4340#endif 4034#endif
4341 } 4035 }
4342 } 4036 }
4343} 4037}
4038
4039void
4040rxvt_term::set_cursor_style (int style)
4041{
4042 if (!IN_RANGE_INC (style, 0, 6))
4043 return;
4044
4045 if (style == 0)
4046 style = 1;
4047
4048 cursor_type = (style - 1) / 2;
4049 set_option (Opt_cursorUnderline, cursor_type == 1);
4050
4051#ifdef CURSOR_BLINK
4052 set_option (Opt_cursorBlink, style & 1);
4053 cursor_blink_reset ();
4054#endif
4055
4056 want_refresh = 1;
4057}
4344/*}}} */ 4058/*}}} */
4345 4059
4346/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4347void
4348rxvt_term::process_graphics ()
4349{
4350 unicode_t ch, cmd = cmd_getc ();
4351
4352 if (cmd == 'Q')
4353 { /* query graphics */
4354 tt_printf ("\033G0\012"); /* no graphics */
4355 return;
4356 }
4357 /* swallow other graphics sequences until terminating ':' */
4358 do
4359 ch = cmd_getc ();
4360 while (ch != ':');
4361}
4362/*}}} */
4363
4364/* ------------------------------------------------------------------------- */ 4060/* ---------------------------------------------------------------------- */
4061/* Write data to the pty as typed by the user, pasted with the mouse,
4062 * or generated by us in response to a query ESC sequence.
4063 */
4365 4064
4366/* 4065/*
4367 * Send printf () formatted output to the command. 4066 * Send printf () formatted output to the command.
4368 * Only use for small amounts of data. 4067 * Only use for small amounts of data.
4369 */ 4068 */
… …
4377 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4076 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4378 va_end (arg_ptr); 4077 va_end (arg_ptr);
4379 tt_write (buf, strlen (buf)); 4078 tt_write (buf, strlen (buf));
4380} 4079}
4381 4080
4382/* ---------------------------------------------------------------------- */
4383/* Write data to the pty as typed by the user, pasted with the mouse, 4081/* Write data to the pty as typed by the user. */
4384 * or generated by us in response to a query ESC sequence. 4082void
4385 */ 4083rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4386const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4084{
4085 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4086 return;
4087
4088 if (option (Opt_scrollTtyKeypress))
4089 if (view_start)
4090 {
4091 view_start = 0;
4092 want_refresh = 1;
4093 }
4094
4095 tt_write_ (data, len);
4096}
4387 4097
4388void 4098void
4389rxvt_term::tt_write (const char *data, unsigned int len) 4099rxvt_term::tt_write (const char *data, unsigned int len)
4390{ 4100{
4391 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4101 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4392 return; 4102 return;
4393 4103
4104 tt_write_ (data, len);
4105}
4106
4107static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4108
4109void
4110rxvt_term::tt_write_ (const char *data, unsigned int len)
4111{
4394 if (pty->pty < 0) 4112 if (pty->pty < 0)
4395 return; 4113 return;
4396 4114
4397 if (v_buflen == 0) 4115 if (v_buflen == 0)
4398 { 4116 {
4399 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4117 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4400 4118
4119 max_it (written, 0);
4120
4401 if ((unsigned int)written == len) 4121 if (written == len)
4402 return; 4122 return;
4403 4123
4404 data += written; 4124 data += written;
4405 len -= written; 4125 len -= written;
4406 } 4126 }
4407 4127
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4128 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4409 4129
4410 memcpy (v_buffer + v_buflen, data, len); 4130 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len; 4131 v_buflen += len;
4412 4132
4413 pty_ev.set (EVENT_READ | EVENT_WRITE); 4133 pty_ev.set (ev::READ | ev::WRITE);
4414} 4134}
4415 4135
4416void rxvt_term::pty_write () 4136void rxvt_term::pty_write ()
4417{ 4137{
4418 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4138 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4423 4143
4424 if (v_buflen == 0) 4144 if (v_buflen == 0)
4425 { 4145 {
4426 free (v_buffer); 4146 free (v_buffer);
4427 v_buffer = 0; 4147 v_buffer = 0;
4428 v_buflen = 0;
4429 4148
4430 pty_ev.set (EVENT_READ); 4149 pty_ev.set (ev::READ);
4431 return; 4150 return;
4432 } 4151 }
4433 4152
4434 memmove (v_buffer, v_buffer + written, v_buflen); 4153 memmove (v_buffer, v_buffer + written, v_buflen);
4435 } 4154 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4155 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ); 4156 pty_ev.set (ev::READ);
4438} 4157}
4439 4158
4440/*----------------------- end-of-file (C source) -----------------------*/ 4159/*----------------------- end-of-file (C source) -----------------------*/
4441 4160

Diff Legend

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