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

Diff Legend

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