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

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

Diff Legend

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