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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.570 by sf-exg, Tue Jun 21 12:03:56 2016 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
132 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
133#endif 132#endif
134 0, 133 0,
135}; 134};
136 135
137void 136void ecb_cold
138rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
139{ 138{
140 x = Pixel2Col (x); 139 x = Pixel2Col (x);
141 y = Pixel2Row (y); 140 y = Pixel2Row (y);
142 141
… …
150 149
151 text_t t = l.t[x]; 150 text_t t = l.t[x];
152 151
153 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
154 { 153 {
155 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
156 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
157 break; 156 break;
158 } 157 }
159 158
160 x--; 159 x--;
161 } 160 }
162} 161}
163 162
164void 163void ecb_cold
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
166{ 165{
167 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
170 int len; 168 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173 169
174# if ENABLE_COMBINING 170# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
176 { 172 {
177 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
185 181
186 alloc = 0; 182 alloc = 0;
187 chr = &ch2; 183 chr = &ch2;
188 len = 1; 184 len = 1;
189 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
190 189
191 char attr[80]; // plenty 190 char attr[80]; // plenty
192 191
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r, 193 (int)r,
… …
198 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
202 int width = 0;
203 fname = rxvt_temp_buf<wchar_t *> (len);
204 for (int i = 0; i < len; i++)
205 {
206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
207 fname[i] = rxvt_utf8towcs (f->name);
203 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
204 210
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
207 212
208 if (y >= 0) 213 if (y >= 0)
209 { 214 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
211 x = 0; 216 x = 0;
212 } 217 }
213 218
214 scr_overlay_new (x, y, width, len + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
215 222
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217 224
218 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
219 { 226 {
220 char buf[9]; 227 char buf[9];
221 228
222 ch = *chr++; 229 ch = *chr++;
223 230
224 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
226 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
227# if !UNICODE3 234# if !UNICODE_3
228 if (ch >= 0x10000) 235 if (ch >= 0x10000)
229 ch = 0xfffd; 236 ch = 0xfffd;
230# endif 237# endif
231 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
239
240 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
233 } 242 }
234 243
244// {
245// char buf[4+4+3+1];
246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
247// scr_overlay_set (0, 0, buf);
248// }
235 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
236 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
237
238 free (fname); 253 free (fname[i]);
254 }
239 255
240# if ENABLE_COMBINING 256# if ENABLE_COMBINING
241 if (alloc) 257 if (alloc)
242 delete [] alloc; 258 delete [] alloc;
243# endif 259# endif
244} 260}
245#endif 261#endif
246 262
247void 263void ecb_cold
248rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
249{ 265{
250 wchar_t ch[2];
251
252 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
253 ch[1] = 0;
254 267
255 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
256 { 269 {
257 char mb[16]; 270 char mb[MB_LEN_MAX];
258 int len; 271 int len;
259 272
260 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
261 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
262 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
263 else 276 else
264 { 277 {
265 mb[0] = ch[0]; 278 mb[0] = ch;
266 len = 1; 279 len = 1;
267 } 280 }
268 281
269 if (len > 0) 282 if (len > 0)
270 tt_write (mb, len); 283 tt_write (mb, len);
… …
273 } 286 }
274 287
275 iso14755buf = 0; 288 iso14755buf = 0;
276} 289}
277 290
278int 291static int ecb_cold
279rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
280{ 293{
281 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
284 { 297 {
285 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
286 299
… …
292 305
293 return -1; 306 return -1;
294} 307}
295#endif 308#endif
296 309
297/*{{{ Convert the keypress event into a string */ 310static inline KeySym ecb_cold
298void 311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
299rxvt_term::lookup_key (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
300{ 409{
301 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
302 unsigned int newlen; 411 KeySym keysym = NoSymbol;
303 KeySym keysym;
304#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 (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1536 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1537 break;
1503 1538
1504 case SelectionClear: 1539 case SelectionClear:
1505 selection_clear (); 1540 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1541 break;
1512 1542
1513 case SelectionRequest: 1543 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1544 selection_send (ev.xselectionrequest);
1515 break; 1545 break;
1516 1546
1517 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
1518 mapped = 1; 1559 mapped = 1;
1519#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1561 text_blink_ev.start ();
1521#endif 1562#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1563 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1564 break;
1524 1565
1525 case UnmapNotify: 1566 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1568#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1569 text_blink_ev.stop ();
1529#endif 1570#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1571 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1572 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1573
1539 case GraphicsExpose: 1574 case GraphicsExpose:
1540 case Expose: 1575 case Expose:
1541 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1542 { 1577 {
1543 do 1578 do
1579 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1580 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1581 ev.xexpose.width, ev.xexpose.height, false);
1582 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1583 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1584
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1585 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1586
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1587 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1588 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1589 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1590 ev.xexpose.width, ev.xexpose.height, false);
1591 }
1553 1592
1554 want_refresh = 1; 1593 want_refresh = 1;
1555 } 1594 }
1556 else 1595 else
1557 { 1596 {
1558 XEvent unused_event; 1597 XEvent unused_event;
1559 1598
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1599 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1600 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1601 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1602 ;
1564 1603
1565 if (isScrollbarWindow (ev.xany.window)) 1604 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1605 {
1567 scrollBar.setIdle (); 1606 scrollBar.state = SB_STATE_IDLE;
1568 scrollbar_show (0); 1607 scrollBar.show (0);
1569 } 1608 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1609 }
1576 break; 1610 break;
1577 1611
1578 case MotionNotify: 1612 case MotionNotify:
1579#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1614 if (hidden_pointer)
1581 pointer_unblank (); 1615 pointer_unblank ();
1582#endif 1616#endif
1617 if (!bypass_keystate
1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1619 || priv_modes & PrivMode_MouseAnyEvent))
1620 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1622 break;
1585 1623
1586 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1587 { 1625 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1626 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1627 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1628 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1630 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1632 ;
1595 1633
1596 XQueryPointer (disp, vt, 1634 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1635 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1638 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1602 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1603 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1604 { 1643 {
1605#endif
1606#if ISO_14755 1644#if ISO_14755
1607 // 5.4 1645 // 5.4
1608 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1609 { 1647 {
1610 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1616 1654
1617#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1618 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1619 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1620 { 1658 {
1659 page_dirn scroll_selection_dir;
1621 int dist; 1660 int dist;
1622 1661
1623 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1625 */ 1664 */
1626 if (!sel_scroll_ev.active) 1665 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1666 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1667
1629 /* save the event params so we can highlight 1668 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1669 * the selection in the pending-scroll loop
1631 */ 1670 */
1632 selection_save_x = ev.xbutton.x; 1671 selection_save_x = ev.xbutton.x;
… …
1640 dist = int_bwidth - ev.xbutton.y; 1679 dist = int_bwidth - ev.xbutton.y;
1641 } 1680 }
1642 else 1681 else
1643 { 1682 {
1644 scroll_selection_dir = DN; 1683 scroll_selection_dir = DN;
1645 dist = ev.xbutton.y - (int_bwidth + height); 1684 dist = ev.xbutton.y - (int_bwidth + vt_height);
1646 } 1685 }
1647 1686
1648 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1649 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1650 + 1; 1689 + 1;
1651 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1652 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1653 } 1693 }
1654 else 1694 else
1655 { 1695 {
1656 /* we are within the text window, so we 1696 /* we are within the text window, so we
1657 * shouldn't be scrolling 1697 * shouldn't be scrolling
1658 */ 1698 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1661 } 1700 }
1662#endif 1701#endif
1663#ifdef MOUSE_THRESHOLD
1664 } 1702 }
1665#endif
1666 } 1703 }
1667 } 1704 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1706 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1708 MotionNotify, &ev))
1672 ; 1709 ;
1673 1710
1674 XQueryPointer (disp, scrollBar.win, 1711 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1712 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1715 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1717 scrollBar.size ());
1681 want_refresh = 1; 1718 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1719 scrollBar.show (1);
1684 } 1720 }
1685 break; 1721 break;
1686 } 1722 }
1687 1723
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1724#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1725 if (ev.type == KeyPress)
1692 { 1726 cursor_blink_reset ();
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif 1727#endif
1702 1728
1703#if defined(POINTER_BLANK) 1729#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1730 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1731 {
1706 if (ev.type == MotionNotify 1732 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1733 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1734 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1735 if (hidden_pointer)
… …
1711 1737
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1738 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1739 pointer_blank ();
1714 } 1740 }
1715#endif 1741#endif
1716}
1717 1742
1718void 1743 refresh_check ();
1744}
1745
1746#if ENABLE_FRILLS
1747void ecb_cold
1748rxvt_term::set_urgency (bool enable)
1749{
1750 if (enable == urgency_hint)
1751 return;
1752
1753 if (XWMHints *h = XGetWMHints (dpy, parent))
1754 {
1755 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1756 XSetWMHints (dpy, parent, h);
1757 urgency_hint = enable;
1758 XFree (h);
1759 }
1760}
1761#endif
1762
1763void ecb_cold
1719rxvt_term::focus_in () 1764rxvt_term::focus_in ()
1720{ 1765{
1721 if (!focus) 1766 if (!focus)
1722 { 1767 {
1723 focus = 1; 1768 focus = 1;
1724 want_refresh = 1; 1769 want_refresh = 1;
1725 1770
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM 1771#if USE_XIM
1729 if (Input_Context != NULL) 1772 if (Input_Context != NULL)
1730 { 1773 {
1731 IMSetStatusPosition (); 1774 im_set_position ();
1732 XSetICFocus (Input_Context); 1775 XSetICFocus (Input_Context);
1733 } 1776 }
1734#endif 1777#endif
1735#if CURSOR_BLINK 1778#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1780 cursor_blink_ev.again ();
1738#endif 1781#endif
1739#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1741 { 1784 {
1742 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1786 scr_recolor ();
1744 } 1787 }
1745#endif 1788#endif
1746 } 1789#if ENABLE_FRILLS
1747} 1790 if (option (Opt_urgentOnBell))
1791 set_urgency (0);
1748 1792
1749void 1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1795#endif
1796
1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1798 }
1799}
1800
1801void ecb_cold
1750rxvt_term::focus_out () 1802rxvt_term::focus_out ()
1751{ 1803{
1752 if (focus) 1804 if (focus)
1753 { 1805 {
1754 focus = 0; 1806 focus = 0;
1755 want_refresh = 1; 1807 want_refresh = 1;
1756 1808
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1809#if ENABLE_FRILLS
1810 if (option (Opt_urgentOnBell))
1811 set_urgency (0);
1758 1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1815#endif
1759#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1817 if (iso14755buf)
1761 { 1818 {
1762 iso14755buf = 0; 1819 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1820# if ISO_14755
1764 scr_overlay_off (); 1821 scr_overlay_off ();
1765# endif 1822# endif
1766 } 1823 }
1767#endif 1824#endif
1768#if USE_XIM 1825#if USE_XIM
1769 if (Input_Context != NULL) 1826 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1827 XUnsetICFocus (Input_Context);
1771#endif 1828#endif
1772#if CURSOR_BLINK 1829#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1830 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1831 cursor_blink_ev.stop ();
1832
1775 hidden_cursor = 0; 1833 hidden_cursor = 0;
1776#endif 1834#endif
1777#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1779 { 1837 {
1780 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1781 scr_recolour (); 1839 scr_recolor ();
1782 } 1840 }
1783#endif 1841#endif
1842
1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1844 }
1845}
1846
1847void ecb_cold
1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1849{
1850#if OFF_FOCUS_FADING
1851 if (rs[Rs_fade])
1784 } 1852 {
1785} 1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1786 1855
1787#if TRANSPARENT 1856 rgba c;
1788void 1857 pix_colors [Color_fade].get (c);
1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1859 }
1860#endif
1861}
1862
1863#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1864void ecb_hot
1789rxvt_term::rootwin_cb (XEvent &ev) 1865rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1866{
1791 make_current (); 1867 make_current ();
1868
1869 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1870 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1871 return;
1792 1872
1793 switch (ev.type) 1873 switch (ev.type)
1794 { 1874 {
1795 case PropertyNotify: 1875 case PropertyNotify:
1796 /* 1876 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1877 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1878 * use the property to determine the pixmap. We use it later on.
1799 */ 1879 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1882 {
1883#if BG_IMAGE_FROM_ROOT
1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1887 update_background ();
1888 }
1889#endif
1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1891 }
1803 1892
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1893 break;
1809 } 1894 }
1895
1896 refresh_check ();
1810} 1897}
1811#endif 1898#endif
1812 1899
1813void 1900void
1814rxvt_term::button_press (XButtonEvent &ev) 1901rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1910 /*
1824 * VT window processing of button press 1911 * VT window processing of button press
1825 */ 1912 */
1826 if (ev.window == vt) 1913 if (ev.window == vt)
1827 { 1914 {
1915 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1916 return;
1917
1828#if ISO_14755 1918#if ISO_14755
1829 // 5.4 1919 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1920 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1921 {
1832 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1833 return; 1923 return;
1834 } 1924 }
1835#endif 1925#endif
1836 1926
1837 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1838 1928
1839 if (reportmode) 1929 if (reportmode)
1840 { 1930 {
1841 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1842 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
1843 MEvent.state = ev.state; 1933 MEvent.state = ev.state;
1844#ifdef MOUSE_REPORT_DOUBLECLICK 1934#ifdef MOUSE_REPORT_DOUBLECLICK
1845 if (ev.button == MEvent.button && clickintime) 1935 if (ev.button == MEvent.button && clickintime)
1846 { 1936 {
1847 /* same button, within alloted time */ 1937 /* same button, within allowed time */
1848 MEvent.clicks++; 1938 MEvent.clicks++;
1849 1939
1850 if (MEvent.clicks > 1) 1940 if (MEvent.clicks > 1)
1851 { 1941 {
1852 /* only report double clicks */ 1942 /* only report double clicks */
… …
1866 mouse_report (ev); 1956 mouse_report (ev);
1867 } 1957 }
1868#else 1958#else
1869 MEvent.button = ev.button; 1959 MEvent.button = ev.button;
1870 mouse_report (ev); 1960 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1961#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1962
1873 } 1963 }
1874 else 1964 else
1875 { 1965 {
1876 if (ev.button != MEvent.button) 1966 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1967 MEvent.clicks = 0;
1878 1968
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1969 switch (ev.button)
1881 { 1970 {
1882 case Button1: 1971 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1972 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1973 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1974#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1975 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1976#else
1888 selection.rect = false; 1977 selection.rect = false;
1889#endif 1978#endif
1890 1979
1891 /* allow shift+left click to extend selection */ 1980 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1981 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1982 {
1894 if (MEvent.button == Button1 && clickintime) 1983 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1984 selection_rotate (ev.x, ev.y);
1896 else 1985 else
1897 selection_extend (ev.x, ev.y, 1); 1986 selection_extend (ev.x, ev.y, 1);
1898 } 1987 }
1899 else 1988 else
1900 { 1989 {
1901 if (MEvent.button == Button1 && clickintime) 1990 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1991 MEvent.clicks++;
1903 else 1992 else
1904 MEvent.clicks = 1; 1993 MEvent.clicks = 1;
1905 1994
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1995 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1996 }
1908 1997
1909 MEvent.button = Button1; 1998 MEvent.button = Button1;
1910 break; 1999 break;
1911 2000
1912 case Button3: 2001 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 2002 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 2003 selection_rotate (ev.x, ev.y);
1915 else 2004 else
1916 selection_extend (ev.x, ev.y, 1); 2005 selection_extend (ev.x, ev.y, 1);
1917 2006
1918 MEvent.button = Button3; 2007 MEvent.button = Button3;
1919 break; 2008 break;
1920 } 2009 }
1921 } 2010 }
1922 2011
1923 MEvent.time = ev.time; 2012 MEvent.time = ev.time;
1924 return; 2013 return;
1925 } 2014 }
1926 2015
1927 /* 2016 /*
1928 * Scrollbar window processing of button press 2017 * Scrollbar window processing of button press
1929 */ 2018 */
1930 if (isScrollbarWindow (ev.window)) 2019 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 2020 {
1932 scrollBar.setIdle (); 2021 page_dirn direction = NO_DIR;
2022
2023 if (scrollBar.upButton (ev.y))
2024 direction = UP; /* up */
2025 else if (scrollBar.dnButton (ev.y))
2026 direction = DN; /* down */
2027
2028 scrollBar.state = SB_STATE_IDLE;
1933 /* 2029 /*
1934 * Rxvt-style scrollbar: 2030 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 2031 * move up if mouse is above slider
1936 * move dn if mouse is below slider 2032 * move dn if mouse is below slider
1937 * 2033 *
… …
1946 /* 2042 /*
1947 * Mouse report disabled scrollbar: 2043 * Mouse report disabled scrollbar:
1948 * arrow buttons - send up/down 2044 * arrow buttons - send up/down
1949 * click on scrollbar - send pageup/down 2045 * click on scrollbar - send pageup/down
1950 */ 2046 */
1951 if ((scrollBar.style == R_SB_NEXT 2047 if (direction == UP)
1952 && scrollbarnext_upButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_upButton (ev.y)))
1955 tt_printf ("\033[A"); 2048 tt_printf ("\033[A");
1956 else if ((scrollBar.style == R_SB_NEXT 2049 else if (direction == DN)
1957 && scrollbarnext_dnButton (ev.y))
1958 || (scrollBar.style == R_SB_RXVT
1959 && scrollbarrxvt_dnButton (ev.y)))
1960 tt_printf ("\033[B"); 2050 tt_printf ("\033[B");
1961 else 2051 else
1962 switch (ev.button) 2052 switch (ev.button)
1963 { 2053 {
1964 case Button2: 2054 case Button2:
… …
1971 tt_printf ("\033[5~"); 2061 tt_printf ("\033[5~");
1972 break; 2062 break;
1973 } 2063 }
1974 } 2064 }
1975 else 2065 else
1976#endif /* NO_SCROLLBAR_REPORT */ 2066#endif /* NO_SCROLLBAR_REPORT */
1977
1978 {
1979 char upordown = 0;
1980
1981 if (scrollBar.style == R_SB_NEXT)
1982 { 2067 {
1983 if (scrollbarnext_upButton (ev.y)) 2068 if (direction != NO_DIR)
1984 upordown = -1; /* up */
1985 else if (scrollbarnext_dnButton (ev.y))
1986 upordown = 1; /* down */
1987 }
1988 else if (scrollBar.style == R_SB_RXVT)
1989 {
1990 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */
1994 }
1995 if (upordown)
1996 { 2069 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2071 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2072 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2073#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2074 if (scr_page (direction, 1))
2001 { 2075 {
2002 if (upordown < 0) 2076 if (direction == UP)
2003 scrollBar.setUp (); 2077 scrollBar.state = SB_STATE_UP;
2004 else 2078 else
2005 scrollBar.setDn (); 2079 scrollBar.state = SB_STATE_DOWN;
2006 } 2080 }
2007 } 2081 }
2008 else 2082 else
2009 switch (ev.button) 2083 switch (ev.button)
2010 { 2084 {
2011 case Button2: 2085 case Button2:
2012 switch (scrollbar_align) 2086 switch (scrollBar.align)
2013 { 2087 {
2014 case R_SB_ALIGN_TOP: 2088 case SB_ALIGN_TOP:
2015 csrO = 0; 2089 csrO = 0;
2016 break; 2090 break;
2017 case R_SB_ALIGN_CENTRE: 2091 case SB_ALIGN_CENTRE:
2018 csrO = (scrollBar.bot - scrollBar.top) / 2; 2092 csrO = (scrollBar.bot - scrollBar.top) / 2;
2019 break; 2093 break;
2020 case R_SB_ALIGN_BOTTOM: 2094 case SB_ALIGN_BOTTOM:
2021 csrO = scrollBar.bot - scrollBar.top; 2095 csrO = scrollBar.bot - scrollBar.top;
2022 break; 2096 break;
2023 } 2097 }
2024 2098
2025 if (scrollBar.style == R_SB_XTERM 2099 if (scrollBar.style == SB_STYLE_XTERM
2026 || scrollbar_above_slider (ev.y) 2100 || scrollBar.above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2101 || scrollBar.below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2102 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2029 2103
2030 scrollBar.setMotion (); 2104 scrollBar.state = SB_STATE_MOTION;
2031 break; 2105 break;
2032 2106
2033 case Button1: 2107 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2108 if (scrollBar.align == SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2109 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2110 /* FALLTHROUGH */
2037 2111
2038 case Button3: 2112 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2113 if (scrollBar.style != SB_STYLE_XTERM)
2040 { 2114 {
2041 if (scrollbar_above_slider (ev.y)) 2115 if (scrollBar.above_slider (ev.y))
2042# ifdef RXVT_SCROLL_FULL 2116# ifdef RXVT_SCROLL_FULL
2043 scr_page (UP, nrow - 1); 2117 scr_page (UP, nrow - 1);
2044# else 2118# else
2045 scr_page (UP, nrow / 4); 2119 scr_page (UP, nrow / 4);
2046# endif 2120# endif
2047 else if (scrollbar_below_slider (ev.y)) 2121 else if (scrollBar.below_slider (ev.y))
2048# ifdef RXVT_SCROLL_FULL 2122# ifdef RXVT_SCROLL_FULL
2049 scr_page (DN, nrow - 1); 2123 scr_page (DN, nrow - 1);
2050# else 2124# else
2051 scr_page (DN, nrow / 4); 2125 scr_page (DN, nrow / 4);
2052# endif 2126# endif
2053 else 2127 else
2054 scrollBar.setMotion (); 2128 scrollBar.state = SB_STATE_MOTION;
2055 } 2129 }
2056 else 2130 else
2057 { 2131 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2132 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2133 (nrow
2060 * scrollbar_position (ev.y) 2134 * scrollBar.position (ev.y)
2061 / scrollbar_size ())); 2135 / scrollBar.size ()));
2062 } 2136 }
2063 2137
2064 break; 2138 break;
2065 } 2139 }
2066 } 2140 }
… …
2076 2150
2077 csrO = 0; /* reset csr Offset */ 2151 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2152 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2153 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2154
2081 if (scrollbar_isUpDn ()) 2155 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2082 { 2156 {
2083 scrollBar.setIdle (); 2157 scrollBar.state = SB_STATE_IDLE;
2084 scrollbar_show (0); 2158 scrollBar.show (0);
2085 } 2159 }
2086 2160
2087#ifdef SELECTION_SCROLLING 2161#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2162 sel_scroll_ev.stop();
2090#endif 2163#endif
2091 2164
2092 if (ev.window == vt) 2165 if (ev.window == vt)
2093 { 2166 {
2167 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2168 return;
2169
2094#if ISO_14755 2170#if ISO_14755
2095 // 5.4 2171 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2172 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2173 return;
2098#endif 2174#endif
2175
2099 if (reportmode) 2176 if (reportmode)
2100 { 2177 {
2101 /* mouse report from vt window */ 2178 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2179 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2180 if (ev.button >= 4)
… …
2105#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2106 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2107 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2108 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2109 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2110 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2111 { 2188 {
2112 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2113 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2114 mouse_report (ev); 2191 mouse_report (ev);
2115 } 2192 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2193#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2194 MEvent.button = AnyButton;
2118 mouse_report (ev); 2195 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2196#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2197 return;
2121 } 2198 }
2122 2199
2123 /* 2200 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2201 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2204 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2205 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2206 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2207 selection_extend (ev.x, ev.y, 0);
2131 2208
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2209 switch (ev.button)
2136 { 2210 {
2137 case Button1: 2211 case Button1:
2138 case Button3: 2212 case Button3:
2139 selection_make (ev.time); 2213 selection_make (ev.time);
2140 break; 2214 break;
2141 2215
2142 case Button2: 2216 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2217 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2218 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2219 break;
2146 2220
2147#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2148 case Button4: 2222 case Button4:
2149 case Button5: 2223 case Button5:
2150 { 2224 {
2151 int i; 2225 int lines;
2152 page_dirn v; 2226 page_dirn dirn;
2153 2227
2154 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2155 2229
2156 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2157 i = 1; 2231 lines = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2233 lines = nrow - 1;
2160 else 2234 else
2161 i = 5; 2235 lines = 5;
2162 2236
2163# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2164 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2165 { 2239 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2242
2170 if (slip_wheel_ev.at < NOW) 2243 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2245 }
2175 else 2246 else
2247# endif
2176 { 2248 {
2177# endif
2178 scr_page (v, i); 2249 scr_page (dirn, lines);
2179 scrollbar_show (1); 2250 scrollBar.show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2251 }
2182# endif
2183 } 2252 }
2184 break; 2253 break;
2185#endif 2254#endif
2186 } 2255 }
2187 } 2256 }
2188} 2257}
2189 2258
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++)
2640 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]);
2643 }
2644
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2646 am_transparent = 1;
2647 }
2648
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None;
2651 }
2652
2653 if (scrollBar.win)
2654 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle ();
2657 scrollbar_show (0);
2658 }
2659
2660 if (am_transparent)
2661 {
2662 want_refresh = want_full_refresh = 1;
2663 if (am_pixmap_trans)
2664 flush ();
2665 }
2666
2667 return pchanged;
2668}
2669#endif
2670
2671/*}}} */ 2259/*}}} */
2672 2260
2673bool 2261void ecb_hot
2674rxvt_term::cmd_parse () 2262rxvt_term::cmd_parse ()
2675{ 2263{
2676 bool flag = false;
2677 wchar_t ch = NOCHAR; 2264 wchar_t ch = NOCHAR;
2678 char *seq_begin; // remember start of esc-sequence here 2265 char *seq_begin; // remember start of esc-sequence here
2679 2266
2680 for (;;) 2267 for (;;)
2681 { 2268 {
2682 if (ch == NOCHAR) 2269 if (ecb_unlikely (ch == NOCHAR))
2683 { 2270 {
2684 seq_begin = cmdbuf_ptr; 2271 seq_begin = cmdbuf_ptr;
2685 ch = next_char (); 2272 ch = next_char ();
2686 2273
2687 if (ch == NOCHAR) 2274 if (ch == NOCHAR)
2688 break; 2275 break;
2689 } 2276 }
2690 2277
2691 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2278 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2692 { 2279 {
2693 if (!seen_input) 2280 if (ecb_unlikely (!seen_input))
2694 { 2281 {
2695 seen_input = 1; 2282 seen_input = 1;
2696 // many badly-written programs (e.g. jed) contain a race condition: 2283 // many badly-written programs (e.g. jed) contain a race condition:
2697 // they first read the screensize and then install a SIGWINCH handler. 2284 // they first read the screensize and then install a SIGWINCH handler.
2698 // some window managers resize the window early, and these programs 2285 // some window managers resize the window early, and these programs
… …
2711 wchar_t *str = buf; 2298 wchar_t *str = buf;
2712 wchar_t *eol = str + min (ncol, UBUFSIZ); 2299 wchar_t *eol = str + min (ncol, UBUFSIZ);
2713 2300
2714 for (;;) 2301 for (;;)
2715 { 2302 {
2716 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2303 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2717 break; 2304 break;
2718 2305
2719 *str++ = ch; 2306 *str++ = ch;
2720 2307
2721 if (ch == C0_LF || str >= eol) 2308 if (ecb_unlikely (ch == C0_LF || str >= eol))
2722 { 2309 {
2723 if (ch == C0_LF) 2310 if (ch == C0_LF)
2724 nlines++; 2311 nlines++;
2725 2312
2726 refresh_count++; 2313 refresh_count++;
2727 2314
2728 if (!OPTION (Opt_jumpScroll) 2315 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2729 || (refresh_count >= refresh_limit * (nrow - 1)))
2730 { 2316 {
2731 refreshnow = true;
2732 refresh_count = 0; 2317 refresh_count = 0;
2318
2319 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2320 {
2321 refreshnow = true;
2733 ch = NOCHAR; 2322 ch = NOCHAR;
2734 break; 2323 break;
2324 }
2735 } 2325 }
2736 2326
2737 // scr_add_lines only works for nlines <= nrow - 1. 2327 // scr_add_lines only works for nlines <= nrow - 1.
2738 if (nlines >= nrow - 1) 2328 if (nlines >= nrow - 1)
2739 { 2329 {
… …
2767 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2357 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2768 scr_add_lines (buf, str - buf, nlines); 2358 scr_add_lines (buf, str - buf, nlines);
2769 2359
2770 /* 2360 /*
2771 * If there have been a lot of new lines, then update the screen 2361 * If there have been a lot of new lines, then update the screen
2772 * What the heck I'll cheat and only refresh less than every page-full. 2362 * What the heck we'll cheat and only refresh less than every page-full.
2773 * the number of pages between refreshes is refresh_limit, which 2363 * if skipScroll is enabled.
2774 * is incremented here because we must be doing flat-out scrolling.
2775 */ 2364 */
2776 if (refreshnow) 2365 if (refreshnow)
2777 { 2366 {
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++;
2780 else
2781 {
2782 flag = true;
2783 scr_refresh (); 2367 scr_refresh ();
2784 want_refresh = 1; 2368 want_refresh = 1;
2785 }
2786 } 2369 }
2787
2788 } 2370 }
2789 else 2371 else
2790 { 2372 {
2791 try 2373 try
2792 { 2374 {
… …
2800 } 2382 }
2801 2383
2802 ch = NOCHAR; 2384 ch = NOCHAR;
2803 } 2385 }
2804 } 2386 }
2805
2806 return flag;
2807} 2387}
2808 2388
2809// read the next character 2389// read the next character
2810wchar_t 2390wchar_t ecb_hot
2811rxvt_term::next_char () NOTHROW 2391rxvt_term::next_char () NOTHROW
2812{ 2392{
2813 while (cmdbuf_ptr < cmdbuf_endp) 2393 while (cmdbuf_ptr < cmdbuf_endp)
2814 { 2394 {
2815 // assume 7-bit to be ascii ALWAYS 2395 // assume 7-bit to be ascii ALWAYS
2816 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2396 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2817 return *cmdbuf_ptr++; 2397 return *cmdbuf_ptr++;
2818 2398
2819 wchar_t wc; 2399 wchar_t wc;
2820 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2400 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2821 2401
… …
2825 cmdbuf_ptr = cmdbuf_endp; 2405 cmdbuf_ptr = cmdbuf_endp;
2826 break; 2406 break;
2827 } 2407 }
2828 2408
2829 if (len == (size_t)-1) 2409 if (len == (size_t)-1)
2410 {
2411 mbstate.reset (); // reset now undefined conversion state
2412 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2413 // in which case we "erroneously" return the next byte which might be valid.
2830 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2414 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2415 }
2831 2416
2832 // assume wchar == unicode 2417 // assume wchar == unicode
2833 cmdbuf_ptr += len; 2418 cmdbuf_ptr += len;
2834 return wc & UNICODE_MASK; 2419 return wc & UNICODE_MASK;
2835 } 2420 }
2836 2421
2837 return NOCHAR; 2422 return NOCHAR;
2838} 2423}
2839 2424
2840// read the next octet 2425// read the next octet
2841uint32_t 2426uint32_t ecb_hot
2842rxvt_term::next_octet () NOTHROW 2427rxvt_term::next_octet () NOTHROW
2843{ 2428{
2844 return cmdbuf_ptr < cmdbuf_endp 2429 return cmdbuf_ptr < cmdbuf_endp
2845 ? (unsigned char)*cmdbuf_ptr++ 2430 ? (unsigned char)*cmdbuf_ptr++
2846 : NOCHAR; 2431 : NOCHAR;
2847} 2432}
2848 2433
2849static class out_of_input out_of_input; 2434static class out_of_input out_of_input;
2850 2435
2851/* rxvt_cmd_getc () - Return next input character */ 2436wchar_t ecb_hot
2852/*
2853 * Return the next input character after first passing any keyboard input
2854 * to the command.
2855 */
2856wchar_t
2857rxvt_term::cmd_getc () THROW ((class out_of_input)) 2437rxvt_term::cmd_getc () THROW ((class out_of_input))
2858{ 2438{
2859 wchar_t c = next_char (); 2439 wchar_t c = next_char ();
2860 2440
2861 if (c == NOCHAR) 2441 if (c == NOCHAR)
2862 throw out_of_input; 2442 throw out_of_input;
2863 2443
2864 return c; 2444 return c;
2865} 2445}
2866 2446
2867uint32_t 2447uint32_t ecb_hot
2868rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2448rxvt_term::cmd_get8 () THROW ((class out_of_input))
2869{ 2449{
2870 uint32_t c = next_octet (); 2450 uint32_t c = next_octet ();
2871 2451
2872 if (c == NOCHAR) 2452 if (c == NOCHAR)
… …
2876} 2456}
2877 2457
2878/*{{{ print pipe */ 2458/*{{{ print pipe */
2879/*----------------------------------------------------------------------*/ 2459/*----------------------------------------------------------------------*/
2880#ifdef PRINTPIPE 2460#ifdef PRINTPIPE
2881FILE * 2461FILE * ecb_cold
2882rxvt_term::popen_printer () 2462rxvt_term::popen_printer ()
2883{ 2463{
2884 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2464 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2885 2465
2886 if (stream == NULL) 2466 if (stream == NULL)
2887 rxvt_warn ("can't open printer pipe, not printing.\n"); 2467 rxvt_warn ("can't open printer pipe, not printing.\n");
2888 2468
2889 return stream; 2469 return stream;
2890} 2470}
2891 2471
2892int 2472int ecb_cold
2893rxvt_term::pclose_printer (FILE *stream) 2473rxvt_term::pclose_printer (FILE *stream)
2894{ 2474{
2895 fflush (stream); 2475 fflush (stream);
2896 return pclose (stream); 2476 return pclose (stream);
2897} 2477}
2898 2478
2899/* 2479/*
2900 * simulate attached vt100 printer 2480 * simulate attached vt100 printer
2901 */ 2481 */
2902void 2482void ecb_cold
2903rxvt_term::process_print_pipe () 2483rxvt_term::process_print_pipe ()
2904{ 2484{
2905 int done; 2485 FILE *fd = popen_printer ();
2906 FILE *fd;
2907 2486
2908 if ((fd = popen_printer ()) == NULL) 2487 if (!fd)
2909 return; 2488 return;
2910 2489
2911 /* 2490 /*
2912 * Send all input to the printer until either ESC[4i or ESC[?4i 2491 * Send all input to the printer until either ESC[4i or ESC[?4i
2913 * is received. 2492 * is received.
2914 */ 2493 */
2915 for (done = 0; !done;) 2494 for (int done = 0; !done; )
2916 { 2495 {
2917 unsigned char buf[8]; 2496 unsigned char buf[8];
2918 unicode_t ch; 2497 unicode_t ch;
2919 unsigned int i, len; 2498 unsigned int i, len;
2920 2499
… …
2939 { 2518 {
2940 if ((buf[len++] = cmd_getc ()) == 'i') 2519 if ((buf[len++] = cmd_getc ()) == 'i')
2941 break; /* done = 1 */ 2520 break; /* done = 1 */
2942 } 2521 }
2943 } 2522 }
2944 2523
2945 for (i = 0; i < len; i++) 2524 for (i = 0; i < len; i++)
2946 if (putc (buf[i], fd) == EOF) 2525 if (putc (buf[i], fd) == EOF)
2947 { 2526 {
2948 done = 1; 2527 done = 1;
2949 break; 2528 break;
… …
2951 } 2530 }
2952 } 2531 }
2953 2532
2954 pclose_printer (fd); 2533 pclose_printer (fd);
2955} 2534}
2956#endif /* PRINTPIPE */ 2535#endif /* PRINTPIPE */
2957/*}}} */ 2536/*}}} */
2958 2537
2959/* *INDENT-OFF* */
2960enum { 2538enum {
2961 C1_40 = 0x40, 2539 C1_40 = 0x40,
2962 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2540 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2963 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2541 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2964 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2542 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2965 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2543 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2966}; 2544};
2967/* *INDENT-ON* */
2968 2545
2969/*{{{ process non-printing single characters */ 2546/*{{{ process non-printing single characters */
2970void 2547void ecb_hot
2971rxvt_term::process_nonprinting (unicode_t ch) 2548rxvt_term::process_nonprinting (unicode_t ch)
2972{ 2549{
2973 switch (ch) 2550 switch (ch)
2974 { 2551 {
2975 case C0_ESC: 2552 case C0_ESC:
… …
3005 scr_charset_choose (0); 2582 scr_charset_choose (0);
3006 break; 2583 break;
3007 2584
3008#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
3009 // 8-bit controls 2586 // 8-bit controls
3010 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
3011 process_dcs_seq (); 2588 process_dcs_seq ();
3012 break; 2589 break;
3013 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
3014 process_csi_seq (); 2591 process_csi_seq ();
3015 break; 2592 break;
3016 case 0x9d: /* CSI */ 2593 case 0x9d: /* OSC */
3017 process_osc_seq (); 2594 process_osc_seq ();
3018 break; 2595 break;
3019#endif 2596#endif
3020 } 2597 }
3021} 2598}
3022/*}}} */ 2599/*}}} */
3023 2600
3024 2601
3025/*{{{ process VT52 escape sequences */ 2602/*{{{ process VT52 escape sequences */
3026void 2603void ecb_cold
3027rxvt_term::process_escape_vt52 (unicode_t ch) 2604rxvt_term::process_escape_vt52 (unicode_t ch)
3028{ 2605{
3029 int row, col; 2606 int row, col;
3030 2607
3031 switch (ch) 2608 switch (ch)
… …
3065 break; 2642 break;
3066 case 'Z': /* identify the terminal type */ 2643 case 'Z': /* identify the terminal type */
3067 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2644 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3068 break; 2645 break;
3069 case '<': /* turn off VT52 mode */ 2646 case '<': /* turn off VT52 mode */
3070 PrivMode (0, PrivMode_vt52); 2647 priv_modes &= ~PrivMode_vt52;
3071 break; 2648 break;
3072 case 'F': /* use special graphics character set */ 2649 case 'F': /* use special graphics character set */
3073 case 'G': /* use regular character set */ 2650 case 'G': /* use regular character set */
3074 /* unimplemented */ 2651 /* unimplemented */
3075 break; 2652 break;
… …
3081} 2658}
3082/*}}} */ 2659/*}}} */
3083 2660
3084 2661
3085/*{{{ process escape sequences */ 2662/*{{{ process escape sequences */
3086void 2663void ecb_hot
3087rxvt_term::process_escape_seq () 2664rxvt_term::process_escape_seq ()
3088{ 2665{
3089 unicode_t ch = cmd_getc (); 2666 unicode_t ch = cmd_getc ();
3090 2667
3091 if (priv_modes & PrivMode_vt52) 2668 if (priv_modes & PrivMode_vt52)
… …
3094 return; 2671 return;
3095 } 2672 }
3096 2673
3097 switch (ch) 2674 switch (ch)
3098 { 2675 {
3099 /* case 1: do_tek_mode (); break; */
3100 case '#': 2676 case '#':
3101 if (cmd_getc () == '8') 2677 if (cmd_getc () == '8')
3102 scr_E (); 2678 scr_E ();
3103 break; 2679 break;
3104 case '(': 2680 case '(':
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 2687 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 2688 break;
3113 case '+': 2689 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 2690 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 2691 break;
3116#if ENABLE_FRILLS 2692#if !ENABLE_MINIMAL
3117 case '6': 2693 case '6':
3118 scr_backindex (); 2694 scr_backindex ();
3119 break; 2695 break;
3120#endif 2696#endif
3121 case '7': 2697 case '7':
3122 scr_cursor (SAVE); 2698 scr_cursor (SAVE);
3123 break; 2699 break;
3124 case '8': 2700 case '8':
3125 scr_cursor (RESTORE); 2701 scr_cursor (RESTORE);
3126 break; 2702 break;
3127#if ENABLE_FRILLS 2703#if !ENABLE_MINIMAL
3128 case '9': 2704 case '9':
3129 scr_forwardindex (); 2705 scr_forwardindex ();
3130 break; 2706 break;
3131#endif 2707#endif
2708 // DECPAM/DECPNM
3132 case '=': 2709 case '=':
2710 priv_modes |= PrivMode_aplKP;
2711 break;
3133 case '>': 2712 case '>':
3134 PrivMode ((ch == '='), PrivMode_aplKP); 2713 priv_modes &= ~PrivMode_aplKP;
3135 break; 2714 break;
3136 2715
3137 case C1_40: 2716 case C1_40:
3138 cmd_getc (); 2717 cmd_getc ();
3139 break; 2718 break;
… …
3143 2722
3144 /* 8.3.87: NEXT LINE */ 2723 /* 8.3.87: NEXT LINE */
3145 case C1_NEL: /* ESC E */ 2724 case C1_NEL: /* ESC E */
3146 { 2725 {
3147 wchar_t nlcr[] = { C0_LF, C0_CR }; 2726 wchar_t nlcr[] = { C0_LF, C0_CR };
3148 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2727 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3149 } 2728 }
3150 break; 2729 break;
3151 2730
3152 /* kidnapped escape sequence: Should be 8.3.48 */ 2731 /* kidnapped escape sequence: Should be 8.3.48 */
3153 case C1_ESA: /* ESC G */ 2732 case C1_ESA: /* ESC G */
3154 process_graphics (); 2733 // used by original rxvt for rob nations own graphics mode
2734 if (cmd_getc () == 'Q')
2735 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3155 break; 2736 break;
3156 2737
3157 /* 8.3.63: CHARACTER TABULATION SET */ 2738 /* 8.3.63: CHARACTER TABULATION SET */
3158 case C1_HTS: /* ESC H */ 2739 case C1_HTS: /* ESC H */
3159 scr_set_tab (1); 2740 scr_set_tab (1);
… …
3163 case C1_RI: /* ESC M */ 2744 case C1_RI: /* ESC M */
3164 scr_index (DN); 2745 scr_index (DN);
3165 break; 2746 break;
3166 2747
3167 /* 8.3.142: SINGLE-SHIFT TWO */ 2748 /* 8.3.142: SINGLE-SHIFT TWO */
3168 /*case C1_SS2: scr_single_shift (2); break; */ 2749 /* case C1_SS2: break; */
3169 2750
3170 /* 8.3.143: SINGLE-SHIFT THREE */ 2751 /* 8.3.143: SINGLE-SHIFT THREE */
3171 /*case C1_SS3: scr_single_shift (3); break; */ 2752 /* case C1_SS3: break; */
3172 2753
3173 /* 8.3.27: DEVICE CONTROL STRING */ 2754 /* 8.3.27: DEVICE CONTROL STRING */
3174 case C1_DCS: /* ESC P */ 2755 case C1_DCS: /* ESC P */
3175 process_dcs_seq (); 2756 process_dcs_seq ();
3176 break; 2757 break;
… …
3178 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2759 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3179 case C1_SCI: /* ESC Z */ 2760 case C1_SCI: /* ESC Z */
3180 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2761 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3181 break; /* steal obsolete ESC [ c */ 2762 break; /* steal obsolete ESC [ c */
3182 2763
3183 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2764 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3184 case C1_CSI: /* ESC [ */ 2765 case C1_CSI: /* ESC [ */
3185 process_csi_seq (); 2766 process_csi_seq ();
3186 break; 2767 break;
3187 2768
3188 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2769 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3189 case C1_OSC: /* ESC ] */ 2770 case C1_OSC: /* ESC ] */
3190 process_osc_seq (); 2771 process_osc_seq ();
3191 break; 2772 break;
3192 2773
3193 /* 8.3.106: RESET TO INITIAL STATE */ 2774 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3194 case 'c': 2775 case 'c':
3195 mbstate.reset (); 2776 mbstate.reset ();
3196 scr_poweron (); 2777 scr_poweron ();
3197 scrollbar_show (1); 2778 scrollBar.show (1);
3198 break; 2779 break;
3199 2780
3200 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2781 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3201 case 'n': 2782 case 'n':
3202 scr_charset_choose (2); 2783 scr_charset_choose (2);
… …
3209 } 2790 }
3210} 2791}
3211/*}}} */ 2792/*}}} */
3212 2793
3213/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2794/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3214/* *INDENT-OFF* */
3215enum { 2795enum {
3216 CSI_ICH = 0x40, 2796 CSI_ICH = 0x40,
3217 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2797 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3218 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2798 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3219 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2799 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3222 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2802 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3223 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2803 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3224 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2804 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3225}; 2805};
3226 2806
3227#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2807#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3228 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2808 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3229 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2809 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3230#define get_byte_array_bit(array, bit) \ 2810#define get_byte_array_bit(array, bit) \
3231 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2811 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3232 2812
3233const unsigned char csi_defaults[] = 2813static const unsigned char csi_defaults[] =
3234 { 2814 {
3235 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2815 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3236 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2816 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3237 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2817 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3238 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2818 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3239 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2819 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3240 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2820 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3241 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2821 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3242 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3243 }; 2823 };
3244/* *INDENT-ON* */
3245 2824
3246void 2825void ecb_hot
3247rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
3248{ 2827{
3249 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
3250 unsigned int nargs, p; 2829 unsigned int nargs, p;
3251 int n, ndef; 2830 int n, ndef;
3252 int arg[ESC_ARGS]; 2831 int arg[ESC_ARGS] = { };
3253 2832
3254 for (nargs = ESC_ARGS; nargs > 0;) 2833 nargs = 0;
3255 arg[--nargs] = 0;
3256 2834
3257 priv = 0; 2835 priv = 0;
3258 ch = cmd_getc (); 2836 ch = cmd_getc ();
3259 if (ch >= '<' && ch <= '?') 2837 if ((ch >= '<' && ch <= '?') || ch == '!')
2838 {
3260 { /* '<' '=' '>' '?' */ 2839 /* '<' '=' '>' '?' '!' */
3261 priv = ch; 2840 priv = ch;
3262 ch = cmd_getc (); 2841 ch = cmd_getc ();
3263 } 2842 }
3264 2843
2844 prev_ch = 0;
3265 /* read any numerical arguments */ 2845 /* read any numerical arguments */
3266 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
3267 { 2847 {
3268 if (isdigit (ch)) 2848 if (isdigit (ch))
3269 { 2849 {
… …
3279 n = -1; 2859 n = -1;
3280 } 2860 }
3281 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
3282 process_nonprinting (ch); 2862 process_nonprinting (ch);
3283 2863
2864 prev_ch = ch;
3284 ch = cmd_getc (); 2865 ch = cmd_getc ();
3285 } 2866 }
3286 2867
3287 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
3288 return; 2869 return;
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 2875 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 2876 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 2877 if (arg[p] == -1)
3297 arg[p] = ndef; 2878 arg[p] = ndef;
3298 2879
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 2880 /*
3307 * private mode handling 2881 * private mode handling
3308 */ 2882 */
3309 if (priv) 2883 if (priv)
3310 { 2884 {
3311 switch (priv) 2885 switch (priv)
3312 { 2886 {
3313 case '>': 2887 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2888 if (ch == CSI_DA) /* secondary device attributes */
3315 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2889 {
2890 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2891 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2892 //
2893 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2894 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2895 // versions.
2896 //
2897 tt_printf ("\033[>%d;95;0c", 'U');
2898 }
3316 break; 2899 break;
2900
3317 case '?': 2901 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2902 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 2903 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 2904 break;
2905
2906 case '!':
2907 if (ch == CSI_70)
2908 {
2909 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2910 scr_soft_reset ();
2911
2912 static const int pm_h[] = { 7, 25 };
2913 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2914
2915 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2916 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3321 } 2917 }
2918 break;
2919 }
2920
3322 return; 2921 return;
3323 } 2922 }
3324 2923
3325 switch (ch) 2924 switch (ch)
3326 { 2925 {
… …
3340 } 2939 }
3341 break; 2940 break;
3342#endif 2941#endif
3343 2942
3344 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2943 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3345 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2944 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3346 arg[0] = -arg[0]; 2945 arg[0] = -arg[0];
3347 /* FALLTHROUGH */ 2946 /* FALLTHROUGH */
3348 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2947 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3349 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2948 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3350 scr_gotorc (arg[0], 0, RELATIVE); 2949 scr_gotorc (arg[0], 0, RELATIVE);
3351 break; 2950 break;
3352 2951
3353 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2952 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3354 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2953 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3446 break; 3045 break;
3447 case 6: /* CPR requested */ 3046 case 6: /* CPR requested */
3448 scr_report_position (); 3047 scr_report_position ();
3449 break; 3048 break;
3450 case 7: /* unofficial extension */ 3049 case 7: /* unofficial extension */
3451 if (OPTION (Opt_insecure)) 3050 if (option (Opt_insecure))
3452 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3051 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3453 break; 3052 break;
3454 case 8: /* unofficial extension */ 3053 case 8: /* unofficial extension */
3455 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3054 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3456 break; 3055 break;
… …
3504 scr_insert_mode (1); 3103 scr_insert_mode (1);
3505 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3506 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3507 break; 3106 break;
3508 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3509 /* 3113 /*
3510 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3511 */ 3115 */
3512 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3513 if (nargs == 1) 3117 if (nargs == 1)
… …
3523 break; 3127 break;
3524 case CSI_75: 3128 case CSI_75:
3525 scr_cursor (RESTORE); 3129 scr_cursor (RESTORE);
3526 break; 3130 break;
3527 3131
3528#if ENABLE_FRILLS 3132#if !ENABLE_MINIMAL
3529 case CSI_74: 3133 case CSI_74:
3530 process_window_ops (arg, nargs); 3134 process_window_ops (arg, nargs);
3531 break; 3135 break;
3532#endif 3136#endif
3533 3137
… …
3540 break; 3144 break;
3541 } 3145 }
3542} 3146}
3543/*}}} */ 3147/*}}} */
3544 3148
3545#if ENABLE_FRILLS 3149#if !ENABLE_MINIMAL
3546/* ARGSUSED */
3547void 3150void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3151rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3152{
3550 int x, y; 3153 int x, y;
3551 XWindowAttributes wattr; 3154 XWindowAttributes wattr;
3552 Window wdummy; 3155 Window wdummy;
3553 dDisp; 3156
3157 dLocal (Display *, dpy);
3554 3158
3555 if (nargs == 0) 3159 if (nargs == 0)
3556 return; 3160 return;
3557 3161
3558 switch (args[0]) 3162 switch (args[0])
3559 { 3163 {
3560 /* 3164 /*
3561 * commands 3165 * commands
3562 */ 3166 */
3563 case 1: /* deiconify window */ 3167 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3168 XMapWindow (dpy, parent);
3565 break; 3169 break;
3566 case 2: /* iconify window */ 3170 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3171 XIconifyWindow (dpy, parent, display->screen);
3568 break; 3172 break;
3569 case 3: /* set position (pixels) */ 3173 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3174 XMoveWindow (dpy, parent, args[1], args[2]);
3571 break; 3175 break;
3572 case 4: /* set size (pixels) */ 3176 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3177 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3178 break;
3575 case 5: /* raise window */ 3179 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3180 XRaiseWindow (dpy, parent);
3577 break; 3181 break;
3578 case 6: /* lower window */ 3182 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3183 XLowerWindow (dpy, parent);
3580 break; 3184 break;
3581 case 7: /* refresh window */ 3185 case 7: /* refresh window */
3582 scr_touch (true); 3186 scr_touch (true);
3583 break; 3187 break;
3584 case 8: /* set size (chars) */ 3188 case 8: /* set size (chars) */
… …
3587 break; 3191 break;
3588 3192
3589 //case 9: NYI, TODO, restore maximized window or maximize window 3193 //case 9: NYI, TODO, restore maximized window or maximize window
3590 default: 3194 default:
3591 if (args[0] >= 24) /* set height (chars) */ 3195 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3196 set_widthheight ((unsigned int)vt_width,
3593 (unsigned int) (args[1] * fheight)); 3197 (unsigned int) (args[1] * fheight));
3594 break; 3198 break;
3595
3596 3199
3597 /* 3200 /*
3598 * reports - some output format copied from XTerm 3201 * reports - some output format copied from XTerm
3599 */ 3202 */
3600 case 11: /* report window state */ 3203 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3204 XGetWindowAttributes (dpy, parent, &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3205 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3206 break;
3604 case 13: /* report window position */ 3207 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3208 XGetWindowAttributes (dpy, parent, &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3209 XTranslateCoordinates (dpy, parent, wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3210 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3211 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3212 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3213 break;
3611 case 14: /* report window size (pixels) */ 3214 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3215 XGetWindowAttributes (dpy, parent, &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3216 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3217 break;
3615 case 18: /* report text area size (chars) */ 3218 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3219 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3220 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3222 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3223 break;
3621 case 20: /* report icon label */ 3224 case 20: /* report icon label */
3622 { 3225 {
3623 char *s; 3226 char *s;
3624 XGetIconName (disp, parent[0], &s); 3227 XGetIconName (dpy, parent, &s);
3625 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3228 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3229 XFree (s);
3627 } 3230 }
3628 break; 3231 break;
3629 case 21: /* report window title */ 3232 case 21: /* report window title */
3630 { 3233 {
3631 char *s; 3234 char *s;
3632 XFetchName (disp, parent[0], &s); 3235 XFetchName (dpy, parent, &s);
3633 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3236 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3634 XFree (s); 3237 XFree (s);
3635 } 3238 }
3636 break; 3239 break;
3637 } 3240 }
3638} 3241}
… …
3647rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3648{ 3251{
3649 unicode_t ch; 3252 unicode_t ch;
3650 bool seen_esc = false; 3253 bool seen_esc = false;
3651 unsigned int n = 0; 3254 unsigned int n = 0;
3652 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3653 3256
3654 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3655 { 3258 {
3656 if (seen_esc) 3259 if (seen_esc)
3657 { 3260 {
… …
3665 seen_esc = true; 3268 seen_esc = true;
3666 continue; 3269 continue;
3667 } 3270 }
3668 else if (ch == C0_BEL || ch == CHAR_ST) 3271 else if (ch == C0_BEL || ch == CHAR_ST)
3669 break; 3272 break;
3273 else if (ch == C0_SYN)
3274 ch = cmd_get8 ();
3670 else if (ch < 0x20) 3275 else if (ch < 0x20)
3671 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3672 3277
3673 seen_esc = false; 3278 seen_esc = false;
3674 3279
3675 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3676 // stop at some sane length 3281 // stop at some sane length
3677 return NULL; 3282 return NULL;
3678 3283
3679 if (ch == C0_SYN)
3680 string[n++] = cmd_get8 ();
3681 else
3682 string[n++] = ch; 3284 string[n++] = ch;
3683 } 3285 }
3684 3286
3685 string[n++] = '\0'; 3287 string[n++] = '\0';
3686 3288
3687 ends_how = (ch == 0x5c ? C0_ESC : ch); 3289 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3694 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3296 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3695 */ 3297 */
3696void 3298void
3697rxvt_term::process_dcs_seq () 3299rxvt_term::process_dcs_seq ()
3698{ 3300{
3699 char *s;
3700 unicode_t eh;
3701
3702 /* 3301 /*
3703 * Not handled yet 3302 * Not handled yet
3704 */ 3303 */
3304
3305 unicode_t eh;
3705 s = get_to_st (eh); 3306 char *s = get_to_st (eh);
3706 if (s) 3307 if (s)
3707 free (s); 3308 free (s);
3708 3309
3709 return; 3310 return;
3710} 3311}
… …
3714 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3315 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3715 */ 3316 */
3716void 3317void
3717rxvt_term::process_osc_seq () 3318rxvt_term::process_osc_seq ()
3718{ 3319{
3719 unicode_t ch, eh;
3720 int arg; 3320 int arg;
3721 3321
3722 ch = cmd_getc (); 3322 unicode_t ch = cmd_getc ();
3723 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3323 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3724 arg = arg * 10 + (ch - '0'); 3324 arg = arg * 10 + (ch - '0');
3725 3325
3726 if (ch == ';') 3326 if (ch == ';')
3727 { 3327 {
3328 unicode_t eh;
3728 char *s = get_to_st (eh); 3329 char *s = get_to_st (eh);
3729 3330
3730 if (s) 3331 if (s)
3731 { 3332 {
3732 process_xterm_seq (arg, s, eh); 3333 process_xterm_seq (arg, s, eh);
3733 free (s); 3334 free (s);
3734 } 3335 }
3735 } 3336 }
3736} 3337}
3737 3338
3339/*
3340 * Find the nearest color slot in the hidden color cube,
3341 * adapt its value to the 24bit RGB color.
3342 */
3343unsigned int
3344rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3345{
3346 unsigned int idx_r = (r & 0xff) / (0xff / (Red_levels - 1));
3347 unsigned int idx_g = (g & 0xff) / (0xff / (Green_levels - 1));
3348 unsigned int idx_b = (b & 0xff) / (0xff / (Blue_levels - 1));
3349 unsigned int idx;
3350
3351 idx = minTermCOLOR24 + idx_r * Blue_levels * Green_levels +
3352 idx_g * Blue_levels +
3353 idx_b;
3354
3355 pix_colors_focused [idx].free (this);
3356 pix_colors_focused [idx].set (this, rgba (r * 0x0101,
3357 g * 0x0101,
3358 b * 0x0101));
3359 update_fade_color (idx, false);
3360
3361 return idx;
3362}
3363
3738void 3364void
3739rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3365rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3740{ 3366{
3741 if (str[0] == '?' && !str[1]) 3367 if (str[0] == '?' && !str[1])
3742 { 3368 {
3743 unsigned short r, g, b; 3369 rgba c;
3744 pix_colors_focused[color].get (display, r, g, b); 3370 pix_colors_focused[color].get (c);
3371
3372#if XFT
3373 if (c.a != rgba::MAX_CC)
3374 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3375 else
3376#endif
3745 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3377 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3746 } 3378 }
3747 else 3379 else
3748 set_window_color (color, str); 3380 set_window_color (color, str);
3749} 3381}
3750 3382
3751/* 3383/*
3752 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3384 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3753 */ 3385 */
3754void 3386void
3755rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3387rxvt_term::process_xterm_seq (int op, char *str, char resp)
3756{ 3388{
3757 int color; 3389 int color;
3758 char *buf, *name; 3390 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3391 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3392 int saveop = op;
3761 dDisp; 3393
3394 dLocal (Display *, dpy);
3762 3395
3763 assert (str != NULL); 3396 assert (str != NULL);
3397
3398 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3399 return;
3400
3764 switch (op) 3401 switch (op)
3765 { 3402 {
3766 case XTerm_name: 3403 case XTerm_name:
3767 set_title (str); 3404 set_title (str);
3768 /* FALLTHROUGH */ 3405 /* FALLTHROUGH */
… …
3782 unsigned long bytes_after; 3419 unsigned long bytes_after;
3783 unsigned char *value = 0; 3420 unsigned char *value = 0;
3784 const char *str = ""; 3421 const char *str = "";
3785 3422
3786 if (prop 3423 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3424 && XGetWindowProperty (dpy, parent,
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3425 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3426 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3427 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3428 && actual_type != None
3792 && actual_format == 8) 3429 && actual_format == 8)
3793 str = (const char *)(value); 3430 str = (const char *)(value);
3794 3431
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3432 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3796 3433
3797 XFree (value); 3434 XFree (value);
3798 } 3435 }
3799 else 3436 else
3800 { 3437 {
3801 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3438 char *eq = strchr (str, '=');
3802 3439
3803 if (eq) 3440 if (eq)
3804 { 3441 {
3805 *eq = 0; 3442 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3443 set_utf8_property (display->atom (str), eq + 1);
3807 } 3444 }
3808 else 3445 else
3809 XDeleteProperty (disp, parent[0], 3446 XDeleteProperty (dpy, parent,
3810 display->atom (str)); 3447 display->atom (str));
3811 } 3448 }
3812 break; 3449 break;
3813 3450
3814 case XTerm_Color: 3451 case XTerm_Color:
… …
3824 break; 3461 break;
3825 3462
3826 if ((buf = strchr (name, ';')) != NULL) 3463 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3464 *buf++ = '\0';
3828 3465
3829 if (name[0] == '?' && !name[1]) 3466 process_color_seq (op, color, name, resp);
3467 }
3468 break;
3469 case Rxvt_restoreFG:
3470 case XTerm_Color00:
3471 process_color_seq (op, Color_fg, str, resp);
3472 break;
3473 case Rxvt_restoreBG:
3474 case XTerm_Color01:
3475 process_color_seq (op, Color_bg, str, resp);
3476 break;
3477#ifndef NO_CURSORCOLOR
3478 case XTerm_Color_cursor:
3479 process_color_seq (op, Color_cursor, str, resp);
3480 break;
3481#endif
3482 case XTerm_Color_pointer_fg:
3483 process_color_seq (op, Color_pointer_fg, str, resp);
3484 break;
3485 case XTerm_Color_pointer_bg:
3486 process_color_seq (op, Color_pointer_bg, str, resp);
3487 break;
3488#ifdef OPTION_HC
3489 case XTerm_Color_HC:
3490 process_color_seq (op, Color_HC, str, resp);
3491 break;
3492 case XTerm_Color_HTC:
3493 process_color_seq (op, Color_HTC, str, resp);
3494 break;
3495#endif
3496#ifndef NO_BOLD_UNDERLINE_REVERSE
3497 case URxvt_Color_BD:
3498 process_color_seq (op, Color_BD, str, resp);
3499 break;
3500 case URxvt_Color_UL:
3501 process_color_seq (op, Color_UL, str, resp);
3502 break;
3503 case URxvt_Color_IT:
3504 process_color_seq (op, Color_IT, str, resp);
3505 break;
3506#endif
3507 case URxvt_Color_border:
3508 process_color_seq (op, Color_border, str, resp);
3509 break;
3510
3511#if BG_IMAGE_FROM_ROOT
3512 case URxvt_Color_tint:
3513 process_color_seq (op, Color_tint, str, resp);
3514 {
3515 bool changed = false;
3516
3517 if (ISSET_PIXCOLOR (Color_tint))
3518 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3519
3520 if (changed)
3521 update_background ();
3522 }
3523
3524 break;
3525#endif
3526
3527#if BG_IMAGE_FROM_FILE
3528 case Rxvt_Pixmap:
3529 if (!strcmp (str, "?"))
3530 {
3531 char str[256];
3532 int h_scale = fimage.h_scale;
3533 int v_scale = fimage.v_scale;
3534 int h_align = fimage.h_align;
3535 int v_align = fimage.v_align;
3536
3537 sprintf (str, "[%dx%d+%d+%d]",
3538 h_scale, v_scale,
3539 h_align, v_align);
3540 process_xterm_seq (XTerm_title, str, CHAR_ST);
3541 }
3542 else
3543 {
3544 bool changed = false;
3545
3546 if (*str != ';')
3830 { 3547 {
3831 unsigned short r, g, b; 3548 try
3832 pix_colors_focused[color].get (display, r, g, b); 3549 {
3833 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3550 fimage.set_file_geometry (this, str);
3551 changed = true;
3552 }
3553 catch (const class rxvt_failure_exception &e)
3554 {
3555 }
3834 } 3556 }
3835 else 3557 else
3836 set_window_color (color, name); 3558 {
3559 str++;
3560 if (fimage.set_geometry (str, true))
3561 changed = true;
3562 }
3563
3564 if (changed)
3565 {
3566 if (bg_window_position_sensitive ())
3567 {
3568 int x, y;
3569 get_window_origin (x, y);
3570 parent_x = x;
3571 parent_y = y;
3572 }
3573 update_background ();
3574 }
3837 } 3575 }
3838 break; 3576 break;
3839 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3841 break;
3842 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3844 break;
3845#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3848 break;
3849#endif 3577#endif
3850 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3852 break;
3853 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3855 break;
3856#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3859 break;
3860 case Rxvt_Color_BD:
3861 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp);
3863 break;
3864 case Rxvt_Color_UL:
3865 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp);
3867 break;
3868 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3870 break;
3871#endif
3872#if TRANSPARENT && TINTING
3873 case URxvt_Color_tint:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3875 check_our_parents ();
3876 if (am_transparent)
3877 want_full_refresh = want_refresh = 1;
3878 break;
3879#endif
3880
3881 case Rxvt_Pixmap:
3882 {
3883 if (*str != ';')
3884 {
3885#if XPM_BACKGROUND
3886 scale_pixmap (""); /* reset to default scaling */
3887 set_bgPixmap (str); /* change pixmap */
3888 scr_touch (true);
3889#endif
3890 }
3891
3892 int changed = 0;
3893
3894 while ((str = strchr (str, ';')) != NULL)
3895 {
3896 str++;
3897#if XPM_BACKGROUND
3898 changed += scale_pixmap (str);
3899#endif
3900 }
3901
3902 if (changed)
3903 {
3904#ifdef XPM_BACKGROUND
3905 resize_pixmap ();
3906 scr_touch (true);
3907#endif
3908 }
3909 }
3910 break;
3911
3912 case Rxvt_restoreFG:
3913 set_window_color (Color_fg, str);
3914 break;
3915 case Rxvt_restoreBG:
3916 set_window_color (Color_bg, str);
3917 break;
3918 3578
3919 case XTerm_logfile: 3579 case XTerm_logfile:
3920 // TODO, when secure mode? 3580 // TODO, when secure mode?
3921 break; 3581 break;
3922 3582
… …
3940 case URxvt_italicFont: 3600 case URxvt_italicFont:
3941 case URxvt_boldItalicFont: 3601 case URxvt_boldItalicFont:
3942#endif 3602#endif
3943 if (query) 3603 if (query)
3944 tt_printf ("\33]%d;%-.250s%c", saveop, 3604 tt_printf ("\33]%d;%-.250s%c", saveop,
3945 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3605 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3946 ? fontset[op - URxvt_font]->fontdesc : "", 3606 ? fontset[op - URxvt_font]->fontdesc : "",
3947 resp); 3607 resp);
3948 else 3608 else
3949 { 3609 {
3950 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3610 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 allocated.push_back ((void *)res); 3613 allocated.push_back ((void *)res);
3954 set_fonts (); 3614 set_fonts ();
3955 } 3615 }
3956 break; 3616 break;
3957 3617
3958#if ENABLE_FRILLS 3618 case URxvt_version:
3619 if (query)
3620 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3621 op,
3622 rs[Rs_name], VERSION[0], VERSION[2],
3623 resp);
3624 break;
3625
3626#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3627 case URxvt_locale:
3960 if (query) 3628 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3629 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3962 else 3630 else
3963 { 3631 {
3964 set_locale (str); 3632 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3633 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3634 init_xlocale ();
… …
3981 break; 3649 break;
3982#endif 3650#endif
3983 3651
3984#if ENABLE_PERL 3652#if ENABLE_PERL
3985 case URxvt_perl: 3653 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3654 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3987 ; // no responses yet
3988 break; 3655 break;
3989#endif 3656#endif
3990 } 3657 }
3991} 3658}
3992/*----------------------------------------------------------------------*/ 3659/*----------------------------------------------------------------------*/
… …
3999 * 's' = save 3666 * 's' = save
4000 * 'r' = restore 3667 * 'r' = restore
4001 * 't' = toggle 3668 * 't' = toggle
4002 * so no need for fancy checking 3669 * so no need for fancy checking
4003 */ 3670 */
4004int 3671int ecb_cold
4005rxvt_term::privcases (int mode, unsigned long bit) 3672rxvt_term::privcases (int mode, unsigned long bit)
4006{ 3673{
4007 int state; 3674 int state;
4008 3675
4009 if (mode == 's') 3676 if (mode == 's')
4010 { 3677 {
4011 SavedModes |= (priv_modes & bit); 3678 if (priv_modes & bit)
3679 SavedModes |= bit;
3680 else
3681 SavedModes &= ~bit;
4012 return -1; 3682 return -1;
4013 } 3683 }
4014 else 3684 else
4015 { 3685 {
4016 if (mode == 'r') 3686 if (mode == 'r')
4017 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3687 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4018 else 3688 else
4019 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3689 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4020 PrivMode (state, bit); 3690
3691 if (state)
3692 priv_modes |= bit;
3693 else
3694 priv_modes &= ~bit;
4021 } 3695 }
4022 3696
4023 return state; 3697 return state;
4024} 3698}
4025 3699
4026/* we're not using priv _yet_ */ 3700/* we're not using priv _yet_ */
4027void 3701void
4028rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3702rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4029{ 3703{
4030 unsigned int i, j; 3704 unsigned int i, j;
4031 int state; 3705 int state;
4032 3706
4033 static const struct 3707 static const struct
4034 { 3708 {
4035 const int argval; 3709 const int argval;
4036 const unsigned long bit; 3710 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3711 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3712 { 1, PrivMode_aplCUR }, // DECCKM
4041 { 2, PrivMode_vt52 }, 3713 { 2, PrivMode_vt52 }, // DECANM
4042 { 3, PrivMode_132 }, 3714 { 3, PrivMode_132 }, // DECCOLM
4043 { 4, PrivMode_smoothScroll }, 3715 { 4, PrivMode_smoothScroll }, // DECSCLM
4044 { 5, PrivMode_rVideo }, 3716 { 5, PrivMode_rVideo }, // DECSCNM
4045 { 6, PrivMode_relOrigin }, 3717 { 6, PrivMode_relOrigin }, // DECOM
4046 { 7, PrivMode_Autowrap }, 3718 { 7, PrivMode_Autowrap }, // DECAWM
4047 // 8, bi-directional support mode 3719 // 8, auto-repeat keys // DECARM
4048 { 9, PrivMode_MouseX10 }, 3720 { 9, PrivMode_MouseX10 },
4049 // 18, 19 printing-related
4050 { 25, PrivMode_VisibleCursor }, 3721 { 12, PrivMode_BlinkingCursor },
3722 // 18 end FF to printer after print screen
3723 // 19 Print screen prints full screen/scroll region
3724 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4051#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4052 { scrollBar_esc, PrivMode_scrollBar }, 3726 { scrollBar_esc, PrivMode_scrollBar },
4053#endif 3727#endif
4054 { 35, PrivMode_ShiftKeys }, // rxvt extension 3728 { 35, PrivMode_ShiftKeys }, // rxvt extension
3729 // 38, tektronix mode // DECTEK
4055 { 40, PrivMode_132OK }, 3730 { 40, PrivMode_132OK },
4056 // 41 xterm more fixes NYI 3731 // 41 xterm more fixes NYI
4057 // 45 margin bell NYI 3732 // 45 margin bell NYI
4058 // 46 start logging 3733 // 46 start logging
4059 { 47, PrivMode_Screen }, 3734 { 47, PrivMode_Screen },
4060 { 66, PrivMode_aplKP }, 3735 { 66, PrivMode_aplKP }, // DECNKM
4061#ifndef NO_BACKSPACE_KEY 3736#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3737 { 67, PrivMode_BackSpace }, // DECBKM
4063#endif 3738#endif
4064 { 1000, PrivMode_MouseX11 }, 3739 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3740 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3741 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3742#if ENABLE_FRILLS
3743 { 1004, PrivMode_FocusEvent },
3744 { 1005, PrivMode_ExtModeMouse },
3745#endif
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3746 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3747 { 1011, PrivMode_Keypress }, // rxvt extension
3748#if ENABLE_FRILLS
3749 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3750#endif
4070 // 1035 enable modifiers for alt, numlock NYI 3751 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3752 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3753 // 1037 send DEL for keypad delete NYI
4073 { 1047, PrivMode_Screen }, 3754 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor 3755 // 1048 save and restore cursor, implemented in code
4075 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3756 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3757 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3758 { 2004, PrivMode_BracketPaste },
4077 }; 3759 };
4078 3760
4079 if (nargs == 0) 3761 if (nargs == 0)
4080 return; 3762 return;
4081 3763
… …
4088 for (i = 0; i < nargs; i++) 3770 for (i = 0; i < nargs; i++)
4089 { 3771 {
4090 state = -1; 3772 state = -1;
4091 3773
4092 /* basic handling */ 3774 /* basic handling */
4093 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3775 for (j = 0; j < ecb_array_length (argtopriv); j++)
4094 if (argtopriv[j].argval == arg[i]) 3776 if (argtopriv[j].argval == arg[i])
4095 { 3777 {
4096 state = privcases (mode, argtopriv[j].bit); 3778 state = privcases (mode, argtopriv[j].bit);
4097 break; 3779 break;
4098 } 3780 }
… …
4106 3788
4107 scr_touch (true); 3789 scr_touch (true);
4108 break; 3790 break;
4109#endif 3791#endif
4110 case 1048: /* alternative cursor save */ 3792 case 1048: /* alternative cursor save */
4111 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3793 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3794 if (mode == 0)
4114 scr_cursor (RESTORE); 3795 scr_cursor (RESTORE);
4115 else if (mode == 1) 3796 else if (mode == 1)
4116 scr_cursor (SAVE); 3797 scr_cursor (SAVE);
4117 break; 3798 break;
… …
4125 case 2: /* VT52 mode */ 3806 case 2: /* VT52 mode */
4126 /* oddball mode. should be set regardless of set/reset 3807 /* oddball mode. should be set regardless of set/reset
4127 * parameter. Return from VT52 mode with an ESC < from 3808 * parameter. Return from VT52 mode with an ESC < from
4128 * within VT52 mode 3809 * within VT52 mode
4129 */ 3810 */
4130 PrivMode (1, PrivMode_vt52); 3811 priv_modes |= PrivMode_vt52;
4131 break; 3812 break;
4132 case 3: /* 80/132 */ 3813 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3814 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3815 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4135 break; 3816 break;
4136 case 4: /* smooth scrolling */ 3817 case 4: /* smooth scrolling */
4137 set_option (Opt_jumpScroll, !state); 3818 set_option (Opt_jumpScroll, !state);
4138 break; 3819 break;
4139 case 5: /* reverse video */ 3820 case 5: /* reverse video */
… …
4146 scr_autowrap (state); 3827 scr_autowrap (state);
4147 break; 3828 break;
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3829 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3830 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3831 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3832 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3833 break;
4153#ifdef scrollBar_esc 3834#ifdef scrollBar_esc
4154 case scrollBar_esc: 3835 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3836 scrollBar.map (state);
4156 {
4157 resize_all_windows (0, 0, 0); 3837 resize_all_windows (0, 0, 0);
4158 scr_touch (true); 3838 scr_touch (true);
4159 } 3839 break;
3840#endif
3841#ifdef CURSOR_BLINK
3842 case 12:
3843 cursor_blink_reset ();
4160 break; 3844 break;
4161#endif 3845#endif
4162 case 25: /* visible/invisible cursor */ 3846 case 25: /* visible/invisible cursor */
4163 scr_cursor_visible (state); 3847 scr_cursor_visible (state);
4164 break; 3848 break;
… …
4169 break; 3853 break;
4170 /* case 66: - application key pad */ 3854 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3855 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3856 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3857 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3858 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3859 break;
4176#if 0
4177 case 1001: 3860 case 1002:
4178 break; /* X11 mouse highlighting */ 3861 case 1003:
4179#endif 3862 if (state)
3863 {
3864 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3865 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3866 mouse_row = mouse_col = 0;
3867 vt_emask_mouse = PointerMotionMask;
3868 }
3869 else
3870 vt_emask_mouse = NoEventMask;
3871
3872 vt_select_input ();
3873 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3874 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3875 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3876 break;
4183 case 1011: /* scroll to bottom on key press */ 3877 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3878 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3879 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3880 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3881 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3882 if (!state)
4189 scr_erase_screen (2); 3883 scr_erase_screen (2);
3884
4190 scr_change_screen (state); 3885 scr_change_screen (state);
4191 break; 3886 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3887 case 1049: /* secondary screen w/ clearing first */
3888 if (option (Opt_secondaryScreen))
3889 if (state)
3890 scr_cursor (SAVE);
3891
4193 scr_change_screen (state); 3892 scr_change_screen (state);
3893
4194 if (OPTION (Opt_secondaryScreen)) 3894 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3895 if (state)
4196 scr_erase_screen (2); 3896 scr_erase_screen (2);
3897 else
3898 scr_cursor (RESTORE);
4197 break; 3899 break;
4198 default: 3900 default:
4199 break; 3901 break;
4200 } 3902 }
4201 } 3903 }
4202} 3904}
4203/*}}} */ 3905/*}}} */
4204 3906
4205/*{{{ process sgr sequences */ 3907/*{{{ process sgr sequences */
4206void 3908void ecb_hot
4207rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3909rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4208{ 3910{
4209 unsigned int i; 3911 unsigned int i;
4210 short rendset; 3912 short rendset;
4211 int rendstyle; 3913 int rendstyle;
… …
4253 //case 19: // ninth alt font 3955 //case 19: // ninth alt font
4254 //case 20: // gothic 3956 //case 20: // gothic
4255 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3957 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4256 rendset = 0, rendstyle = RS_Bold; 3958 rendset = 0, rendstyle = RS_Bold;
4257 break; 3959 break;
4258 case 22: // normal intensity 3960 case 22: // bold off (vt220)
4259 rendset = 0, rendstyle = RS_Bold; 3961 rendset = 0, rendstyle = RS_Bold;
4260 break; 3962 break;
4261 case 23: // disable italic 3963 case 23: // disable italic
4262 rendset = 0, rendstyle = RS_Italic; 3964 rendset = 0, rendstyle = RS_Italic;
4263 break; 3965 break;
4264 case 24: 3966 case 24: // underline off (vt220)
4265 rendset = 0, rendstyle = RS_Uline; 3967 rendset = 0, rendstyle = RS_Uline;
4266 break; 3968 break;
4267 case 25: 3969 case 25: // blink off (vt220)
4268 rendset = 0, rendstyle = RS_Blink; 3970 rendset = 0, rendstyle = RS_Blink;
4269 break; 3971 break;
4270 case 26: // variable spacing (iso 8613) 3972 case 26: // variable spacing (iso 8613)
4271 rendset = 0, rendstyle = RS_Blink; 3973 rendset = 0, rendstyle = RS_Blink;
4272 break; 3974 break;
4273 case 27: 3975 case 27: // reverse off (vt220)
4274 rendset = 0, rendstyle = RS_RVid; 3976 rendset = 0, rendstyle = RS_RVid;
4275 break; 3977 break;
4276 //case 28: // visible. NYI 3978 //case 28: // visible. NYI
4277 //case 29: // not crossed-out 3979 //case 29: // not crossed-out
4278 } 3980 }
… …
4299 if (nargs > i + 2 && arg[i + 1] == 5) 4001 if (nargs > i + 2 && arg[i + 1] == 5)
4300 { 4002 {
4301 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4003 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4302 i += 2; 4004 i += 2;
4303 } 4005 }
4006 else if (nargs > i + 4 && arg[i + 1] == 2)
4007 {
4008 unsigned int r = arg[i + 2];
4009 unsigned int g = arg[i + 3];
4010 unsigned int b = arg[i + 4];
4011 unsigned int idx = map_rgb24_color (r, g, b);
4012 scr_color (idx, Color_fg);
4013 i += 4;
4014 }
4304 break; 4015 break;
4305 case 39: /* default fg */ 4016 case 39: /* default fg */
4306 scr_color (Color_fg, Color_fg); 4017 scr_color (Color_fg, Color_fg);
4307 break; 4018 break;
4308 4019
… …
4320 if (nargs > i + 2 && arg[i + 1] == 5) 4031 if (nargs > i + 2 && arg[i + 1] == 5)
4321 { 4032 {
4322 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4033 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4323 i += 2; 4034 i += 2;
4324 } 4035 }
4036 else if (nargs > i + 4 && arg[i + 1] == 2)
4037 {
4038 unsigned int r = arg[i + 2];
4039 unsigned int g = arg[i + 3];
4040 unsigned int b = arg[i + 4];
4041 unsigned int idx = map_rgb24_color (r, g, b);
4042 scr_color (idx, Color_bg);
4043 i += 4;
4044 }
4325 break; 4045 break;
4326 case 49: /* default bg */ 4046 case 49: /* default bg */
4327 scr_color (Color_bg, Color_bg); 4047 scr_color (Color_bg, Color_bg);
4328 break; 4048 break;
4329 4049
4330 //case 50: // not variable spacing 4050 //case 50: // not variable spacing
4331 4051
4332#if ENABLE_FRILLS 4052#if !ENABLE_MINIMAL
4333 case 90: 4053 case 90:
4334 case 91: /* set bright fg color */ 4054 case 91: /* set bright fg color */
4335 case 92: 4055 case 92:
4336 case 93: 4056 case 93:
4337 case 94: 4057 case 94:
… …
4352 break; 4072 break;
4353#endif 4073#endif
4354 } 4074 }
4355 } 4075 }
4356} 4076}
4077
4078void
4079rxvt_term::set_cursor_style (int style)
4080{
4081 if (!IN_RANGE_INC (style, 0, 6))
4082 return;
4083
4084 if (style == 0)
4085 style = 1;
4086
4087 cursor_type = (style - 1) / 2;
4088 set_option (Opt_cursorUnderline, cursor_type == 1);
4089
4090#ifdef CURSOR_BLINK
4091 set_option (Opt_cursorBlink, style & 1);
4092 cursor_blink_reset ();
4093#endif
4094
4095 want_refresh = 1;
4096}
4357/*}}} */ 4097/*}}} */
4358 4098
4359/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4360void
4361rxvt_term::process_graphics ()
4362{
4363 unicode_t ch, cmd = cmd_getc ();
4364
4365 if (cmd == 'Q')
4366 { /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */
4368 return;
4369 }
4370 /* swallow other graphics sequences until terminating ':' */
4371 do
4372 ch = cmd_getc ();
4373 while (ch != ':');
4374}
4375/*}}} */
4376
4377/* ------------------------------------------------------------------------- */ 4099/* ---------------------------------------------------------------------- */
4100/* Write data to the pty as typed by the user, pasted with the mouse,
4101 * or generated by us in response to a query ESC sequence.
4102 */
4378 4103
4379/* 4104/*
4380 * Send printf () formatted output to the command. 4105 * Send printf () formatted output to the command.
4381 * Only use for small amounts of data. 4106 * Only use for small amounts of data.
4382 */ 4107 */
… …
4390 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4115 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4391 va_end (arg_ptr); 4116 va_end (arg_ptr);
4392 tt_write (buf, strlen (buf)); 4117 tt_write (buf, strlen (buf));
4393} 4118}
4394 4119
4395/* ---------------------------------------------------------------------- */
4396/* Write data to the pty as typed by the user, pasted with the mouse, 4120/* Write data to the pty as typed by the user. */
4397 * or generated by us in response to a query ESC sequence. 4121void
4398 */ 4122rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4399const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4123{
4124 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4125 return;
4126
4127 if (option (Opt_scrollTtyKeypress))
4128 if (view_start)
4129 {
4130 view_start = 0;
4131 want_refresh = 1;
4132 }
4133
4134 tt_write_ (data, len);
4135}
4400 4136
4401void 4137void
4402rxvt_term::tt_write (const char *data, unsigned int len) 4138rxvt_term::tt_write (const char *data, unsigned int len)
4403{ 4139{
4404 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4140 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4405 return; 4141 return;
4406 4142
4143 tt_write_ (data, len);
4144}
4145
4146static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4147
4148void
4149rxvt_term::tt_write_ (const char *data, unsigned int len)
4150{
4407 if (pty->pty < 0) 4151 if (pty->pty < 0)
4408 return; 4152 return;
4409 4153
4410 if (v_buflen == 0) 4154 if (v_buflen == 0)
4411 { 4155 {
4412 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4156 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4413 4157
4158 max_it (written, 0);
4159
4414 if ((unsigned int)written == len) 4160 if (written == len)
4415 return; 4161 return;
4416 4162
4417 data += written; 4163 data += written;
4418 len -= written; 4164 len -= written;
4419 } 4165 }
4420 4166
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4167 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4422 4168
4423 memcpy (v_buffer + v_buflen, data, len); 4169 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4170 v_buflen += len;
4425 4171
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4172 pty_ev.set (ev::READ | ev::WRITE);
4427} 4173}
4428 4174
4429void rxvt_term::pty_write () 4175void rxvt_term::pty_write ()
4430{ 4176{
4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4177 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4436 4182
4437 if (v_buflen == 0) 4183 if (v_buflen == 0)
4438 { 4184 {
4439 free (v_buffer); 4185 free (v_buffer);
4440 v_buffer = 0; 4186 v_buffer = 0;
4441 v_buflen = 0;
4442 4187
4443 pty_ev.set (EVENT_READ); 4188 pty_ev.set (ev::READ);
4444 return; 4189 return;
4445 } 4190 }
4446 4191
4447 memmove (v_buffer, v_buffer + written, v_buflen); 4192 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 4193 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4194 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 4195 pty_ev.set (ev::READ);
4451} 4196}
4452 4197
4453/*----------------------- end-of-file (C source) -----------------------*/ 4198/*----------------------- end-of-file (C source) -----------------------*/
4454 4199

Diff Legend

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