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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.559 by root, Fri Nov 14 10:08:20 2014 UTC

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

Diff Legend

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