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

Diff Legend

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