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

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