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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.67 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.366 by ayin, Thu Nov 15 11:36:15 2007 UTC

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

Diff Legend

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