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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.389 by ayin, Mon Dec 31 13:50:56 2007 UTC

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

Diff Legend

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