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.383 by root, Fri Dec 14 06:29:28 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
687 1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1058{
1059 make_current ();
1060
1061 refresh_count = 0;
688 flush (); 1062 flush ();
689} 1063}
690 1064
691#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
692void 1066void
693rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
694{ 1068{
695 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
696 want_refresh = 1; 1070 want_refresh = 1;
697 1071 refresh_check ();
698 w.start (w.at + BLINK_INTERVAL);
699} 1072}
700#endif 1073#endif
701 1074
702#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
703void 1076void
704rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
705{ 1078{
706 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
707 { 1080 {
708 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
709 want_refresh = 1; 1082 want_refresh = 1;
710 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
711 } 1084 }
1085 else
1086 w.stop ();
712} 1087}
713#endif 1088#endif
714 1089
715#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
716void 1091void
717rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
718{ 1093{
719 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
720 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
721 { 1096 {
722 refresh_type |= SMOOTH_REFRESH;
723 want_refresh = 1; 1097 want_refresh = 1;
724 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
725 } 1099 }
1100 else
1101 w.stop ();
726} 1102}
727#endif 1103#endif
728 1104
729#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
730void 1106void
731rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
732{ 1108{
733 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
734 { 1110 {
735 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
736 refresh_type |= SMOOTH_REFRESH;
737 want_refresh = 1; 1112 want_refresh = 1;
738 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
739 } 1114 }
1115 else
1116 w.stop ();
740} 1117}
741#endif 1118#endif
742 1119
743#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
744void 1121void
745rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
746{ 1123{
747 if (mouse_slip_wheel_speed == 0 1124 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 { 1125 {
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1126 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
754 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
755} 1135}
1136#endif
1137
1138#if LINUX_YIELD_HACK
1139static struct event_handler
1140{
1141 ev::prepare yield_ev;
1142
1143 void yield_cb (ev::prepare &w, int revents)
1144 {
1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1153 w.stop ();
1154 }
1155
1156 event_handler ()
1157 : yield_ev (this, &event_handler::yield_cb)
1158 {
1159 }
1160} event_handler;
756#endif 1161#endif
757 1162
758bool 1163bool
759rxvt_term::pty_fill () 1164rxvt_term::pty_fill ()
760{ 1165{
761 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1166 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
762 1167
763 if (CBUFSIZ == n) 1168 if (CBUFSIZ == n)
764 { 1169 {
765 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1170 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
766 n = 0; 1171 n = 0;
767 } 1172 }
768 1173
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1174 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1175 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1176 cmdbuf_endp = cmdbuf_ptr + n;
772 1177
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1178 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
774 1179
775 if (n > 0) 1180 if (r > 0)
776 { 1181 {
777 cmdbuf_endp += n; 1182 cmdbuf_endp += r;
778 return true; 1183 return true;
779 } 1184 }
780 else if (n < 0 && errno != EAGAIN) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1186 {
1187#if LINUX_YIELD_HACK
1188 if (display->is_local)
1189 event_handler.yield_ev.start ();
1190#endif
1191 }
1192 else
1193 {
1194 pty_ev.stop ();
1195
1196 if (!option (Opt_hold))
781 destroy (); 1197 destroy ();
782 1198 }
1199
783 return false; 1200 return false;
784} 1201}
785 1202
786void 1203void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
788{ 1205{
789 SET_R (this); 1206 make_current ();
790 SET_LOCALE (locale);
791 1207
792 if (revents & EVENT_WRITE) 1208 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 1209 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1210 while (pty_fill ())
797 if (cmd_parse ()) 1211 if (cmd_parse ())
798 break; 1212 break;
1213
1214 if (revents & ev::WRITE)
1215 pty_write ();
1216
1217 refresh_check ();
1218}
1219
1220void
1221rxvt_term::pointer_unblank ()
1222{
1223 XDefineCursor (dpy, vt, TermWin_cursor);
1224 recolour_cursor ();
1225
1226#ifdef POINTER_BLANK
1227 hidden_pointer = 0;
1228
1229 if (option (Opt_pointerBlank))
1230 pointer_ev.start (pointerBlankDelay);
1231#endif
799} 1232}
800 1233
801#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
802void 1235void
803rxvt_term::pointer_unblank () 1236rxvt_term::pointer_blank ()
804{ 1237{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1238 if (!option (Opt_pointerBlank))
806 recolour_cursor (); 1239 return;
807 1240
1241 XDefineCursor (dpy, vt, display->blank_cursor);
1242 XFlush (dpy);
1243
808 hidden_pointer = 0; 1244 hidden_pointer = 1;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812} 1245}
813 1246
814void 1247void
815rxvt_term::pointer_blank () 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
816{ 1249{
817 if (! (Options & Opt_pointerBlank)) 1250 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 1251
832 pointer_blank (); 1252 pointer_blank ();
833} 1253}
834#endif 1254#endif
835 1255
836void 1256void
837rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
838{ 1258{
839 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
840 int x, y; 1260 int x, y;
1261 int code = 32;
841 1262
842 x = ev.x; 1263 x = Pixel2Col (ev.x);
843 y = ev.y; 1264 y = Pixel2Row (ev.y);
844 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
845 1273
846 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1275 button_number = 3;
849 }
850 else 1276 else
851 { 1277 {
852 button_number = MEvent.button - Button1; 1278 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1279 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1280 if (button_number >= 3)
855 button_number += (64 - 3); 1281 button_number += (64 - 3);
856 } 1282 }
857 1283
858 if (PrivateModes & PrivMode_MouseX10) 1284 if (priv_modes & PrivMode_MouseX10)
859 { 1285 {
860 /* 1286 /*
861 * do not report ButtonRelease 1287 * do not report ButtonRelease
862 * no state info allowed 1288 * no state info allowed
863 */ 1289 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1304 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1305 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1306#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1307 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1308#endif
883
884 } 1309 }
885 1310
886#ifdef DEBUG_MOUSEREPORT 1311#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1312 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1313 if (key_state & 16)
889 fputc ('C', stderr); 1314 fputc ('C', stderr);
890 if (key_state & 4) 1315 if (key_state & 4)
891 fputc ('S', stderr); 1316 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1320 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1321 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1322 button_number,
898 x + 1, 1323 x + 1,
899 y + 1); 1324 y + 1);
900#else 1325#endif
1326
901 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1328 (code + button_number + key_state),
903 (32 + x + 1), 1329 (32 + x + 1),
904 (32 + y + 1)); 1330 (32 + y + 1));
905#endif
906} 1331}
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 1332
918/*{{{ process an X event */ 1333/*{{{ process an X event */
919void 1334void
920rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
921{ 1336{
922 SET_R (this); 1337 make_current ();
923 SET_LOCALE (locale);
924 1338
925#if defined(CURSOR_BLINK) 1339 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 1340
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1341 if (ev.xany.window == vt
935 } 1342 && SHOULD_INVOKE (HOOK_X_EVENT)
936#endif 1343 && 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; 1344 return;
955#endif
956 1345
1346 // for XQueryPointer
957 Window unused_root, unused_child; 1347 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1348 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1349 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 1350
1010 switch (ev.type) 1351 switch (ev.type)
1011 { 1352 {
1012 case KeyPress: 1353 case KeyPress:
1013 lookup_key (ev.xkey); 1354 key_press (ev.xkey);
1014 break; 1355 break;
1015 1356
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease: 1357 case KeyRelease:
1018 { 1358 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; 1359 break;
1030 }
1031#endif
1032 1360
1033 case ButtonPress: 1361 case ButtonPress:
1034 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1035 break; 1363 break;
1036 1364
… …
1038 button_release (ev.xbutton); 1366 button_release (ev.xbutton);
1039 break; 1367 break;
1040 1368
1041 case ClientMessage: 1369 case ClientMessage:
1042 if (ev.xclient.format == 32 1370 if (ev.xclient.format == 32
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1371 && !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 { 1372 {
1052 /* Get Dnd data */ 1373 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1053 Atom ActualType; 1374 {
1054 int ActualFormat; 1375 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1055 unsigned char *data; 1376 {
1056 unsigned long Size, RemainingBytes; 1377 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1057 1378 {
1058 XGetWindowProperty (display->display, display->root, 1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1059 xa[XA_DNDSELECTION], 1380 destroy ();
1060 0L, 1000000L, 1381 }
1061 False, AnyPropertyType, 1382#if ENABLE_EWMH
1062 &ActualType, &ActualFormat, 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1063 &Size, &RemainingBytes, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1064 &data); 1386 &ev);
1065 XChangeProperty (display->display, display->root, 1387#endif
1066 XA_CUT_BUFFER0, XA_STRING, 1388 }
1067 8, PropModeReplace, 1389 }
1068 data, STRLEN (data)); 1390#if ENABLE_XEMBED
1069 XFree (data); 1391 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1392 {
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1393 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1394 focus_in ();
1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1396 focus_out ();
1397 }
1398#endif
1072 } 1399 }
1073#endif /* OFFIX_DND */
1074 break;
1075
1076 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping));
1078 break; 1400 break;
1079 1401
1080 /* 1402 /*
1081 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1101 break; 1423 break;
1102 } 1424 }
1103 break; 1425 break;
1104 1426
1105 case FocusIn: 1427 case FocusIn:
1106 if (!TermWin.focus) 1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1431 focus_in ();
1432 break;
1433
1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1438 focus_out ();
1439 break;
1440
1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1445 if (ev.xconfigure.window == parent[0])
1107 { 1446 {
1108 TermWin.focus = 1; 1447 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 } 1448 ;
1120 break;
1121 1449
1122 case FocusOut: 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1123 if (TermWin.focus)
1124 { 1451 {
1125 TermWin.focus = 0; 1452 seen_resize = 1;
1126 want_refresh = 1; 1453 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 } 1454 }
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 1455 else
1160 { 1456 {
1161 D_SIZE ((stderr, "Size: Not resizing")); 1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1162 } 1461 }
1163#endif 1462 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 } 1463 }
1464 break;
1465
1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1173 break; 1472 break;
1174 1473
1175 case SelectionClear: 1474 case SelectionClear:
1176 selection_clear (); 1475 selection_clear ();
1177 break; 1476 break;
1178 1477
1179 case SelectionNotify: 1478 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1479 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1481 break;
1184 1482
1185 case SelectionRequest: 1483 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1484 selection_send (ev.xselectionrequest);
1187 break; 1485 break;
1188 1486
1487 case MapNotify:
1488 mapped = 1;
1489#ifdef TEXT_BLINK
1490 text_blink_ev.start ();
1491#endif
1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 break;
1494
1189 case UnmapNotify: 1495 case UnmapNotify:
1190 TermWin.mapped = 0; 1496 mapped = 0;
1191#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1192 text_blink_ev.stop (); 1498 text_blink_ev.stop ();
1193#endif 1499#endif
1500 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1194 break; 1501 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 1502
1209 case GraphicsExpose: 1503 case GraphicsExpose:
1210 case Expose: 1504 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1505 if (ev.xany.window == vt)
1212 { 1506 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1507 do
1508 {
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1511 }
1217 // I don't understand this, so I changed it :) 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1513
1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1515
1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 {
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1520 }
1221 // ev.xexpose.width, TermWin.height, False); 1521
1222#endif
1223 want_refresh = 1; 1522 want_refresh = 1;
1224 } 1523 }
1225 else 1524 else
1226 { 1525 {
1227 XEvent unused_event; 1526 XEvent unused_event;
1228 1527
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1230 ; 1529 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1531 ;
1233 1532
1234 if (isScrollbarWindow (ev.xany.window)) 1533 if (isScrollbarWindow (ev.xany.window))
1235 { 1534 {
1236 scrollBar.setIdle (); 1535 scrollBar.setIdle ();
1237 scrollbar_show (0); 1536 scrollbar_show (0);
1238 } 1537 }
1239#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose ();
1242#endif
1243 } 1538 }
1244 break; 1539 break;
1245 1540
1246 case MotionNotify: 1541 case MotionNotify:
1247#ifdef POINTER_BLANK 1542#ifdef POINTER_BLANK
1248 if (hidden_pointer) 1543 if (hidden_pointer)
1249 pointer_unblank (); 1544 pointer_unblank ();
1250#endif 1545#endif
1251#if MENUBAR 1546 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1252 if (isMenuBarWindow (ev.xany.window)) 1547 || priv_modes & PrivMode_MouseAnyEvent)
1548 mouse_report (ev.xbutton);
1549 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1550 break;
1551
1552 if (ev.xany.window == vt)
1253 { 1553 {
1254 menubar_control (ev.xbutton); 1554 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1255 break; 1555 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1256 } 1556 ; // 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))) 1557 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1558 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1266 ; 1560 ;
1267 1561
1268 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (dpy, vt,
1269 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1565 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1566 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1570 {
1277#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 ev.xbutton.state & Button3Mask ? 2 : 0);
1582
1280#ifdef SELECTION_SCROLLING 1583#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1584 if (ev.xbutton.y < int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1585 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1283 { 1586 {
1284 int dist; 1587 int dist;
1285 1588
1286 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1287 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1288 */ 1591 */
1289 if (!sel_scroll_ev.active) 1592 if (!sel_scroll_ev.is_active ())
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1593 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1291 1594
1292 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1294 */ 1597 */
1295 selection_save_x=ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1599 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1601
1300 /* calc number of lines to scroll */ 1602 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1603 if (ev.xbutton.y < int_bwidth)
1302 { 1604 {
1303 scroll_selection_dir = UP; 1605 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1606 dist = int_bwidth - ev.xbutton.y;
1305 } 1607 }
1306 else 1608 else
1307 { 1609 {
1308 scroll_selection_dir = DN; 1610 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y - 1611 dist = ev.xbutton.y - (int_bwidth + height);
1310 (TermWin.int_bwidth + TermWin.height);
1311 } 1612 }
1613
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1614 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1615 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1;
1314 MIN_IT (scroll_selection_lines, 1617 min_it (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1618 SELECTION_SCROLL_MAX_LINES);
1316 } 1619 }
1317 else 1620 else
1318 { 1621 {
1319 /* we are within the text window, so we 1622 /* we are within the text window, so we
1320 * shouldn't be scrolling 1623 * shouldn't be scrolling
1321 */ 1624 */
1322 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1324 } 1626 }
1325#endif 1627#endif
1326#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1327
1328 } 1629 }
1329#endif 1630#endif
1330
1331 } 1631 }
1332 } 1632 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1634 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1336 MotionNotify, &ev)) ; 1636 MotionNotify, &ev))
1637 ;
1638
1337 XQueryPointer (display->display, scrollBar.win, 1639 XQueryPointer (dpy, scrollBar.win,
1338 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1642 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1643 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1645 scrollbar_size ());
1344 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1646 want_refresh = 1;
1346 scrollbar_show (1); 1647 scrollbar_show (1);
1347 } 1648 }
1348 break; 1649 break;
1349 } 1650 }
1350}
1351 1651
1652#if defined(CURSOR_BLINK)
1653 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1654 {
1655 if (hidden_cursor)
1656 {
1657 hidden_cursor = 0;
1658 want_refresh = 1;
1659 }
1660
1661 cursor_blink_ev.again ();
1662 }
1663#endif
1664
1665#if defined(POINTER_BLANK)
1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1667 {
1668 if (ev.type == MotionNotify
1669 || ev.type == ButtonPress
1670 || ev.type == ButtonRelease)
1671 if (hidden_pointer)
1672 pointer_unblank ();
1673
1674 if (ev.type == KeyPress && hidden_pointer == 0)
1675 pointer_blank ();
1676 }
1677#endif
1678
1679 refresh_check ();
1680}
1681
1682void
1683rxvt_term::focus_in ()
1684{
1685 if (!focus)
1686 {
1687 focus = 1;
1688 want_refresh = 1;
1689
1690 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1691
1692#if USE_XIM
1693 if (Input_Context != NULL)
1694 {
1695 IMSetPosition ();
1696 XSetICFocus (Input_Context);
1697 }
1698#endif
1699#if CURSOR_BLINK
1700 if (option (Opt_cursorBlink))
1701 cursor_blink_ev.again ();
1702#endif
1703#if OFF_FOCUS_FADING
1704 if (rs[Rs_fade])
1705 {
1706 pix_colors = pix_colors_focused;
1707 scr_recolour ();
1708 }
1709#endif
1710#if ENABLE_FRILLS
1711 if (option (Opt_urgentOnBell))
1712 {
1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714 {
1715 h->flags &= ~XUrgencyHint;
1716 XSetWMHints (dpy, parent[0], h);
1717 }
1718 }
1719#endif
1720 }
1721}
1722
1723void
1724rxvt_term::focus_out ()
1725{
1726 if (focus)
1727 {
1728 focus = 0;
1729 want_refresh = 1;
1730
1731 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1732
1733#if ENABLE_FRILLS || ISO_14755
1734 if (iso14755buf)
1735 {
1736 iso14755buf = 0;
1737# if ISO_14755
1738 scr_overlay_off ();
1739# endif
1740 }
1741#endif
1742#if USE_XIM
1743 if (Input_Context != NULL)
1744 XUnsetICFocus (Input_Context);
1745#endif
1746#if CURSOR_BLINK
1747 if (option (Opt_cursorBlink))
1748 cursor_blink_ev.stop ();
1749
1750 hidden_cursor = 0;
1751#endif
1752#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade])
1754 {
1755 pix_colors = pix_colors_unfocused;
1756 scr_recolour ();
1757 }
1758#endif
1759 }
1760}
1761
1762void
1763rxvt_term::update_fade_color (unsigned int idx)
1764{
1765#if OFF_FOCUS_FADING
1766 if (rs[Rs_fade])
1767 {
1768 rgba c;
1769 pix_colors [Color_fade].get (c);
1770 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1771 }
1772#endif
1773}
1774
1775#if ENABLE_TRANSPARENCY || ENABLE_PERL
1352void 1776void
1353rxvt_term::rootwin_cb (XEvent &ev) 1777rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1778{
1355 SET_R (this); 1779 make_current ();
1356 SET_LOCALE (locale);
1357 1780
1781 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1782 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1783 return;
1784
1785# if ENABLE_TRANSPARENCY
1358 switch (ev.type) 1786 switch (ev.type)
1359 { 1787 {
1360 case PropertyNotify: 1788 case PropertyNotify:
1789 /*
1790 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on.
1792 */
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1793 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1362 { 1795 {
1363 if (ev.xproperty.state == PropertyNewValue) 1796 bgPixmap.set_root_pixmap ();
1364 selection_property (ev.xproperty.window, ev.xproperty.atom); 1797 update_background ();
1365 break;
1366 } 1798 }
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; 1799 break;
1800 }
1386#endif 1801# endif
1387 } 1802
1803 refresh_check ();
1388} 1804}
1805#endif
1389 1806
1390void 1807void
1391rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)
1392{ 1809{
1393 int reportmode = 0, clickintime; 1810 int reportmode = 0, clickintime;
1394 1811
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1812 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1813
1396 if (!bypass_keystate) 1814 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1815 reportmode = !! (priv_modes & PrivMode_mouse_report);
1816
1398 /* 1817 /*
1399 * VT window processing of button press 1818 * VT window processing of button press
1400 */ 1819 */
1401 if (ev.window == TermWin.vt) 1820 if (ev.window == vt)
1402 { 1821 {
1822 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1825#if ISO_14755
1826 // 5.4
1827 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1828 {
1829 iso14755_54 (ev.x, ev.y);
1830 return;
1831 }
1832#endif
1833
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1834 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1835
1404 if (reportmode) 1836 if (reportmode)
1405 { 1837 {
1406 /* mouse report from vt window */ 1838 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1839 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1840 MEvent.state = ev.state;
1409#ifdef MOUSE_REPORT_DOUBLECLICK 1841#ifdef MOUSE_REPORT_DOUBLECLICK
1410 if (ev.button == MEvent.button && clickintime) 1842 if (ev.button == MEvent.button && clickintime)
1411 { 1843 {
1412 /* same button, within alloted time */ 1844 /* same button, within alloted time */
1413 MEvent.clicks++; 1845 MEvent.clicks++;
1846
1414 if (MEvent.clicks > 1) 1847 if (MEvent.clicks > 1)
1415 { 1848 {
1416 /* only report double clicks */ 1849 /* only report double clicks */
1417 MEvent.clicks = 2; 1850 MEvent.clicks = 2;
1418 mouse_report (ev); 1851 mouse_report (ev);
… …
1430 mouse_report (ev); 1863 mouse_report (ev);
1431 } 1864 }
1432#else 1865#else
1433 MEvent.button = ev.button; 1866 MEvent.button = ev.button;
1434 mouse_report (ev); 1867 mouse_report (ev);
1435#endif /* MOUSE_REPORT_DOUBLECLICK */ 1868#endif /* MOUSE_REPORT_DOUBLECLICK */
1436 1869
1437 } 1870 }
1438 else 1871 else
1439 { 1872 {
1440 if (ev.button != MEvent.button) 1873 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1874 MEvent.clicks = 0;
1875
1442 switch (ev.button) 1876 switch (ev.button)
1443 { 1877 {
1444 case Button1: 1878 case Button1:
1879 /* allow meta + click to select rectangular areas */
1880 /* should be done in screen.C */
1881#if ENABLE_FRILLS
1882 selection.rect = !!(ev.state & ModMetaMask);
1883#else
1884 selection.rect = false;
1885#endif
1886
1445 /* allow shift+left click to extend selection */ 1887 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1888 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1447 { 1889 {
1448 if (MEvent.button == Button1 && clickintime) 1890 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1891 selection_rotate (ev.x, ev.y);
1450 else 1892 else
1451 selection_extend (ev.x, ev.y, 1); 1893 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1908 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1909 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1910 selection_rotate (ev.x, ev.y);
1469 else 1911 else
1470 selection_extend (ev.x, ev.y, 1); 1912 selection_extend (ev.x, ev.y, 1);
1913
1471 MEvent.button = Button3; 1914 MEvent.button = Button3;
1472 break; 1915 break;
1473 } 1916 }
1474 } 1917 }
1918
1475 MEvent.time = ev.time; 1919 MEvent.time = ev.time;
1476 return; 1920 return;
1477 } 1921 }
1478 1922
1479 /* 1923 /*
… …
1523 tt_printf ("\033[5~"); 1967 tt_printf ("\033[5~");
1524 break; 1968 break;
1525 } 1969 }
1526 } 1970 }
1527 else 1971 else
1528#endif /* NO_SCROLLBAR_REPORT */ 1972#endif /* NO_SCROLLBAR_REPORT */
1529 1973
1530 { 1974 {
1531 char upordown = 0; 1975 char upordown = 0;
1532 1976
1533 if (scrollBar.style == R_SB_NEXT) 1977 if (scrollBar.style == R_SB_NEXT)
1534 { 1978 {
1535 if (scrollbarnext_upButton (ev.y)) 1979 if (scrollbarnext_upButton (ev.y))
1536 upordown = -1; /* up */ 1980 upordown = -1; /* up */
… …
1542 if (scrollbarrxvt_upButton (ev.y)) 1986 if (scrollbarrxvt_upButton (ev.y))
1543 upordown = -1; /* up */ 1987 upordown = -1; /* up */
1544 else if (scrollbarrxvt_dnButton (ev.y)) 1988 else if (scrollbarrxvt_dnButton (ev.y))
1545 upordown = 1; /* down */ 1989 upordown = 1; /* down */
1546 } 1990 }
1991
1547 if (upordown) 1992 if (upordown)
1548 { 1993 {
1549#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ())
1550 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1551#endif 1997#endif
1552 if (scr_page (upordown < 0 ? UP : DN, 1)) 1998 if (scr_page (upordown < 0 ? UP : DN, 1))
1553 { 1999 {
1554 if (upordown < 0) 2000 if (upordown < 0)
1555 scrollBar.setUp (); 2001 scrollBar.setUp ();
… …
1571 break; 2017 break;
1572 case R_SB_ALIGN_BOTTOM: 2018 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 2019 csrO = scrollBar.bot - scrollBar.top;
1574 break; 2020 break;
1575 } 2021 }
2022
1576 if (scrollBar.style == R_SB_XTERM 2023 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 2024 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 2025 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 2026 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 2027
1581 scrollBar.setMotion (); 2028 scrollBar.setMotion ();
1582 break; 2029 break;
1583 2030
1584 case Button1: 2031 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2032 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1589 case Button3: 2036 case Button3:
1590 if (scrollBar.style != R_SB_XTERM) 2037 if (scrollBar.style != R_SB_XTERM)
1591 { 2038 {
1592 if (scrollbar_above_slider (ev.y)) 2039 if (scrollbar_above_slider (ev.y))
1593# ifdef RXVT_SCROLL_FULL 2040# ifdef RXVT_SCROLL_FULL
1594 scr_page (UP, TermWin.nrow - 1); 2041 scr_page (UP, nrow - 1);
1595# else 2042# else
1596 scr_page (UP, TermWin.nrow / 4); 2043 scr_page (UP, nrow / 4);
1597# endif 2044# endif
1598 else if (scrollbar_below_slider (ev.y)) 2045 else if (scrollbar_below_slider (ev.y))
1599# ifdef RXVT_SCROLL_FULL 2046# ifdef RXVT_SCROLL_FULL
1600 scr_page (DN, TermWin.nrow - 1); 2047 scr_page (DN, nrow - 1);
1601# else 2048# else
1602 scr_page (DN, TermWin.nrow / 4); 2049 scr_page (DN, nrow / 4);
1603# endif 2050# endif
1604 else 2051 else
1605 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
1606 } 2053 }
1607 else 2054 else
1608 { 2055 {
1609 scr_page ((ev.button == Button1 ? DN : UP), 2056 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 2057 (nrow
1611 * scrollbar_position (ev.y) 2058 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 2059 / scrollbar_size ()));
1613 } 2060 }
2061
1614 break; 2062 break;
1615 } 2063 }
1616 } 2064 }
2065
1617 return; 2066 return;
1618 } 2067 }
1619#if MENUBAR
1620 /*
1621 * Menubar window processing of button press
1622 */
1623 if (isMenuBarWindow (ev.window))
1624 menubar_control (ev);
1625#endif
1626} 2068}
1627 2069
1628void 2070void
1629rxvt_term::button_release (XButtonEvent &ev) 2071rxvt_term::button_release (XButtonEvent &ev)
1630{ 2072{
1631 int reportmode = 0; 2073 int reportmode = 0;
1632 2074
1633 csrO = 0; /* reset csr Offset */ 2075 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 2076 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2077 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 2078
1637 if (scrollbar_isUpDn ()) 2079 if (scrollbar_isUpDn ())
1638 { 2080 {
1639 scrollBar.setIdle (); 2081 scrollBar.setIdle ();
1640 scrollbar_show (0); 2082 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH;
1643#endif
1644
1645 } 2083 }
2084
1646#ifdef SELECTION_SCROLLING 2085#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2086 sel_scroll_ev.stop();
1649#endif 2087#endif
2088
1650 if (ev.window == TermWin.vt) 2089 if (ev.window == vt)
1651 { 2090 {
2091 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2092 return;
2093
2094#if ISO_14755
2095 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return;
2098#endif
2099
1652 if (reportmode) 2100 if (reportmode)
1653 { 2101 {
1654 /* mouse report from vt window */ 2102 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2103 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2104 if (ev.button >= 4)
… …
1667 mouse_report (ev); 2115 mouse_report (ev);
1668 } 2116 }
1669#else /* MOUSE_REPORT_DOUBLECLICK */ 2117#else /* MOUSE_REPORT_DOUBLECLICK */
1670 MEvent.button = AnyButton; 2118 MEvent.button = AnyButton;
1671 mouse_report (ev); 2119 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2120#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2121 return;
1674 } 2122 }
2123
1675 /* 2124 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2125 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2126 * when overriding mouse reporting
1678 */ 2127 */
1679 if (PrivateModes & PrivMode_mouse_report 2128 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2129 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2130 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2131 selection_extend (ev.x, ev.y, 0);
1683 2132
1684 switch (ev.button) 2133 switch (ev.button)
1685 { 2134 {
1686 case Button1: 2135 case Button1:
1687 case Button3: 2136 case Button3:
1688 selection_make (ev.time); 2137 selection_make (ev.time);
1689 break; 2138 break;
2139
1690 case Button2: 2140 case Button2:
1691 selection_request (ev.time, ev.x, ev.y); 2141 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2142 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1692 break; 2143 break;
2144
1693#ifdef MOUSE_WHEEL 2145#ifdef MOUSE_WHEEL
1694 case Button4: 2146 case Button4:
1695 case Button5: 2147 case Button5:
1696 { 2148 {
1697 int i; 2149 int i;
… …
1699 2151
1700 v = ev.button == Button4 ? UP : DN; 2152 v = ev.button == Button4 ? UP : DN;
1701 2153
1702 if (ev.state & ShiftMask) 2154 if (ev.state & ShiftMask)
1703 i = 1; 2155 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2156 else if (option (Opt_mouseWheelScrollPage))
1705 i = TermWin.nrow - 1; 2157 i = nrow - 1;
1706 else 2158 else
1707 i = 5; 2159 i = 5;
1708 2160
1709# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2162 if (ev.state & ControlMask)
1711 { 2163 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2164 mouse_slip_wheel_speed += v ? -1 : 1;
2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2167
2168 if (!slip_wheel_ev.is_active ())
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170 }
2171 else
2172 {
2173# endif
2174 scr_page (v, i);
2175 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
1714 } 2177 }
1715# endif 2178# 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 } 2179 }
1730 break; 2180 break;
1731#endif 2181#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 { 2182 }
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 { 2183 }
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} 2184}
2211#endif
2212 2185
2213/*}}} */ 2186/*}}} */
2214 2187
2215bool 2188bool
2216rxvt_term::cmd_parse () 2189rxvt_term::cmd_parse ()
2217{ 2190{
2218 bool flag = false; 2191 bool flag = false;
2219 unicode_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2220 unsigned char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2221 2194
2222 for (;;) 2195 for (;;)
2223 { 2196 {
2224 if (ch == NOCHAR) 2197 if (ch == NOCHAR)
2225 { 2198 {
2226 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2200 ch = next_char ();
2228 }
2229 2201
2230 if (ch == NOCHAR) // TODO: improve 2202 if (ch == NOCHAR)
2231 break; 2203 break;
2204 }
2232 2205
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2207 {
2208 if (!seen_input)
2209 {
2210 seen_input = 1;
2211 // many badly-written programs (e.g. jed) contain a race condition:
2212 // they first read the screensize and then install a SIGWINCH handler.
2213 // some window managers resize the window early, and these programs
2214 // then sometimes get the size wrong.
2215 // unfortunately other programs are even more buggy and dislike
2216 // being sent SIGWINCH, so only do it when we were in fact being
2217 // resized.
2218 if (seen_resize && cmd_pid)
2219 kill (-cmd_pid, SIGWINCH);
2220 }
2221
2235 /* Read a text string from the input buffer */ 2222 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2223 wchar_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2224 bool refreshnow = false;
2238 int nlines = 0; 2225 int nlines = 0;
2239 unicode_t *str = buf; 2226 wchar_t *str = buf;
2240 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2241 *str++ = ch;
2242 2228
2243 for (;;) 2229 for (;;)
2244 { 2230 {
2231 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2232 break;
2233
2234 *str++ = ch;
2235
2236 if (ch == C0_LF || str >= eol)
2237 {
2238 if (ch == C0_LF)
2239 nlines++;
2240
2241 refresh_count++;
2242
2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2244 {
2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2250 ch = NOCHAR;
2251 break;
2252 }
2253 }
2254
2255 // scr_add_lines only works for nlines <= nrow - 1.
2256 if (nlines >= nrow - 1)
2257 {
2258 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2259 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2260 scr_add_lines (buf, str - buf, nlines);
2261
2262 nlines = 0;
2263 str = buf;
2264 eol = str + min (ncol, UBUFSIZ);
2265 }
2266
2267 if (str >= eol)
2268 {
2269 if (eol >= buf + UBUFSIZ)
2270 {
2271 ch = NOCHAR;
2272 break;
2273 }
2274 else
2275 eol = min (eol + ncol, buf + UBUFSIZ);
2276 }
2277
2278 }
2279
2245 seq_begin = cmdbuf_ptr; 2280 seq_begin = cmdbuf_ptr;
2246 ch = next_char (); 2281 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 } 2282 }
2282 2283
2284 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2283 scr_add_lines (buf, nlines, str - buf); 2286 scr_add_lines (buf, str - buf, nlines);
2284 2287
2285 /* 2288 /*
2286 * If there have been a lot of new lines, then update the screen 2289 * 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. 2290 * 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 2291 * 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 */ 2292 */
2294 if (refreshnow) 2293 if (refreshnow)
2295 { 2294 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2295 flag = true;
2297 refresh_limit++;
2298 else
2299 scr_refresh (refresh_type); 2296 scr_refresh ();
2297 want_refresh = 1;
2300 } 2298 }
2301 2299
2302 } 2300 }
2303 else 2301 else
2304 { 2302 {
… …
2318 } 2316 }
2319 2317
2320 return flag; 2318 return flag;
2321} 2319}
2322 2320
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 2321// read the next character
2333unicode_t 2322wchar_t
2334rxvt_term::next_char () 2323rxvt_term::next_char () NOTHROW
2335{ 2324{
2336 while (cmdbuf_ptr < cmdbuf_endp) 2325 while (cmdbuf_ptr < cmdbuf_endp)
2337 { 2326 {
2338 // assume 7-bit to be ascii ALWAYS 2327 // assume 7-bit to be ascii ALWAYS
2339 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2340 return *cmdbuf_ptr++; 2329 return *cmdbuf_ptr++;
2341 2330
2342 wchar_t wc; 2331 wchar_t wc;
2343 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2332 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2344 2333
2345 if (len == (size_t)-2) 2334 if (len == (size_t)-2)
2346 { 2335 {
2347 // the mbstate stores incomplete sequences. didn't know this :/ 2336 // the mbstate stores incomplete sequences. didn't know this :/
2348 cmdbuf_ptr = cmdbuf_endp; 2337 cmdbuf_ptr = cmdbuf_endp;
2349 break; 2338 break;
2350 } 2339 }
2351 2340
2352 if (len == (size_t)-1) 2341 if (len == (size_t)-1)
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2354 2343
2355 // assume wchar == unicode 2344 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2345 cmdbuf_ptr += len;
2357 return wc; 2346 return wc & UNICODE_MASK;
2358 } 2347 }
2359 2348
2360 return NOCHAR; 2349 return NOCHAR;
2361} 2350}
2351
2352// read the next octet
2353uint32_t
2354rxvt_term::next_octet () NOTHROW
2355{
2356 return cmdbuf_ptr < cmdbuf_endp
2357 ? (unsigned char)*cmdbuf_ptr++
2358 : NOCHAR;
2359}
2360
2361static class out_of_input out_of_input;
2362 2362
2363/* rxvt_cmd_getc () - Return next input character */ 2363/* rxvt_cmd_getc () - Return next input character */
2364/* 2364/*
2365 * Return the next input character after first passing any keyboard input 2365 * Return the next input character after first passing any keyboard input
2366 * to the command. 2366 * to the command.
2367 */ 2367 */
2368unicode_t 2368wchar_t
2369rxvt_term::cmd_getc () 2369rxvt_term::cmd_getc () THROW ((class out_of_input))
2370{ 2370{
2371 unicode_t c = next_char (); 2371 wchar_t c = next_char ();
2372 2372
2373 if (c == NOCHAR) 2373 if (c == NOCHAR)
2374 throw out_of_input; 2374 throw out_of_input;
2375 2375
2376 return c; 2376 return c;
2377} 2377}
2378 2378
2379unicode_t 2379uint32_t
2380rxvt_term::cmd_get8 () 2380rxvt_term::cmd_get8 () THROW ((class out_of_input))
2381{ 2381{
2382 unicode_t c = next_octet (); 2382 uint32_t c = next_octet ();
2383 2383
2384 if (c == NOCHAR) 2384 if (c == NOCHAR)
2385 throw out_of_input; 2385 throw out_of_input;
2386 2386
2387 return c; 2387 return c;
… …
2451 { 2451 {
2452 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2453 break; /* done = 1 */ 2453 break; /* done = 1 */
2454 } 2454 }
2455 } 2455 }
2456 2456
2457 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2458 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2459 { 2459 {
2460 done = 1; 2460 done = 1;
2461 break; 2461 break;
… …
2463 } 2463 }
2464 } 2464 }
2465 2465
2466 pclose_printer (fd); 2466 pclose_printer (fd);
2467} 2467}
2468#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2469/*}}} */ 2469/*}}} */
2470 2470
2471/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2472enum { 2472enum {
2473 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
2487 case C0_ESC: 2487 case C0_ESC:
2488 process_escape_seq (); 2488 process_escape_seq ();
2489 break; 2489 break;
2490 case C0_ENQ: /* terminal Status */ 2490 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2491 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2492 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2494 else 2493 else
2495 tt_write ((unsigned char *)VT100_ANS, 2494 tt_write (VT100_ANS, strlen (VT100_ANS));
2496 (unsigned int)STRLEN (VT100_ANS));
2497 break; 2495 break;
2498 case C0_BEL: /* bell */ 2496 case C0_BEL: /* bell */
2499 scr_bell (); 2497 scr_bell ();
2500 break; 2498 break;
2501 case C0_BS: /* backspace */ 2499 case C0_BS: /* backspace */
… …
2525 process_dcs_seq (); 2523 process_dcs_seq ();
2526 break; 2524 break;
2527 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
2528 process_csi_seq (); 2526 process_csi_seq ();
2529 break; 2527 break;
2530 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
2531 process_osc_seq (); 2529 process_osc_seq ();
2532 break; 2530 break;
2533#endif 2531#endif
2534 } 2532 }
2535} 2533}
… …
2600void 2598void
2601rxvt_term::process_escape_seq () 2599rxvt_term::process_escape_seq ()
2602{ 2600{
2603 unicode_t ch = cmd_getc (); 2601 unicode_t ch = cmd_getc ();
2604 2602
2605 if (PrivateModes & PrivMode_vt52) 2603 if (priv_modes & PrivMode_vt52)
2606 { 2604 {
2607 process_escape_vt52 (ch); 2605 process_escape_vt52 (ch);
2608 return; 2606 return;
2609 } 2607 }
2610 2608
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 2624 break;
2627 case '+': 2625 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 2627 break;
2630#ifndef NO_FRILLS 2628#if !ENABLE_MINIMAL
2631 case '6': 2629 case '6':
2632 scr_backindex (); 2630 scr_backindex ();
2633 break; 2631 break;
2634#endif 2632#endif
2635 case '7': 2633 case '7':
2636 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
2637 break; 2635 break;
2638 case '8': 2636 case '8':
2639 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
2640 break; 2638 break;
2641#ifndef NO_FRILLS 2639#if !ENABLE_MINIMAL
2642 case '9': 2640 case '9':
2643 scr_forwardindex (); 2641 scr_forwardindex ();
2644 break; 2642 break;
2645#endif 2643#endif
2646 case '=': 2644 case '=':
… …
2656 break; 2654 break;
2657 2655
2658 /* 8.3.87: NEXT LINE */ 2656 /* 8.3.87: NEXT LINE */
2659 case C1_NEL: /* ESC E */ 2657 case C1_NEL: /* ESC E */
2660 { 2658 {
2661 unicode_t nlcr[] = { C0_LF, C0_CR }; 2659 wchar_t nlcr[] = { C0_LF, C0_CR };
2662 scr_add_lines (nlcr, 1, 2); 2660 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2663 } 2661 }
2664 break; 2662 break;
2665 2663
2666 /* kidnapped escape sequence: Should be 8.3.48 */ 2664 /* kidnapped escape sequence: Should be 8.3.48 */
2667 case C1_ESA: /* ESC G */ 2665 case C1_ESA: /* ESC G */
… …
2689 process_dcs_seq (); 2687 process_dcs_seq ();
2690 break; 2688 break;
2691 2689
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2694 tt_write ((const unsigned char *)ESCZ_ANSWER, 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2696 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2697 2694
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2699 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 2697 process_csi_seq ();
… …
2762rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
2763{ 2760{
2764 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
2765 unsigned int nargs, p; 2762 unsigned int nargs, p;
2766 int n, ndef; 2763 int n, ndef;
2767 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
2768 2765
2769 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
2770 arg[--nargs] = 0;
2771 2767
2772 priv = 0; 2768 priv = 0;
2773 ch = cmd_getc (); 2769 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
2775 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
2776 priv = ch; 2773 priv = ch;
2777 ch = cmd_getc (); 2774 ch = cmd_getc ();
2778 } 2775 }
2779 2776
2780 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2809 ndef = get_byte_array_bit (csi_defaults, i); 2806 ndef = get_byte_array_bit (csi_defaults, i);
2810 for (p = 0; p < nargs; p++) 2807 for (p = 0; p < nargs; p++)
2811 if (arg[p] == -1) 2808 if (arg[p] == -1)
2812 arg[p] = ndef; 2809 arg[p] = ndef;
2813 2810
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 /* 2811 /*
2822 * private mode handling 2812 * private mode handling
2823 */ 2813 */
2824 if (priv) 2814 if (priv)
2825 { 2815 {
2826 switch (priv) 2816 switch (priv)
2827 { 2817 {
2828 case '>': 2818 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
2820 {
2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2823 //
2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2826 // versions.
2827 //
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2828 tt_printf ("\033[>%d;95;0c", 'U');
2829 }
2831 break; 2830 break;
2832 case '?': 2831 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 2834 break;
… …
2940 2939
2941 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2940 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2942 arg[0] = -arg[0]; 2941 arg[0] = -arg[0];
2943 /* FALLTHROUGH */ 2942 /* FALLTHROUGH */
2944 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2943 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2944 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2946 break; 2945 break;
2947 2946
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2947 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 2948 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2950 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 2949 break;
2952 2950
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2951 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 2952 process_sgr_mode (nargs, arg);
2955 break; 2953 break;
… …
2962 break; 2960 break;
2963 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
2964 scr_report_position (); 2962 scr_report_position ();
2965 break; 2963 break;
2966 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 2965 if (option (Opt_insecure))
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 2967 break;
2970 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 2970 break;
2973 } 2971 }
… …
3009 break; 3007 break;
3010 3008
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3009 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3010 if (arg[0] == 4)
3013 scr_insert_mode (0); 3011 scr_insert_mode (0);
3012 else if (arg[0] == 20)
3013 priv_modes &= ~PrivMode_LFNL;
3014 break; 3014 break;
3015 3015
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3016 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3017 if (arg[0] == 4)
3018 scr_insert_mode (1); 3018 scr_insert_mode (1);
3019 else if (arg[0] == 20)
3020 priv_modes |= PrivMode_LFNL;
3019 break; 3021 break;
3020 3022
3021 /* 3023 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3024 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3025 */
… …
3035 break; 3037 break;
3036 case CSI_75: 3038 case CSI_75:
3037 scr_cursor (RESTORE); 3039 scr_cursor (RESTORE);
3038 break; 3040 break;
3039 3041
3040#ifndef NO_FRILLS 3042#if !ENABLE_MINIMAL
3041 case CSI_74: 3043 case CSI_74:
3042 process_window_ops (arg, nargs); 3044 process_window_ops (arg, nargs);
3043 break; 3045 break;
3044#endif 3046#endif
3045 3047
… …
3052 break; 3054 break;
3053 } 3055 }
3054} 3056}
3055/*}}} */ 3057/*}}} */
3056 3058
3057#ifndef NO_FRILLS 3059#if !ENABLE_MINIMAL
3058/* ARGSUSED */ 3060/* ARGSUSED */
3059void 3061void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3062rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3063{
3062 int x, y; 3064 int x, y;
3063 XWindowAttributes wattr; 3065 XWindowAttributes wattr;
3064 Window wdummy; 3066 Window wdummy;
3067
3068 dLocal (Display *, dpy);
3065 3069
3066 if (nargs == 0) 3070 if (nargs == 0)
3067 return; 3071 return;
3068 3072
3069 switch (args[0]) 3073 switch (args[0])
3070 { 3074 {
3071 /* 3075 /*
3072 * commands 3076 * commands
3073 */ 3077 */
3074 case 1: /* deiconify window */ 3078 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3079 XMapWindow (dpy, parent[0]);
3076 break; 3080 break;
3077 case 2: /* iconify window */ 3081 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3082 XIconifyWindow (dpy, parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3083 break;
3081 case 3: /* set position (pixels) */ 3084 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3085 XMoveWindow (dpy, parent[0], args[1], args[2]);
3083 break; 3086 break;
3084 case 4: /* set size (pixels) */ 3087 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3089 break;
3087 case 5: /* raise window */ 3090 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3091 XRaiseWindow (dpy, parent[0]);
3089 break; 3092 break;
3090 case 6: /* lower window */ 3093 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3094 XLowerWindow (dpy, parent[0]);
3092 break; 3095 break;
3093 case 7: /* refresh window */ 3096 case 7: /* refresh window */
3094 scr_touch (true); 3097 scr_touch (true);
3095 break; 3098 break;
3096 case 8: /* set size (chars) */ 3099 case 8: /* set size (chars) */
3097 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3100 set_widthheight ((unsigned int) (args[2] * fwidth),
3098 (unsigned int) (args[1] * TermWin.fheight)); 3101 (unsigned int) (args[1] * fheight));
3099 break; 3102 break;
3100 3103
3101 //case 9: NYI, TODO, restore maximized window or maximize window 3104 //case 9: NYI, TODO, restore maximized window or maximize window
3102 default: 3105 default:
3103 if (args[0] >= 24) /* set height (chars) */ 3106 if (args[0] >= 24) /* set height (chars) */
3104 set_widthheight ((unsigned int)TermWin.width, 3107 set_widthheight ((unsigned int)width,
3105 (unsigned int) (args[1] * TermWin.fheight)); 3108 (unsigned int) (args[1] * fheight));
3106 break; 3109 break;
3107
3108 3110
3109 /* 3111 /*
3110 * reports - some output format copied from XTerm 3112 * reports - some output format copied from XTerm
3111 */ 3113 */
3112 case 11: /* report window state */ 3114 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3117 break;
3116 case 13: /* report window position */ 3118 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3119 XGetWindowAttributes (dpy, parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3120 XTranslateCoordinates (dpy, parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3121 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3122 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3123 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3124 break;
3123 case 14: /* report window size (pixels) */ 3125 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3126 XGetWindowAttributes (dpy, parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3128 break;
3127 case 18: /* report text area size (chars) */ 3129 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3130 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3129 break; 3131 break;
3130 case 19: /* report window size (chars) */ 3132 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3133 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3132 break; 3134 break;
3133 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3136 {
3136 char *s; 3137 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3140 XFree (s);
3139 } 3141 }
3140 break; 3142 break;
3141 case 21: /* report window title */ 3143 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3144 {
3144 char *s; 3145 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3148 XFree (s);
3147 } 3149 }
3148 break; 3150 break;
3149 } 3151 }
3150} 3152}
3151#endif 3153#endif
3152 3154
3153/*----------------------------------------------------------------------*/ 3155/*----------------------------------------------------------------------*/
3154/* 3156/*
3155 * get input up until STRING TERMINATOR (or BEL) 3157 * get input up until STRING TERMINATOR (or BEL)
3156 * ends_how is terminator used. returned input must be free()'d 3158 * ends_how is terminator used. returned input must be free()'d
3157 */ 3159 */
3158unsigned char * 3160char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3161rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3162{
3161 unicode_t prev = 0, ch; 3163 unicode_t ch;
3164 bool seen_esc = false;
3162 unsigned int n = 0; 3165 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3166 wchar_t string[STRING_MAX];
3165 3167
3166 while ((ch = cmd_getc ()) != NOCHAR) 3168 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3169 {
3168 if (prev == C0_ESC) 3170 if (seen_esc)
3169 { 3171 {
3170 if (ch == 0x5c) /* 7bit ST */ 3172 if (ch == 0x5c) /* 7bit ST */
3171 break; 3173 break;
3172 else 3174 else
3173 return NULL; 3175 return NULL;
3174 } 3176 }
3177 else if (ch == C0_ESC)
3178 {
3179 seen_esc = true;
3180 continue;
3181 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3182 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3183 break;
3184 else if (ch == C0_SYN)
3185 ch = cmd_get8 ();
3177 else if (ch < 0x20) 3186 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3187 return NULL; /* other control character - exit */
3179 3188
3180 if (n >= sizeof (string) - 1) 3189 seen_esc = false;
3190
3191 if (n >= STRING_MAX - 1)
3181 // stop at some sane length 3192 // stop at some sane length
3182 return NULL; 3193 return NULL;
3183 3194
3184 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else
3190 string[n++] = prev = ch; 3195 string[n++] = ch;
3191 } 3196 }
3192 3197
3193 string[n++] = '\0'; 3198 string[n++] = '\0';
3194 3199
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3200 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3201
3200 return s; 3202 return rxvt_wcstombs (string);
3201} 3203}
3202 3204
3203/*----------------------------------------------------------------------*/ 3205/*----------------------------------------------------------------------*/
3204/* 3206/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3207 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3206 */ 3208 */
3207void 3209void
3208rxvt_term::process_dcs_seq () 3210rxvt_term::process_dcs_seq ()
3209{ 3211{
3210 unsigned char *s; 3212 char *s;
3211 unicode_t eh; 3213 unicode_t eh;
3212 3214
3213 /* 3215 /*
3214 * Not handled yet 3216 * Not handled yet
3215 */ 3217 */
… …
3234 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3236 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3235 arg = arg * 10 + (ch - '0'); 3237 arg = arg * 10 + (ch - '0');
3236 3238
3237 if (ch == ';') 3239 if (ch == ';')
3238 { 3240 {
3239 unsigned char *s = get_to_st (eh); 3241 char *s = get_to_st (eh);
3240 3242
3241 if (s) 3243 if (s)
3242 { 3244 {
3243 process_xterm_seq (arg, (char *)s, eh); 3245 process_xterm_seq (arg, s, eh);
3244 free (s); 3246 free (s);
3245 } 3247 }
3246 } 3248 }
3247} 3249}
3248 3250
3249void 3251void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3251{ 3253{
3252 if (str[0] == '?' && !str[1]) 3254 if (str[0] == '?' && !str[1])
3253 { 3255 {
3254 if (Options & Opt_insecure) 3256 rgba c;
3255 { 3257 pix_colors_focused[color].get (c);
3256 unsigned short r, g, b; 3258
3257 PixColors[color].get (display, r, g, b); 3259#if XFT
3260 if (c.a != rgba::MAX_CC)
3261 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3262 else
3263#endif
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3259 }
3260 } 3265 }
3261 else 3266 else
3262 set_window_color (color, str); 3267 set_window_color (color, str);
3263} 3268}
3264 3269
3265/* 3270/*
3266 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3271 * 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 */ 3272 */
3290void 3273void
3291rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3274rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3292{ 3275{
3293 int changed = 0;
3294 int color; 3276 int color;
3295 char *buf, *name; 3277 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3278 bool query = str[0] == '?' && !str[1];
3279 int saveop = op;
3280
3281 dLocal (Display *, dpy);
3297 3282
3298 assert (str != NULL); 3283 assert (str != NULL);
3284
3285 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3286 return;
3287
3299 switch (op) 3288 switch (op)
3300 { 3289 {
3301 case XTerm_name: 3290 case XTerm_name:
3302 set_title (str); 3291 set_title (str);
3303 /* FALLTHROUGH */ 3292 /* FALLTHROUGH */
… …
3308 set_title (str); 3297 set_title (str);
3309 break; 3298 break;
3310 case XTerm_property: 3299 case XTerm_property:
3311 if (str[0] == '?') 3300 if (str[0] == '?')
3312 { 3301 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3302 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3303 Atom actual_type;
3315 int actual_format; 3304 int actual_format;
3316 unsigned long nitems; 3305 unsigned long nitems;
3317 unsigned long bytes_after; 3306 unsigned long bytes_after;
3318 unsigned char *value = 0; 3307 unsigned char *value = 0;
3319 const char *str = ""; 3308 const char *str = "";
3320 3309
3321 if (prop 3310 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3311 && XGetWindowProperty (dpy, parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3312 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3313 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3314 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3315 && actual_type != None
3327 && actual_format == 8) 3316 && actual_format == 8)
3328 str = (const char *)(value); 3317 str = (const char *)(value);
3329 3318
3330 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3319 tt_printf ("\033]%d;%s%c", op, str, resp);
3331 3320
3332 XFree (value); 3321 XFree (value);
3333 } 3322 }
3334 else 3323 else
3335 { 3324 {
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3325 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3326
3338 if (eq) 3327 if (eq)
3339 { 3328 {
3340 *eq = 0; 3329 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3330 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 } 3331 }
3346 else 3332 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3333 XDeleteProperty (dpy, parent[0],
3348 display->atom (str)); 3334 display->atom (str));
3349 } 3335 }
3350 break; 3336 break;
3351 3337
3352 case XTerm_Color: 3338 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3339 for (buf = (char *)str; buf && *buf;)
3354 { 3340 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3341 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3342 break;
3357 3343
3358 *name++ = '\0'; 3344 *name++ = '\0';
3359 color = atoi (buf); 3345 color = atoi (buf) + minCOLOR;
3360 3346
3361 if (color < 0 || color >= TOTAL_COLORS) 3347 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3362 break; 3348 break;
3363 3349
3364 if ((buf = STRCHR (name, ';')) != NULL) 3350 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3351 *buf++ = '\0';
3366 3352
3367 if (name[0] == '?' && !name[1]) 3353 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 } 3354 }
3379 break; 3355 break;
3380 case XTerm_Color00: 3356 case XTerm_Color00:
3381 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3382 break; 3358 break;
3383 case XTerm_Color01: 3359 case XTerm_Color01:
3384 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3360 process_color_seq (op, Color_bg, str, resp);
3385 break; 3361 break;
3386#ifndef NO_CURSORCOLOR 3362#ifndef NO_CURSORCOLOR
3387 case XTerm_Color_cursor: 3363 case XTerm_Color_cursor:
3388 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3364 process_color_seq (op, Color_cursor, str, resp);
3389 break; 3365 break;
3390#endif 3366#endif
3391 case XTerm_Color_pointer_fg: 3367 case XTerm_Color_pointer_fg:
3392 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3368 process_color_seq (op, Color_pointer_fg, str, resp);
3393 break; 3369 break;
3394 case XTerm_Color_pointer_bg: 3370 case XTerm_Color_pointer_bg:
3395 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3371 process_color_seq (op, Color_pointer_bg, str, resp);
3396 break; 3372 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3373#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: 3374 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3375 process_color_seq (op, Color_RV, str, resp);
3406 break; 3376 break;
3377 case Rxvt_Color_BD:
3378 case URxvt_Color_BD:
3379 process_color_seq (op, Color_BD, str, resp);
3380 break;
3381 case Rxvt_Color_UL:
3382 case URxvt_Color_UL:
3383 process_color_seq (op, Color_UL, str, resp);
3384 break;
3385 case URxvt_Color_IT:
3386 process_color_seq (op, Color_IT, str, resp);
3387 break;
3407#endif 3388#endif
3389#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp);
3392 {
3393 bool changed = false;
3394 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3408 3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3409 case XTerm_Pixmap: 3406 case Rxvt_Pixmap:
3410 if (*str != ';') 3407 if (!strcmp (str, "?"))
3411 { 3408 {
3412#if XPM_BACKGROUND 3409 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 3410
3425 } 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3426 if (changed) 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3427 { 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428#ifdef XPM_BACKGROUND 3414 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 } 3415 }
3467 else 3416 else
3468 { 3417 {
3418 int changed = 0;
3419
3420 if (*str != ';')
3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3469 set_locale (str); 3430 while (str)
3470# ifdef USE_XIM 3431 {
3471 im_cb (); 3432 str++;
3472# endif 3433 if (bgPixmap.set_geometry (str))
3434 changed++;
3435 str = strchr (str, ';');
3436 }
3437 if (changed)
3438 update_background ();
3473 } 3439 }
3474 break; 3440 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 3441#endif
3485 3442
3486#ifdef MENUBAR 3443 case Rxvt_restoreFG:
3487 case XTerm_Menu: 3444 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; 3445 break;
3491#endif 3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449
3450 case XTerm_logfile:
3451 // TODO, when secure mode?
3452 break;
3453
3492#if 0 3454#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3455 case Rxvt_dumpscreen: /* no error notices */
3494 { 3456 {
3495 int fd; 3457 int fd;
3496 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3458 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3497 { 3459 {
3498 scr_dump (fd); 3460 scr_dump (fd);
3499 close (fd); 3461 close (fd);
3500 } 3462 }
3501 } 3463 }
3464 break;
3465#endif
3466 case XTerm_font:
3467 op = URxvt_font;
3468 case URxvt_font:
3469#if ENABLE_STYLES
3470 case URxvt_boldFont:
3471 case URxvt_italicFont:
3472 case URxvt_boldItalicFont:
3473#endif
3474 if (query)
3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3477 ? fontset[op - URxvt_font]->fontdesc : "",
3478 resp);
3479 else
3480 {
3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
3482
3483 res = strdup (str);
3484 allocated.push_back ((void *)res);
3485 set_fonts ();
3486 }
3487 break;
3488
3489 case URxvt_version:
3490 if (query)
3491 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3492 op,
3493 rs[Rs_name], VERSION[0], VERSION[2],
3494 resp);
3495 break;
3496
3497#if !ENABLE_MINIMAL
3498 case URxvt_locale:
3499 if (query)
3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3501 else
3502 {
3503 set_locale (str);
3504 pty->set_utf8_mode (enc_utf8);
3505 init_xlocale ();
3506 }
3507 break;
3508
3509 case URxvt_view_up:
3510 case URxvt_view_down:
3511 {
3512 int lines = atoi (str);
3513
3514 if (lines)
3515 scr_page (op == URxvt_view_up ? UP : DN, lines);
3516 else
3517 scr_erase_savelines ();
3518 }
3519
3520 break;
3521#endif
3522
3523#if ENABLE_PERL
3524 case URxvt_perl:
3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3526 ; // no responses yet
3502 break; 3527 break;
3503#endif 3528#endif
3504 } 3529 }
3505} 3530}
3506/*----------------------------------------------------------------------*/ 3531/*----------------------------------------------------------------------*/
… …
3520{ 3545{
3521 int state; 3546 int state;
3522 3547
3523 if (mode == 's') 3548 if (mode == 's')
3524 { 3549 {
3525 SavedModes |= (PrivateModes & bit); 3550 SavedModes |= (priv_modes & bit);
3526 return -1; 3551 return -1;
3527 } 3552 }
3528 else 3553 else
3529 { 3554 {
3530 if (mode == 'r') 3555 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3556 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3557 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3558 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3559 PrivMode (state, bit);
3535 } 3560 }
3536 3561
3537 return state; 3562 return state;
3538} 3563}
3539 3564
3540/* we're not using priv _yet_ */ 3565/* we're not using priv _yet_ */
3541void 3566void
3542rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3543{ 3568{
3544 unsigned int i, j; 3569 unsigned int i, j;
3545 int state; 3570 int state;
3546 3571
3547 static const struct 3572 static const struct
3548 { 3573 {
3549 const int argval; 3574 const int argval;
3550 const unsigned long bit; 3575 const unsigned long bit;
3551 }
3552
3553 argtopriv[] = { 3576 } argtopriv[] = {
3554 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
3555 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
3556 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3582 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3583 { 7, PrivMode_Autowrap },
3584 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3585 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3586 // 18, 19 printing-related
3563 { menuBar_esc, PrivMode_menuBar }, 3587 { 25, PrivMode_VisibleCursor },
3564#endif
3565#ifdef scrollBar_esc 3588#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3589 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3590#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3591 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3592 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3593 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3594 // 45 margin bell NYI
3575 // 46 start logging 3595 // 46 start logging
… …
3577 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
3578#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
3579 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
3580#endif 3600#endif
3581 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
3582 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
3583 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
3584 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3585 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3586 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
3587 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
3588 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
3589 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
3615 } 3634 }
3616 3635
3617 /* extra handling for values with state unkept */ 3636 /* extra handling for values with state unkept */
3618 switch (arg[i]) 3637 switch (arg[i])
3619 { 3638 {
3639#if ENABLE_STYLES
3640 case 1021:
3641 set_option (Opt_intensityStyles, mode);
3642
3643 scr_touch (true);
3644 break;
3645#endif
3620 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
3647 case 1049:
3621 if (Options & Opt_secondaryScreen) 3648 if (option (Opt_secondaryScreen))
3622 if (mode == 0) 3649 if (mode == 0)
3623 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
3624 else if (mode == 1) 3651 else if (mode == 1)
3625 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
3626 break; 3653 break;
… …
3637 * within VT52 mode 3664 * within VT52 mode
3638 */ 3665 */
3639 PrivMode (1, PrivMode_vt52); 3666 PrivMode (1, PrivMode_vt52);
3640 break; 3667 break;
3641 case 3: /* 80/132 */ 3668 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 3669 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3670 set_widthheight (((state ? 132 : 80) * fwidth), height);
3644 break; 3671 break;
3645 case 4: /* smooth scrolling */ 3672 case 4: /* smooth scrolling */
3646 if (state) 3673 set_option (Opt_jumpScroll, !state);
3647 Options &= ~Opt_jumpScroll;
3648 else
3649 Options |= Opt_jumpScroll;
3650 break; 3674 break;
3651 case 5: /* reverse video */ 3675 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 3676 scr_rvideo_mode (state);
3653 break; 3677 break;
3654 case 6: /* relative/absolute origins */ 3678 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 3682 scr_autowrap (state);
3659 break; 3683 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3664 break; 3688 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 3689#ifdef scrollBar_esc
3673 case scrollBar_esc: 3690 case scrollBar_esc:
3674 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
3675 { 3692 {
3676 resize_all_windows (0, 0, 0); 3693 resize_all_windows (0, 0, 0);
… …
3688 break; 3705 break;
3689 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3711 break;
3695#if 0
3696 case 1001: 3712 case 1002:
3697 break; /* X11 mouse highlighting */ 3713 case 1003:
3698#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state)
3701 Options &= ~Opt_scrollTtyOutput;
3702 else
3703 Options |= Opt_scrollTtyOutput; 3725 set_option (Opt_scrollTtyOutput, !state);
3704 break; 3726 break;
3705 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
3706 if (state)
3707 Options |= Opt_scrollTtyKeypress; 3728 set_option (Opt_scrollTtyKeypress, state);
3708 else
3709 Options &= ~Opt_scrollTtyKeypress;
3710 break; 3729 break;
3711 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 3731 if (option (Opt_secondaryScreen))
3713 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 3733 scr_erase_screen (2);
3715 scr_change_screen (state); 3734 scr_change_screen (state);
3716 break; 3735 break;
3717 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 3737 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 3738 if (option (Opt_secondaryScreen))
3720 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 3740 scr_erase_screen (2);
3722 break; 3741 break;
3723 default: 3742 default:
3724 break; 3743 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 3769 rendset = 0, rendstyle = ~RS_None;
3751 break; 3770 break;
3752 case 1: 3771 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 3772 rendset = 1, rendstyle = RS_Bold;
3754 break; 3773 break;
3774 //case 2: // low intensity
3775 case 3:
3776 rendset = 1, rendstyle = RS_Italic;
3777 break;
3755 case 4: 3778 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 3779 rendset = 1, rendstyle = RS_Uline;
3757 break; 3780 break;
3758 case 5: 3781 case 5: // slowly blinking
3782 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 3783 rendset = 1, rendstyle = RS_Blink;
3760 break; 3784 break;
3761 //case 6: // scoansi light background 3785 //case 6: // scoansi light background
3762 case 7: 3786 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 3787 rendset = 1, rendstyle = RS_RVid;
3764 break; 3788 break;
3765 case 8: 3789 case 8:
3766 // invisible. NYI 3790 // invisible. NYI
3767 break; 3791 break;
3792 //case 9: // crossed out
3768 //case 10: // scoansi acs off 3793 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 3794 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 3795 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 3796 //...
3797 //case 19: // ninth alt font
3798 //case 20: // gothic
3799 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 3800 rendset = 0, rendstyle = RS_Bold;
3773 break; 3801 break;
3774 case 22: 3802 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 3803 rendset = 0, rendstyle = RS_Bold;
3804 break;
3805 case 23: // disable italic
3806 rendset = 0, rendstyle = RS_Italic;
3776 break; 3807 break;
3777 case 24: 3808 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 3809 rendset = 0, rendstyle = RS_Uline;
3779 break; 3810 break;
3780 case 25: 3811 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 3812 rendset = 0, rendstyle = RS_Blink;
3782 break; 3813 break;
3814 case 26: // variable spacing (iso 8613)
3815 rendset = 0, rendstyle = RS_Blink;
3816 break;
3783 case 27: 3817 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 3818 rendset = 0, rendstyle = RS_RVid;
3785 break; 3819 break;
3786 case 28:
3787 // visible. NYI 3820 //case 28: // visible. NYI
3788 break; 3821 //case 29: // not crossed-out
3789 } 3822 }
3790 3823
3791 if (rendset != -1) 3824 if (rendset != -1)
3792 { 3825 {
3793 scr_rendition (rendset, rendstyle); 3826 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 3837 case 35:
3805 case 36: 3838 case 36:
3806 case 37: 3839 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3840 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 3841 break;
3809#ifdef TTY_256COLOR 3842 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 3843 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 3844 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3845 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 3846 i += 2;
3815 } 3847 }
3816 break; 3848 break;
3817#endif
3818 case 39: /* default fg */ 3849 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 3850 scr_color (Color_fg, Color_fg);
3820 break; 3851 break;
3821 3852
3822 case 40: 3853 case 40:
… …
3827 case 45: 3858 case 45:
3828 case 46: 3859 case 46:
3829 case 47: 3860 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3861 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 3862 break;
3832#ifdef TTY_256COLOR 3863 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 3864 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 3865 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3866 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 3867 i += 2;
3838 } 3868 }
3839 break; 3869 break;
3840#endif
3841 case 49: /* default bg */ 3870 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 3871 scr_color (Color_bg, Color_bg);
3843 break; 3872 break;
3844 3873
3845#ifndef NO_BRIGHTCOLOR 3874 //case 50: // not variable spacing
3875
3876#if !ENABLE_MINIMAL
3846 case 90: 3877 case 90:
3847 case 91: /* set bright fg color */ 3878 case 91: /* set bright fg color */
3848 case 92: 3879 case 92:
3849 case 93: 3880 case 93:
3850 case 94: 3881 case 94:
3851 case 95: 3882 case 95:
3852 case 96: 3883 case 96:
3853 case 97: 3884 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3885 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 3886 break;
3857 case 100: 3887 case 100:
3858 case 101: /* set bright bg color */ 3888 case 101: /* set bright bg color */
3859 case 102: 3889 case 102:
3860 case 103: 3890 case 103:
3861 case 104: 3891 case 104:
3862 case 105: 3892 case 105:
3863 case 106: 3893 case 106:
3864 case 107: 3894 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3895 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 3896 break;
3868#endif 3897#endif
3869
3870 } 3898 }
3871 } 3899 }
3872} 3900}
3873/*}}} */ 3901/*}}} */
3874 3902
… …
3877rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
3878{ 3906{
3879 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
3880 3908
3881 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
3882 { /* query graphics */ 3911 /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 3913 return;
3885 } 3914 }
3886 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
3887 do 3916 do
3888 ch = cmd_getc (); 3917 ch = cmd_getc ();
… …
3898 */ 3927 */
3899void 3928void
3900rxvt_term::tt_printf (const char *fmt,...) 3929rxvt_term::tt_printf (const char *fmt,...)
3901{ 3930{
3902 va_list arg_ptr; 3931 va_list arg_ptr;
3903 unsigned char buf[256]; 3932 char buf[256];
3904 3933
3905 va_start (arg_ptr, fmt); 3934 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3935 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 3936 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 3937 tt_write (buf, strlen (buf));
3909} 3938}
3910 3939
3911/* ---------------------------------------------------------------------- */ 3940/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 3941/* 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. 3942 * or generated by us in response to a query ESC sequence.
3914 */ 3943 */
3944const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3945
3915void 3946void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3947rxvt_term::tt_write (const char *data, unsigned int len)
3917{ 3948{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3949 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3950 return;
3919 3951
3920 if (len) 3952 if (pty->pty < 0)
3953 return;
3954
3955 if (v_buflen == 0)
3956 {
3957 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3958
3959 if ((unsigned int)written == len)
3960 return;
3961
3962 data += written;
3963 len -= written;
3921 { 3964 }
3965
3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3967
3968 memcpy (v_buffer + v_buflen, data, len);
3969 v_buflen += len;
3970
3971 pty_ev.set (ev::READ | ev::WRITE);
3972}
3973
3974void rxvt_term::pty_write ()
3975{
3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3977
3978 if (written > 0)
3979 {
3980 v_buflen -= written;
3981
3922 if (v_buflen == 0) 3982 if (v_buflen == 0)
3923 { 3983 {
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); 3984 free (v_buffer);
3951 v_buffer = 0; 3985 v_buffer = 0;
3952 v_buflen = 0;
3953 3986
3954 pty_ev.set (EVENT_READ); 3987 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; 3988 return;
3967 } 3989 }
3990
3991 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 3992 }
3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3994 pty_ev.set (ev::READ);
3969} 3995}
3970 3996
3971/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
3972 3998

Diff Legend

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