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

Diff Legend

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