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

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

Diff Legend

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