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

Diff Legend

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