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.265 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.551 by sf-exg, Wed Jul 16 14:29:23 2014 UTC

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

Diff Legend

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