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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.368 by root, Sun Nov 25 08:38:26 2007 UTC

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

Diff Legend

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