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

Diff Legend

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