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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.73 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 2007 UTC

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

Diff Legend

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