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

Diff Legend

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