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

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

Diff Legend

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