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

Diff Legend

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