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

Diff Legend

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