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.179 by root, Wed Dec 15 05:39:08 2004 UTC vs.
Revision 1.524 by root, Tue Aug 14 20:32:48 2012 UTC

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

Diff Legend

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