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

Diff Legend

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