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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.219 by root, Sat Dec 31 17:16:17 2005 UTC

… …
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-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
59// exception thrown when the command parser runs out of input data 63// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 64class out_of_input { } out_of_input;
65
66#if ENABLE_FRILLS || ISO_14755
67
68#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1)
70#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
71#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
72#define ISO_14755_MASK 0x0fffffffUL
73
74#if ISO_14755
75static unsigned short iso14755_symtab[] = {
76 // keysym, unicode
77 XK_Left, 0x2190,
78 XK_KP_Left, 0x2190,
79 XK_Up, 0x2191,
80 XK_KP_Up, 0x2191,
81 XK_Right, 0x2192,
82 XK_KP_Right, 0x2192,
83 XK_Down, 0x2193,
84 XK_KP_Down, 0x2193,
85 XK_Linefeed, 0x21b4,
86 XK_Return, 0x21b5,
87 XK_KP_Enter, 0x21b5,
88
89 XK_Prior, 0x21de,
90 XK_Next, 0x21df,
91 XK_Tab, 0x21e5,
92 XK_ISO_Left_Tab, 0x21e6,
93 XK_Shift_L, 0x21e7,
94 XK_Shift_R, 0x21e7,
95
96 XK_Shift_Lock, 0x21eb,
97 XK_ISO_Lock, 0x21eb,
98 XK_ISO_Lock, 0x21eb,
99 XK_Caps_Lock, 0x21ec,
100 XK_Num_Lock, 0x21ed,
101 XK_ISO_Level3_Shift, 0x21ee,
102 XK_ISO_Level3_Lock, 0x21ef,
103 XK_ISO_Group_Lock, 0x21f0,
104 XK_Home, 0x21f1,
105 XK_End, 0x21f2,
106
107 XK_Execute, 0x2318,
108 XK_Begin, 0x2320,
109 XK_Delete, 0x2326,
110 XK_Clear, 0x2327,
111 XK_BackSpace, 0x232b,
112 XK_Insert, 0x2380,
113 XK_Control_L, 0x2388,
114 XK_Control_R, 0x2388,
115 XK_Pause, 0x2389,
116 XK_Break, 0x238a,
117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c,
119 XK_Print, 0x2399,
120
121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
129 XK_KP_Space, 0x2422,
130#endif
131 0,
132};
133
134void
135rxvt_term::iso14755_54 (int x, int y)
136{
137 x = Pixel2Col (x);
138 y = Pixel2Row (y);
139
140 if (!IN_RANGE_EXC (x, 0, ncol)
141 || !IN_RANGE_EXC (y, 0, nrow))
142 return;
143
144 for (;;)
145 {
146 const line_t &l = ROW(y - view_start);
147
148 text_t t = l.t[x];
149
150 if (t != NOCHAR || !x)
151 {
152 iso14755_51 (l.t[x], l.r[x], x, y);
153 iso14755buf = ISO_14755_54;
154 break;
155 }
156
157 x--;
158 }
159}
160#endif
161
162void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231 scr_overlay_set (12, y, NOCHAR, r);
232 }
233
234 scr_overlay_set (0, len , attr);
235 scr_overlay_set (0, len + 1, fname);
236
237 free (fname);
238
239# if ENABLE_COMBINING
240 if (alloc)
241 delete [] alloc;
242# endif
243#endif
244}
245
246void
247rxvt_term::commit_iso14755 ()
248{
249 wchar_t ch[2];
250
251 ch[0] = iso14755buf & ISO_14755_MASK;
252 ch[1] = 0;
253
254 if (iso14755buf & ISO_14755_51)
255 {
256 char mb[16];
257 int len;
258
259 // allow verbatim 0-bytes and control-bytes to be entered
260 if (ch[0] >= 0x20)
261 len = wcstombs (mb, ch, 16);
262 else
263 {
264 mb[0] = ch[0];
265 len = 1;
266 }
267
268 if (len > 0)
269 tt_write ((unsigned char *)mb, len);
270 else
271 scr_bell ();
272 }
273
274 iso14755buf = 0;
275}
276
277int
278rxvt_term::hex_keyval (XKeyEvent &ev)
279{
280 // check wether this event corresponds to a hex digit
281 // if the modifiers had not been pressed.
282 for (int index = 0; index < 8; index++)
283 {
284 KeySym k = XLookupKeysym (&ev, index);
285
286 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
287 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
288 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
289 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
290 }
291
292 return -1;
293}
294#endif
61 295
62/*{{{ Convert the keypress event into a string */ 296/*{{{ Convert the keypress event into a string */
63void 297void
64rxvt_term::lookup_key (XKeyEvent &ev) 298rxvt_term::lookup_key (XKeyEvent &ev)
65{ 299{
… …
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
78 * 312 *
79 * Always permit `shift' to override the current setting 313 * Always permit `shift' to override the current setting
80 */ 314 */
81 shft = (ev.state & ShiftMask); 315 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 316 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 317 meta = ev.state & ModMetaMask;
84 318
85 if (numlock_state || (ev.state & ModNumLockMask)) 319 if (numlock_state || (ev.state & ModNumLockMask))
86 { 320 {
87 numlock_state = (ev.state & ModNumLockMask); 321 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 322 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
108 342
109 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
113 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
116 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 353 SET_LOCALE (locale);
118 354
119 if (status_return == XLookupChars 355 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
… …
147 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
148 } 384 }
149 385
150 if (valid_keysym) 386 if (valid_keysym)
151 { 387 {
388#ifdef KEYSYM_RESOURCE
389 if (keyboard->dispatch (this, keysym, ev.state))
390 return;
391#endif
392
152 if (TermWin.saveLines) 393 if (saveLines)
153 { 394 {
154#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 396 if (!ctrl && !meta)
156 {
157#else 397#else
158 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
399#endif
159 { 400 {
160#endif
161 int lnsppg; 401 int lnsppg;
162 402
163#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 405#else
166 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
167#endif 407#endif
168 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
169 { 409 {
170 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
171 return; 411 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 454 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 455 {
216 keysym += (XK_F11 - XK_F1); 456 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 457 shft = 0; /* turn off Shift */
218 } 458 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 459 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 460 {
221 switch (keysym) 461 switch (keysym)
222 { 462 {
223 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 465 selection_request (ev.time, 0, 0);
226 return; 466 return;
467#if TODO
227 /* rxvt extras */ 468 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 470 change_font (FONT_UP);
230 return; 471 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 472 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 473 change_font (FONT_DN);
233 return; 474 return;
475#endif
234 } 476 }
235 } 477 }
236 } 478 }
237#ifdef PRINTPIPE 479
238 if (keysym == XK_Print) 480#if ENABLE_FRILLS || ISO_14755
239 { 481 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 482 if (shft && ctrl)
241 return;
242 } 483 {
243#endif 484 int hv;
244 485
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 486 if (iso14755buf & ISO_14755_51
246 { 487 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 488 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 489 {
250 unsigned int l; 490 commit_iso14755 ();
251 const unsigned char *kbuf0; 491 iso14755buf = ISO_14755_51;
252 492# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 493 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 494# endif
261 ) 495 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 496 }
266 497 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 498 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51;
501# if ISO_14755
502 iso14755_51 (iso14755buf & ISO_14755_MASK);
503# endif
268 return; 504 return;
269 } 505 }
270 else 506 else
507 {
508# if ENABLE_OVERLAY
509 scr_overlay_off ();
271#endif 510# endif
511 iso14755buf = 0;
512 }
513 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED))
517 {
518 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif
523 }
524#endif
525
526#ifdef PRINTPIPE
527 if (keysym == XK_Print)
528 {
529 scr_printscreen (ctrl | shft);
530 return;
531 }
532#endif
533
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 {
272 { 536 {
273 newlen = 1; 537 newlen = 1;
274 switch (keysym) 538 switch (keysym)
275 { 539 {
276#ifndef NO_BACKSPACE_KEY 540#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 541 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 542 if (priv_modes & PrivMode_HaveBackSpace)
279 { 543 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 545 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 546 kbuf[1] = '\0';
283 } 547 }
284 else 548 else
285 STRCPY (kbuf, key_backspace); 549 strcpy (kbuf, key_backspace);
286 break; 550 break;
287#endif 551#endif
288#ifndef NO_DELETE_KEY 552#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
289 case XK_Delete: 563 case XK_Delete:
290 STRCPY (kbuf, key_delete); 564 strcpy (kbuf, key_delete);
291 break; 565 break;
292#endif 566#endif
293 case XK_Tab: 567 case XK_Tab:
294 if (shft) 568 if (shft)
295 STRCPY (kbuf, "\033[Z"); 569 strcpy (kbuf, "\033[Z");
296 else 570 else
297 { 571 {
298#ifdef CTRL_TAB_MAKES_META 572#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 573 if (ctrl)
300 meta = 1; 574 meta = 1;
… …
306 newlen = 0; 580 newlen = 0;
307 } 581 }
308 break; 582 break;
309 583
310#ifdef XK_KP_Left 584#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 585 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 586 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 587 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 588 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 590 {
317 STRCPY (kbuf, "\033OZ"); 591 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 593 break;
320 } 594 }
321 else 595 else
322 /* translate to std. cursor key */ 596 /* translate to std. cursor key */
… …
325#endif 599#endif
326 case XK_Up: /* "\033[A" */ 600 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 601 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 602 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 603 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 605 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 606 /* do Shift first */
333 if (shft) 607 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 608 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 609 else if (ctrl)
336 { 610 {
337 kbuf[1] = 'O'; 611 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 613 }
340 else if (PrivateModes & PrivMode_aplCUR) 614 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
342 break; 616 break;
343 617
344#ifndef UNSHIFTED_SCROLLKEYS 618#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 619# ifdef XK_KP_Prior
346 case XK_KP_Prior: 620 case XK_KP_Prior:
347 /* allow shift to override */ 621 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 623 {
350 STRCPY (kbuf, "\033Oy"); 624 strcpy (kbuf, "\033Oy");
351 break; 625 break;
352 } 626 }
353 /* FALLTHROUGH */ 627 /* FALLTHROUGH */
354# endif 628# endif
355 case XK_Prior: 629 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 630 strcpy (kbuf, "\033[5~");
357 break; 631 break;
358# ifdef XK_KP_Next 632# ifdef XK_KP_Next
359 case XK_KP_Next: 633 case XK_KP_Next:
360 /* allow shift to override */ 634 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 636 {
363 STRCPY (kbuf, "\033Os"); 637 strcpy (kbuf, "\033Os");
364 break; 638 break;
365 } 639 }
366 /* FALLTHROUGH */ 640 /* FALLTHROUGH */
367# endif 641# endif
368 case XK_Next: 642 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
370 break; 644 break;
371#endif 645#endif
372 case XK_KP_Enter: 646 case XK_KP_Enter:
373 /* allow shift to override */ 647 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 649 {
376 STRCPY (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
377 } 662 }
378 else 663 else
379 { 664 {
380 kbuf[0] = '\r'; 665 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
382 } 667 }
383 break; 668 break;
384 669
385#ifdef XK_KP_Begin 670#ifdef XK_KP_Begin
386 case XK_KP_Begin: 671 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 672 strcpy (kbuf, "\033Ou");
388 break; 673 break;
389 674
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 675#endif
398 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 681 kbuf[2] += (keysym - XK_KP_F1);
404 break; 682 break;
405 683
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 684 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 685 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 700 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 702 {
425 STRCPY (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 705 }
428 else 706 else
429 { 707 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 709 kbuf[1] = '\0';
432 } 710 }
433 break; 711 break;
434 712
435 case XK_Find: 713 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
437 break; 715 break;
716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
438 case XK_Insert: 727 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 728 strcpy (kbuf, "\033[2~");
440 break; 729 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 730#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 731 case DXK_Remove:
443 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
444#endif 733#endif
445 case XK_Execute: 734 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 735 strcpy (kbuf, "\033[3~");
447 break; 736 break;
448 case XK_Select: 737 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 738 strcpy (kbuf, "\033[4~");
450 break; 739 break;
451#ifdef XK_KP_End 740#ifdef XK_KP_End
452 case XK_KP_End: 741 case XK_KP_End:
453 /* allow shift to override */ 742 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 744 {
456 STRCPY (kbuf, "\033Oq"); 745 strcpy (kbuf, "\033Oq");
457 break; 746 break;
458 } 747 }
459 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
460#endif 749#endif
461 case XK_End: 750 case XK_End:
462 STRCPY (kbuf, KS_END); 751 strcpy (kbuf, KS_END);
463 break; 752 break;
464#ifdef XK_KP_Home 753#ifdef XK_KP_Home
465 case XK_KP_Home: 754 case XK_KP_Home:
466 /* allow shift to override */ 755 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 757 {
469 STRCPY (kbuf, "\033Ow"); 758 strcpy (kbuf, "\033Ow");
470 break; 759 break;
471 } 760 }
472 /* FALLTHROUGH */ 761 /* FALLTHROUGH */
473#endif 762#endif
474 case XK_Home: 763 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 764 strcpy (kbuf, KS_HOME);
476 break; 765 break;
477 766
478#define FKEY(n, fkey) \ 767#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 768 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 769
… …
532#undef FKEY 821#undef FKEY
533 default: 822 default:
534 newlen = 0; 823 newlen = 0;
535 break; 824 break;
536 } 825 }
826
537 if (newlen) 827 if (newlen)
538 len = STRLEN (kbuf); 828 len = strlen (kbuf);
539 } 829 }
540 830
541 /* 831 /*
542 * Pass meta for all function keys, if 'meta' option set 832 * Pass meta for all function keys, if 'meta' option set
543 */ 833 */
… …
550 else if (ctrl && keysym == XK_minus) 840 else if (ctrl && keysym == XK_minus)
551 { 841 {
552 len = 1; 842 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 843 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 844 }
845 else if (keysym == XK_ISO_Left_Tab)
846 {
847 strcpy (kbuf, "\033[Z");
848 len = 3;
849 }
555 else 850 else
556 { 851 {
557#ifdef META8_OPTION 852#ifdef META8_OPTION
558 /* set 8-bit on */ 853 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
… …
571 } 866 }
572 867
573 if (len <= 0) 868 if (len <= 0)
574 return; /* not mapped */ 869 return; /* not mapped */
575 870
576 if (Options & Opt_scrollTtyKeypress) 871 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 872 if (view_start)
578 { 873 {
579 TermWin.view_start = 0; 874 view_start = 0;
580 want_refresh = 1; 875 want_refresh = 1;
581 } 876 }
582 877
583 /* 878 /*
584 * these modifications only affect the static keybuffer 879 * these modifications only affect the static keybuffer
… …
617#endif /* DEBUG_CMD */ 912#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 913 tt_write (kbuf, (unsigned int)len);
619} 914}
620/*}}} */ 915/*}}} */
621 916
622#if (MENUBAR_MAX) 917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 919/* attempt to `write' count to the input buffer */
625unsigned int 920unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 921rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
627{ 922{
… …
630 n = cmdbuf_ptr - cmdbuf_base; 925 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 927
633 if (n > 0 && s < count) 928 if (n > 0 && s < count)
634 { 929 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 930 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 931 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 932 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 933 cmdbuf_endp -= n;
639 s += n; 934 s += n;
640 } 935 }
… …
650 945
651 cmd_parse (); 946 cmd_parse ();
652 947
653 return 0; 948 return 0;
654} 949}
655#endif /* MENUBAR_MAX */ 950#endif
656 951
657void 952void
658rxvt_term::flush () 953rxvt_term::flush ()
659{ 954{
955 flush_ev.stop ();
956
660#ifdef TRANSPARENT 957#ifdef TRANSPARENT
661 if (want_full_refresh) 958 if (want_full_refresh)
662 { 959 {
663 want_full_refresh = 0; 960 want_full_refresh = 0;
664 scr_clear (); 961 scr_clear ();
665 scr_touch (false); 962 scr_touch (false);
666 want_refresh = 1;
667 } 963 }
668#endif 964#endif
669 965
670 if (want_refresh) 966 if (want_refresh)
671 { 967 {
… …
683rxvt_term::check_cb (check_watcher &w) 979rxvt_term::check_cb (check_watcher &w)
684{ 980{
685 SET_R (this); 981 SET_R (this);
686 SET_LOCALE (locale); 982 SET_LOCALE (locale);
687 983
984 display->flush ();
985
986 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01);
988}
989
990void
991rxvt_term::flush_cb (time_watcher &w)
992{
993 SET_R (this);
994 SET_LOCALE (locale);
995
996 refresh_limit = 1;
997 refresh_count = 0;
688 flush (); 998 flush ();
689} 999}
690 1000
691#ifdef CURSOR_BLINK 1001#ifdef CURSOR_BLINK
692void 1002void
… …
746{ 1056{
747 if (mouse_slip_wheel_speed == 0 1057 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1058 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1059 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1060 {
1061 if (view_start == nsaved ||
1062 view_start == 0)
1063 mouse_slip_wheel_speed = 0;
1064
751 refresh_type |= SMOOTH_REFRESH; 1065 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1066 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1068 }
755} 1069}
… …
768 1082
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1083 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1084 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1085 cmdbuf_endp = cmdbuf_ptr + n;
772 1086
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1088
775 if (n > 0) 1089 if (n > 0)
776 { 1090 {
777 cmdbuf_endp += n; 1091 cmdbuf_endp += n;
778 return true; 1092 return true;
779 } 1093 }
780 else if (n < 0 && errno != EAGAIN) 1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1095 {
1096 pty_ev.stop ();
1097
1098 if (!OPTION (Opt_hold))
781 destroy (); 1099 destroy ();
1100 }
782 1101
783 return false; 1102 return false;
784} 1103}
785 1104
786void 1105void
787rxvt_term::pty_cb (io_watcher &w, short revents) 1106rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1107{
789 SET_R (this); 1108 SET_R (this);
790 SET_LOCALE (locale); 1109 SET_LOCALE (locale);
791 1110
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1111 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1112 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1113 while (pty_fill ())
797 if (cmd_parse ()) 1114 if (cmd_parse ())
798 break; 1115 break;
1116
1117 if (revents & EVENT_WRITE)
1118 pty_write ();
799} 1119}
800 1120
801void 1121void
802rxvt_term::pointer_unblank () 1122rxvt_term::pointer_unblank ()
803{ 1123{
804 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1124 XDefineCursor (display->display, vt, TermWin_cursor);
805 recolour_cursor (); 1125 recolour_cursor ();
806 1126
807#ifdef POINTER_BLANK 1127#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1128 hidden_pointer = 0;
809 1129
810 if (Options & Opt_pointerBlank) 1130 if (OPTION (Opt_pointerBlank))
811 pointer_ev.start (NOW + pointerBlankDelay); 1131 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1132#endif
813} 1133}
814 1134
815#ifdef POINTER_BLANK 1135#ifdef POINTER_BLANK
816void 1136void
817rxvt_term::pointer_blank () 1137rxvt_term::pointer_blank ()
818{ 1138{
819 if (! (Options & Opt_pointerBlank)) 1139 if (! OPTION (Opt_pointerBlank))
820 return; 1140 return;
821 1141
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1142 XDefineCursor (display->display, vt, display->blank_cursor);
823 XFlush (display->display); 1143 XFlush (display->display);
824 1144
825 hidden_pointer = 1; 1145 hidden_pointer = 1;
826} 1146}
827 1147
… …
844 x = ev.x; 1164 x = ev.x;
845 y = ev.y; 1165 y = ev.y;
846 pixel_position (&x, &y); 1166 pixel_position (&x, &y);
847 1167
848 if (MEvent.button == AnyButton) 1168 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1169 button_number = 3;
851 }
852 else 1170 else
853 { 1171 {
854 button_number = MEvent.button - Button1; 1172 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1173 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1174 if (button_number >= 3)
857 button_number += (64 - 3); 1175 button_number += (64 - 3);
858 } 1176 }
859 1177
860 if (PrivateModes & PrivMode_MouseX10) 1178 if (priv_modes & PrivMode_MouseX10)
861 { 1179 {
862 /* 1180 /*
863 * do not report ButtonRelease 1181 * do not report ButtonRelease
864 * no state info allowed 1182 * no state info allowed
865 */ 1183 */
… …
880 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1198 + ((MEvent.state & ModMetaMask) ? 8 : 0)
881 + ((MEvent.state & ControlMask) ? 16 : 0); 1199 + ((MEvent.state & ControlMask) ? 16 : 0);
882#ifdef MOUSE_REPORT_DOUBLECLICK 1200#ifdef MOUSE_REPORT_DOUBLECLICK
883 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1201 key_state += ((MEvent.clicks > 1) ? 32 : 0);
884#endif 1202#endif
885
886 } 1203 }
887 1204
888#ifdef DEBUG_MOUSEREPORT 1205#if DEBUG_MOUSEREPORT
889 fprintf (stderr, "Mouse ["); 1206 fprintf (stderr, "Mouse [");
890 if (key_state & 16) 1207 if (key_state & 16)
891 fputc ('C', stderr); 1208 fputc ('C', stderr);
892 if (key_state & 4) 1209 if (key_state & 4)
893 fputc ('S', stderr); 1210 fputc ('S', stderr);
… …
897 fputc ('2', stderr); 1214 fputc ('2', stderr);
898 fprintf (stderr, "]: <%d>, %d/%d\n", 1215 fprintf (stderr, "]: <%d>, %d/%d\n",
899 button_number, 1216 button_number,
900 x + 1, 1217 x + 1,
901 y + 1); 1218 y + 1);
902#else 1219#endif
1220
903 tt_printf ("\033[M%c%c%c", 1221 tt_printf ("\033[M%c%c%c",
904 (32 + button_number + key_state), 1222 (32 + button_number + key_state),
905 (32 + x + 1), 1223 (32 + x + 1),
906 (32 + y + 1)); 1224 (32 + y + 1));
907#endif
908} 1225}
909 1226
910#ifdef USING_W11LIB 1227#ifdef USING_W11LIB
911void 1228void
912rxvt_W11_process_x_event (XEvent *ev) 1229rxvt_W11_process_x_event (XEvent *ev)
… …
919 1236
920/*{{{ process an X event */ 1237/*{{{ process an X event */
921void 1238void
922rxvt_term::x_cb (XEvent &ev) 1239rxvt_term::x_cb (XEvent &ev)
923{ 1240{
1241 dDisp;
1242
924 SET_R (this); 1243 SET_R (this);
925 SET_LOCALE (locale); 1244 SET_LOCALE (locale);
926 1245
927#if defined(CURSOR_BLINK) 1246#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1247 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
929 { 1248 {
930 if (hidden_cursor) 1249 if (hidden_cursor)
931 { 1250 {
932 hidden_cursor = 0; 1251 hidden_cursor = 0;
933 want_refresh = 1; 1252 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1255 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1256 }
938#endif 1257#endif
939 1258
940#if defined(POINTER_BLANK) 1259#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1260 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1261 {
943 if (ev.type == MotionNotify 1262 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1263 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1264 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1265 if (hidden_pointer)
… …
949 if (ev.type == KeyPress && hidden_pointer == 0) 1268 if (ev.type == KeyPress && hidden_pointer == 0)
950 pointer_blank (); 1269 pointer_blank ();
951 } 1270 }
952#endif 1271#endif
953 1272
954#ifdef USE_XIM
955 if (XFilterEvent (&ev, None))
956 return;
957#endif
958
959 Window unused_root, unused_child; 1273 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1274 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1275 unsigned int unused_mask;
962
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
1010#endif
1011 1276
1012 switch (ev.type) 1277 switch (ev.type)
1013 { 1278 {
1014 case KeyPress: 1279 case KeyPress:
1280#if ISO_14755
1281 if (!(iso14755buf & ISO_14755_52))
1282#endif
1015 lookup_key (ev.xkey); 1283 lookup_key (ev.xkey);
1284
1285 break;
1286
1287 case KeyRelease:
1288 {
1289#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1290 KeySym ks;
1291
1292 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1293#endif
1294
1295#if ENABLE_FRILLS || ISO_14755
1296 // ISO 14755 support
1297 if (iso14755buf)
1298 if (iso14755buf & ISO_14755_52)
1299 {
1300# if ENABLE_OVERLAY
1301 scr_overlay_off ();
1302# endif
1303# if ISO_14755
1304 // iso14755 part 5.2 handling: release time
1305 // first: controls
1306 if ((ev.xkey.state & ControlMask)
1307 && ((ks >= 0x40 && ks <= 0x5f)
1308 || (ks >= 0x61 && ks <= 0x7f)))
1309 {
1310 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1311 commit_iso14755 ();
1312 return; // case-break;
1313 }
1314
1315 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1316 if (i[0] == ks)
1317 {
1318 iso14755buf = ISO_14755_51 | i[1];
1319 commit_iso14755 ();
1320 return; // case-break;
1321 }
1322
1323 scr_bell ();
1324# endif
1325 iso14755buf = 0;
1016 break; 1326 break;
1327 }
1328 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1329 {
1330# if ENABLE_OVERLAY
1331 scr_overlay_off ();
1332# endif
1333 if (iso14755buf & ISO_14755_51)
1334 commit_iso14755 ();
1335#if ISO_14755
1336 else if (iso14755buf & ISO_14755_STARTED)
1337 {
1338 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1339
1340 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1341 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1342 }
1343# endif
1344 else
1345 iso14755buf = 0;
1346 }
1347#endif
1017 1348
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1351 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1352 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1030 } 1354#endif
1031 break; 1355 break;
1032 } 1356 }
1033#endif
1034 1357
1035 case ButtonPress: 1358 case ButtonPress:
1036 button_press (ev.xbutton); 1359 button_press (ev.xbutton);
1037 break; 1360 break;
1038 1361
… …
1040 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1041 break; 1364 break;
1042 1365
1043 case ClientMessage: 1366 case ClientMessage:
1044 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1368 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1369 {
1045 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1370 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1046 destroy (); 1371 destroy ();
1372#if ENABLE_EWMH
1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1374 XSendEvent (disp, ev.xclient.window = display->root,
1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1376 &ev);
1377#endif
1378 }
1379#if ENABLE_XEMBED
1380 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1381 {
1382 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1383 focus_in ();
1384 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1385 focus_out ();
1386 }
1387#endif
1047#ifdef OFFIX_DND 1388#ifdef OFFIX_DND
1048 /* OffiX Dnd (drag 'n' drop) protocol */ 1389 /* OffiX Dnd (drag 'n' drop) protocol */
1049 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1390 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1050 && (ev.xclient.data.l[0] == DndFile 1391 && (ev.xclient.data.l[0] == DndFile
1051 || ev.xclient.data.l[0] == DndDir 1392 || ev.xclient.data.l[0] == DndDir
1052 || ev.xclient.data.l[0] == DndLink)) 1393 || ev.xclient.data.l[0] == DndLink))
1053 { 1394 {
1054 /* Get Dnd data */ 1395 /* Get Dnd data */
1055 Atom ActualType; 1396 Atom ActualType;
1056 int ActualFormat; 1397 int ActualFormat;
1057 unsigned char *data; 1398 unsigned char *data;
1058 unsigned long Size, RemainingBytes; 1399 unsigned long Size, RemainingBytes;
1059 1400
1060 XGetWindowProperty (display->display, display->root, 1401 XGetWindowProperty (disp, display->root,
1061 xa[XA_DNDSELECTION], 1402 xa[XA_DNDSELECTION],
1062 0L, 1000000L, 1403 0L, 1000000L,
1063 False, AnyPropertyType, 1404 False, AnyPropertyType,
1064 &ActualType, &ActualFormat, 1405 &ActualType, &ActualFormat,
1065 &Size, &RemainingBytes, 1406 &Size, &RemainingBytes,
1066 &data); 1407 &data);
1067 XChangeProperty (display->display, display->root, 1408 set_string_property (XA_CUT_BUFFER0, data);
1068 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace,
1070 data, STRLEN (data));
1071 XFree (data); 1409 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1410 selection_paste (display->root, XA_CUT_BUFFER0, true);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1411 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1074 } 1412 }
1075#endif /* OFFIX_DND */ 1413#endif /* OFFIX_DND */
1076 break; 1414 break;
1077 1415
1078 case MappingNotify: 1416 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1417 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1418 break;
1081 1419
1082 /* 1420 /*
1083 * XXX: this is not the _current_ arrangement 1421 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1422 * Here's my conclusion:
… …
1103 break; 1441 break;
1104 } 1442 }
1105 break; 1443 break;
1106 1444
1107 case FocusIn: 1445 case FocusIn:
1108 if (!TermWin.focus) 1446 focus_in ();
1447 break;
1448
1449 case FocusOut:
1450 focus_out ();
1451 break;
1452
1453 case ConfigureNotify:
1454 if (ev.xconfigure.window == parent[0])
1109 { 1455 {
1110 TermWin.focus = 1; 1456 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1111 want_refresh = 1; 1457 ;
1112#ifdef USE_XIM 1458
1113 if (Input_Context != NULL) 1459 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1114 XSetICFocus (Input_Context);
1115#endif
1116#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif
1120#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade])
1122 { 1460 {
1123 PixColors = PixColorsFocused; 1461 seen_resize = 1;
1124 set_colorfgbg (); 1462 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1125 scr_clear ();
1126 scr_touch (true);
1127 } 1463 }
1128#endif
1129 1464
1465#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1466 if (OPTION (Opt_transparent))
1467 check_our_parents ();
1468#endif
1130 } 1469 }
1131 break; 1470 break;
1132 1471
1133 case FocusOut:
1134 if (TermWin.focus)
1135 {
1136 TermWin.focus = 0;
1137 want_refresh = 1;
1138#ifdef USE_XIM
1139 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context);
1141#endif
1142#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink)
1144 cursor_blink_ev.stop ();
1145 hidden_cursor = 0;
1146#endif
1147#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade])
1149 {
1150 PixColors = PixColorsUnFocused;
1151 set_colorfgbg ();
1152 scr_clear ();
1153 scr_touch (true);
1154 }
1155#endif
1156
1157 }
1158 break;
1159
1160 case ConfigureNotify: 1472 case PropertyNotify:
1161 if (ev.xconfigure.window == TermWin.parent[0]) 1473 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1162 { 1474 && ev.xproperty.state == PropertyNewValue)
1163 int height, width; 1475 selection_property (ev.xproperty.window, ev.xproperty.atom);
1164 1476
1165 do
1166 { /* Wrap lots of configures into one */
1167 width = ev.xconfigure.width;
1168 height = ev.xconfigure.height;
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172
1173 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1);
1177 }
1178#ifdef DEBUG_SIZE
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent)
1186 {
1187 check_our_parents ();
1188 if (am_transparent)
1189 want_full_refresh = 1;
1190 }
1191#endif
1192 }
1193 break; 1477 break;
1194 1478
1195 case SelectionClear: 1479 case SelectionClear:
1196 selection_clear (); 1480 selection_clear ();
1197 break; 1481 break;
1198 1482
1199 case SelectionNotify: 1483 case SelectionNotify:
1200 if (selection_wait == Sel_normal) 1484 if (selection_wait == Sel_normal)
1201 selection_paste (ev.xselection.requestor, 1485 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1202 ev.xselection.property, True);
1203 break; 1486 break;
1204 1487
1205 case SelectionRequest: 1488 case SelectionRequest:
1206 selection_send (ev.xselectionrequest); 1489 selection_send (ev.xselectionrequest);
1207 break; 1490 break;
1208 1491
1209 case UnmapNotify: 1492 case UnmapNotify:
1210 TermWin.mapped = 0; 1493 mapped = 0;
1211#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1212 text_blink_ev.stop (); 1495 text_blink_ev.stop ();
1213#endif 1496#endif
1214 break; 1497 break;
1215 1498
1216 case MapNotify: 1499 case MapNotify:
1217 TermWin.mapped = 1; 1500 mapped = 1;
1218#ifdef TEXT_BLINK 1501#ifdef TEXT_BLINK
1219 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1502 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1220#endif 1503#endif
1221 break; 1504 break;
1222 1505
… …
1226 break; 1509 break;
1227#endif /* TRANSPARENT */ 1510#endif /* TRANSPARENT */
1228 1511
1229 case GraphicsExpose: 1512 case GraphicsExpose:
1230 case Expose: 1513 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == vt)
1232 { 1515 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1516 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1519 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1520
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1526
1241 // ev.xexpose.width, TermWin.height, False); 1527 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1528 }
1245 else 1529 else
1246 { 1530 {
1247 XEvent unused_event; 1531 XEvent unused_event;
1248 1532
1249 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1250 ; 1534 ;
1251 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1252 ; 1536 ;
1253 1537
1254 if (isScrollbarWindow (ev.xany.window)) 1538 if (isScrollbarWindow (ev.xany.window))
1255 { 1539 {
1256 scrollBar.setIdle (); 1540 scrollBar.setIdle ();
… …
1258 } 1542 }
1259#ifdef MENUBAR 1543#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1545 menubar_expose ();
1262#endif 1546#endif
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window);
1551#endif
1263 } 1552 }
1264 break; 1553 break;
1265 1554
1266 case MotionNotify: 1555 case MotionNotify:
1267#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
… …
1273 { 1562 {
1274 menubar_control (ev.xbutton); 1563 menubar_control (ev.xbutton);
1275 break; 1564 break;
1276 } 1565 }
1277#endif 1566#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1279 break; 1568 break;
1280 1569
1281 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == vt)
1282 { 1571 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1573 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1286 ; 1575 ;
1287 1576
1288 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (disp, vt,
1289 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1580 &ev.xbutton.x, &ev.xbutton.y,
1292 &unused_mask); 1581 &ev.xbutton.state);
1293#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1585 {
1297#endif 1586#endif
1587#if ISO_14755
1588 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break;
1593 }
1594#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 ev.xbutton.state & Button3Mask ? 2 : 0);
1597
1300#ifdef SELECTION_SCROLLING 1598#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1599 if (ev.xbutton.y < int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1600 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1303 { 1601 {
1304 int dist; 1602 int dist;
1305 1603
1306 /* don't clobber the current delay if we are 1604 /* don't clobber the current delay if we are
1307 * already in the middle of scrolling. 1605 * already in the middle of scrolling.
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1608 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1609
1312 /* save the event params so we can highlight 1610 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1611 * the selection in the pending-scroll loop
1314 */ 1612 */
1315 selection_save_x=ev.xbutton.x; 1613 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1614 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1615 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1616
1320 /* calc number of lines to scroll */ 1617 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1618 if (ev.xbutton.y < int_bwidth)
1322 { 1619 {
1323 scroll_selection_dir = UP; 1620 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1621 dist = int_bwidth - ev.xbutton.y;
1325 } 1622 }
1326 else 1623 else
1327 { 1624 {
1328 scroll_selection_dir = DN; 1625 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y - 1626 dist = ev.xbutton.y - (int_bwidth + height);
1330 (TermWin.int_bwidth + TermWin.height);
1331 } 1627 }
1628
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1629 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1630 / SELECTION_SCROLL_LINE_SPEEDUP
1631 + 1;
1334 MIN_IT (scroll_selection_lines, 1632 min_it (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1633 SELECTION_SCROLL_MAX_LINES);
1336 } 1634 }
1337 else 1635 else
1338 { 1636 {
1339 /* we are within the text window, so we 1637 /* we are within the text window, so we
1340 * shouldn't be scrolling 1638 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1640 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1641 sel_scroll_ev.stop();
1344 } 1642 }
1345#endif 1643#endif
1346#ifdef MOUSE_THRESHOLD 1644#ifdef MOUSE_THRESHOLD
1347
1348 } 1645 }
1349#endif 1646#endif
1350
1351 } 1647 }
1352 } 1648 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1649 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1650 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1651 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1356 MotionNotify, &ev)) ; 1652 MotionNotify, &ev))
1653 ;
1654
1357 XQueryPointer (display->display, scrollBar.win, 1655 XQueryPointer (disp, scrollBar.win,
1358 &unused_root, &unused_child, 1656 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1657 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1658 &ev.xbutton.x, &ev.xbutton.y,
1361 &unused_mask); 1659 &unused_mask);
1362 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1363 scrollbar_size ()); 1661 scrollbar_size ());
1364 scr_refresh (refresh_type); 1662 scr_refresh (refresh_type);
1365 refresh_limit = 0; 1663 refresh_limit = 0;
… …
1368 break; 1666 break;
1369 } 1667 }
1370} 1668}
1371 1669
1372void 1670void
1671rxvt_term::focus_in ()
1672{
1673 if (!focus)
1674 {
1675 focus = 1;
1676 want_refresh = 1;
1677#if USE_XIM
1678 if (Input_Context != NULL)
1679 {
1680 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context);
1682 }
1683#endif
1684#if CURSOR_BLINK
1685 if (OPTION (Opt_cursorBlink))
1686 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1687#endif
1688#if OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_focused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698void
1699rxvt_term::focus_out ()
1700{
1701 if (focus)
1702 {
1703 focus = 0;
1704 want_refresh = 1;
1705
1706#if ENABLE_FRILLS || ISO_14755
1707 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY
1710 scr_overlay_off ();
1711#endif
1712#if USE_XIM
1713 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context);
1715#endif
1716#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.stop ();
1719 hidden_cursor = 0;
1720#endif
1721#if OFF_FOCUS_FADING
1722 if (rs[Rs_fade])
1723 {
1724 pix_colors = pix_colors_unfocused;
1725 scr_recolour ();
1726 }
1727#endif
1728 }
1729}
1730
1731#if TRANSPARENT
1732void
1373rxvt_term::rootwin_cb (XEvent &ev) 1733rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1734{
1375 SET_R (this); 1735 SET_R (this);
1376 SET_LOCALE (locale); 1736 SET_LOCALE (locale);
1377 1737
1378 switch (ev.type) 1738 switch (ev.type)
1379 { 1739 {
1380 case PropertyNotify: 1740 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1741 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1742 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on. 1743 * use the property to determine the pixmap. We use it later on.
1393 */ 1744 */
1394 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1745 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1746 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1398 return; 1747 return;
1399 }
1400 1748
1401 /* FALLTHROUGH */ 1749 /* FALLTHROUGH */
1402 case ReparentNotify: 1750 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1751 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1752 want_refresh = want_full_refresh = 1;
1405 break; 1753 break;
1406#endif
1407 } 1754 }
1408} 1755}
1756#endif
1409 1757
1410void 1758void
1411rxvt_term::button_press (XButtonEvent &ev) 1759rxvt_term::button_press (XButtonEvent &ev)
1412{ 1760{
1413 int reportmode = 0, clickintime; 1761 int reportmode = 0, clickintime;
1414 1762
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1764 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1765 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766
1418 /* 1767 /*
1419 * VT window processing of button press 1768 * VT window processing of button press
1420 */ 1769 */
1421 if (ev.window == TermWin.vt) 1770 if (ev.window == vt)
1422 { 1771 {
1772#if ISO_14755
1773 // 5.4
1774 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1775 {
1776 iso14755_54 (ev.x, ev.y);
1777 return;
1778 }
1779#endif
1780
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1781 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1782
1424 if (reportmode) 1783 if (reportmode)
1425 { 1784 {
1426 /* mouse report from vt window */ 1785 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1786 /* save the xbutton state (for ButtonRelease) */
1428 MEvent.state = ev.state; 1787 MEvent.state = ev.state;
… …
1457 } 1816 }
1458 else 1817 else
1459 { 1818 {
1460 if (ev.button != MEvent.button) 1819 if (ev.button != MEvent.button)
1461 MEvent.clicks = 0; 1820 MEvent.clicks = 0;
1821
1462 switch (ev.button) 1822 switch (ev.button)
1463 { 1823 {
1464 case Button1: 1824 case Button1:
1825 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */
1827#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask);
1829#else
1830 selection.rect = false;
1831#endif
1832
1465 /* allow shift+left click to extend selection */ 1833 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1835 {
1468 if (MEvent.button == Button1 && clickintime) 1836 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1837 selection_rotate (ev.x, ev.y);
1470 else 1838 else
1471 selection_extend (ev.x, ev.y, 1); 1839 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1854 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1855 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1856 selection_rotate (ev.x, ev.y);
1489 else 1857 else
1490 selection_extend (ev.x, ev.y, 1); 1858 selection_extend (ev.x, ev.y, 1);
1859
1491 MEvent.button = Button3; 1860 MEvent.button = Button3;
1492 break; 1861 break;
1493 } 1862 }
1494 } 1863 }
1864
1495 MEvent.time = ev.time; 1865 MEvent.time = ev.time;
1496 return; 1866 return;
1497 } 1867 }
1498 1868
1499 /* 1869 /*
… …
1591 break; 1961 break;
1592 case R_SB_ALIGN_BOTTOM: 1962 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1963 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1964 break;
1595 } 1965 }
1966
1596 if (scrollBar.style == R_SB_XTERM 1967 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1968 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1969 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1970 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1971
1601 scrollBar.setMotion (); 1972 scrollBar.setMotion ();
1602 break; 1973 break;
1603 1974
1604 case Button1: 1975 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1976 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 case Button3: 1980 case Button3:
1610 if (scrollBar.style != R_SB_XTERM) 1981 if (scrollBar.style != R_SB_XTERM)
1611 { 1982 {
1612 if (scrollbar_above_slider (ev.y)) 1983 if (scrollbar_above_slider (ev.y))
1613# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1614 scr_page (UP, TermWin.nrow - 1); 1985 scr_page (UP, nrow - 1);
1615# else 1986# else
1616 scr_page (UP, TermWin.nrow / 4); 1987 scr_page (UP, nrow / 4);
1617# endif 1988# endif
1618 else if (scrollbar_below_slider (ev.y)) 1989 else if (scrollbar_below_slider (ev.y))
1619# ifdef RXVT_SCROLL_FULL 1990# ifdef RXVT_SCROLL_FULL
1620 scr_page (DN, TermWin.nrow - 1); 1991 scr_page (DN, nrow - 1);
1621# else 1992# else
1622 scr_page (DN, TermWin.nrow / 4); 1993 scr_page (DN, nrow / 4);
1623# endif 1994# endif
1624 else 1995 else
1625 scrollBar.setMotion (); 1996 scrollBar.setMotion ();
1626 } 1997 }
1627 else 1998 else
1628 { 1999 {
1629 scr_page ((ev.button == Button1 ? DN : UP), 2000 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 2001 (nrow
1631 * scrollbar_position (ev.y) 2002 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 2003 / scrollbar_size ()));
1633 } 2004 }
2005
1634 break; 2006 break;
1635 } 2007 }
1636 } 2008 }
1637 return; 2009 return;
1638 } 2010 }
… …
1650{ 2022{
1651 int reportmode = 0; 2023 int reportmode = 0;
1652 2024
1653 csrO = 0; /* reset csr Offset */ 2025 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 2026 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2027 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 2028
1657 if (scrollbar_isUpDn ()) 2029 if (scrollbar_isUpDn ())
1658 { 2030 {
1659 scrollBar.setIdle (); 2031 scrollBar.setIdle ();
1660 scrollbar_show (0); 2032 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2033#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 2034 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 2035#endif
1664
1665 } 2036 }
2037
1666#ifdef SELECTION_SCROLLING 2038#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 2039 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 2040 sel_scroll_ev.stop();
1669#endif 2041#endif
2042
1670 if (ev.window == TermWin.vt) 2043 if (ev.window == vt)
1671 { 2044 {
2045#if ISO_14755
2046 // 5.4
2047 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2048 return;
2049#endif
1672 if (reportmode) 2050 if (reportmode)
1673 { 2051 {
1674 /* mouse report from vt window */ 2052 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 2053 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 2054 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 2068 MEvent.button = AnyButton;
1691 mouse_report (ev); 2069 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 2070#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 2071 return;
1694 } 2072 }
2073
1695 /* 2074 /*
1696 * dumb hack to compensate for the failure of click-and-drag 2075 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 2076 * when overriding mouse reporting
1698 */ 2077 */
1699 if (PrivateModes & PrivMode_mouse_report 2078 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 2079 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 2080 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 2081 selection_extend (ev.x, ev.y, 0);
1703 2082
1704 switch (ev.button) 2083 switch (ev.button)
… …
1719 2098
1720 v = ev.button == Button4 ? UP : DN; 2099 v = ev.button == Button4 ? UP : DN;
1721 2100
1722 if (ev.state & ShiftMask) 2101 if (ev.state & ShiftMask)
1723 i = 1; 2102 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2103 else if (OPTION (Opt_mouseWheelScrollPage))
1725 i = TermWin.nrow - 1; 2104 i = nrow - 1;
1726 else 2105 else
1727 i = 5; 2106 i = 5;
1728 2107
1729# ifdef MOUSE_SLIP_WHEELING 2108# ifdef MOUSE_SLIP_WHEELING
1730 if (ev.state & ControlMask) 2109 if (ev.state & ControlMask)
1731 { 2110 {
1732 mouse_slip_wheel_speed += v ? -1 : 1; 2111 mouse_slip_wheel_speed += v ? -1 : 1;
1733 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2112 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1734 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2113 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1735 2114
1736 if (slip_wheel_ev.at < NOW) 2115 if (slip_wheel_ev.at < NOW)
1737 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2116 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1738 2117
1739 slip_wheel_ev.start (); 2118 slip_wheel_ev.start ();
… …
1767#endif 2146#endif
1768} 2147}
1769 2148
1770#ifdef TRANSPARENT 2149#ifdef TRANSPARENT
1771#if TINTING 2150#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2151/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2152
1775static void 2153typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2154
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2155void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2156{
1783 /* No saturation */ 2157 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2158 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2159 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2160 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2161 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2162 int i;
1787 2163
1788 b = ((uint16_t *) ptr)[x]; 2164 Visual *visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2165
1790 g = (b & 0x3e0) * gm; 2166 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2167
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2168 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2169 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2170 mask_g = visual->green_mask;
1795 } 2171 mask_b = visual->blue_mask;
1796 ptr += bpl; 2172
1797 } 2173 /* boring lookup table pre-initialization */
2174 switch (srcImage->bits_per_pixel) {
2175 case 15:
2176 if ((mask_r != 0x7c00) ||
2177 (mask_g != 0x03e0) ||
2178 (mask_b != 0x001f))
2179 return;
2180 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2181 lookup_r = lookup;
2182 lookup_g = lookup+32;
2183 lookup_b = lookup+32+32;
2184 sh_r = 10;
2185 sh_g = 5;
2186 sh_b = 0;
2187 break;
2188 case 16:
2189 if ((mask_r != 0xf800) ||
2190 (mask_g != 0x07e0) ||
2191 (mask_b != 0x001f))
2192 return;
2193 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2194 lookup_r = lookup;
2195 lookup_g = lookup+32;
2196 lookup_b = lookup+32+64;
2197 sh_r = 11;
2198 sh_g = 5;
2199 sh_b = 0;
2200 break;
2201 case 24:
2202 if ((mask_r != 0xff0000) ||
2203 (mask_g != 0x00ff00) ||
2204 (mask_b != 0x0000ff))
2205 return;
2206 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2207 lookup_r = lookup;
2208 lookup_g = lookup+256;
2209 lookup_b = lookup+256+256;
2210 sh_r = 16;
2211 sh_g = 8;
2212 sh_b = 0;
2213 break;
2214 case 32:
2215 if ((mask_r != 0xff0000) ||
2216 (mask_g != 0x00ff00) ||
2217 (mask_b != 0x0000ff))
2218 return;
2219 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2220 lookup_r = lookup;
2221 lookup_g = lookup+256;
2222 lookup_b = lookup+256+256;
2223 sh_r = 16;
2224 sh_g = 8;
2225 sh_b = 0;
2226 break;
2227 default:
2228 return; /* we do not support this color depth */
2229 }
2230
2231 /* prepare limits for color transformation (each channel is handled separately) */
2232 if (shade < 0) {
2233 shade = -shade;
2234 if (shade < 0) shade = 0;
2235 if (shade > 100) shade = 100;
2236
2237 lower_lim_r = 65535-rm;
2238 lower_lim_g = 65535-gm;
2239 lower_lim_b = 65535-bm;
2240
2241 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2242 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2243 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2244
2245 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2246 } else {
1799 for (y = h; --y >= 0;) { 2247 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2248 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2249
1803 b = ((uint16_t *) ptr)[x]; 2250 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2251
1805 g = (b & 0x3e0) * gm; 2252 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2253 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2254 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2255 }
1809 b |= (!(b >> 5) - 1); 2256
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2257 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2258 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2259 {
1813 } 2260 unsigned int tmp;
1814 ptr += bpl; 2261
2262 tmp = lower_lim_r;
2263 lower_lim_r = lower_lim_b;
2264 lower_lim_b = tmp;
2265
2266 tmp = upper_lim_r;
2267 upper_lim_r = upper_lim_b;
2268 upper_lim_b = tmp;
2269 }
2270
2271 /* fill our lookup tables */
2272 for (i = 0; i <= mask_r>>sh_r; i++)
2273 {
2274 RUINT32T tmp;
2275 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2276 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2277 lookup_r[i] = (tmp/65535)<<sh_r;
2278 }
2279 for (i = 0; i <= mask_g>>sh_g; i++)
2280 {
2281 RUINT32T tmp;
2282 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2283 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2284 lookup_g[i] = (tmp/65535)<<sh_g;
2285 }
2286 for (i = 0; i <= mask_b>>sh_b; i++)
2287 {
2288 RUINT32T tmp;
2289 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2290 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2291 lookup_b[i] = (tmp/65535)<<sh_b;
2292 }
2293
2294 /* apply table to input image (replacing colors by newly calculated ones) */
2295 switch (srcImage->bits_per_pixel)
2296 {
2297 case 15:
2298 {
2299 unsigned short *p1, *pf, *p, *pl;
2300 p1 = (unsigned short *) srcImage->data;
2301 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2302 while (p1 < pf)
2303 {
2304 p = p1;
2305 pl = p1 + srcImage->width;
2306 for (; p < pl; p++)
1815 } 2307 {
2308 *p = lookup_r[(*p & 0x7c00)>>10] |
2309 lookup_g[(*p & 0x03e0)>> 5] |
2310 lookup_b[(*p & 0x001f)];
2311 }
2312 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2313 }
1817} 2314 break;
1818 2315 }
1819/* RGB 16 */ 2316 case 16:
1820static void 2317 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2318 unsigned short *p1, *pf, *p, *pl;
1822{ 2319 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2320 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2321 while (p1 < pf)
1825 2322 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2323 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2324 pl = p1 + srcImage->width;
1828 /* No saturation */ 2325 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2326 {
1843 } else { 2327 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2328 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2329 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2330 }
1859 ptr += bpl; 2331 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2332 }
2333 break;
2334 }
2335 case 24:
2336 {
2337 unsigned char *p1, *pf, *p, *pl;
2338 p1 = (unsigned char *) srcImage->data;
2339 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2340 while (p1 < pf)
2341 {
2342 p = p1;
2343 pl = p1 + srcImage->width * 3;
2344 for (; p < pl; p += 3)
1860 } 2345 {
2346 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2347 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2348 p[2] = lookup_r[(p[2] & 0x0000ff)];
2349 }
2350 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2351 }
1862} 2352 break;
2353 }
2354 case 32:
2355 {
2356 RUINT32T *p1, *pf, *p, *pl;
2357 p1 = (RUINT32T *) srcImage->data;
2358 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2359
1864/* RGB 24 */ 2360 while (p1 < pf)
1865static void 2361 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2362 p = p1;
1867{ 2363 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2364 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2365 {
1896 } else { 2366 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2367 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2368 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2369 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2370 }
1927 ptr += bpl; 2371 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2372 }
2373 break;
2374 }
1929 } 2375 }
1930}
1931 2376
1932/* RGB 32 */ 2377 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2378}
2003
2004#endif 2379#endif
2005 2380
2006/* 2381/*
2007 * Check our parents are still who we think they are. 2382 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2383 * Do transparency updates if required
… …
2015 Atom atype; 2390 Atom atype;
2016 unsigned char *prop = NULL; 2391 unsigned char *prop = NULL;
2017 Window root, oldp, *list; 2392 Window root, oldp, *list;
2018 Pixmap rootpixmap = None; 2393 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2394 XWindowAttributes wattr, wrootattr;
2395 dDisp;
2020 2396
2021 pchanged = 0; 2397 pchanged = 0;
2022 2398
2023 if (!(Options & Opt_transparent)) 2399 if (!OPTION (Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2400 return pchanged; /* Don't try any more */
2025 2401
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2402 XGetWindowAttributes (disp, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2403 rootdepth = wrootattr.depth;
2028 2404
2029 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2405 XGetWindowAttributes (disp, parent[0], &wattr);
2030 2406
2031 if (rootdepth != wattr.depth) 2407 if (rootdepth != wattr.depth)
2032 { 2408 {
2033 if (am_transparent) 2409 if (am_transparent)
2034 { 2410 {
2035 pchanged = 1; 2411 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2412 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2413 am_transparent = am_pixmap_trans = 0;
2038 } 2414 }
2039 2415
2040 return pchanged; /* Don't try any more */ 2416 return pchanged; /* Don't try any more */
2041 } 2417 }
2042 2418
2043 /* Get all X ops out of the queue so that our information is up-to-date. */ 2419 /* Get all X ops out of the queue so that our information is up-to-date. */
2044 XSync (display->display, False); 2420 XSync (disp, False);
2045 2421
2046 /* 2422 /*
2047 * Make the frame window set by the window manager have 2423 * Make the frame window set by the window manager have
2048 * the root background. Some window managers put multiple nested frame 2424 * the root background. Some window managers put multiple nested frame
2049 * windows for each client, so we have to take care about that. 2425 * windows for each client, so we have to take care about that.
2050 */ 2426 */
2051 i = (xa[XA_XROOTPMAPID] 2427 i = (xa[XA_XROOTPMAP_ID]
2052 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2428 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2053 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2429 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2054 &nitems, &bytes_after, &prop) == Success); 2430 &nitems, &bytes_after, &prop) == Success);
2055 2431
2056 if (!i || prop == NULL) 2432 if (!i || prop == NULL)
2057 i = (xa[XA_XSETROOTID] 2433 i = (xa[XA_ESETROOT_PMAP_ID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2434 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2435 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2436 &nitems, &bytes_after, &prop) == Success);
2061 2437
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2438 if (!i || prop == NULL
2439#if TINTING
2440 || !rs[Rs_color + Color_tint]
2441#endif
2442 )
2063 have_pixmap = 0; 2443 have_pixmap = 0;
2064 else 2444 else
2065 { 2445 {
2066 have_pixmap = 1; 2446 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2447 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2458 Window cr;
2079 XImage *image; 2459 XImage *image;
2080 GC gc; 2460 GC gc;
2081 XGCValues gcvalue; 2461 XGCValues gcvalue;
2082 2462
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2463 XTranslateCoordinates (disp, parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2464 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2465 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2466 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2467 nx = ny = 0;
2088 2468
… …
2098 nh += sy; 2478 nh += sy;
2099 ny = -sy; 2479 ny = -sy;
2100 sy = 0; 2480 sy = 0;
2101 } 2481 }
2102 2482
2103 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2483 min_it (nw, (unsigned int) (wrootattr.width - sx));
2104 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2484 min_it (nh, (unsigned int) (wrootattr.height - sy));
2485
2486 XSync (disp, False);
2105 allowedxerror = -1; 2487 allowedxerror = -1;
2106 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2488 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2107 2489
2108 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2490 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2109 /* XXX: may need a delay here? */ 2491 /* XXX: may need a delay here? */
2110 allowedxerror = 0; 2492 allowedxerror = 0;
2111 2493
2112 if (image == NULL) 2494 if (image == NULL)
2113 { 2495 {
2114 if (am_transparent && am_pixmap_trans) 2496 if (am_transparent && am_pixmap_trans)
2115 { 2497 {
2116 pchanged = 1; 2498 pchanged = 1;
2117 if (TermWin.pixmap != None) 2499 if (pixmap != None)
2118 { 2500 {
2119 XFreePixmap (display->display, TermWin.pixmap); 2501 XFreePixmap (disp, pixmap);
2120 TermWin.pixmap = None; 2502 pixmap = None;
2121 } 2503 }
2122 } 2504 }
2123 2505
2124 am_pixmap_trans = 0; 2506 am_pixmap_trans = 0;
2125 } 2507 }
2126 else 2508 else
2127 { 2509 {
2128 if (TermWin.pixmap != None) 2510 if (pixmap != None)
2129 XFreePixmap (display->display, TermWin.pixmap); 2511 XFreePixmap (disp, pixmap);
2130 2512
2131#if TINTING 2513#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2514 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2515 {
2134 unsigned short rm, gm, bm; 2516 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2517 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2518
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2519 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2520
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2521 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2522 }
2151#endif 2523#endif
2152 2524
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2525 pixmap = XCreatePixmap (disp, vt,
2154 szHint.width, szHint.height, image->depth); 2526 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2527 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2528 XPutImage (disp, pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2529 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2530 XFreeGC (disp, gc);
2159 XDestroyImage (image); 2531 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2532 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2533 XClearWindow (disp, parent[0]);
2161 2534
2162 if (!am_transparent || !am_pixmap_trans) 2535 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2536 pchanged = 1;
2164 2537
2165 am_transparent = am_pixmap_trans = 1; 2538 am_transparent = am_pixmap_trans = 1;
2166 } 2539 }
2167 } 2540 }
2168 2541
2169 if (!am_pixmap_trans) 2542 if (am_pixmap_trans)
2543 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2544 else
2170 { 2545 {
2171 unsigned int n; 2546 unsigned int n;
2172 /* 2547 /*
2173 * InheritPixmap transparency 2548 * InheritPixmap transparency
2174 */ 2549 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2550 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2177 { 2551 {
2178 oldp = TermWin.parent[i]; 2552 oldp = parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2553 XQueryTree (disp, parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2554 &parent[i], &list, &n);
2181 XFree (list); 2555 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2556
2184 if (TermWin.parent[i] == display->root) 2557 if (parent[i] == display->root)
2185 { 2558 {
2186 if (oldp != None) 2559 if (oldp != None)
2187 pchanged = 1; 2560 pchanged = 1;
2188 2561
2189 break; 2562 break;
2190 } 2563 }
2191 2564
2192 if (oldp != TermWin.parent[i]) 2565 if (oldp != parent[i])
2193 pchanged = 1; 2566 pchanged = 1;
2194 } 2567 }
2195 2568
2196 n = 0; 2569 n = 0;
2197 2570
2198 if (pchanged) 2571 if (pchanged)
2199 { 2572 {
2200 for (; n < (unsigned int)i; n++) 2573 for (; n < (unsigned int)i; n++)
2201 { 2574 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2575 XGetWindowAttributes (disp, parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2576 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2577 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2578 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2207 break; 2579 break;
2208 } 2580 }
2209 } 2581 }
2210 } 2582 }
2211 2583
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2584 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2213 { 2585 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2586 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2587 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2588 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2589 /* XXX: also turn off Opt_transparent? */
2219 } 2590 }
2220 else 2591 else
2221 { 2592 {
2222#if WAIT_FOR_WM 2593#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2594 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2595 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2596 sleep (1);
2226#endif 2597#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2598 for (n = 0; n < (unsigned int)i; n++)
2599 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2600 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2601 XClearWindow (disp, parent[n]);
2602 }
2230 2603
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2232 am_transparent = 1; 2605 am_transparent = 1;
2233 } 2606 }
2234 2607
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2608 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2609 parent[i] = None;
2610 }
2611
2612 if (scrollBar.win)
2613 {
2614 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2615 scrollBar.setIdle ();
2616 scrollbar_show (0);
2617 }
2618
2619 if (am_transparent)
2620 {
2621 want_refresh = want_full_refresh = 1;
2622 if (am_pixmap_trans)
2623 flush ();
2237 } 2624 }
2238 2625
2239 return pchanged; 2626 return pchanged;
2240} 2627}
2241#endif 2628#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2647 if (ch == NOCHAR) // TODO: improve
2261 break; 2648 break;
2262 2649
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2650 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2651 {
2652 if (!seen_input)
2653 {
2654 seen_input = 1;
2655 // many badly-written programs (e.g. jed) contain a race condition:
2656 // they first read the screensize and then install a SIGWINCH handler.
2657 // some window managers resize the window early, and these programs
2658 // then sometimes get the size wrong.
2659 // unfortunately other programs are even more buggy and dislike
2660 // being sent SIGWINCH, so only do it when we were in fact being
2661 // resized.
2662 if (seen_resize && cmd_pid)
2663 kill (-cmd_pid, SIGWINCH);
2664 }
2665
2265 /* Read a text string from the input buffer */ 2666 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2667 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2668 bool refreshnow = false;
2268 int nlines = 0; 2669 int nlines = 0;
2269 unicode_t *str = buf; 2670 unicode_t *str = buf;
2270 2671 unicode_t *eol = str + min (ncol, UBUFSIZ);
2271 *str++ = ch;
2272 2672
2273 for (;;) 2673 for (;;)
2274 { 2674 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2675 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2676 break;
2280 2677
2281 *str++ = ch; 2678 *str++ = ch;
2282 2679
2283 if (ch == C0_LF) 2680 if (ch == C0_LF || str >= eol)
2284 { 2681 {
2682 if (ch == C0_LF)
2285 nlines++; 2683 nlines++;
2684
2286 refresh_count++; 2685 refresh_count++;
2287 2686
2288 if (! (Options & Opt_jumpScroll) 2687 if (!OPTION (Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2688 || (refresh_count >= refresh_limit * (nrow - 1)))
2290 { 2689 {
2291 refreshnow = true; 2690 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2691 ch = NOCHAR;
2294 break; 2692 break;
2295 } 2693 }
2296 2694
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2695 // scr_add_lines only works for nlines <= nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2696 if (nlines >= nrow - 1)
2299 { 2697 {
2300 scr_add_lines (buf, nlines, str - buf); 2698 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2699 nlines = 0;
2302 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2303 } 2702 }
2703
2704 if (str >= eol)
2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2708 ch = NOCHAR;
2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2304 } 2715 }
2305 2716
2306 if (str >= buf + UBUFSIZ) 2717 seq_begin = cmdbuf_ptr;
2307 { 2718 ch = next_char ();
2308 ch = NOCHAR;
2309 break;
2310 }
2311 } 2719 }
2312 2720
2313 scr_add_lines (buf, nlines, str - buf); 2721 scr_add_lines (buf, nlines, str - buf);
2314 2722
2315 /* 2723 /*
2316 * If there have been a lot of new lines, then update the screen 2724 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2725 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2726 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2727 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2728 */
2324 if (refreshnow) 2729 if (refreshnow)
2325 { 2730 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2731 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2732 refresh_limit++;
2328 else 2733 else
2734 {
2735 flag = true;
2329 scr_refresh (refresh_type); 2736 scr_refresh (refresh_type);
2737 }
2330 } 2738 }
2331 2739
2332 } 2740 }
2333 else 2741 else
2334 { 2742 {
… …
2382 if (len == (size_t)-1) 2790 if (len == (size_t)-1)
2383 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2791 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2384 2792
2385 // assume wchar == unicode 2793 // assume wchar == unicode
2386 cmdbuf_ptr += len; 2794 cmdbuf_ptr += len;
2387 return wc; 2795 return wc & UNICODE_MASK;
2388 } 2796 }
2389 2797
2390 return NOCHAR; 2798 return NOCHAR;
2391} 2799}
2392 2800
… …
2518 process_escape_seq (); 2926 process_escape_seq ();
2519 break; 2927 break;
2520 case C0_ENQ: /* terminal Status */ 2928 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2929 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2932 else
2525 tt_write ((unsigned char *)VT100_ANS, 2933 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2934 (unsigned int)strlen (VT100_ANS));
2527 break; 2935 break;
2528 case C0_BEL: /* bell */ 2936 case C0_BEL: /* bell */
2529 scr_bell (); 2937 scr_bell ();
2530 break; 2938 break;
2531 case C0_BS: /* backspace */ 2939 case C0_BS: /* backspace */
… …
2630void 3038void
2631rxvt_term::process_escape_seq () 3039rxvt_term::process_escape_seq ()
2632{ 3040{
2633 unicode_t ch = cmd_getc (); 3041 unicode_t ch = cmd_getc ();
2634 3042
2635 if (PrivateModes & PrivMode_vt52) 3043 if (priv_modes & PrivMode_vt52)
2636 { 3044 {
2637 process_escape_vt52 (ch); 3045 process_escape_vt52 (ch);
2638 return; 3046 return;
2639 } 3047 }
2640 3048
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 3063 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 3064 break;
2657 case '+': 3065 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 3066 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 3067 break;
2660#ifndef NO_FRILLS 3068#if ENABLE_FRILLS
2661 case '6': 3069 case '6':
2662 scr_backindex (); 3070 scr_backindex ();
2663 break; 3071 break;
2664#endif 3072#endif
2665 case '7': 3073 case '7':
2666 scr_cursor (SAVE); 3074 scr_cursor (SAVE);
2667 break; 3075 break;
2668 case '8': 3076 case '8':
2669 scr_cursor (RESTORE); 3077 scr_cursor (RESTORE);
2670 break; 3078 break;
2671#ifndef NO_FRILLS 3079#if ENABLE_FRILLS
2672 case '9': 3080 case '9':
2673 scr_forwardindex (); 3081 scr_forwardindex ();
2674 break; 3082 break;
2675#endif 3083#endif
2676 case '=': 3084 case '=':
… …
2855 { 3263 {
2856 switch (priv) 3264 switch (priv)
2857 { 3265 {
2858 case '>': 3266 case '>':
2859 if (ch == CSI_DA) /* secondary device attributes */ 3267 if (ch == CSI_DA) /* secondary device attributes */
2860 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3268 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2861 break; 3269 break;
2862 case '?': 3270 case '?':
2863 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3271 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2864 process_terminal_mode (ch, priv, nargs, arg); 3272 process_terminal_mode (ch, priv, nargs, arg);
2865 break; 3273 break;
… …
2970 3378
2971 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3379 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2972 arg[0] = -arg[0]; 3380 arg[0] = -arg[0];
2973 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
2974 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2976 break; 3384 break;
2977 3385
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3387 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3388 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3389 break;
2982 3390
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3392 process_sgr_mode (nargs, arg);
2985 break; 3393 break;
… …
2992 break; 3400 break;
2993 case 6: /* CPR requested */ 3401 case 6: /* CPR requested */
2994 scr_report_position (); 3402 scr_report_position ();
2995 break; 3403 break;
2996 case 7: /* unofficial extension */ 3404 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3405 if (OPTION (Opt_insecure))
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3406 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3407 break;
3000 case 8: /* unofficial extension */ 3408 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3409 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3410 break;
3003 } 3411 }
… …
3039 break; 3447 break;
3040 3448
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3449 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3450 if (arg[0] == 4)
3043 scr_insert_mode (0); 3451 scr_insert_mode (0);
3452 else if (arg[0] == 20)
3453 priv_modes &= ~PrivMode_LFNL;
3044 break; 3454 break;
3045 3455
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3456 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3457 if (arg[0] == 4)
3048 scr_insert_mode (1); 3458 scr_insert_mode (1);
3459 else if (arg[0] == 20)
3460 priv_modes |= PrivMode_LFNL;
3049 break; 3461 break;
3050 3462
3051 /* 3463 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3464 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3465 */
… …
3065 break; 3477 break;
3066 case CSI_75: 3478 case CSI_75:
3067 scr_cursor (RESTORE); 3479 scr_cursor (RESTORE);
3068 break; 3480 break;
3069 3481
3070#ifndef NO_FRILLS 3482#if ENABLE_FRILLS
3071 case CSI_74: 3483 case CSI_74:
3072 process_window_ops (arg, nargs); 3484 process_window_ops (arg, nargs);
3073 break; 3485 break;
3074#endif 3486#endif
3075 3487
… …
3082 break; 3494 break;
3083 } 3495 }
3084} 3496}
3085/*}}} */ 3497/*}}} */
3086 3498
3087#ifndef NO_FRILLS 3499#if ENABLE_FRILLS
3088/* ARGSUSED */ 3500/* ARGSUSED */
3089void 3501void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3502rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3503{
3092 int x, y; 3504 int x, y;
3093 XWindowAttributes wattr; 3505 XWindowAttributes wattr;
3094 Window wdummy; 3506 Window wdummy;
3507 dDisp;
3095 3508
3096 if (nargs == 0) 3509 if (nargs == 0)
3097 return; 3510 return;
3098 3511
3099 switch (args[0]) 3512 switch (args[0])
3100 { 3513 {
3101 /* 3514 /*
3102 * commands 3515 * commands
3103 */ 3516 */
3104 case 1: /* deiconify window */ 3517 case 1: /* deiconify window */
3105 XMapWindow (display->display, TermWin.parent[0]); 3518 XMapWindow (disp, parent[0]);
3106 break; 3519 break;
3107 case 2: /* iconify window */ 3520 case 2: /* iconify window */
3108 XIconifyWindow (display->display, TermWin.parent[0], 3521 XIconifyWindow (disp, parent[0], display->screen);
3109 DefaultScreen (display->display));
3110 break; 3522 break;
3111 case 3: /* set position (pixels) */ 3523 case 3: /* set position (pixels) */
3112 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3524 XMoveWindow (disp, parent[0], args[1], args[2]);
3113 break; 3525 break;
3114 case 4: /* set size (pixels) */ 3526 case 4: /* set size (pixels) */
3115 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3527 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3116 break; 3528 break;
3117 case 5: /* raise window */ 3529 case 5: /* raise window */
3118 XRaiseWindow (display->display, TermWin.parent[0]); 3530 XRaiseWindow (disp, parent[0]);
3119 break; 3531 break;
3120 case 6: /* lower window */ 3532 case 6: /* lower window */
3121 XLowerWindow (display->display, TermWin.parent[0]); 3533 XLowerWindow (disp, parent[0]);
3122 break; 3534 break;
3123 case 7: /* refresh window */ 3535 case 7: /* refresh window */
3124 scr_touch (true); 3536 scr_touch (true);
3125 break; 3537 break;
3126 case 8: /* set size (chars) */ 3538 case 8: /* set size (chars) */
3127 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3539 set_widthheight ((unsigned int) (args[2] * fwidth),
3128 (unsigned int) (args[1] * TermWin.fheight)); 3540 (unsigned int) (args[1] * fheight));
3129 break; 3541 break;
3130 3542
3131 //case 9: NYI, TODO, restore maximized window or maximize window 3543 //case 9: NYI, TODO, restore maximized window or maximize window
3132 default: 3544 default:
3133 if (args[0] >= 24) /* set height (chars) */ 3545 if (args[0] >= 24) /* set height (chars) */
3134 set_widthheight ((unsigned int)TermWin.width, 3546 set_widthheight ((unsigned int)width,
3135 (unsigned int) (args[1] * TermWin.fheight)); 3547 (unsigned int) (args[1] * fheight));
3136 break; 3548 break;
3137 3549
3138 3550
3139 /* 3551 /*
3140 * reports - some output format copied from XTerm 3552 * reports - some output format copied from XTerm
3141 */ 3553 */
3142 case 11: /* report window state */ 3554 case 11: /* report window state */
3143 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3555 XGetWindowAttributes (disp, parent[0], &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3556 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3557 break;
3146 case 13: /* report window position */ 3558 case 13: /* report window position */
3147 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3559 XGetWindowAttributes (disp, parent[0], &wattr);
3148 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3560 XTranslateCoordinates (disp, parent[0], wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3561 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3562 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3563 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3564 break;
3153 case 14: /* report window size (pixels) */ 3565 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3566 XGetWindowAttributes (disp, parent[0], &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3567 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3568 break;
3157 case 18: /* report text area size (chars) */ 3569 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3570 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3571 break;
3160 case 19: /* report window size (chars) */ 3572 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3574 break;
3163 case 20: /* report icon label */ 3575 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3576 {
3166 char *s; 3577 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3578 XGetIconName (disp, parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3579 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3580 XFree (s);
3169 } 3581 }
3170 break; 3582 break;
3171 case 21: /* report window title */ 3583 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3584 {
3174 char *s; 3585 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3586 XFetchName (disp, parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3587 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s);
3177 } 3589 }
3178 break; 3590 break;
3179 } 3591 }
3180} 3592}
3181#endif 3593#endif
3182 3594
… …
3186 * ends_how is terminator used. returned input must be free()'d 3598 * ends_how is terminator used. returned input must be free()'d
3187 */ 3599 */
3188unsigned char * 3600unsigned char *
3189rxvt_term::get_to_st (unicode_t &ends_how) 3601rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3602{
3191 unicode_t prev = 0, ch; 3603 unicode_t ch;
3604 bool seen_esc = false;
3192 unsigned int n = 0; 3605 unsigned int n = 0;
3193 unsigned char *s;
3194 unsigned char string[STRING_MAX]; 3606 wchar_t string[STRING_MAX];
3195 3607
3196 while ((ch = cmd_getc ()) != NOCHAR) 3608 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3609 {
3198 if (prev == C0_ESC) 3610 if (seen_esc)
3199 { 3611 {
3200 if (ch == 0x5c) /* 7bit ST */ 3612 if (ch == 0x5c) /* 7bit ST */
3201 break; 3613 break;
3202 else 3614 else
3203 return NULL; 3615 return NULL;
3204 } 3616 }
3617 else if (ch == C0_ESC)
3618 {
3619 seen_esc = true;
3620 continue;
3621 }
3205 else if (ch == C0_BEL || ch == CHAR_ST) 3622 else if (ch == C0_BEL || ch == CHAR_ST)
3206 break; 3623 break;
3207 else if (ch < 0x20) 3624 else if (ch < 0x20)
3208 return NULL; /* other control character - exit */ 3625 return NULL; /* other control character - exit */
3209 3626
3210 if (n >= sizeof (string) - 1) 3627 seen_esc = false;
3628
3629 if (n >= STRING_MAX - 1)
3211 // stop at some sane length 3630 // stop at some sane length
3212 return NULL; 3631 return NULL;
3213 3632
3214 if (ch == C0_SYN) 3633 if (ch == C0_SYN)
3215 {
3216 string[n++] = cmd_get8 (); 3634 string[n++] = cmd_get8 ();
3217 prev = 0;
3218 }
3219 else 3635 else
3220 string[n++] = prev = ch; 3636 string[n++] = ch;
3221 } 3637 }
3222 3638
3223 string[n++] = '\0'; 3639 string[n++] = '\0';
3224 3640
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL;
3227
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3641 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3642
3230 return s; 3643 return (unsigned char *)rxvt_wcstombs (string);
3231} 3644}
3232 3645
3233/*----------------------------------------------------------------------*/ 3646/*----------------------------------------------------------------------*/
3234/* 3647/*
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3648 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3279void 3692void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3693rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3694{
3282 if (str[0] == '?' && !str[1]) 3695 if (str[0] == '?' && !str[1])
3283 { 3696 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3697 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3698 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3699 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3700 }
3291 else 3701 else
3292 set_window_color (color, str); 3702 set_window_color (color, str);
3293} 3703}
3294 3704
3295/* 3705/*
3296 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3297 * 0 = change iconName/title
3298 * 1 = change iconName
3299 * 2 = change title
3300 * 4 = change color
3301 * 10 = change fg color
3302 * 11 = change bg color
3303 * 12 = change text color
3304 * 13 = change mouse foreground color
3305 * 17 = change highlight character colour
3306 * 18 = change bold character color
3307 * 19 = change underlined character color
3308 * 46 = change logfile (not implemented)
3309 * 50 = change font
3310 *
3311 * rxvt extensions:
3312 * 20 = bg pixmap
3313 * 39 = change default fg color
3314 * 49 = change default bg color
3315 * 55 = dump scrollback buffer and all of screen
3316 * 701 = change locale
3317 * 702 = find font
3318 * 703 = menu
3319 */ 3707 */
3320void 3708void
3321rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3322{ 3710{
3323 int changed = 0; 3711 int changed = 0;
3324 int color; 3712 int color;
3325 char *buf, *name; 3713 char *buf, *name;
3326 bool query = str[0] == '?' && !str[1]; 3714 bool query = str[0] == '?' && !str[1];
3715 int saveop = op;
3716 dDisp;
3327 3717
3328 assert (str != NULL); 3718 assert (str != NULL);
3329 switch (op) 3719 switch (op)
3330 { 3720 {
3331 case XTerm_name: 3721 case XTerm_name:
… …
3338 set_title (str); 3728 set_title (str);
3339 break; 3729 break;
3340 case XTerm_property: 3730 case XTerm_property:
3341 if (str[0] == '?') 3731 if (str[0] == '?')
3342 { 3732 {
3343 Atom prop = XInternAtom (display->display, str + 1, True); 3733 Atom prop = display->atom (str + 1);
3344 Atom actual_type; 3734 Atom actual_type;
3345 int actual_format; 3735 int actual_format;
3346 unsigned long nitems; 3736 unsigned long nitems;
3347 unsigned long bytes_after; 3737 unsigned long bytes_after;
3348 unsigned char *value = 0; 3738 unsigned char *value = 0;
3349 const char *str = ""; 3739 const char *str = "";
3350 3740
3351 if (prop 3741 if (prop
3352 && XGetWindowProperty (display->display, TermWin.parent[0], 3742 && XGetWindowProperty (disp, parent[0],
3353 prop, 0, 1<<16, 0, AnyPropertyType, 3743 prop, 0, 1<<16, 0, AnyPropertyType,
3354 &actual_type, &actual_format, 3744 &actual_type, &actual_format,
3355 &nitems, &bytes_after, &value) == Success 3745 &nitems, &bytes_after, &value) == Success
3356 && actual_type != None 3746 && actual_type != None
3357 && actual_format == 8) 3747 && actual_format == 8)
… …
3366 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3756 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3367 3757
3368 if (eq) 3758 if (eq)
3369 { 3759 {
3370 *eq = 0; 3760 *eq = 0;
3371 XChangeProperty (display->display, TermWin.parent[0], 3761 set_utf8_property (display->atom (str), eq + 1);
3372 display->atom (str), XA_STRING, 8,
3373 PropModeReplace, (unsigned char *)eq + 1,
3374 strlen (eq + 1));
3375 } 3762 }
3376 else 3763 else
3377 XDeleteProperty (display->display, TermWin.parent[0], 3764 XDeleteProperty (disp, parent[0],
3378 display->atom (str)); 3765 display->atom (str));
3379 } 3766 }
3380 break; 3767 break;
3381 3768
3382 case XTerm_Color: 3769 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3770 for (buf = (char *)str; buf && *buf;)
3384 { 3771 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3772 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3773 break;
3387 3774
3388 *name++ = '\0'; 3775 *name++ = '\0';
3389 color = atoi (buf); 3776 color = atoi (buf);
3390 3777
3391 if (color < 0 || color >= TOTAL_COLORS) 3778 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3779 break;
3393 3780
3394 if ((buf = STRCHR (name, ';')) != NULL) 3781 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3782 *buf++ = '\0';
3396 3783
3397 if (name[0] == '?' && !name[1]) 3784 if (name[0] == '?' && !name[1])
3398 { 3785 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3786 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3787 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3788 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3789 }
3406 else 3790 else
3407 set_window_color (color + minCOLOR, name); 3791 set_window_color (color + minCOLOR, name);
3408 } 3792 }
3409 break; 3793 break;
… …
3431 case XTerm_Color_UL: 3815 case XTerm_Color_UL:
3432 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3816 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3433 break; 3817 break;
3434 case XTerm_Color_RV: 3818 case XTerm_Color_RV:
3435 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3819 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3820 break;
3821 case URxvt_Color_IT:
3822 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3823 break;
3824#endif
3825#if TRANSPARENT && TINTING
3826 case URxvt_Color_tint:
3827 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3828 check_our_parents ();
3829 if (am_transparent)
3830 want_full_refresh = want_refresh = 1;
3436 break; 3831 break;
3437#endif 3832#endif
3438 3833
3439 case XTerm_Pixmap: 3834 case XTerm_Pixmap:
3440 if (*str != ';') 3835 if (*str != ';')
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3838 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3839 set_bgPixmap (str); /* change pixmap */
3445#endif 3840#endif
3446 scr_touch (true); 3841 scr_touch (true);
3447 } 3842 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3843 while ((str = strchr (str, ';')) != NULL)
3449 { 3844 {
3450 str++; 3845 str++;
3451#if XPM_BACKGROUND 3846#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3847 changed += scale_pixmap (str);
3453#endif 3848#endif
3454
3455 } 3849 }
3850
3456 if (changed) 3851 if (changed)
3457 { 3852 {
3458#ifdef XPM_BACKGROUND 3853#ifdef XPM_BACKGROUND
3459 resize_pixmap (); 3854 resize_pixmap ();
3460#endif 3855#endif
… …
3471 3866
3472 case XTerm_logfile: 3867 case XTerm_logfile:
3473 // TODO, when secure mode? 3868 // TODO, when secure mode?
3474 break; 3869 break;
3475 3870
3476 case XTerm_font:
3477 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3481 TermWin.fontset->fontdesc
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp);
3485 }
3486 else
3487 change_font (str);
3488 break;
3489
3490#ifndef NO_FRILLS
3491 case XTerm_locale:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3496 }
3497 else
3498 {
3499 set_locale (str);
3500# ifdef USE_XIM
3501 im_cb ();
3502# endif
3503 }
3504 break;
3505
3506 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 {
3509 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp);
3512 }
3513 break;
3514#endif
3515
3516#ifdef MENUBAR 3871#ifdef MENUBAR
3517 case XTerm_Menu: 3872 case URxvt_Menu:
3518 if (Options & Opt_insecure) 3873 if (OPTION (Opt_insecure))
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3874 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3875 break;
3521#endif 3876#endif
3522#if 0 3877#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3878 case XTerm_dumpscreen: /* no error notices */
… …
3527 { 3882 {
3528 scr_dump (fd); 3883 scr_dump (fd);
3529 close (fd); 3884 close (fd);
3530 } 3885 }
3531 } 3886 }
3887 break;
3888#endif
3889 case XTerm_font:
3890 op = URxvt_font;
3891 case URxvt_font:
3892#if ENABLE_STYLES
3893 case URxvt_boldFont:
3894 case URxvt_italicFont:
3895 case URxvt_boldItalicFont:
3896#endif
3897 if (query)
3898 tt_printf ("\33]%d;%-.250s%c", saveop,
3899 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3900 ? fontset[op - URxvt_font]->fontdesc : "",
3901 resp);
3902 else
3903 {
3904 const char *&res = rs[Rs_font + (op - URxvt_font)];
3905
3906 res = strdup (str);
3907 allocated.push_back ((void *)res);
3908 set_fonts ();
3909 }
3910 break;
3911
3912#if ENABLE_FRILLS
3913 case URxvt_locale:
3914 if (query)
3915 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3916 else
3917 {
3918 set_locale (str);
3919 pty.set_utf8_mode (enc_utf8);
3920 init_xlocale ();
3921 }
3922 break;
3923
3924 case URxvt_view_up:
3925 case URxvt_view_down:
3926 int lines = atoi (str);
3927
3928 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else
3931 {
3932 scr_erase_savelines ();
3933 }
3934
3532 break; 3935 break;
3533#endif 3936#endif
3534 } 3937 }
3535} 3938}
3536/*----------------------------------------------------------------------*/ 3939/*----------------------------------------------------------------------*/
… …
3550{ 3953{
3551 int state; 3954 int state;
3552 3955
3553 if (mode == 's') 3956 if (mode == 's')
3554 { 3957 {
3555 SavedModes |= (PrivateModes & bit); 3958 SavedModes |= (priv_modes & bit);
3556 return -1; 3959 return -1;
3557 } 3960 }
3558 else 3961 else
3559 { 3962 {
3560 if (mode == 'r') 3963 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3964 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3965 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3966 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3967 PrivMode (state, bit);
3565 } 3968 }
3566 3969
3567 return state; 3970 return state;
3568} 3971}
… …
3586 { 3, PrivMode_132 }, 3989 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3990 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3991 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3992 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3993 { 7, PrivMode_Autowrap },
3994 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3995 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3996#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3997 { menuBar_esc, PrivMode_menuBar },
3594#endif 3998#endif
3999 // 18, 19 printing-related
4000 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 4001#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 4002 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 4003#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 4004 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 4005 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 4006 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 4007 // 45 margin bell NYI
3605 // 46 start logging 4008 // 46 start logging
… …
3646 4049
3647 /* extra handling for values with state unkept */ 4050 /* extra handling for values with state unkept */
3648 switch (arg[i]) 4051 switch (arg[i])
3649 { 4052 {
3650 case 1048: /* alternative cursor save */ 4053 case 1048: /* alternative cursor save */
4054 case 1049:
3651 if (Options & Opt_secondaryScreen) 4055 if (OPTION (Opt_secondaryScreen))
3652 if (mode == 0) 4056 if (mode == 0)
3653 scr_cursor (RESTORE); 4057 scr_cursor (RESTORE);
3654 else if (mode == 1) 4058 else if (mode == 1)
3655 scr_cursor (SAVE); 4059 scr_cursor (SAVE);
3656 break; 4060 break;
… …
3667 * within VT52 mode 4071 * within VT52 mode
3668 */ 4072 */
3669 PrivMode (1, PrivMode_vt52); 4073 PrivMode (1, PrivMode_vt52);
3670 break; 4074 break;
3671 case 3: /* 80/132 */ 4075 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 4076 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4077 set_widthheight (((state ? 132 : 80) * fwidth), height);
3674 break; 4078 break;
3675 case 4: /* smooth scrolling */ 4079 case 4: /* smooth scrolling */
3676 if (state) 4080 if (!state)
3677 Options &= ~Opt_jumpScroll; 4081 SET_OPTION (Opt_jumpScroll);
3678 else 4082 else
3679 Options |= Opt_jumpScroll; 4083 CLR_OPTION (Opt_jumpScroll);
3680 break; 4084 break;
3681 case 5: /* reverse video */ 4085 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 4086 scr_rvideo_mode (state);
3683 break; 4087 break;
3684 case 6: /* relative/absolute origins */ 4088 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 4092 scr_autowrap (state);
3689 break; 4093 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 4094 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 4095 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 4096 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 4097 priv_modes &= ~PrivMode_MouseX11;
3694 break; 4098 break;
3695#ifdef menuBar_esc 4099#ifdef menuBar_esc
3696 case menuBar_esc: 4100 case menuBar_esc:
3697#ifdef MENUBAR 4101#ifdef MENUBAR
3698 map_menuBar (state); 4102 map_menuBar (state);
… …
3718 break; 4122 break;
3719 /* case 66: - application key pad */ 4123 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4124 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4125 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4126 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4127 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4128 break;
3725#if 0 4129#if 0
3726 case 1001: 4130 case 1001:
3727 break; /* X11 mouse highlighting */ 4131 break; /* X11 mouse highlighting */
3728#endif 4132#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4133 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4134 if (!state)
3731 Options &= ~Opt_scrollTtyOutput; 4135 SET_OPTION (Opt_scrollTtyOutput);
3732 else 4136 else
3733 Options |= Opt_scrollTtyOutput; 4137 CLR_OPTION (Opt_scrollTtyOutput);
3734 break; 4138 break;
3735 case 1011: /* scroll to bottom on key press */ 4139 case 1011: /* scroll to bottom on key press */
3736 if (state) 4140 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4141 SET_OPTION (Opt_scrollTtyKeypress);
3738 else 4142 else
3739 Options &= ~Opt_scrollTtyKeypress; 4143 CLR_OPTION (Opt_scrollTtyKeypress);
3740 break; 4144 break;
4145#if ENABLE_STYLES
4146 case 1021:
4147 if (state)
4148 SET_OPTION (Opt_intensityStyles);
4149 else
4150 CLR_OPTION (Opt_intensityStyles);
4151#endif
3741 case 1047: /* secondary screen w/ clearing last */ 4152 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4153 if (OPTION (Opt_secondaryScreen))
3743 if (current_screen != PRIMARY) 4154 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4155 scr_erase_screen (2);
3745 scr_change_screen (state); 4156 scr_change_screen (state);
3746 break; 4157 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4158 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4159 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4160 if (OPTION (Opt_secondaryScreen))
3750 if (current_screen != PRIMARY) 4161 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4162 scr_erase_screen (2);
3752 break; 4163 break;
3753 default: 4164 default:
3754 break; 4165 break;
… …
3780 rendset = 0, rendstyle = ~RS_None; 4191 rendset = 0, rendstyle = ~RS_None;
3781 break; 4192 break;
3782 case 1: 4193 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4194 rendset = 1, rendstyle = RS_Bold;
3784 break; 4195 break;
3785 //case 2: // faint or second colour 4196 //case 2: // low intensity
4197 case 3:
4198 rendset = 1, rendstyle = RS_Italic;
4199 break;
3786 case 4: 4200 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4201 rendset = 1, rendstyle = RS_Uline;
3788 break; 4202 break;
3789 case 5: // slowly blinking 4203 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4204 case 6: // rapidly blinking
… …
3802 //case 11: // scoansi acs on, first alt font 4216 //case 11: // scoansi acs on, first alt font
3803 //case 12: // scoansi acs on, |0x80, second alt font 4217 //case 12: // scoansi acs on, |0x80, second alt font
3804 //... 4218 //...
3805 //case 19: // ninth alt font 4219 //case 19: // ninth alt font
3806 //case 20: // gothic 4220 //case 20: // gothic
3807 case 21: // disable bold, faint 4221 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3808 rendset = 0, rendstyle = RS_Bold; 4222 rendset = 0, rendstyle = RS_Bold;
3809 break; 4223 break;
3810 case 22: 4224 case 22: // normal intensity
3811 rendset = 0, rendstyle = RS_Bold; 4225 rendset = 0, rendstyle = RS_Bold;
3812 break; 4226 break;
3813 //case 23: disable italic 4227 case 23: // disable italic
4228 rendset = 0, rendstyle = RS_Italic;
4229 break;
3814 case 24: 4230 case 24:
3815 rendset = 0, rendstyle = RS_Uline; 4231 rendset = 0, rendstyle = RS_Uline;
3816 break; 4232 break;
3817 case 25: 4233 case 25:
4234 rendset = 0, rendstyle = RS_Blink;
4235 break;
4236 case 26: // variable spacing (iso 8613)
3818 rendset = 0, rendstyle = RS_Blink; 4237 rendset = 0, rendstyle = RS_Blink;
3819 break; 4238 break;
3820 case 27: 4239 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4240 rendset = 0, rendstyle = RS_RVid;
3822 break; 4241 break;
… …
3840 case 35: 4259 case 35:
3841 case 36: 4260 case 36:
3842 case 37: 4261 case 37:
3843 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4262 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3844 break; 4263 break;
3845#ifdef TTY_256COLOR 4264 case 38: // set fg color, ISO 8613-6
3846 case 38:
3847 if (nargs > i + 2 && arg[i + 1] == 5) 4265 if (nargs > i + 2 && arg[i + 1] == 5)
3848 { 4266 {
3849 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4267 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3850 i += 2; 4268 i += 2;
3851 } 4269 }
3852 break; 4270 break;
3853#endif
3854 case 39: /* default fg */ 4271 case 39: /* default fg */
3855 scr_color (Color_fg, Color_fg); 4272 scr_color (Color_fg, Color_fg);
3856 break; 4273 break;
3857 4274
3858 case 40: 4275 case 40:
… …
3863 case 45: 4280 case 45:
3864 case 46: 4281 case 46:
3865 case 47: 4282 case 47:
3866 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4283 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3867 break; 4284 break;
3868#ifdef TTY_256COLOR 4285 case 48: // set bg color, ISO 8613-6
3869 case 48:
3870 if (nargs > i + 2 && arg[i + 1] == 5) 4286 if (nargs > i + 2 && arg[i + 1] == 5)
3871 { 4287 {
3872 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4288 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3873 i += 2; 4289 i += 2;
3874 } 4290 }
3875 break; 4291 break;
3876#endif
3877 case 49: /* default bg */ 4292 case 49: /* default bg */
3878 scr_color (Color_bg, Color_bg); 4293 scr_color (Color_bg, Color_bg);
3879 break; 4294 break;
4295
4296 //case 50: // not variable spacing
3880 4297
3881#ifndef NO_BRIGHTCOLOR 4298#ifndef NO_BRIGHTCOLOR
3882 case 90: 4299 case 90:
3883 case 91: /* set bright fg color */ 4300 case 91: /* set bright fg color */
3884 case 92: 4301 case 92:
3885 case 93: 4302 case 93:
3886 case 94: 4303 case 94:
3887 case 95: 4304 case 95:
3888 case 96: 4305 case 96:
3889 case 97: 4306 case 97:
3890 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4307 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3891 Color_fg);
3892 break; 4308 break;
3893 case 100: 4309 case 100:
3894 case 101: /* set bright bg color */ 4310 case 101: /* set bright bg color */
3895 case 102: 4311 case 102:
3896 case 103: 4312 case 103:
3897 case 104: 4313 case 104:
3898 case 105: 4314 case 105:
3899 case 106: 4315 case 106:
3900 case 107: 4316 case 107:
3901 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4317 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3902 Color_bg);
3903 break; 4318 break;
3904#endif 4319#endif
3905 4320
3906 } 4321 }
3907 } 4322 }
… …
3914{ 4329{
3915 unicode_t ch, cmd = cmd_getc (); 4330 unicode_t ch, cmd = cmd_getc ();
3916 4331
3917 if (cmd == 'Q') 4332 if (cmd == 'Q')
3918 { /* query graphics */ 4333 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4334 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4335 return;
3921 } 4336 }
3922 /* swallow other graphics sequences until terminating ':' */ 4337 /* swallow other graphics sequences until terminating ':' */
3923 do 4338 do
3924 ch = cmd_getc (); 4339 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4354 unsigned char buf[256];
3940 4355
3941 va_start (arg_ptr, fmt); 4356 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4357 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4358 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4359 tt_write (buf, strlen (buf));
3945} 4360}
3946 4361
3947/* ---------------------------------------------------------------------- */ 4362/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4363/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4364 * or generated by us in response to a query ESC sequence.
3950 */ 4365 */
4366const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4367
3951void 4368void
3952rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4369rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3953{ 4370{
3954 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4371 if (v_buflen == 0)
4372 {
4373 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3955 4374
3956 if (len) 4375 if ((unsigned int)written == len)
4376 return;
4377
4378 data += written;
4379 len -= written;
3957 { 4380 }
4381
4382 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4383
4384 memcpy (v_buffer + v_buflen, data, len);
4385 v_buflen += len;
4386
4387 pty_ev.set (EVENT_READ | EVENT_WRITE);
4388}
4389
4390void rxvt_term::pty_write ()
4391{
4392 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4393
4394 if (written > 0)
4395 {
4396 v_buflen -= written;
4397
3958 if (v_buflen == 0) 4398 if (v_buflen == 0)
3959 { 4399 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3961
3962 if ((unsigned int)written == len)
3963 return;
3964
3965 data += written;
3966 len -= written;
3967 }
3968
3969
3970 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3971
3972 memcpy (v_buffer + v_buflen, data, len);
3973 v_buflen += len;
3974 }
3975
3976 for (;;)
3977 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979
3980 if (written > 0)
3981 {
3982 v_buflen -= written;
3983
3984 if (v_buflen == 0)
3985 {
3986 free (v_buffer); 4400 free (v_buffer);
3987 v_buffer = 0; 4401 v_buffer = 0;
3988 v_buflen = 0; 4402 v_buflen = 0;
3989 4403
3990 pty_ev.set (EVENT_READ); 4404 pty_ev.set (EVENT_READ);
3991 return;
3992 }
3993
3994 memmove (v_buffer, v_buffer + written, v_buflen);
3995 }
3996 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3997 // original code just ignores this...
3998 destroy ();
3999 else
4000 {
4001 pty_ev.set (EVENT_READ | EVENT_WRITE);
4002 return; 4405 return;
4003 } 4406 }
4407
4408 memmove (v_buffer, v_buffer + written, v_buflen);
4004 } 4409 }
4410 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4411 pty_ev.set (EVENT_READ);
4005} 4412}
4006 4413
4007/*----------------------- end-of-file (C source) -----------------------*/ 4414/*----------------------- end-of-file (C source) -----------------------*/
4008 4415

Diff Legend

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