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

Diff Legend

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