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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.390 by ayin, Tue Jan 8 16:25:42 2008 UTC

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

Diff Legend

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