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

Diff Legend

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