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

Diff Legend

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