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

Diff Legend

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