ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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