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

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

Diff Legend

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