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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.356 by root, Mon Sep 17 08:31:54 2007 UTC

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

Diff Legend

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