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

Diff Legend

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