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.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.561 by sf-exg, Thu Nov 27 14:47:55 2014 UTC

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

Diff Legend

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