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

Diff Legend

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