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

Diff Legend

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