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.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

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

Diff Legend

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