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.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.489 by sf-exg, Sat Jul 9 13:40:13 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 want_refresh = 1;
667 } 946 }
668#endif 947#endif
669 948
670 if (want_refresh) 949 if (want_refresh)
671 { 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
672 scr_refresh (refresh_type); 989 scr_refresh ();
673 scrollbar_show (1); 990 scrollBar.show (1);
674#ifdef USE_XIM 991#ifdef USE_XIM
675 IMSendSpot (); 992 im_send_spot ();
676#endif 993#endif
677 } 994 }
678 995
679 display->flush (); 996 display->flush ();
680
681 flush_ev.stop ();
682} 997}
683 998
999/* checks whether a refresh is requested and starts the refresh timer */
684void 1000void
685rxvt_term::check_cb (check_watcher &w) 1001rxvt_term::refresh_check ()
686{ 1002{
687 SET_R (this); 1003 if (want_refresh && !flush_ev.is_active ())
688 SET_LOCALE (locale); 1004 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
689 1005
690 display->flush (); 1006 display->flush ();
691
692 if (!flush_ev.active)
693 flush_ev.start (NOW + 0.01);
694} 1007}
695 1008
696void 1009void
697rxvt_term::flush_cb (time_watcher &w) 1010rxvt_term::flush_cb (ev::timer &w, int revents)
698{ 1011{
699 SET_R (this); 1012 make_current ();
700 SET_LOCALE (locale);
701 1013
702 refresh_limit = 1;
703 refresh_count = 0; 1014 refresh_count = 0;
704 flush (); 1015 flush ();
705} 1016}
706 1017
707#ifdef CURSOR_BLINK 1018#ifdef CURSOR_BLINK
708void 1019void
709rxvt_term::cursor_blink_cb (time_watcher &w) 1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
710{ 1021{
711 hidden_cursor = !hidden_cursor; 1022 hidden_cursor = !hidden_cursor;
712 want_refresh = 1; 1023 want_refresh = 1;
713 1024 refresh_check ();
714 w.start (w.at + BLINK_INTERVAL);
715} 1025}
716#endif 1026#endif
717 1027
718#ifdef TEXT_BLINK 1028#ifdef TEXT_BLINK
719void 1029void
720rxvt_term::text_blink_cb (time_watcher &w) 1030rxvt_term::text_blink_cb (ev::timer &w, int revents)
721{ 1031{
722 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1032 if (scr_refresh_rend (RS_Blink, RS_Blink))
723 { 1033 {
724 hidden_text = !hidden_text; 1034 hidden_text = !hidden_text;
725 want_refresh = 1; 1035 want_refresh = 1;
726 w.start (w.at + TEXT_BLINK_INTERVAL); 1036 refresh_check ();
727 } 1037 }
1038 else
1039 w.stop ();
728} 1040}
729#endif 1041#endif
730 1042
731#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
732void 1044void
733rxvt_term::cont_scroll_cb (time_watcher &w) 1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
734{ 1046{
735 if ((scrollbar_isUp() || scrollbar_isDn()) && 1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
736 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
737 { 1049 {
738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1; 1050 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1051 refresh_check ();
741 } 1052 }
1053 else
1054 w.stop ();
742} 1055}
743#endif 1056#endif
744 1057
745#ifdef SELECTION_SCROLLING 1058#ifdef SELECTION_SCROLLING
746void 1059void
747rxvt_term::sel_scroll_cb (time_watcher &w) 1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
748{ 1061{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1062 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 { 1063 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1064 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1; 1065 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1066 refresh_check ();
755 } 1067 }
1068 else
1069 w.stop ();
756} 1070}
757#endif 1071#endif
758 1072
759#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
760void 1074void
761rxvt_term::slip_wheel_cb (time_watcher &w) 1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
762{ 1076{
763 if (mouse_slip_wheel_speed == 0 1077 if (scr_changeview (view_start - mouse_slip_wheel_speed))
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1078 {
767 refresh_type |= SMOOTH_REFRESH;
768 want_refresh = 1; 1079 want_refresh = 1;
769 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)
770 } 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 ();
771} 1149}
772#endif 1150#endif
773 1151
774bool 1152bool
775rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
776{ 1154{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
778 1156
779 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
780 { 1158
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
782 n = 0;
783 } 1160 {
784 1161 // normally this indicates a "too long" command sequence - just drop the data we have
785 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1162 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
788 1166
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
790 1168
791 if (n > 0) 1169 if (r > 0)
792 { 1170 {
793 cmdbuf_endp += n; 1171 cmdbuf_endp += r;
794 return true; 1172 return true;
795 } 1173 }
796 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))
797 destroy (); 1186 destroy ();
798 1187 }
1188
799 return false; 1189 return false;
800} 1190}
801 1191
802void 1192void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1193rxvt_term::pty_cb (ev::io &w, int revents)
804{ 1194{
805 SET_R (this); 1195 make_current ();
806 SET_LOCALE (locale);
807 1196
808 if (revents & EVENT_WRITE) 1197 if (revents & ev::READ)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
813 if (cmd_parse ()) 1200 cmd_parse ();
814 break; 1201
1202 if (revents & ev::WRITE)
1203 pty_write ();
1204
1205 refresh_check ();
815} 1206}
816 1207
817void 1208void
818rxvt_term::pointer_unblank () 1209rxvt_term::pointer_unblank ()
819{ 1210{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1211 XDefineCursor (dpy, vt, TermWin_cursor);
821 recolour_cursor (); 1212 recolour_cursor ();
822 1213
823#ifdef POINTER_BLANK 1214#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1215 hidden_pointer = 0;
825 1216
826 if (Options & Opt_pointerBlank) 1217 if (option (Opt_pointerBlank))
827 pointer_ev.start (NOW + pointerBlankDelay); 1218 pointer_ev.start (pointerBlankDelay);
828#endif 1219#endif
829} 1220}
830 1221
831#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
832void 1223void
833rxvt_term::pointer_blank () 1224rxvt_term::pointer_blank ()
834{ 1225{
835 if (! (Options & Opt_pointerBlank)) 1226 if (!option (Opt_pointerBlank))
836 return; 1227 return;
837 1228
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1229 XDefineCursor (dpy, vt, display->blank_cursor);
839 XFlush (display->display); 1230 XFlush (dpy);
840 1231
841 hidden_pointer = 1; 1232 hidden_pointer = 1;
842} 1233}
843 1234
844void 1235void
845rxvt_term::pointer_cb (time_watcher &w) 1236rxvt_term::pointer_cb (ev::timer &w, int revents)
846{ 1237{
847 SET_R (this); 1238 make_current ();
848 SET_LOCALE (locale);
849 1239
850 pointer_blank (); 1240 pointer_blank ();
851} 1241}
852#endif 1242#endif
853 1243
854void 1244void
855rxvt_term::mouse_report (XButtonEvent &ev) 1245rxvt_term::mouse_report (XButtonEvent &ev)
856{ 1246{
857 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
858 int x, y; 1248 int x, y;
1249 int code = 32;
859 1250
860 x = ev.x; 1251 x = Pixel2Col (ev.x) + 1;
861 y = ev.y; 1252 y = Pixel2Row (ev.y) + 1;
862 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 }
863 1263
864 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1265 button_number = 3;
867 }
868 else 1266 else
869 { 1267 {
870 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1270 if (button_number >= 3)
873 button_number += (64 - 3); 1271 button_number += 64 - 3;
874 } 1272 }
875 1273
876 if (PrivateModes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
877 { 1275 {
878 /* 1276 /*
879 * do not report ButtonRelease 1277 * do not report ButtonRelease
880 * no state info allowed 1278 * no state info allowed
881 */ 1279 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1294 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1295 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1296#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1297 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1298#endif
901
902 } 1299 }
903 1300
904#ifdef DEBUG_MOUSEREPORT 1301#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1302 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1303 if (key_state & 16)
907 fputc ('C', stderr); 1304 fputc ('C', stderr);
908 if (key_state & 4) 1305 if (key_state & 4)
909 fputc ('S', stderr); 1306 fputc ('S', stderr);
… …
911 fputc ('A', stderr); 1308 fputc ('A', stderr);
912 if (key_state & 32) 1309 if (key_state & 32)
913 fputc ('2', stderr); 1310 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1312 button_number,
916 x + 1, 1313 x,
917 y + 1); 1314 y);
918#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
919 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1331 code + button_number + key_state,
921 (32 + x + 1), 1332 32 + x,
922 (32 + y + 1)); 1333 32 + y);
923#endif
924} 1334}
925
926#ifdef USING_W11LIB
927void
928rxvt_W11_process_x_event (XEvent *ev)
929{
930 rxvt_t *r = rxvt_get_r ();
931
932 x_cb (*ev);
933}
934#endif
935 1335
936/*{{{ process an X event */ 1336/*{{{ process an X event */
937void 1337void
938rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
939{ 1339{
940 SET_R (this); 1340 make_current ();
941 SET_LOCALE (locale);
942 1341
943#if defined(CURSOR_BLINK) 1342 dLocal (Display *, dpy);
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951 1343
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1344 if (ev.xany.window == vt
953 } 1345 && SHOULD_INVOKE (HOOK_X_EVENT)
954#endif 1346 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
955
956#if defined(POINTER_BLANK)
957 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
958 {
959 if (ev.type == MotionNotify
960 || ev.type == ButtonPress
961 || ev.type == ButtonRelease)
962 if (hidden_pointer)
963 pointer_unblank ();
964
965 if (ev.type == KeyPress && hidden_pointer == 0)
966 pointer_blank ();
967 }
968#endif
969
970#ifdef USE_XIM
971 if (XFilterEvent (&ev, None))
972 return; 1347 return;
973#endif
974 1348
1349 // for XQueryPointer
975 Window unused_root, unused_child; 1350 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1351 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1352 unsigned int unused_mask;
978
979#ifdef DEBUG_X
980 const char *const eventnames[] =
981 { /* mason - this matches my system */
982 "",
983 "",
984 "KeyPress",
985 "KeyRelease",
986 "ButtonPress",
987 "ButtonRelease",
988 "MotionNotify",
989 "EnterNotify",
990 "LeaveNotify",
991 "FocusIn",
992 "FocusOut",
993 "KeymapNotify",
994 "Expose",
995 "GraphicsExpose",
996 "NoExpose",
997 "VisibilityNotify",
998 "CreateNotify",
999 "DestroyNotify",
1000 "UnmapNotify",
1001 "MapNotify",
1002 "MapRequest",
1003 "ReparentNotify",
1004 "ConfigureNotify",
1005 "ConfigureRequest",
1006 "GravityNotify",
1007 "ResizeRequest",
1008 "CirculateNotify",
1009 "CirculateRequest",
1010 "PropertyNotify",
1011 "SelectionClear",
1012 "SelectionRequest",
1013 "SelectionNotify",
1014 "ColormapNotify",
1015 "ClientMessage",
1016 "MappingNotify"
1017 };
1018#endif
1019
1020#ifdef DEBUG_X
1021 struct timeval tp;
1022 struct tm *ltt;
1023 (void)gettimeofday (&tp, NULL);
1024 ltt = localtime (& (tp.tv_sec));
1025 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));
1026#endif
1027 1353
1028 switch (ev.type) 1354 switch (ev.type)
1029 { 1355 {
1030 case KeyPress: 1356 case KeyPress:
1031 lookup_key (ev.xkey); 1357 key_press (ev.xkey);
1032 break; 1358 break;
1033 1359
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease: 1360 case KeyRelease:
1036 { 1361 key_release (ev.xkey);
1037 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop ();
1039 else
1040 {
1041 KeySym ks;
1042
1043 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1044 if (ks == XK_Control_L || ks == XK_Control_R)
1045 mouse_slip_wheel_speed = 0;
1046 }
1047 break; 1362 break;
1048 }
1049#endif
1050 1363
1051 case ButtonPress: 1364 case ButtonPress:
1052 button_press (ev.xbutton); 1365 button_press (ev.xbutton);
1053 break; 1366 break;
1054 1367
… …
1056 button_release (ev.xbutton); 1369 button_release (ev.xbutton);
1057 break; 1370 break;
1058 1371
1059 case ClientMessage: 1372 case ClientMessage:
1060 if (ev.xclient.format == 32 1373 if (ev.xclient.format == 32
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1374 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1062 destroy ();
1063#ifdef OFFIX_DND
1064 /* OffiX Dnd (drag 'n' drop) protocol */
1065 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1066 && (ev.xclient.data.l[0] == DndFile
1067 || ev.xclient.data.l[0] == DndDir
1068 || ev.xclient.data.l[0] == DndLink))
1069 { 1375 {
1070 /* Get Dnd data */ 1376 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1071 Atom ActualType; 1377 {
1072 int ActualFormat; 1378 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1073 unsigned char *data; 1379 {
1074 unsigned long Size, RemainingBytes; 1380 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1075 1381 {
1076 XGetWindowProperty (display->display, display->root, 1382 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1077 xa[XA_DNDSELECTION], 1383 destroy ();
1078 0L, 1000000L, 1384 }
1079 False, AnyPropertyType, 1385#if ENABLE_EWMH
1080 &ActualType, &ActualFormat, 1386 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1081 &Size, &RemainingBytes, 1387 XSendEvent (dpy, ev.xclient.window = display->root,
1388 False, SubstructureRedirectMask | SubstructureNotifyMask,
1082 &data); 1389 &ev);
1083 XChangeProperty (display->display, display->root, 1390#endif
1084 XA_CUT_BUFFER0, XA_STRING, 1391 }
1085 8, PropModeReplace, 1392 }
1086 data, STRLEN (data)); 1393#if ENABLE_XEMBED
1087 XFree (data); 1394 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1395 {
1089 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
1090 } 1402 }
1091#endif /* OFFIX_DND */
1092 break;
1093
1094 case MappingNotify:
1095 XRefreshKeyboardMapping (&ev.xmapping);
1096 break; 1403 break;
1097 1404
1098 /* 1405 /*
1099 * XXX: this is not the _current_ arrangement 1406 * XXX: this is not the _current_ arrangement
1100 * Here's my conclusion: 1407 * Here's my conclusion:
… …
1119 break; 1426 break;
1120 } 1427 }
1121 break; 1428 break;
1122 1429
1123 case FocusIn: 1430 case FocusIn:
1124 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)
1125 { 1446 {
1126 TermWin.focus = 1; 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1448 ;
1128#ifdef USE_XIM 1449
1129 if (Input_Context != NULL) 1450#ifdef HAVE_BG_PIXMAP
1130 XSetICFocus (Input_Context); 1451 bool moved = false;
1131#endif 1452 if (bg_window_position_sensitive ())
1132#ifdef CURSOR_BLINK
1133 if (Options & Opt_cursorBlink)
1134 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1135#endif
1136#ifdef OFF_FOCUS_FADING
1137 if (rs[Rs_fade])
1138 { 1453 {
1139 PixColors = PixColorsFocused; 1454 int x, y;
1140 set_colorfgbg (); 1455 if (ev.xconfigure.send_event)
1141 scr_clear (); 1456 {
1142 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;
1143 } 1466 }
1144#endif 1467#endif
1145 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 {
1479 if (mapped)
1480 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif
1485 }
1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1146 } 1488 }
1147 break; 1489 break;
1148 1490
1149 case FocusOut:
1150 if (TermWin.focus)
1151 {
1152 TermWin.focus = 0;
1153 want_refresh = 1;
1154#ifdef USE_XIM
1155 if (Input_Context != NULL)
1156 XUnsetICFocus (Input_Context);
1157#endif
1158#ifdef CURSOR_BLINK
1159 if (Options & Opt_cursorBlink)
1160 cursor_blink_ev.stop ();
1161 hidden_cursor = 0;
1162#endif
1163#ifdef OFF_FOCUS_FADING
1164 if (rs[Rs_fade])
1165 {
1166 PixColors = PixColorsUnFocused;
1167 set_colorfgbg ();
1168 scr_clear ();
1169 scr_touch (true);
1170 }
1171#endif
1172
1173 }
1174 break;
1175
1176 case ConfigureNotify: 1491 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1178 {
1179 int height, width;
1180
1181 do
1182 { /* Wrap lots of configures into one */
1183 width = ev.xconfigure.width;
1184 height = ev.xconfigure.height;
1185 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1186 }
1187 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1188
1189 if (szHint.width != width || szHint.height != height)
1190 resize_all_windows (width, height, 1);
1191
1192#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1193 if (Options & Opt_transparent)
1194 {
1195 check_our_parents ();
1196 if (am_transparent)
1197 want_full_refresh = 1;
1198 }
1199#endif
1200 }
1201 break; 1493 break;
1202 1494
1203 case SelectionClear: 1495 case SelectionClear:
1204 selection_clear (); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1205 break;
1206
1207 case SelectionNotify:
1208 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor,
1210 ev.xselection.property, True);
1211 break; 1497 break;
1212 1498
1213 case SelectionRequest: 1499 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1215 break; 1501 break;
1216 1502
1503 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025);
1519#endif
1520 mapped = 1;
1521#ifdef TEXT_BLINK
1522 text_blink_ev.start ();
1523#endif
1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break;
1526
1217 case UnmapNotify: 1527 case UnmapNotify:
1218 TermWin.mapped = 0; 1528 mapped = 0;
1219#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1530 text_blink_ev.stop ();
1221#endif 1531#endif
1532 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1222 break; 1533 break;
1223
1224 case MapNotify:
1225 TermWin.mapped = 1;
1226#ifdef TEXT_BLINK
1227 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1228#endif
1229 break;
1230
1231#ifdef TRANSPARENT
1232 case ReparentNotify:
1233 rootwin_cb (ev);
1234 break;
1235#endif /* TRANSPARENT */
1236 1534
1237 case GraphicsExpose: 1535 case GraphicsExpose:
1238 case Expose: 1536 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == vt)
1240 { 1538 {
1241 do 1539 do
1540 {
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1543 }
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1245 1545
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1547
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 {
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1552 }
1251 1553
1252 scr_refresh (refresh_type); 1554 want_refresh = 1;
1253 } 1555 }
1254 else 1556 else
1255 { 1557 {
1256 XEvent unused_event; 1558 XEvent unused_event;
1257 1559
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1259 ; 1561 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1563 ;
1262 1564
1263 if (isScrollbarWindow (ev.xany.window)) 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1264 { 1566 {
1265 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1266 scrollbar_show (0); 1568 scrollBar.show (0);
1267 } 1569 }
1268#ifdef MENUBAR
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose ();
1271#endif
1272
1273#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0])
1275 XClearWindow (display->display, ev.xany.window);
1276#endif
1277 } 1570 }
1278 break; 1571 break;
1279 1572
1280 case MotionNotify: 1573 case MotionNotify:
1281#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1282 if (hidden_pointer) 1575 if (hidden_pointer)
1283 pointer_unblank (); 1576 pointer_unblank ();
1284#endif 1577#endif
1285#if MENUBAR 1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1286 if (isMenuBarWindow (ev.xany.window)) 1579 || priv_modes & PrivMode_MouseAnyEvent)
1580 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break;
1583
1584 if (ev.xany.window == vt)
1287 { 1585 {
1288 menubar_control (ev.xbutton); 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1289 break; 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1290 } 1588 ; // nop
1291#endif
1292 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1293 break;
1294
1295 if (ev.xany.window == TermWin.vt)
1296 {
1297 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1590 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1300 ; 1592 ;
1301 1593
1302 XQueryPointer (display->display, TermWin.vt, 1594 XQueryPointer (dpy, vt,
1303 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1597 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1598 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1600 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1602 {
1311#endif 1603#endif
1604#if ISO_14755
1605 // 5.4
1606 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1607 {
1608 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1609 break;
1610 }
1611#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1612 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1613 ev.xbutton.state & Button3Mask ? 2 : 0);
1614
1314#ifdef SELECTION_SCROLLING 1615#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1616 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1617 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1618 {
1318 int dist; 1619 int dist;
1319 1620
1320 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1322 */ 1623 */
1323 if (!sel_scroll_ev.active) 1624 if (!sel_scroll_ev.is_active ())
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1325 1626
1326 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1328 */ 1629 */
1329 selection_save_x=ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1631 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1632 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1633
1334 /* calc number of lines to scroll */ 1634 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1635 if (ev.xbutton.y < int_bwidth)
1336 { 1636 {
1337 scroll_selection_dir = UP; 1637 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1638 dist = int_bwidth - ev.xbutton.y;
1339 } 1639 }
1340 else 1640 else
1341 { 1641 {
1342 scroll_selection_dir = DN; 1642 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1643 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1644 }
1645
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1646 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1647 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1;
1348 MIN_IT (scroll_selection_lines, 1649 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1650 SELECTION_SCROLL_MAX_LINES);
1350 } 1651 }
1351 else 1652 else
1352 { 1653 {
1353 /* we are within the text window, so we 1654 /* we are within the text window, so we
1354 * shouldn't be scrolling 1655 * shouldn't be scrolling
1355 */ 1656 */
1356 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1657 sel_scroll_ev.stop();
1358 } 1658 }
1359#endif 1659#endif
1360#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1361
1362 } 1661 }
1363#endif 1662#endif
1364
1365 } 1663 }
1366 } 1664 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1368 { 1666 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1370 MotionNotify, &ev)) ; 1668 MotionNotify, &ev))
1669 ;
1670
1371 XQueryPointer (display->display, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1372 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1674 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1675 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1677 scrollBar.size ());
1378 scr_refresh (refresh_type);
1379 refresh_limit = 0; 1678 want_refresh = 1;
1380 scrollbar_show (1); 1679 scrollBar.show (1);
1381 } 1680 }
1382 break; 1681 break;
1383 } 1682 }
1384}
1385 1683
1684#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again ();
1694 }
1695#endif
1696
1697#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 {
1700 if (ev.type == MotionNotify
1701 || ev.type == ButtonPress
1702 || ev.type == ButtonRelease)
1703 if (hidden_pointer)
1704 pointer_unblank ();
1705
1706 if (ev.type == KeyPress && hidden_pointer == 0)
1707 pointer_blank ();
1708 }
1709#endif
1710
1711 refresh_check ();
1712}
1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1729
1730void
1731rxvt_term::focus_in ()
1732{
1733 if (!focus)
1734 {
1735 focus = 1;
1736 want_refresh = 1;
1737
1738#if USE_XIM
1739 if (Input_Context != NULL)
1740 {
1741 im_set_position ();
1742 XSetICFocus (Input_Context);
1743 }
1744#endif
1745#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink))
1747 cursor_blink_ev.again ();
1748#endif
1749#if OFF_FOCUS_FADING
1750 if (rs[Rs_fade])
1751 {
1752 pix_colors = pix_colors_focused;
1753 scr_recolour ();
1754 }
1755#endif
1756#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1777#if ENABLE_FRILLS || ISO_14755
1778 if (iso14755buf)
1779 {
1780 iso14755buf = 0;
1781# if ISO_14755
1782 scr_overlay_off ();
1783# endif
1784 }
1785#endif
1786#if USE_XIM
1787 if (Input_Context != NULL)
1788 XUnsetICFocus (Input_Context);
1789#endif
1790#if CURSOR_BLINK
1791 if (option (Opt_cursorBlink))
1792 cursor_blink_ev.stop ();
1793
1794 hidden_cursor = 0;
1795#endif
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 pix_colors = pix_colors_unfocused;
1800 scr_recolour ();
1801 }
1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 }
1806}
1807
1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1386void 1822void
1387rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1824{
1389 SET_R (this); 1825 make_current ();
1390 SET_LOCALE (locale);
1391 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1392 switch (ev.type) 1832 switch (ev.type)
1393 { 1833 {
1394 case PropertyNotify: 1834 case PropertyNotify:
1835 /*
1836 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on.
1838 */
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1396 { 1841 {
1397 if (ev.xproperty.state == PropertyNewValue) 1842 bg_set_root_pixmap ();
1398 selection_property (ev.xproperty.window, ev.xproperty.atom); 1843 update_background ();
1399 break;
1400 } 1844 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /*
1405 * if user used some Esetroot compatible prog to set the root bg,
1406 * use the property to determine the pixmap. We use it later on.
1407 */
1408 if (xa[XA_XROOTPMAPID] == 0)
1409 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1410 1845
1411 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1412 return;
1413 }
1414
1415 /* FALLTHROUGH */
1416 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1;
1419 break; 1846 break;
1847 }
1420#endif 1848# endif
1421 } 1849
1850 refresh_check ();
1422} 1851}
1852#endif
1423 1853
1424void 1854void
1425rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
1426{ 1856{
1427 int reportmode = 0, clickintime; 1857 int reportmode = 0, clickintime;
1428 1858
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1859 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1860
1430 if (!bypass_keystate) 1861 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1862 reportmode = !! (priv_modes & PrivMode_mouse_report);
1863
1432 /* 1864 /*
1433 * VT window processing of button press 1865 * VT window processing of button press
1434 */ 1866 */
1435 if (ev.window == TermWin.vt) 1867 if (ev.window == vt)
1436 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1872#if ISO_14755
1873 // 5.4
1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1875 {
1876 iso14755_54 (ev.x, ev.y);
1877 return;
1878 }
1879#endif
1880
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1882
1438 if (reportmode) 1883 if (reportmode)
1439 { 1884 {
1440 /* mouse report from vt window */ 1885 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1445 { 1890 {
1446 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1447 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1448 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1449 { 1895 {
1450 /* only report double clicks */ 1896 /* only report double clicks */
1451 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1452 mouse_report (ev); 1898 mouse_report (ev);
… …
1464 mouse_report (ev); 1910 mouse_report (ev);
1465 } 1911 }
1466#else 1912#else
1467 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1468 mouse_report (ev); 1914 mouse_report (ev);
1469#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1470 1916
1471 } 1917 }
1472 else 1918 else
1473 { 1919 {
1474 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1922
1476 switch (ev.button) 1923 switch (ev.button)
1477 { 1924 {
1478 case Button1: 1925 case Button1:
1926 /* allow meta + click to select rectangular areas */
1927 /* should be done in screen.C */
1928#if ENABLE_FRILLS
1929 selection.rect = !!(ev.state & ModMetaMask);
1930#else
1931 selection.rect = false;
1932#endif
1933
1479 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1481 { 1936 {
1482 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1484 else 1939 else
1485 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1955 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1503 else 1958 else
1504 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1960
1505 MEvent.button = Button3; 1961 MEvent.button = Button3;
1506 break; 1962 break;
1507 } 1963 }
1508 } 1964 }
1965
1509 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1510 return; 1967 return;
1511 } 1968 }
1512 1969
1513 /* 1970 /*
1514 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1515 */ 1972 */
1516 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1517 { 1974 {
1518 scrollBar.setIdle (); 1975 page_dirn direction = NO_DIR;
1976
1977 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */
1981
1982 scrollBar.state = STATE_IDLE;
1519 /* 1983 /*
1520 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1521 * move up if mouse is above slider 1985 * move up if mouse is above slider
1522 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1523 * 1987 *
… …
1532 /* 1996 /*
1533 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1534 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1535 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1536 */ 2000 */
1537 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1538 && scrollbarnext_upButton (ev.y))
1539 || (scrollBar.style == R_SB_RXVT
1540 && scrollbarrxvt_upButton (ev.y)))
1541 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1542 else if ((scrollBar.style == R_SB_NEXT 2003 else if (direction == DN)
1543 && scrollbarnext_dnButton (ev.y))
1544 || (scrollBar.style == R_SB_RXVT
1545 && scrollbarrxvt_dnButton (ev.y)))
1546 tt_printf ("\033[B"); 2004 tt_printf ("\033[B");
1547 else 2005 else
1548 switch (ev.button) 2006 switch (ev.button)
1549 { 2007 {
1550 case Button2: 2008 case Button2:
… …
1557 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
1558 break; 2016 break;
1559 } 2017 }
1560 } 2018 }
1561 else 2019 else
1562#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1563
1564 {
1565 char upordown = 0;
1566
1567 if (scrollBar.style == R_SB_NEXT)
1568 { 2021 {
1569 if (scrollbarnext_upButton (ev.y)) 2022 if (direction != NO_DIR)
1570 upordown = -1; /* up */
1571 else if (scrollbarnext_dnButton (ev.y))
1572 upordown = 1; /* down */
1573 }
1574 else if (scrollBar.style == R_SB_RXVT)
1575 {
1576 if (scrollbarrxvt_upButton (ev.y))
1577 upordown = -1; /* up */
1578 else if (scrollbarrxvt_dnButton (ev.y))
1579 upordown = 1; /* down */
1580 }
1581 if (upordown)
1582 { 2023 {
1583#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2025 if (!cont_scroll_ev.is_active ())
1584 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1585#endif 2027#endif
1586 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
1587 { 2029 {
1588 if (upordown < 0) 2030 if (direction == UP)
1589 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
1590 else 2032 else
1591 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
1592 } 2034 }
1593 } 2035 }
1594 else 2036 else
1595 switch (ev.button) 2037 switch (ev.button)
1596 { 2038 {
1597 case Button2: 2039 case Button2:
1598 switch (scrollbar_align) 2040 switch (scrollBar.align)
1599 { 2041 {
1600 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
1601 csrO = 0; 2043 csrO = 0;
1602 break; 2044 break;
1603 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
1605 break; 2047 break;
1606 case R_SB_ALIGN_BOTTOM: 2048 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 2049 csrO = scrollBar.bot - scrollBar.top;
1608 break; 2050 break;
1609 } 2051 }
2052
1610 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1614 scrollbar_size ()); 2057
1615 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
1616 break; 2059 break;
1617 2060
1618 case Button1: 2061 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1620 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
1621 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
1622 2065
1623 case Button3: 2066 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
1625 { 2068 {
1626 if (scrollbar_above_slider (ev.y)) 2069 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2070# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2071 scr_page (UP, nrow - 1);
1629# else 2072# else
1630 scr_page (UP, TermWin.nrow / 4); 2073 scr_page (UP, nrow / 4);
1631# endif 2074# endif
1632 else if (scrollbar_below_slider (ev.y)) 2075 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2077 scr_page (DN, nrow - 1);
1635# else 2078# else
1636 scr_page (DN, TermWin.nrow / 4); 2079 scr_page (DN, nrow / 4);
1637# endif 2080# endif
1638 else 2081 else
1639 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
1640 } 2083 }
1641 else 2084 else
1642 { 2085 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2087 (nrow
1645 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2089 / scrollBar.size ()));
1647 } 2090 }
2091
1648 break; 2092 break;
1649 } 2093 }
1650 } 2094 }
2095
1651 return; 2096 return;
1652 } 2097 }
1653#if MENUBAR
1654 /*
1655 * Menubar window processing of button press
1656 */
1657 if (isMenuBarWindow (ev.window))
1658 menubar_control (ev);
1659#endif
1660} 2098}
1661 2099
1662void 2100void
1663rxvt_term::button_release (XButtonEvent &ev) 2101rxvt_term::button_release (XButtonEvent &ev)
1664{ 2102{
1665 int reportmode = 0; 2103 int reportmode = 0;
1666 2104
1667 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2106 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2108
1671 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1672 { 2110 {
1673 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
1674 scrollbar_show (0); 2112 scrollBar.show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH;
1677#endif
1678
1679 } 2113 }
2114
1680#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2116 sel_scroll_ev.stop();
1683#endif 2117#endif
2118
1684 if (ev.window == TermWin.vt) 2119 if (ev.window == vt)
1685 { 2120 {
2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2122 return;
2123
2124#if ISO_14755
2125 // 5.4
2126 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2127 return;
2128#endif
2129
1686 if (reportmode) 2130 if (reportmode)
1687 { 2131 {
1688 /* mouse report from vt window */ 2132 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2133 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2134 if (ev.button >= 4)
… …
1701 mouse_report (ev); 2145 mouse_report (ev);
1702 } 2146 }
1703#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
1704 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
1705 mouse_report (ev); 2149 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2151 return;
1708 } 2152 }
2153
1709 /* 2154 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2156 * when overriding mouse reporting
1712 */ 2157 */
1713 if (PrivateModes & PrivMode_mouse_report 2158 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2159 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2160 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2161 selection_extend (ev.x, ev.y, 0);
1717 2162
1718 switch (ev.button) 2163 switch (ev.button)
1719 { 2164 {
1720 case Button1: 2165 case Button1:
1721 case Button3: 2166 case Button3:
1722 selection_make (ev.time); 2167 selection_make (ev.time);
1723 break; 2168 break;
2169
1724 case Button2: 2170 case Button2:
1725 selection_request (ev.time, ev.x, ev.y); 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1726 break; 2173 break;
2174
1727#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
1728 case Button4: 2176 case Button4:
1729 case Button5: 2177 case Button5:
1730 { 2178 {
1731 int i; 2179 int i;
… …
1733 2181
1734 v = ev.button == Button4 ? UP : DN; 2182 v = ev.button == Button4 ? UP : DN;
1735 2183
1736 if (ev.state & ShiftMask) 2184 if (ev.state & ShiftMask)
1737 i = 1; 2185 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2186 else if (option (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2187 i = nrow - 1;
1740 else 2188 else
1741 i = 5; 2189 i = 5;
1742 2190
1743# ifdef MOUSE_SLIP_WHEELING 2191# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2192 if (ev.state & ControlMask)
1745 { 2193 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2194 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1748 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2197
1750 if (slip_wheel_ev.at < NOW) 2198 if (!slip_wheel_ev.is_active ())
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1752
1753 slip_wheel_ev.start ();
1754 } 2200 }
1755 else 2201 else
2202# endif
1756 { 2203 {
1757# endif
1758# ifdef JUMP_MOUSE_WHEEL
1759 scr_page (v, i); 2204 scr_page (v, i);
1760 scr_refresh (SMOOTH_REFRESH);
1761 scrollbar_show (1); 2205 scrollBar.show (1);
1762# else
1763 while (i--)
1764 {
1765 scr_page (v, 1);
1766 scr_refresh (SMOOTH_REFRESH);
1767 scrollbar_show (1);
1768 }
1769# endif
1770# ifdef MOUSE_SLIP_WHEELING
1771 } 2206 }
1772#endif
1773 } 2207 }
1774 break; 2208 break;
1775#endif 2209#endif
1776 } 2210 }
1777 } 2211 }
1778#ifdef MENUBAR
1779 else if (isMenuBarWindow (ev.window))
1780 menubar_control (ev);
1781#endif
1782} 2212}
1783
1784#ifdef TRANSPARENT
1785#if TINTING
1786/* taken from aterm-0.4.2 */
1787
1788typedef uint32_t RUINT32T;
1789
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{
1792 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i;
1798
1799 Visual* visual = display->visual;
1800
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802
1803 /* for convenience */
1804 mask_r = visual->red_mask;
1805 mask_g = visual->green_mask;
1806 mask_b = visual->blue_mask;
1807
1808 /* boring lookup table pre-initialization */
1809 switch (srcImage->bits_per_pixel) {
1810 case 15:
1811 if ((mask_r != 0x7c00) ||
1812 (mask_g != 0x03e0) ||
1813 (mask_b != 0x001f))
1814 return;
1815 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1816 lookup_r = lookup;
1817 lookup_g = lookup+32;
1818 lookup_b = lookup+32+32;
1819 sh_r = 10;
1820 sh_g = 5;
1821 sh_b = 0;
1822 break;
1823 case 16:
1824 if ((mask_r != 0xf800) ||
1825 (mask_g != 0x07e0) ||
1826 (mask_b != 0x001f))
1827 return;
1828 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1829 lookup_r = lookup;
1830 lookup_g = lookup+32;
1831 lookup_b = lookup+32+64;
1832 sh_r = 11;
1833 sh_g = 5;
1834 sh_b = 0;
1835 break;
1836 case 24:
1837 if ((mask_r != 0xff0000) ||
1838 (mask_g != 0x00ff00) ||
1839 (mask_b != 0x0000ff))
1840 return;
1841 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1842 lookup_r = lookup;
1843 lookup_g = lookup+256;
1844 lookup_b = lookup+256+256;
1845 sh_r = 16;
1846 sh_g = 8;
1847 sh_b = 0;
1848 break;
1849 case 32:
1850 if ((mask_r != 0xff0000) ||
1851 (mask_g != 0x00ff00) ||
1852 (mask_b != 0x0000ff))
1853 return;
1854 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1855 lookup_r = lookup;
1856 lookup_g = lookup+256;
1857 lookup_b = lookup+256+256;
1858 sh_r = 16;
1859 sh_g = 8;
1860 sh_b = 0;
1861 break;
1862 default:
1863 return; /* we do not support this color depth */
1864 }
1865
1866 /* prepare limits for color transformation (each channel is handled separately) */
1867 if (shade < 0) {
1868 shade = -shade;
1869 if (shade < 0) shade = 0;
1870 if (shade > 100) shade = 100;
1871
1872 lower_lim_r = 65535-rm;
1873 lower_lim_g = 65535-gm;
1874 lower_lim_b = 65535-bm;
1875
1876 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1877 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1878 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1879
1880 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1881 } else {
1882 if (shade < 0) shade = 0;
1883 if (shade > 100) shade = 100;
1884
1885 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1886
1887 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1888 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1889 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1890 }
1891
1892 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1893 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1894 {
1895 unsigned int tmp;
1896
1897 tmp = lower_lim_r;
1898 lower_lim_r = lower_lim_b;
1899 lower_lim_b = tmp;
1900
1901 tmp = upper_lim_r;
1902 upper_lim_r = upper_lim_b;
1903 upper_lim_b = tmp;
1904 }
1905
1906 /* fill our lookup tables */
1907 for (i = 0; i <= mask_r>>sh_r; i++)
1908 {
1909 RUINT32T tmp;
1910 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1911 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1912 lookup_r[i] = (tmp/65535)<<sh_r;
1913 }
1914 for (i = 0; i <= mask_g>>sh_g; i++)
1915 {
1916 RUINT32T tmp;
1917 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1918 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1919 lookup_g[i] = (tmp/65535)<<sh_g;
1920 }
1921 for (i = 0; i <= mask_b>>sh_b; i++)
1922 {
1923 RUINT32T tmp;
1924 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1925 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1926 lookup_b[i] = (tmp/65535)<<sh_b;
1927 }
1928
1929 /* apply table to input image (replacing colors by newly calculated ones) */
1930 switch (srcImage->bits_per_pixel)
1931 {
1932 case 15:
1933 {
1934 unsigned short *p1, *pf, *p, *pl;
1935 p1 = (unsigned short *) srcImage->data;
1936 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1937 while (p1 < pf)
1938 {
1939 p = p1;
1940 pl = p1 + srcImage->width;
1941 for (; p < pl; p++)
1942 {
1943 *p = lookup_r[(*p & 0x7c00)>>10] |
1944 lookup_g[(*p & 0x03e0)>> 5] |
1945 lookup_b[(*p & 0x001f)];
1946 }
1947 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1948 }
1949 break;
1950 }
1951 case 16:
1952 {
1953 unsigned short *p1, *pf, *p, *pl;
1954 p1 = (unsigned short *) srcImage->data;
1955 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1956 while (p1 < pf)
1957 {
1958 p = p1;
1959 pl = p1 + srcImage->width;
1960 for (; p < pl; p++)
1961 {
1962 *p = lookup_r[(*p & 0xf800)>>11] |
1963 lookup_g[(*p & 0x07e0)>> 5] |
1964 lookup_b[(*p & 0x001f)];
1965 }
1966 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1967 }
1968 break;
1969 }
1970 case 24:
1971 {
1972 unsigned char *p1, *pf, *p, *pl;
1973 p1 = (unsigned char *) srcImage->data;
1974 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1975 while (p1 < pf)
1976 {
1977 p = p1;
1978 pl = p1 + srcImage->width * 3;
1979 for (; p < pl; p += 3)
1980 {
1981 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1982 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1983 p[2] = lookup_r[(p[2] & 0x0000ff)];
1984 }
1985 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1986 }
1987 break;
1988 }
1989 case 32:
1990 {
1991 RUINT32T *p1, *pf, *p, *pl;
1992 p1 = (RUINT32T *) srcImage->data;
1993 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1994
1995 while (p1 < pf)
1996 {
1997 p = p1;
1998 pl = p1 + srcImage->width;
1999 for (; p < pl; p++)
2000 {
2001 *p = lookup_r[(*p & 0xff0000)>>16] |
2002 lookup_g[(*p & 0x00ff00)>> 8] |
2003 lookup_b[(*p & 0x0000ff)] |
2004 (*p & ~0xffffff);
2005 }
2006 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2007 }
2008 break;
2009 }
2010 }
2011
2012 free (lookup);
2013}
2014#endif
2015
2016/*
2017 * Check our parents are still who we think they are.
2018 * Do transparency updates if required
2019 */
2020int
2021rxvt_term::check_our_parents ()
2022{
2023 int i, pchanged, aformat, have_pixmap, rootdepth;
2024 unsigned long nitems, bytes_after;
2025 Atom atype;
2026 unsigned char *prop = NULL;
2027 Window root, oldp, *list;
2028 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr;
2030
2031 pchanged = 0;
2032
2033 if (!(Options & Opt_transparent))
2034 return pchanged; /* Don't try any more */
2035
2036 XGetWindowAttributes (display->display, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth;
2038
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2040
2041 if (rootdepth != wattr.depth)
2042 {
2043 if (am_transparent)
2044 {
2045 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0;
2048 }
2049
2050 return pchanged; /* Don't try any more */
2051 }
2052
2053 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False);
2055
2056 /*
2057 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that.
2060 */
2061 i = (xa[XA_XROOTPMAPID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success);
2065
2066 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success);
2071
2072 if (!i || prop == NULL
2073#if TINTING
2074 || !rs[Rs_color + Color_tint]
2075#endif
2076 )
2077 have_pixmap = 0;
2078 else
2079 {
2080 have_pixmap = 1;
2081 rootpixmap = *(Pixmap *)prop;
2082 XFree (prop);
2083 }
2084
2085 if (have_pixmap)
2086 {
2087 /*
2088 * Copy display->root pixmap transparency
2089 */
2090 int sx, sy, nx, ny;
2091 unsigned int nw, nh;
2092 Window cr;
2093 XImage *image;
2094 GC gc;
2095 XGCValues gcvalue;
2096
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2098 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height;
2101 nx = ny = 0;
2102
2103 if (sx < 0)
2104 {
2105 nw += sx;
2106 nx = -sx;
2107 sx = 0;
2108 }
2109
2110 if (sy < 0)
2111 {
2112 nh += sy;
2113 ny = -sy;
2114 sy = 0;
2115 }
2116
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2119 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */
2124 allowedxerror = 0;
2125
2126 if (image == NULL)
2127 {
2128 if (am_transparent && am_pixmap_trans)
2129 {
2130 pchanged = 1;
2131 if (TermWin.pixmap != None)
2132 {
2133 XFreePixmap (display->display, TermWin.pixmap);
2134 TermWin.pixmap = None;
2135 }
2136 }
2137
2138 am_pixmap_trans = 0;
2139 }
2140 else
2141 {
2142 if (TermWin.pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap);
2144
2145#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint))
2147 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm);
2152
2153 ShadeXImage (display, image, shade, rm, gm, bm);
2154 }
2155#endif
2156
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2158 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc);
2163 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]);
2166
2167 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1;
2169
2170 am_transparent = am_pixmap_trans = 1;
2171 }
2172 }
2173
2174 if (!am_pixmap_trans)
2175 {
2176 unsigned int n;
2177 /*
2178 * InheritPixmap transparency
2179 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2182 {
2183 oldp = TermWin.parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2185 &TermWin.parent[i], &list, &n);
2186 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188
2189 if (TermWin.parent[i] == display->root)
2190 {
2191 if (oldp != None)
2192 pchanged = 1;
2193
2194 break;
2195 }
2196
2197 if (oldp != TermWin.parent[i])
2198 pchanged = 1;
2199 }
2200
2201 n = 0;
2202
2203 if (pchanged)
2204 {
2205 for (; n < (unsigned int)i; n++)
2206 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2212 break;
2213 }
2214 }
2215 }
2216
2217 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2218 {
2219 D_X ((stderr, "InheritPixmap Turning off"));
2220 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]);
2222 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */
2224 }
2225 else
2226 {
2227#if WAIT_FOR_WM
2228 /* wait (an arbitrary period) for the WM to do its thing
2229 * needed for fvwm2.2.2 (and before?) */
2230 sleep (1);
2231#endif
2232 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2233 for (n = 0; n < (unsigned int)i; n++)
2234 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]);
2237 }
2238
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2240 am_transparent = 1;
2241 }
2242
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None;
2245 }
2246
2247 // this is experimental
2248 if (scrollBar.win)
2249 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle ();
2253 scrollbar_show (0);
2254 }
2255
2256 return pchanged;
2257}
2258#endif
2259 2213
2260/*}}} */ 2214/*}}} */
2261 2215
2262bool 2216void
2263rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
2264{ 2218{
2265 bool flag = false;
2266 unicode_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
2268 2221
2269 for (;;) 2222 for (;;)
2270 { 2223 {
2271 if (ch == NOCHAR) 2224 if (ecb_unlikely (ch == NOCHAR))
2272 { 2225 {
2273 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
2274 ch = next_char (); 2227 ch = next_char ();
2275 }
2276 2228
2277 if (ch == NOCHAR) // TODO: improve 2229 if (ch == NOCHAR)
2278 break; 2230 break;
2231 }
2279 2232
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2233 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 {
2235 if (ecb_unlikely (!seen_input))
2281 { 2236 {
2237 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs
2241 // then sometimes get the size wrong.
2242 // unfortunately other programs are even more buggy and dislike
2243 // being sent SIGWINCH, so only do it when we were in fact being
2244 // resized.
2245 if (seen_resize && cmd_pid)
2246 kill (-cmd_pid, SIGWINCH);
2247 }
2248
2282 /* Read a text string from the input buffer */ 2249 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2250 wchar_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2251 bool refreshnow = false;
2285 int nlines = 0; 2252 int nlines = 0;
2286 unicode_t *str = buf; 2253 wchar_t *str = buf;
2287 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2255
2290 for (;;) 2256 for (;;)
2291 { 2257 {
2258 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break;
2260
2261 *str++ = ch;
2262
2263 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 {
2265 if (ch == C0_LF)
2266 nlines++;
2267
2268 refresh_count++;
2269
2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2271 {
2272 refresh_count = 0;
2273
2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2275 {
2276 refreshnow = true;
2277 ch = NOCHAR;
2278 break;
2279 }
2280 }
2281
2282 // scr_add_lines only works for nlines <= nrow - 1.
2283 if (nlines >= nrow - 1)
2284 {
2285 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2286 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2287 scr_add_lines (buf, str - buf, nlines);
2288
2289 nlines = 0;
2290 str = buf;
2291 eol = str + min (ncol, UBUFSIZ);
2292 }
2293
2294 if (str >= eol)
2295 {
2296 if (eol >= buf + UBUFSIZ)
2297 {
2298 ch = NOCHAR;
2299 break;
2300 }
2301 else
2302 eol = min (eol + ncol, buf + UBUFSIZ);
2303 }
2304
2305 }
2306
2292 seq_begin = cmdbuf_ptr; 2307 seq_begin = cmdbuf_ptr;
2293 ch = next_char (); 2308 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break;
2297
2298 *str++ = ch;
2299
2300 if (ch == C0_LF)
2301 {
2302 nlines++;
2303 refresh_count++;
2304
2305 if (! (Options & Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2307 {
2308 refreshnow = true;
2309 ch = NOCHAR;
2310 break;
2311 }
2312
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2314 if (nlines >= TermWin.nrow - 1)
2315 {
2316 scr_add_lines (buf, nlines, str - buf);
2317 nlines = 0;
2318 str = buf;
2319 }
2320 }
2321
2322 if (str >= buf + UBUFSIZ)
2323 {
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2309 }
2328 2310
2311 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2312 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2329 scr_add_lines (buf, nlines, str - buf); 2313 scr_add_lines (buf, str - buf, nlines);
2330 2314
2331 /* 2315 /*
2332 * If there have been a lot of new lines, then update the screen 2316 * If there have been a lot of new lines, then update the screen
2333 * What the heck I'll cheat and only refresh less than every page-full. 2317 * What the heck we'll cheat and only refresh less than every page-full.
2334 * the number of pages between refreshes is refresh_limit, which 2318 * if skipScroll is enabled.
2335 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2319 */
2337 if (refreshnow) 2320 if (refreshnow)
2338 { 2321 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++;
2341 else
2342 {
2343 flag = true;
2344 scr_refresh (refresh_type); 2322 scr_refresh ();
2345 } 2323 want_refresh = 1;
2346 } 2324 }
2347
2348 } 2325 }
2349 else 2326 else
2350 { 2327 {
2351 try 2328 try
2352 { 2329 {
… …
2360 } 2337 }
2361 2338
2362 ch = NOCHAR; 2339 ch = NOCHAR;
2363 } 2340 }
2364 } 2341 }
2365
2366 return flag;
2367}
2368
2369// read the next octet
2370unicode_t
2371rxvt_term::next_octet ()
2372{
2373 return cmdbuf_ptr < cmdbuf_endp
2374 ? *cmdbuf_ptr++
2375 : NOCHAR;
2376} 2342}
2377 2343
2378// read the next character 2344// read the next character
2379unicode_t 2345wchar_t
2380rxvt_term::next_char () 2346rxvt_term::next_char () NOTHROW
2381{ 2347{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2349 {
2384 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2386 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2387 2353
2388 wchar_t wc; 2354 wchar_t wc;
2389 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2356
2391 if (len == (size_t)-2) 2357 if (len == (size_t)-2)
2392 { 2358 {
2393 // the mbstate stores incomplete sequences. didn't know this :/ 2359 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2361 break;
2396 } 2362 }
2397 2363
2398 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2400 2369
2401 // assume wchar == unicode 2370 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2403 return wc; 2372 return wc & UNICODE_MASK;
2404 } 2373 }
2405 2374
2406 return NOCHAR; 2375 return NOCHAR;
2407} 2376}
2408 2377
2409/* rxvt_cmd_getc () - Return next input character */ 2378// read the next octet
2410/* 2379uint32_t
2411 * Return the next input character after first passing any keyboard input 2380rxvt_term::next_octet () NOTHROW
2412 * to the command.
2413 */
2414unicode_t
2415rxvt_term::cmd_getc ()
2416{ 2381{
2382 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR;
2385}
2386
2387static class out_of_input out_of_input;
2388
2389wchar_t
2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2391{
2417 unicode_t c = next_char (); 2392 wchar_t c = next_char ();
2418 2393
2419 if (c == NOCHAR) 2394 if (c == NOCHAR)
2420 throw out_of_input; 2395 throw out_of_input;
2421 2396
2422 return c; 2397 return c;
2423} 2398}
2424 2399
2425unicode_t 2400uint32_t
2426rxvt_term::cmd_get8 () 2401rxvt_term::cmd_get8 () THROW ((class out_of_input))
2427{ 2402{
2428 unicode_t c = next_octet (); 2403 uint32_t c = next_octet ();
2429 2404
2430 if (c == NOCHAR) 2405 if (c == NOCHAR)
2431 throw out_of_input; 2406 throw out_of_input;
2432 2407
2433 return c; 2408 return c;
… …
2437/*----------------------------------------------------------------------*/ 2412/*----------------------------------------------------------------------*/
2438#ifdef PRINTPIPE 2413#ifdef PRINTPIPE
2439FILE * 2414FILE *
2440rxvt_term::popen_printer () 2415rxvt_term::popen_printer ()
2441{ 2416{
2442 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2417 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2443 2418
2444 if (stream == NULL) 2419 if (stream == NULL)
2445 rxvt_warn ("can't open printer pipe, not printing.\n"); 2420 rxvt_warn ("can't open printer pipe, not printing.\n");
2446 2421
2447 return stream; 2422 return stream;
… …
2458 * simulate attached vt100 printer 2433 * simulate attached vt100 printer
2459 */ 2434 */
2460void 2435void
2461rxvt_term::process_print_pipe () 2436rxvt_term::process_print_pipe ()
2462{ 2437{
2463 int done; 2438 FILE *fd = popen_printer ();
2464 FILE *fd;
2465 2439
2466 if ((fd = popen_printer ()) == NULL) 2440 if (!fd)
2467 return; 2441 return;
2468 2442
2469 /* 2443 /*
2470 * Send all input to the printer until either ESC[4i or ESC[?4i 2444 * Send all input to the printer until either ESC[4i or ESC[?4i
2471 * is received. 2445 * is received.
2472 */ 2446 */
2473 for (done = 0; !done;) 2447 for (int done = 0; !done; )
2474 { 2448 {
2475 unsigned char buf[8]; 2449 unsigned char buf[8];
2476 unicode_t ch; 2450 unicode_t ch;
2477 unsigned int i, len; 2451 unsigned int i, len;
2478 2452
… …
2497 { 2471 {
2498 if ((buf[len++] = cmd_getc ()) == 'i') 2472 if ((buf[len++] = cmd_getc ()) == 'i')
2499 break; /* done = 1 */ 2473 break; /* done = 1 */
2500 } 2474 }
2501 } 2475 }
2502 2476
2503 for (i = 0; i < len; i++) 2477 for (i = 0; i < len; i++)
2504 if (putc (buf[i], fd) == EOF) 2478 if (putc (buf[i], fd) == EOF)
2505 { 2479 {
2506 done = 1; 2480 done = 1;
2507 break; 2481 break;
… …
2509 } 2483 }
2510 } 2484 }
2511 2485
2512 pclose_printer (fd); 2486 pclose_printer (fd);
2513} 2487}
2514#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2515/*}}} */ 2489/*}}} */
2516 2490
2517/* *INDENT-OFF* */
2518enum { 2491enum {
2519 C1_40 = 0x40, 2492 C1_40 = 0x40,
2520 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2521 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2522 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2523 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2524}; 2497};
2525/* *INDENT-ON* */
2526 2498
2527/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2528void 2500void
2529rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2530{ 2502{
… …
2533 case C0_ESC: 2505 case C0_ESC:
2534 process_escape_seq (); 2506 process_escape_seq ();
2535 break; 2507 break;
2536 case C0_ENQ: /* terminal Status */ 2508 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2509 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2510 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2540 else 2511 else
2541 tt_write ((unsigned char *)VT100_ANS, 2512 tt_write (VT100_ANS, strlen (VT100_ANS));
2542 (unsigned int)STRLEN (VT100_ANS));
2543 break; 2513 break;
2544 case C0_BEL: /* bell */ 2514 case C0_BEL: /* bell */
2545 scr_bell (); 2515 scr_bell ();
2546 break; 2516 break;
2547 case C0_BS: /* backspace */ 2517 case C0_BS: /* backspace */
… …
2571 process_dcs_seq (); 2541 process_dcs_seq ();
2572 break; 2542 break;
2573 case 0x9b: /* CSI */ 2543 case 0x9b: /* CSI */
2574 process_csi_seq (); 2544 process_csi_seq ();
2575 break; 2545 break;
2576 case 0x9d: /* CSI */ 2546 case 0x9d: /* OSC */
2577 process_osc_seq (); 2547 process_osc_seq ();
2578 break; 2548 break;
2579#endif 2549#endif
2580 } 2550 }
2581} 2551}
… …
2625 break; 2595 break;
2626 case 'Z': /* identify the terminal type */ 2596 case 'Z': /* identify the terminal type */
2627 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2628 break; 2598 break;
2629 case '<': /* turn off VT52 mode */ 2599 case '<': /* turn off VT52 mode */
2630 PrivMode (0, PrivMode_vt52); 2600 set_privmode (PrivMode_vt52, 0);
2631 break; 2601 break;
2632 case 'F': /* use special graphics character set */ 2602 case 'F': /* use special graphics character set */
2633 case 'G': /* use regular character set */ 2603 case 'G': /* use regular character set */
2634 /* unimplemented */ 2604 /* unimplemented */
2635 break; 2605 break;
… …
2646void 2616void
2647rxvt_term::process_escape_seq () 2617rxvt_term::process_escape_seq ()
2648{ 2618{
2649 unicode_t ch = cmd_getc (); 2619 unicode_t ch = cmd_getc ();
2650 2620
2651 if (PrivateModes & PrivMode_vt52) 2621 if (priv_modes & PrivMode_vt52)
2652 { 2622 {
2653 process_escape_vt52 (ch); 2623 process_escape_vt52 (ch);
2654 return; 2624 return;
2655 } 2625 }
2656 2626
2657 switch (ch) 2627 switch (ch)
2658 { 2628 {
2659 /* case 1: do_tek_mode (); break; */
2660 case '#': 2629 case '#':
2661 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2662 scr_E (); 2631 scr_E ();
2663 break; 2632 break;
2664 case '(': 2633 case '(':
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 2640 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 2641 break;
2673 case '+': 2642 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 2643 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 2644 break;
2676#ifndef NO_FRILLS 2645#if !ENABLE_MINIMAL
2677 case '6': 2646 case '6':
2678 scr_backindex (); 2647 scr_backindex ();
2679 break; 2648 break;
2680#endif 2649#endif
2681 case '7': 2650 case '7':
2682 scr_cursor (SAVE); 2651 scr_cursor (SAVE);
2683 break; 2652 break;
2684 case '8': 2653 case '8':
2685 scr_cursor (RESTORE); 2654 scr_cursor (RESTORE);
2686 break; 2655 break;
2687#ifndef NO_FRILLS 2656#if !ENABLE_MINIMAL
2688 case '9': 2657 case '9':
2689 scr_forwardindex (); 2658 scr_forwardindex ();
2690 break; 2659 break;
2691#endif 2660#endif
2692 case '=': 2661 case '=':
2693 case '>': 2662 case '>':
2694 PrivMode ((ch == '='), PrivMode_aplKP); 2663 set_privmode (PrivMode_aplKP, ch == '=');
2695 break; 2664 break;
2696 2665
2697 case C1_40: 2666 case C1_40:
2698 cmd_getc (); 2667 cmd_getc ();
2699 break; 2668 break;
… …
2702 break; 2671 break;
2703 2672
2704 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2705 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2706 { 2675 {
2707 unicode_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2708 scr_add_lines (nlcr, 1, 2); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2709 } 2678 }
2710 break; 2679 break;
2711 2680
2712 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2713 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2714 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2715 break; 2686 break;
2716 2687
2717 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2718 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2719 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2723 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2724 scr_index (DN); 2695 scr_index (DN);
2725 break; 2696 break;
2726 2697
2727 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2728 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2729 2700
2730 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2731 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2732 2703
2733 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2734 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2735 process_dcs_seq (); 2706 process_dcs_seq ();
2736 break; 2707 break;
2737 2708
2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2709 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2739 case C1_SCI: /* ESC Z */ 2710 case C1_SCI: /* ESC Z */
2740 tt_write ((const unsigned char *)ESCZ_ANSWER, 2711 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2742 break; /* steal obsolete ESC [ c */ 2712 break; /* steal obsolete ESC [ c */
2743 2713
2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2714 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2745 case C1_CSI: /* ESC [ */ 2715 case C1_CSI: /* ESC [ */
2746 process_csi_seq (); 2716 process_csi_seq ();
2747 break; 2717 break;
2748 2718
2749 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2719 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2750 case C1_OSC: /* ESC ] */ 2720 case C1_OSC: /* ESC ] */
2751 process_osc_seq (); 2721 process_osc_seq ();
2752 break; 2722 break;
2753 2723
2754 /* 8.3.106: RESET TO INITIAL STATE */ 2724 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2755 case 'c': 2725 case 'c':
2756 mbstate.reset (); 2726 mbstate.reset ();
2757 scr_poweron (); 2727 scr_poweron ();
2758 scrollbar_show (1); 2728 scrollBar.show (1);
2759 break; 2729 break;
2760 2730
2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2731 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2762 case 'n': 2732 case 'n':
2763 scr_charset_choose (2); 2733 scr_charset_choose (2);
… …
2770 } 2740 }
2771} 2741}
2772/*}}} */ 2742/*}}} */
2773 2743
2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2775/* *INDENT-OFF* */
2776enum { 2745enum {
2777 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2778 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2779 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2780 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2783 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2784 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2785 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2786}; 2755};
2787 2756
2788#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2789 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2790 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2791#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2792 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2793 2762
2794const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2795 { 2764 {
2796 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2797 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2798 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2799 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2800 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2801 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2802 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2803 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2804 }; 2773 };
2805/* *INDENT-ON* */
2806 2774
2807void 2775void
2808rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2809{ 2777{
2810 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
2811 unsigned int nargs, p; 2779 unsigned int nargs, p;
2812 int n, ndef; 2780 int n, ndef;
2813 int arg[ESC_ARGS]; 2781 int arg[ESC_ARGS] = { };
2814 2782
2815 for (nargs = ESC_ARGS; nargs > 0;) 2783 nargs = 0;
2816 arg[--nargs] = 0;
2817 2784
2818 priv = 0; 2785 priv = 0;
2819 ch = cmd_getc (); 2786 ch = cmd_getc ();
2820 if (ch >= '<' && ch <= '?') 2787 if ((ch >= '<' && ch <= '?') || ch == '!')
2788 {
2821 { /* '<' '=' '>' '?' */ 2789 /* '<' '=' '>' '?' '!' */
2822 priv = ch; 2790 priv = ch;
2823 ch = cmd_getc (); 2791 ch = cmd_getc ();
2824 } 2792 }
2825 2793
2826 /* read any numerical arguments */ 2794 /* read any numerical arguments */
… …
2855 ndef = get_byte_array_bit (csi_defaults, i); 2823 ndef = get_byte_array_bit (csi_defaults, i);
2856 for (p = 0; p < nargs; p++) 2824 for (p = 0; p < nargs; p++)
2857 if (arg[p] == -1) 2825 if (arg[p] == -1)
2858 arg[p] = ndef; 2826 arg[p] = ndef;
2859 2827
2860#ifdef DEBUG_CMD
2861 fprintf (stderr, "CSI ");
2862 for (p = 0; p < nargs; p++)
2863 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2864 fprintf (stderr, "%c\n", ch);
2865#endif
2866
2867 /* 2828 /*
2868 * private mode handling 2829 * private mode handling
2869 */ 2830 */
2870 if (priv) 2831 if (priv)
2871 { 2832 {
2872 switch (priv) 2833 switch (priv)
2873 { 2834 {
2874 case '>': 2835 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 2836 if (ch == CSI_DA) /* secondary device attributes */
2837 {
2838 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2839 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2840 //
2841 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2842 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2843 // versions.
2844 //
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2845 tt_printf ("\033[>%d;95;0c", 'U');
2846 }
2877 break; 2847 break;
2848
2878 case '?': 2849 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 2852 break;
2853
2854 case '!':
2855 if (ch == CSI_70)
2856 {
2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2858 scr_soft_reset ();
2859
2860 static const int pm_h[] = { 7, 25 };
2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2862
2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2882 } 2865 }
2866 break;
2867 }
2868
2883 return; 2869 return;
2884 } 2870 }
2885 2871
2886 switch (ch) 2872 switch (ch)
2887 { 2873 {
… …
2986 2972
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2973 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 2974 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 2975 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2976 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2977 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 2978 break;
2993 2979
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2980 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 2981 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 2982 break;
2998 2983
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2984 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 2985 process_sgr_mode (nargs, arg);
3001 break; 2986 break;
… …
3008 break; 2993 break;
3009 case 6: /* CPR requested */ 2994 case 6: /* CPR requested */
3010 scr_report_position (); 2995 scr_report_position ();
3011 break; 2996 break;
3012 case 7: /* unofficial extension */ 2997 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 2998 if (option (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2999 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3000 break;
3016 case 8: /* unofficial extension */ 3001 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3002 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3003 break;
3019 } 3004 }
… …
3055 break; 3040 break;
3056 3041
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3042 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3043 if (arg[0] == 4)
3059 scr_insert_mode (0); 3044 scr_insert_mode (0);
3045 else if (arg[0] == 20)
3046 priv_modes &= ~PrivMode_LFNL;
3060 break; 3047 break;
3061 3048
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3049 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3050 if (arg[0] == 4)
3064 scr_insert_mode (1); 3051 scr_insert_mode (1);
3052 else if (arg[0] == 20)
3053 priv_modes |= PrivMode_LFNL;
3065 break; 3054 break;
3066 3055
3067 /* 3056 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3057 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3058 */
… …
3081 break; 3070 break;
3082 case CSI_75: 3071 case CSI_75:
3083 scr_cursor (RESTORE); 3072 scr_cursor (RESTORE);
3084 break; 3073 break;
3085 3074
3086#ifndef NO_FRILLS 3075#if !ENABLE_MINIMAL
3087 case CSI_74: 3076 case CSI_74:
3088 process_window_ops (arg, nargs); 3077 process_window_ops (arg, nargs);
3089 break; 3078 break;
3090#endif 3079#endif
3091 3080
… …
3098 break; 3087 break;
3099 } 3088 }
3100} 3089}
3101/*}}} */ 3090/*}}} */
3102 3091
3103#ifndef NO_FRILLS 3092#if !ENABLE_MINIMAL
3104/* ARGSUSED */
3105void 3093void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3095{
3108 int x, y; 3096 int x, y;
3109 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
3110 Window wdummy; 3098 Window wdummy;
3099
3100 dLocal (Display *, dpy);
3111 3101
3112 if (nargs == 0) 3102 if (nargs == 0)
3113 return; 3103 return;
3114 3104
3115 switch (args[0]) 3105 switch (args[0])
3116 { 3106 {
3117 /* 3107 /*
3118 * commands 3108 * commands
3119 */ 3109 */
3120 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3111 XMapWindow (dpy, parent);
3122 break; 3112 break;
3123 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3114 XIconifyWindow (dpy, parent, display->screen);
3125 DefaultScreen (display->display));
3126 break; 3115 break;
3127 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3129 break; 3118 break;
3130 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3121 break;
3133 case 5: /* raise window */ 3122 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3123 XRaiseWindow (dpy, parent);
3135 break; 3124 break;
3136 case 6: /* lower window */ 3125 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3126 XLowerWindow (dpy, parent);
3138 break; 3127 break;
3139 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3140 scr_touch (true); 3129 scr_touch (true);
3141 break; 3130 break;
3142 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3132 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3133 (unsigned int) (args[1] * fheight));
3145 break; 3134 break;
3146 3135
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3136 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3137 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3138 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3139 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3140 (unsigned int) (args[1] * fheight));
3152 break; 3141 break;
3153
3154 3142
3155 /* 3143 /*
3156 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3157 */ 3145 */
3158 case 11: /* report window state */ 3146 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3149 break;
3162 case 13: /* report window position */ 3150 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3156 break;
3169 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3160 break;
3173 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3163 break;
3176 case 19: /* report window size (chars) */ 3164 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3166 break;
3179 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3168 {
3182 char *s; 3169 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s);
3185 } 3173 }
3186 break; 3174 break;
3187 case 21: /* report window title */ 3175 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3176 {
3190 char *s; 3177 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3180 XFree (s);
3193 } 3181 }
3194 break; 3182 break;
3195 } 3183 }
3196} 3184}
3197#endif 3185#endif
3198 3186
3199/*----------------------------------------------------------------------*/ 3187/*----------------------------------------------------------------------*/
3200/* 3188/*
3201 * get input up until STRING TERMINATOR (or BEL) 3189 * get input up until STRING TERMINATOR (or BEL)
3202 * ends_how is terminator used. returned input must be free()'d 3190 * ends_how is terminator used. returned input must be free()'d
3203 */ 3191 */
3204unsigned char * 3192char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3193rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3194{
3207 unicode_t prev = 0, ch; 3195 unicode_t ch;
3196 bool seen_esc = false;
3208 unsigned int n = 0; 3197 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3198 wchar_t string[STRING_MAX];
3211 3199
3212 while ((ch = cmd_getc ()) != NOCHAR) 3200 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3201 {
3214 if (prev == C0_ESC) 3202 if (seen_esc)
3215 { 3203 {
3216 if (ch == 0x5c) /* 7bit ST */ 3204 if (ch == 0x5c) /* 7bit ST */
3217 break; 3205 break;
3218 else 3206 else
3219 return NULL; 3207 return NULL;
3220 } 3208 }
3209 else if (ch == C0_ESC)
3210 {
3211 seen_esc = true;
3212 continue;
3213 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3214 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3215 break;
3216 else if (ch == C0_SYN)
3217 ch = cmd_get8 ();
3223 else if (ch < 0x20) 3218 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3219 return NULL; /* other control character - exit */
3225 3220
3226 if (n >= sizeof (string) - 1) 3221 seen_esc = false;
3222
3223 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3224 // stop at some sane length
3228 return NULL; 3225 return NULL;
3229 3226
3230 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else
3236 string[n++] = prev = ch; 3227 string[n++] = ch;
3237 } 3228 }
3238 3229
3239 string[n++] = '\0'; 3230 string[n++] = '\0';
3240 3231
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3232 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3233
3246 return s; 3234 return rxvt_wcstombs (string);
3247} 3235}
3248 3236
3249/*----------------------------------------------------------------------*/ 3237/*----------------------------------------------------------------------*/
3250/* 3238/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3252 */ 3240 */
3253void 3241void
3254rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3255{ 3243{
3256 unsigned char *s;
3257 unicode_t eh;
3258
3259 /* 3244 /*
3260 * Not handled yet 3245 * Not handled yet
3261 */ 3246 */
3247
3248 unicode_t eh;
3262 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3263 if (s) 3250 if (s)
3264 free (s); 3251 free (s);
3265 3252
3266 return; 3253 return;
3267} 3254}
… …
3271 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3272 */ 3259 */
3273void 3260void
3274rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3275{ 3262{
3276 unicode_t ch, eh;
3277 int arg; 3263 int arg;
3278 3264
3279 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3280 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3281 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3282 3268
3283 if (ch == ';') 3269 if (ch == ';')
3284 { 3270 {
3271 unicode_t eh;
3285 unsigned char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3286 3273
3287 if (s) 3274 if (s)
3288 { 3275 {
3289 process_xterm_seq (arg, (char *)s, eh); 3276 process_xterm_seq (arg, s, eh);
3290 free (s); 3277 free (s);
3291 } 3278 }
3292 } 3279 }
3293} 3280}
3294 3281
3295void 3282void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3283rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3297{ 3284{
3298 if (str[0] == '?' && !str[1]) 3285 if (str[0] == '?' && !str[1])
3299 { 3286 {
3300 if (Options & Opt_insecure) 3287 rgba c;
3301 { 3288 pix_colors_focused[color].get (c);
3302 unsigned short r, g, b; 3289
3303 PixColorsFocused[color].get (display, r, g, b); 3290#if XFT
3291 if (c.a != rgba::MAX_CC)
3292 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3293 else
3294#endif
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3295 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3305 }
3306 } 3296 }
3307 else 3297 else
3308 set_window_color (color, str); 3298 set_window_color (color, str);
3309} 3299}
3310 3300
3311/* 3301/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3302 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3313 * 0 = change iconName/title
3314 * 1 = change iconName
3315 * 2 = change title
3316 * 4 = change color
3317 * 10 = change fg color
3318 * 11 = change bg color
3319 * 12 = change text color
3320 * 13 = change mouse foreground color
3321 * 17 = change highlight character colour
3322 * 18 = change bold character color
3323 * 19 = change underlined character color
3324 * 46 = change logfile (not implemented)
3325 * 50 = change font
3326 *
3327 * rxvt extensions:
3328 * 20 = bg pixmap
3329 * 39 = change default fg color
3330 * 49 = change default bg color
3331 * 55 = dump scrollback buffer and all of screen
3332 * 701 = change locale
3333 * 702 = find font
3334 * 703 = menu
3335 */ 3303 */
3336void 3304void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3305rxvt_term::process_xterm_seq (int op, char *str, char resp)
3338{ 3306{
3339 int changed = 0;
3340 int color; 3307 int color;
3341 char *buf, *name; 3308 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3309 bool query = str[0] == '?' && !str[1];
3310 int saveop = op;
3311
3312 dLocal (Display *, dpy);
3343 3313
3344 assert (str != NULL); 3314 assert (str != NULL);
3315
3316 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3317 return;
3318
3345 switch (op) 3319 switch (op)
3346 { 3320 {
3347 case XTerm_name: 3321 case XTerm_name:
3348 set_title (str); 3322 set_title (str);
3349 /* FALLTHROUGH */ 3323 /* FALLTHROUGH */
… …
3354 set_title (str); 3328 set_title (str);
3355 break; 3329 break;
3356 case XTerm_property: 3330 case XTerm_property:
3357 if (str[0] == '?') 3331 if (str[0] == '?')
3358 { 3332 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3333 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3334 Atom actual_type;
3361 int actual_format; 3335 int actual_format;
3362 unsigned long nitems; 3336 unsigned long nitems;
3363 unsigned long bytes_after; 3337 unsigned long bytes_after;
3364 unsigned char *value = 0; 3338 unsigned char *value = 0;
3365 const char *str = ""; 3339 const char *str = "";
3366 3340
3367 if (prop 3341 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3342 && XGetWindowProperty (dpy, parent,
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3346 && actual_type != None
3373 && actual_format == 8) 3347 && actual_format == 8)
3374 str = (const char *)(value); 3348 str = (const char *)(value);
3375 3349
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3350 tt_printf ("\033]%d;%s%c", op, str, resp);
3377 3351
3378 XFree (value); 3352 XFree (value);
3379 } 3353 }
3380 else 3354 else
3381 { 3355 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3356 char *eq = strchr (str, '=');
3383 3357
3384 if (eq) 3358 if (eq)
3385 { 3359 {
3386 *eq = 0; 3360 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3361 set_utf8_property (display->atom (str), eq + 1);
3388 display->atom (str), XA_STRING, 8,
3389 PropModeReplace, (unsigned char *)eq + 1,
3390 strlen (eq + 1));
3391 } 3362 }
3392 else 3363 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3364 XDeleteProperty (dpy, parent,
3394 display->atom (str)); 3365 display->atom (str));
3395 } 3366 }
3396 break; 3367 break;
3397 3368
3398 case XTerm_Color: 3369 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3370 for (buf = (char *)str; buf && *buf;)
3400 { 3371 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3372 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3373 break;
3403 3374
3404 *name++ = '\0'; 3375 *name++ = '\0';
3405 color = atoi (buf); 3376 color = atoi (buf) + minCOLOR;
3406 3377
3407 if (color < 0 || color >= TOTAL_COLORS) 3378 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3408 break; 3379 break;
3409 3380
3410 if ((buf = STRCHR (name, ';')) != NULL) 3381 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3382 *buf++ = '\0';
3412 3383
3413 if (name[0] == '?' && !name[1]) 3384 process_color_seq (op, color, name, resp);
3385 }
3386 break;
3387 case Rxvt_restoreFG:
3388 case XTerm_Color00:
3389 process_color_seq (op, Color_fg, str, resp);
3390 break;
3391 case Rxvt_restoreBG:
3392 case XTerm_Color01:
3393 process_color_seq (op, Color_bg, str, resp);
3394 break;
3395#ifndef NO_CURSORCOLOR
3396 case XTerm_Color_cursor:
3397 process_color_seq (op, Color_cursor, str, resp);
3398 break;
3399#endif
3400 case XTerm_Color_pointer_fg:
3401 process_color_seq (op, Color_pointer_fg, str, resp);
3402 break;
3403 case XTerm_Color_pointer_bg:
3404 process_color_seq (op, Color_pointer_bg, str, resp);
3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3415 case URxvt_Color_BD:
3416 process_color_seq (op, Color_BD, str, resp);
3417 break;
3418 case URxvt_Color_UL:
3419 process_color_seq (op, Color_UL, str, resp);
3420 break;
3421 case URxvt_Color_IT:
3422 process_color_seq (op, Color_IT, str, resp);
3423 break;
3424#endif
3425 case URxvt_Color_border:
3426 process_color_seq (op, Color_border, str, resp);
3427 break;
3428#if ENABLE_TRANSPARENCY
3429 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp);
3431 {
3432 bool changed = false;
3433
3434 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3436
3437 if (changed)
3438 update_background ();
3439 }
3440
3441 break;
3442#endif
3443
3444#if BG_IMAGE_FROM_FILE
3445 case Rxvt_Pixmap:
3446 if (!strcmp (str, "?"))
3447 {
3448 char str[256];
3449
3450 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767),
3452 min (h_align, 32767), min (v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 }
3455 else
3456 {
3457 int changed = 0;
3458
3459 if (*str != ';')
3414 { 3460 {
3415 if (Options & Opt_insecure) 3461 if (bg_set_file (str)) /* change pixmap */
3416 { 3462 {
3417 unsigned short r, g, b; 3463 changed++;
3418 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3464 str = strchr (str, ';');
3419 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3465 if (str == NULL)
3466 bg_set_default_geometry ();
3467 else
3468 bg_set_geometry (str+1);
3420 } 3469 }
3421 } 3470 }
3422 else 3471 else
3423 set_window_color (color + minCOLOR, name); 3472 {
3473 str++;
3474 if (bg_set_geometry (str, true))
3475 changed++;
3476 }
3477
3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3486 update_background ();
3487 }
3424 } 3488 }
3425 break; 3489 break;
3426 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3428 break;
3429 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3431 break;
3432#ifndef NO_CURSORCOLOR
3433 case XTerm_Color_cursor:
3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3435 break;
3436#endif 3490#endif
3437 case XTerm_Color_pointer_fg:
3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3439 break;
3440 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3442 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE
3444 case XTerm_Color_BD:
3445 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3446 break;
3447 case XTerm_Color_UL:
3448 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3449 break;
3450 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3452 break;
3453#endif
3454
3455 case XTerm_Pixmap:
3456 if (*str != ';')
3457 {
3458#if XPM_BACKGROUND
3459 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */
3461#endif
3462 scr_touch (true);
3463 }
3464 while ((str = STRCHR (str, ';')) != NULL)
3465 {
3466 str++;
3467#if XPM_BACKGROUND
3468 changed += scale_pixmap (str);
3469#endif
3470
3471 }
3472 if (changed)
3473 {
3474#ifdef XPM_BACKGROUND
3475 resize_pixmap ();
3476#endif
3477 scr_touch (true);
3478 }
3479 break;
3480
3481 case XTerm_restoreFG:
3482 set_window_color (Color_fg, str);
3483 break;
3484 case XTerm_restoreBG:
3485 set_window_color (Color_bg, str);
3486 break;
3487 3491
3488 case XTerm_logfile: 3492 case XTerm_logfile:
3489 // TODO, when secure mode? 3493 // TODO, when secure mode?
3490 break; 3494 break;
3491 3495
3492 case XTerm_font:
3493 if (query)
3494 {
3495 if (Options & Opt_insecure)
3496 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3497 TermWin.fontset->fontdesc
3498 ? TermWin.fontset->fontdesc
3499 : "",
3500 resp);
3501 }
3502 else
3503 change_font (str);
3504 break;
3505
3506#ifndef NO_FRILLS
3507 case XTerm_locale:
3508 if (query)
3509 {
3510 if (Options & Opt_insecure)
3511 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3512 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 break;
3521
3522 case XTerm_findfont:
3523 if (Options & Opt_insecure)
3524 {
3525 int fid = TermWin.fontset->find_font (atoi (str));
3526 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3527 fid, (*TermWin.fontset)[fid]->name, resp);
3528 }
3529 break;
3530#endif
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break;
3537#endif
3538#if 0 3496#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3497 case Rxvt_dumpscreen: /* no error notices */
3540 { 3498 {
3541 int fd; 3499 int fd;
3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3500 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3543 { 3501 {
3544 scr_dump (fd); 3502 scr_dump (fd);
3545 close (fd); 3503 close (fd);
3546 } 3504 }
3547 } 3505 }
3506 break;
3507#endif
3508 case XTerm_font:
3509 op = URxvt_font;
3510 case URxvt_font:
3511#if ENABLE_STYLES
3512 case URxvt_boldFont:
3513 case URxvt_italicFont:
3514 case URxvt_boldItalicFont:
3515#endif
3516 if (query)
3517 tt_printf ("\33]%d;%-.250s%c", saveop,
3518 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3519 ? fontset[op - URxvt_font]->fontdesc : "",
3520 resp);
3521 else
3522 {
3523 const char *&res = rs[Rs_font + (op - URxvt_font)];
3524
3525 res = strdup (str);
3526 allocated.push_back ((void *)res);
3527 set_fonts ();
3528 }
3529 break;
3530
3531 case URxvt_version:
3532 if (query)
3533 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3534 op,
3535 rs[Rs_name], VERSION[0], VERSION[2],
3536 resp);
3537 break;
3538
3539#if !ENABLE_MINIMAL
3540 case URxvt_locale:
3541 if (query)
3542 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3543 else
3544 {
3545 set_locale (str);
3546 pty->set_utf8_mode (enc_utf8);
3547 init_xlocale ();
3548 }
3549 break;
3550
3551 case URxvt_view_up:
3552 case URxvt_view_down:
3553 {
3554 int lines = atoi (str);
3555
3556 if (lines)
3557 scr_page (op == URxvt_view_up ? UP : DN, lines);
3558 else
3559 scr_erase_savelines ();
3560 }
3561
3562 break;
3563#endif
3564
3565#if ENABLE_PERL
3566 case URxvt_perl:
3567 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3548 break; 3568 break;
3549#endif 3569#endif
3550 } 3570 }
3551} 3571}
3552/*----------------------------------------------------------------------*/ 3572/*----------------------------------------------------------------------*/
… …
3566{ 3586{
3567 int state; 3587 int state;
3568 3588
3569 if (mode == 's') 3589 if (mode == 's')
3570 { 3590 {
3571 SavedModes |= (PrivateModes & bit); 3591 SavedModes |= (priv_modes & bit);
3572 return -1; 3592 return -1;
3573 } 3593 }
3574 else 3594 else
3575 { 3595 {
3576 if (mode == 'r') 3596 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3597 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3598 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3599 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3600
3601 set_privmode (bit, state);
3581 } 3602 }
3582 3603
3583 return state; 3604 return state;
3584} 3605}
3585 3606
3586/* we're not using priv _yet_ */ 3607/* we're not using priv _yet_ */
3587void 3608void
3588rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3609rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3589{ 3610{
3590 unsigned int i, j; 3611 unsigned int i, j;
3591 int state; 3612 int state;
3592 3613
3593 static const struct 3614 static const struct
3594 { 3615 {
3595 const int argval; 3616 const int argval;
3596 const unsigned long bit; 3617 const unsigned long bit;
3597 }
3598
3599 argtopriv[] = { 3618 } argtopriv[] = {
3600 { 1, PrivMode_aplCUR }, 3619 { 1, PrivMode_aplCUR }, // DECCKM
3601 { 2, PrivMode_vt52 }, 3620 { 2, PrivMode_vt52 },
3602 { 3, PrivMode_132 }, 3621 { 3, PrivMode_132 }, // DECCOLM
3603 { 4, PrivMode_smoothScroll }, 3622 { 4, PrivMode_smoothScroll }, // DECSCLM
3604 { 5, PrivMode_rVideo }, 3623 { 5, PrivMode_rVideo }, // DECSCNM
3605 { 6, PrivMode_relOrigin }, 3624 { 6, PrivMode_relOrigin }, // DECOM
3606 { 7, PrivMode_Autowrap }, 3625 { 7, PrivMode_Autowrap }, // DECAWM
3626 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 3628 // 18 end FF to printer after print screen
3609 { menuBar_esc, PrivMode_menuBar }, 3629 // 19 Print screen prints full screen/scroll region
3610#endif 3630 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3631#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3632 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3633#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 3634 { 35, PrivMode_ShiftKeys }, // rxvt extension
3635 // 38, tektronix mode // DECTEK
3618 { 40, PrivMode_132OK }, 3636 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 3637 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 3638 // 45 margin bell NYI
3621 // 46 start logging 3639 // 46 start logging
3622 { 47, PrivMode_Screen }, 3640 { 47, PrivMode_Screen },
3623 { 66, PrivMode_aplKP }, 3641 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3624#ifndef NO_BACKSPACE_KEY 3642#ifndef NO_BACKSPACE_KEY
3625 { 67, PrivMode_BackSpace }, 3643 { 67, PrivMode_BackSpace }, // DECBKM
3626#endif 3644#endif
3627 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
3628 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3646 { 1002, PrivMode_MouseBtnEvent },
3629 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3647 { 1003, PrivMode_MouseAnyEvent },
3630 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
3631 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3632 { 1011, PrivMode_Keypress }, // rxvt extension 3652 { 1011, PrivMode_Keypress }, // rxvt extension
3653#if ENABLE_FRILLS
3654 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3655#endif
3633 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
3634 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
3635 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
3636 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
3637 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
3638 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3661 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3639 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3663 { 2004, PrivMode_BracketPaste },
3640 }; 3664 };
3641 3665
3642 if (nargs == 0) 3666 if (nargs == 0)
3643 return; 3667 return;
3644 3668
… …
3651 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3652 { 3676 {
3653 state = -1; 3677 state = -1;
3654 3678
3655 /* basic handling */ 3679 /* basic handling */
3656 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ecb_array_length (argtopriv); j++)
3657 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3658 { 3682 {
3659 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3660 break; 3684 break;
3661 } 3685 }
3662 3686
3663 /* extra handling for values with state unkept */ 3687 /* extra handling for values with state unkept */
3664 switch (arg[i]) 3688 switch (arg[i])
3665 { 3689 {
3690#if ENABLE_STYLES
3691 case 1021:
3692 set_option (Opt_intensityStyles, mode);
3693
3694 scr_touch (true);
3695 break;
3696#endif
3666 case 1048: /* alternative cursor save */ 3697 case 1048: /* alternative cursor save */
3667 if (Options & Opt_secondaryScreen) 3698 if (option (Opt_secondaryScreen))
3668 if (mode == 0) 3699 if (mode == 0)
3669 scr_cursor (RESTORE); 3700 scr_cursor (RESTORE);
3670 else if (mode == 1) 3701 else if (mode == 1)
3671 scr_cursor (SAVE); 3702 scr_cursor (SAVE);
3672 break; 3703 break;
… …
3680 case 2: /* VT52 mode */ 3711 case 2: /* VT52 mode */
3681 /* oddball mode. should be set regardless of set/reset 3712 /* oddball mode. should be set regardless of set/reset
3682 * parameter. Return from VT52 mode with an ESC < from 3713 * parameter. Return from VT52 mode with an ESC < from
3683 * within VT52 mode 3714 * within VT52 mode
3684 */ 3715 */
3685 PrivMode (1, PrivMode_vt52); 3716 set_privmode (PrivMode_vt52, 1);
3686 break; 3717 break;
3687 case 3: /* 80/132 */ 3718 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 3719 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3720 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3690 break; 3721 break;
3691 case 4: /* smooth scrolling */ 3722 case 4: /* smooth scrolling */
3692 if (state) 3723 set_option (Opt_jumpScroll, !state);
3693 Options &= ~Opt_jumpScroll;
3694 else
3695 Options |= Opt_jumpScroll;
3696 break; 3724 break;
3697 case 5: /* reverse video */ 3725 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 3726 scr_rvideo_mode (state);
3699 break; 3727 break;
3700 case 6: /* relative/absolute origins */ 3728 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 3732 scr_autowrap (state);
3705 break; 3733 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 3734 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 3735 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 3736 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 3737 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3710 break; 3738 break;
3711#ifdef menuBar_esc
3712 case menuBar_esc:
3713#ifdef MENUBAR
3714 map_menuBar (state);
3715#endif
3716 break;
3717#endif
3718#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3719 case scrollBar_esc: 3740 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3741 if (scrollBar.map (state))
3721 { 3742 {
3722 resize_all_windows (0, 0, 0); 3743 resize_all_windows (0, 0, 0);
3723 scr_touch (true); 3744 scr_touch (true);
3724 } 3745 }
3725 break; 3746 break;
… …
3734 break; 3755 break;
3735 /* case 66: - application key pad */ 3756 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3757 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3758 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3761 break;
3741#if 0
3742 case 1001: 3762 case 1002:
3743 break; /* X11 mouse highlighting */ 3763 case 1003:
3744#endif 3764 if (state)
3765 {
3766 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3767 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3768 mouse_row = mouse_col = 0;
3769 vt_emask_mouse = PointerMotionMask;
3770 }
3771 else
3772 vt_emask_mouse = NoEventMask;
3773
3774 vt_select_input ();
3775 break;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3776 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state)
3747 Options &= ~Opt_scrollTtyOutput;
3748 else
3749 Options |= Opt_scrollTtyOutput; 3777 set_option (Opt_scrollTtyOutput, !state);
3750 break; 3778 break;
3751 case 1011: /* scroll to bottom on key press */ 3779 case 1011: /* scroll to bottom on key press */
3752 if (state)
3753 Options |= Opt_scrollTtyKeypress; 3780 set_option (Opt_scrollTtyKeypress, state);
3754 else
3755 Options &= ~Opt_scrollTtyKeypress;
3756 break; 3781 break;
3757 case 1047: /* secondary screen w/ clearing last */ 3782 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 3783 if (option (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 3784 if (!state)
3760 scr_erase_screen (2); 3785 scr_erase_screen (2);
3786
3761 scr_change_screen (state); 3787 scr_change_screen (state);
3762 break; 3788 break;
3763 case 1049: /* secondary screen w/ clearing first */ 3789 case 1049: /* secondary screen w/ clearing first */
3790 if (option (Opt_secondaryScreen))
3791 if (state)
3792 scr_cursor (SAVE);
3793
3764 scr_change_screen (state); 3794 scr_change_screen (state);
3795
3765 if (Options & Opt_secondaryScreen) 3796 if (option (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 3797 if (state)
3767 scr_erase_screen (2); 3798 scr_erase_screen (2);
3799 else
3800 scr_cursor (RESTORE);
3768 break; 3801 break;
3769 default: 3802 default:
3770 break; 3803 break;
3771 } 3804 }
3772 } 3805 }
… …
3796 rendset = 0, rendstyle = ~RS_None; 3829 rendset = 0, rendstyle = ~RS_None;
3797 break; 3830 break;
3798 case 1: 3831 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 3832 rendset = 1, rendstyle = RS_Bold;
3800 break; 3833 break;
3801 //case 2: // faint or second colour 3834 //case 2: // low intensity
3835 case 3:
3836 rendset = 1, rendstyle = RS_Italic;
3837 break;
3802 case 4: 3838 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 3839 rendset = 1, rendstyle = RS_Uline;
3804 break; 3840 break;
3805 case 5: // slowly blinking 3841 case 5: // slowly blinking
3806 case 6: // rapidly blinking 3842 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 3854 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 3855 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 3856 //...
3821 //case 19: // ninth alt font 3857 //case 19: // ninth alt font
3822 //case 20: // gothic 3858 //case 20: // gothic
3823 case 21: // disable bold, faint 3859 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 3860 rendset = 0, rendstyle = RS_Bold;
3825 break; 3861 break;
3826 case 22: 3862 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 3863 rendset = 0, rendstyle = RS_Bold;
3828 break; 3864 break;
3829 //case 23: disable italic 3865 case 23: // disable italic
3866 rendset = 0, rendstyle = RS_Italic;
3867 break;
3830 case 24: 3868 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 3869 rendset = 0, rendstyle = RS_Uline;
3832 break; 3870 break;
3833 case 25: 3871 case 25:
3872 rendset = 0, rendstyle = RS_Blink;
3873 break;
3874 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 3875 rendset = 0, rendstyle = RS_Blink;
3835 break; 3876 break;
3836 case 27: 3877 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 3878 rendset = 0, rendstyle = RS_RVid;
3838 break; 3879 break;
… …
3856 case 35: 3897 case 35:
3857 case 36: 3898 case 36:
3858 case 37: 3899 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3900 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 3901 break;
3861#ifdef TTY_256COLOR 3902 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 3903 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 3904 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3905 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 3906 i += 2;
3867 } 3907 }
3868 break; 3908 break;
3869#endif
3870 case 39: /* default fg */ 3909 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 3910 scr_color (Color_fg, Color_fg);
3872 break; 3911 break;
3873 3912
3874 case 40: 3913 case 40:
… …
3879 case 45: 3918 case 45:
3880 case 46: 3919 case 46:
3881 case 47: 3920 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3921 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 3922 break;
3884#ifdef TTY_256COLOR 3923 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 3924 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 3925 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3926 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 3927 i += 2;
3890 } 3928 }
3891 break; 3929 break;
3892#endif
3893 case 49: /* default bg */ 3930 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 3931 scr_color (Color_bg, Color_bg);
3895 break; 3932 break;
3896 3933
3897#ifndef NO_BRIGHTCOLOR 3934 //case 50: // not variable spacing
3935
3936#if !ENABLE_MINIMAL
3898 case 90: 3937 case 90:
3899 case 91: /* set bright fg color */ 3938 case 91: /* set bright fg color */
3900 case 92: 3939 case 92:
3901 case 93: 3940 case 93:
3902 case 94: 3941 case 94:
3903 case 95: 3942 case 95:
3904 case 96: 3943 case 96:
3905 case 97: 3944 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3945 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 3946 break;
3909 case 100: 3947 case 100:
3910 case 101: /* set bright bg color */ 3948 case 101: /* set bright bg color */
3911 case 102: 3949 case 102:
3912 case 103: 3950 case 103:
3913 case 104: 3951 case 104:
3914 case 105: 3952 case 105:
3915 case 106: 3953 case 106:
3916 case 107: 3954 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3955 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 3956 break;
3920#endif 3957#endif
3921
3922 } 3958 }
3923 } 3959 }
3924}
3925/*}}} */
3926
3927/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3928void
3929rxvt_term::process_graphics ()
3930{
3931 unicode_t ch, cmd = cmd_getc ();
3932
3933 if (cmd == 'Q')
3934 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */
3936 return;
3937 }
3938 /* swallow other graphics sequences until terminating ':' */
3939 do
3940 ch = cmd_getc ();
3941 while (ch != ':');
3942} 3960}
3943/*}}} */ 3961/*}}} */
3944 3962
3945/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
3946 3964
… …
3950 */ 3968 */
3951void 3969void
3952rxvt_term::tt_printf (const char *fmt,...) 3970rxvt_term::tt_printf (const char *fmt,...)
3953{ 3971{
3954 va_list arg_ptr; 3972 va_list arg_ptr;
3955 unsigned char buf[256]; 3973 char buf[256];
3956 3974
3957 va_start (arg_ptr, fmt); 3975 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3976 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 3977 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 3978 tt_write (buf, strlen (buf));
3961} 3979}
3962 3980
3963/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 3982/* Write data to the pty as typed by the user, pasted with the mouse,
3965 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
3966 */ 3984 */
3967void 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3969{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT
3971 3986
3972 if (len) 3987void
3988rxvt_term::tt_write (const char *data, unsigned int len)
3989{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3991 return;
3992
3993 if (pty->pty < 0)
3994 return;
3995
3996 if (v_buflen == 0)
3997 {
3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3999
4000 max_it (written, 0);
4001
4002 if (written == len)
4003 return;
4004
4005 data += written;
4006 len -= written;
3973 { 4007 }
4008
4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4010
4011 memcpy (v_buffer + v_buflen, data, len);
4012 v_buflen += len;
4013
4014 pty_ev.set (ev::READ | ev::WRITE);
4015}
4016
4017void rxvt_term::pty_write ()
4018{
4019 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4020
4021 if (written > 0)
4022 {
4023 v_buflen -= written;
4024
3974 if (v_buflen == 0) 4025 if (v_buflen == 0)
3975 { 4026 {
3976 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3977
3978 if ((unsigned int)written == len)
3979 return;
3980
3981 data += written;
3982 len -= written;
3983 }
3984
3985
3986 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3987
3988 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len;
3990 }
3991
3992 for (;;)
3993 {
3994 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3995
3996 if (written > 0)
3997 {
3998 v_buflen -= written;
3999
4000 if (v_buflen == 0)
4001 {
4002 free (v_buffer); 4027 free (v_buffer);
4003 v_buffer = 0; 4028 v_buffer = 0;
4004 v_buflen = 0;
4005 4029
4006 pty_ev.set (EVENT_READ); 4030 pty_ev.set (ev::READ);
4007 return;
4008 }
4009
4010 memmove (v_buffer, v_buffer + written, v_buflen);
4011 }
4012 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4013 // original code just ignores this...
4014 destroy ();
4015 else
4016 {
4017 pty_ev.set (EVENT_READ | EVENT_WRITE);
4018 return; 4031 return;
4019 } 4032 }
4033
4034 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4035 }
4036 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4037 pty_ev.set (ev::READ);
4021} 4038}
4022 4039
4023/*----------------------- end-of-file (C source) -----------------------*/ 4040/*----------------------- end-of-file (C source) -----------------------*/
4024 4041

Diff Legend

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