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

Diff Legend

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