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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.64 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.346 by root, Wed Aug 15 06:48:16 2007 UTC

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

Diff Legend

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