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.377 by root, Fri Dec 14 02:22:24 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines