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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.171 by root, Wed Dec 1 02:12:18 2004 UTC

… …
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#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
56 57
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 59
59// exception thrown when the command parser runs out of input data 60// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
61 258
62/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
63void 260void
64rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
65{ 262{
… …
151 { 348 {
152 if (TermWin.saveLines) 349 if (TermWin.saveLines)
153 { 350 {
154#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 352 if (!ctrl && !meta)
156 {
157#else 353#else
158 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
159 { 356 {
160#endif
161 int lnsppg; 357 int lnsppg;
162 358
163#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 361#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 411 {
216 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
218 } 414 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 416 {
221 switch (keysym) 417 switch (keysym)
222 { 418 {
223 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
226 return; 422 return;
423#if TODO
227 /* rxvt extras */ 424 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 426 change_font (FONT_UP);
230 return; 427 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 429 change_font (FONT_DN);
233 return; 430 return;
431#endif
234 } 432 }
235 } 433 }
236 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
237#ifdef PRINTPIPE 482#ifdef PRINTPIPE
238 if (keysym == XK_Print) 483 if (keysym == XK_Print)
239 { 484 {
240 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
241 return; 486 return;
… …
273 newlen = 1; 518 newlen = 1;
274 switch (keysym) 519 switch (keysym)
275 { 520 {
276#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 522 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
279 { 524 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
283 } 528 }
284 else 529 else
285 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
286 break; 531 break;
287#endif 532#endif
288#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
289 case XK_Delete: 534 case XK_Delete:
290 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
291 break; 536 break;
292#endif 537#endif
293 case XK_Tab: 538 case XK_Tab:
294 if (shft) 539 if (shft)
295 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
296 else 541 else
297 { 542 {
298#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 544 if (ctrl)
300 meta = 1; 545 meta = 1;
… …
306 newlen = 0; 551 newlen = 0;
307 } 552 }
308 break; 553 break;
309 554
310#ifdef XK_KP_Left 555#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 561 {
317 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 564 break;
320 } 565 }
321 else 566 else
322 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
325#endif 570#endif
326 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 577 /* do Shift first */
333 if (shft) 578 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 580 else if (ctrl)
336 { 581 {
337 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 584 }
340 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
342 break; 587 break;
343 588
344#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
346 case XK_KP_Prior: 591 case XK_KP_Prior:
347 /* allow shift to override */ 592 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 594 {
350 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
351 break; 596 break;
352 } 597 }
353 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
354# endif 599# endif
355 case XK_Prior: 600 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
357 break; 602 break;
358# ifdef XK_KP_Next 603# ifdef XK_KP_Next
359 case XK_KP_Next: 604 case XK_KP_Next:
360 /* allow shift to override */ 605 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 607 {
363 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
364 break; 609 break;
365 } 610 }
366 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
367# endif 612# endif
368 case XK_Next: 613 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
370 break; 615 break;
371#endif 616#endif
372 case XK_KP_Enter: 617 case XK_KP_Enter:
373 /* allow shift to override */ 618 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 620 {
376 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
377 } 633 }
378 else 634 else
379 { 635 {
380 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
382 } 638 }
383 break; 639 break;
384 640
385#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
386 case XK_KP_Begin: 642 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
388 break; 644 break;
389 645
390 case XK_KP_Insert: 646 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
392 break; 648 break;
393 649
394 case XK_KP_Delete: 650 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
396 break; 652 break;
397#endif 653#endif
398 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
404 break; 660 break;
405 661
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 678 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 680 {
425 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 683 }
428 else 684 else
429 { 685 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
432 } 688 }
433 break; 689 break;
434 690
435 case XK_Find: 691 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
437 break; 693 break;
438 case XK_Insert: 694 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
440 break; 696 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 698 case DXK_Remove:
443 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
444#endif 700#endif
445 case XK_Execute: 701 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
447 break; 703 break;
448 case XK_Select: 704 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
450 break; 706 break;
451#ifdef XK_KP_End 707#ifdef XK_KP_End
452 case XK_KP_End: 708 case XK_KP_End:
453 /* allow shift to override */ 709 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 711 {
456 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
457 break; 713 break;
458 } 714 }
459 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
460#endif 716#endif
461 case XK_End: 717 case XK_End:
462 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
463 break; 719 break;
464#ifdef XK_KP_Home 720#ifdef XK_KP_Home
465 case XK_KP_Home: 721 case XK_KP_Home:
466 /* allow shift to override */ 722 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 724 {
469 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
470 break; 726 break;
471 } 727 }
472 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
473#endif 729#endif
474 case XK_Home: 730 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
476 break; 732 break;
477 733
478#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 736
… …
533 default: 789 default:
534 newlen = 0; 790 newlen = 0;
535 break; 791 break;
536 } 792 }
537 if (newlen) 793 if (newlen)
538 len = STRLEN (kbuf); 794 len = strlen (kbuf);
539 } 795 }
540 796
541 /* 797 /*
542 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
543 */ 799 */
… …
571 } 827 }
572 828
573 if (len <= 0) 829 if (len <= 0)
574 return; /* not mapped */ 830 return; /* not mapped */
575 831
576 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 833 if (TermWin.view_start)
578 { 834 {
579 TermWin.view_start = 0; 835 TermWin.view_start = 0;
580 want_refresh = 1; 836 want_refresh = 1;
581 } 837 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 888
633 if (n > 0 && s < count) 889 if (n > 0 && s < count)
634 { 890 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
639 s += n; 895 s += n;
640 } 896 }
… …
655#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
656 912
657void 913void
658rxvt_term::flush () 914rxvt_term::flush ()
659{ 915{
916 flush_ev.stop ();
917
660#ifdef TRANSPARENT 918#ifdef TRANSPARENT
661 if (want_full_refresh) 919 if (want_full_refresh)
662 { 920 {
663 want_full_refresh = 0; 921 want_full_refresh = 0;
664 scr_clear (); 922 scr_clear ();
665 scr_touch (false); 923 scr_touch (false);
666 want_refresh = 1;
667 } 924 }
668#endif 925#endif
669 926
670 if (want_refresh) 927 if (want_refresh)
671 { 928 {
… …
683rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
684{ 941{
685 SET_R (this); 942 SET_R (this);
686 SET_LOCALE (locale); 943 SET_LOCALE (locale);
687 944
945 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949}
950
951void
952rxvt_term::flush_cb (time_watcher &w)
953{
954 SET_R (this);
955 SET_LOCALE (locale);
956
957 refresh_limit = 1;
958 refresh_count = 0;
688 flush (); 959 flush ();
689} 960}
690 961
691#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
692void 963void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 982 }
712} 983}
713#endif 984#endif
714 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
715bool 1029bool
716rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
717{ 1031{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1033
… …
725 1039
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
729 1043
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1045
732 if (n > 0) 1046 if (n > 0)
733 { 1047 {
734 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
735 return true; 1049 return true;
… …
753 while (pty_fill ()) 1067 while (pty_fill ())
754 if (cmd_parse ()) 1068 if (cmd_parse ())
755 break; 1069 break;
756} 1070}
757 1071
1072void
1073rxvt_term::pointer_unblank ()
1074{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1076 recolour_cursor ();
1077
1078#ifdef POINTER_BLANK
1079 hidden_pointer = 0;
1080
1081 if (options & Opt_pointerBlank)
1082 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif
1084}
1085
758#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
759void 1087void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
773{ 1089{
774 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
775 return; 1091 return;
776 1092
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
778 XFlush (display->display); 1094 XFlush (display->display);
779 1095
… …
799 x = ev.x; 1115 x = ev.x;
800 y = ev.y; 1116 y = ev.y;
801 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
802 1118
803 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1120 button_number = 3;
806 }
807 else 1121 else
808 { 1122 {
809 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1125 if (button_number >= 3)
812 button_number += (64 - 3); 1126 button_number += (64 - 3);
813 } 1127 }
814 1128
815 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
816 { 1130 {
817 /* 1131 /*
818 * do not report ButtonRelease 1132 * do not report ButtonRelease
819 * no state info allowed 1133 * no state info allowed
820 */ 1134 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1153#endif
840
841 } 1154 }
842 1155
843#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1158 if (key_state & 16)
846 fputc ('C', stderr); 1159 fputc ('C', stderr);
847 if (key_state & 4) 1160 if (key_state & 4)
848 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1165 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1167 button_number,
855 x + 1, 1168 x + 1,
856 y + 1); 1169 y + 1);
857#else 1170#endif
1171
858 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
860 (32 + x + 1), 1174 (32 + x + 1),
861 (32 + y + 1)); 1175 (32 + y + 1));
862#endif
863} 1176}
864 1177
865#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
866void 1179void
867rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
878{ 1191{
879 SET_R (this); 1192 SET_R (this);
880 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
881 1194
882#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1197 {
885 if (hidden_cursor) 1198 if (hidden_cursor)
886 { 1199 {
887 hidden_cursor = 0; 1200 hidden_cursor = 0;
888 want_refresh = 1; 1201 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1205 }
893#endif 1206#endif
894 1207
895#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1210 {
898 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1214 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1218 pointer_blank ();
906 } 1219 }
907#endif 1220#endif
908 1221
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1224 unsigned int unused_mask;
917 1225
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966
967 switch (ev.type) 1226 switch (ev.type)
968 { 1227 {
969 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
970 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
971 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
972 1297
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
978 else 1303#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1304 break;
987 } 1305 }
988#endif
989 1306
990 case ButtonPress: 1307 case ButtonPress:
991 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
992 break; 1309 break;
993 1310
… …
1020 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1021 &data); 1338 &data);
1022 XChangeProperty (display->display, display->root, 1339 XChangeProperty (display->display, display->root,
1023 XA_CUT_BUFFER0, XA_STRING, 1340 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace, 1341 8, PropModeReplace,
1025 data, STRLEN (data)); 1342 data, strlen (data));
1026 XFree (data); 1343 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1344 selection_paste (display->root, XA_CUT_BUFFER0, True);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1029 } 1346 }
1030#endif /* OFFIX_DND */ 1347#endif /* OFFIX_DND */
1031 break; 1348 break;
1032 1349
1033 case MappingNotify: 1350 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1351 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1352 break;
1036 1353
1037 /* 1354 /*
1038 * XXX: this is not the _current_ arrangement 1355 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1356 * Here's my conclusion:
… …
1064 { 1381 {
1065 TermWin.focus = 1; 1382 TermWin.focus = 1;
1066 want_refresh = 1; 1383 want_refresh = 1;
1067#ifdef USE_XIM 1384#ifdef USE_XIM
1068 if (Input_Context != NULL) 1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1069 XSetICFocus (Input_Context); 1388 XSetICFocus (Input_Context);
1389 }
1070#endif 1390#endif
1071#ifdef CURSOR_BLINK 1391#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink) 1392 if (options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1074#endif 1401#endif
1075 1402
1076 } 1403 }
1077 break; 1404 break;
1078 1405
1079 case FocusOut: 1406 case FocusOut:
1080 if (TermWin.focus) 1407 if (TermWin.focus)
1081 { 1408 {
1082 TermWin.focus = 0; 1409 TermWin.focus = 0;
1083 want_refresh = 1; 1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1084#ifdef USE_XIM 1418#ifdef USE_XIM
1085 if (Input_Context != NULL) 1419 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context); 1420 XUnsetICFocus (Input_Context);
1087#endif 1421#endif
1088#ifdef CURSOR_BLINK 1422#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink) 1423 if (options & Opt_cursorBlink)
1090 cursor_blink_ev.stop (); 1424 cursor_blink_ev.stop ();
1091 hidden_cursor = 0; 1425 hidden_cursor = 0;
1092#endif 1426#endif
1093 1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1094 } 1434 }
1095 break; 1435 break;
1096 1436
1097 case ConfigureNotify: 1437 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1438 if (ev.xconfigure.window == TermWin.parent[0])
… …
1107 } 1447 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1449
1110 if (szHint.width != width || szHint.height != height) 1450 if (szHint.width != width || szHint.height != height)
1111 { 1451 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1452 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1453 resize_all_windows (width, height, 1);
1114 } 1454 }
1115#ifdef DEBUG_SIZE 1455
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1457 if (options & Opt_transparent)
1123 { 1458 {
1124 check_our_parents (); 1459 check_our_parents ();
1125 if (am_transparent) 1460 if (am_transparent)
1126 want_full_refresh = 1; 1461 want_refresh = want_full_refresh = 1;
1127 } 1462 }
1128#endif 1463#endif
1129 } 1464 }
1465 break;
1466
1467 case PropertyNotify:
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1130 break; 1472 break;
1131 1473
1132 case SelectionClear: 1474 case SelectionClear:
1133 selection_clear (); 1475 selection_clear ();
1134 break; 1476 break;
… …
1165 1507
1166 case GraphicsExpose: 1508 case GraphicsExpose:
1167 case Expose: 1509 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1510 if (ev.xany.window == TermWin.vt)
1169 { 1511 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1512 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1174 // don't understand this, so commented it out 1516
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1522
1178 // ev.xexpose.width, TermWin.height, False); 1523 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1524 }
1182 else 1525 else
1183 { 1526 {
1184 XEvent unused_event; 1527 XEvent unused_event;
1185 1528
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1187 Expose, 1530 ;
1188 &unused_event)) ;
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1190 GraphicsExpose, 1532 ;
1191 &unused_event)) ; 1533
1192 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1193 { 1535 {
1194 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1195 scrollbar_show (0); 1537 scrollbar_show (0);
1196 } 1538 }
1197#ifdef MENUBAR 1539#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1541 menubar_expose ();
1200#endif 1542#endif
1543
1544#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window);
1547#endif
1201 } 1548 }
1202 break; 1549 break;
1203 1550
1204 case MotionNotify: 1551 case MotionNotify:
1205#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
… …
1211 { 1558 {
1212 menubar_control (ev.xbutton); 1559 menubar_control (ev.xbutton);
1213 break; 1560 break;
1214 } 1561 }
1215#endif 1562#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1564 break;
1218 1565
1219 if (ev.xany.window == TermWin.vt) 1566 if (ev.xany.window == TermWin.vt)
1220 { 1567 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1568 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1569 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1224 ; 1571 ;
1225 1572
1226 XQueryPointer (display->display, TermWin.vt, 1573 XQueryPointer (display->display, TermWin.vt,
1227 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1576 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1577 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1579 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1580 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1581 {
1235#endif 1582#endif
1583#if ISO_14755
1584 // 5.4
1585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1586 {
1587 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1588 break;
1589 }
1590#endif
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1591 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1592 ev.xbutton.state & Button3Mask ? 2 : 0);
1593
1238#ifdef SELECTION_SCROLLING 1594#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1595 if (ev.xbutton.y < TermWin.int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1241 { 1597 {
1242 int dist; 1598 int dist;
1243 1599
1244 pending_scroll_selection=1;
1245
1246 /* don't clobber the current delay if we are 1600 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1601 * already in the middle of scrolling.
1248 */ 1602 */
1249 if (scroll_selection_delay<=0) 1603 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1605
1252 /* save the event params so we can highlight 1606 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1607 * the selection in the pending-scroll loop
1254 */ 1608 */
1255 selection_save_x=ev.xbutton.x; 1609 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1610 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1612
1260 /* calc number of lines to scroll */ 1613 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1614 if (ev.xbutton.y < TermWin.int_bwidth)
1262 { 1615 {
1263 scroll_selection_dir = UP; 1616 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1617 dist = TermWin.int_bwidth - ev.xbutton.y;
1265 } 1618 }
1266 else 1619 else
1267 { 1620 {
1268 scroll_selection_dir = DN; 1621 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y -
1270 (TermWin.int_bwidth + TermWin.height); 1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1271 } 1623 }
1624
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1625 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1626 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1;
1274 MIN_IT (scroll_selection_lines, 1628 MIN_IT (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1629 SELECTION_SCROLL_MAX_LINES);
1276 } 1630 }
1277 else 1631 else
1278 { 1632 {
1279 /* we are within the text window, so we 1633 /* we are within the text window, so we
1280 * shouldn't be scrolling 1634 * shouldn't be scrolling
1281 */ 1635 */
1282 pending_scroll_selection = 0; 1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop();
1283 } 1638 }
1284#endif 1639#endif
1285#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1286
1287 } 1641 }
1288#endif 1642#endif
1289
1290 } 1643 }
1291 } 1644 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1646 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1295 MotionNotify, &ev)) ; 1648 MotionNotify, &ev))
1649 ;
1650
1296 XQueryPointer (display->display, scrollBar.win, 1651 XQueryPointer (display->display, scrollBar.win,
1297 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1654 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1655 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1657 scrollbar_size ());
1303 scr_refresh (refresh_type); 1658 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1659 refresh_limit = 0;
… …
1306 } 1661 }
1307 break; 1662 break;
1308 } 1663 }
1309} 1664}
1310 1665
1666#if TRANSPARENT
1311void 1667void
1312rxvt_term::rootwin_cb (XEvent &ev) 1668rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1669{
1314 SET_R (this); 1670 SET_R (this);
1315 SET_LOCALE (locale); 1671 SET_LOCALE (locale);
1316 1672
1317 switch (ev.type) 1673 switch (ev.type)
1318 { 1674 {
1319 case PropertyNotify: 1675 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1676 /*
1330 * if user used some Esetroot compatible prog to set the root bg, 1677 * if user used some Esetroot compatible prog to set the root bg,
1331 * use the property to determine the pixmap. We use it later on. 1678 * use the property to determine the pixmap. We use it later on.
1332 */ 1679 */
1333 if (xa[XA_XROOTPMAPID] == 0) 1680 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335 1682
1336 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1337 return; 1684 return;
1338 }
1339 1685
1340 /* FALLTHROUGH */ 1686 /* FALLTHROUGH */
1341 case ReparentNotify: 1687 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1689 want_refresh = want_full_refresh = 1;
1344 break; 1690 break;
1345#endif
1346 } 1691 }
1347} 1692}
1693#endif
1348 1694
1349void 1695void
1350rxvt_term::button_press (XButtonEvent &ev) 1696rxvt_term::button_press (XButtonEvent &ev)
1351{ 1697{
1352 int reportmode = 0, clickintime; 1698 int reportmode = 0, clickintime;
1353 1699
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1701 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1702 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703
1357 /* 1704 /*
1358 * VT window processing of button press 1705 * VT window processing of button press
1359 */ 1706 */
1360 if (ev.window == TermWin.vt) 1707 if (ev.window == TermWin.vt)
1361 { 1708 {
1709#if ISO_14755
1710 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 {
1713 iso14755_54 (ev.x, ev.y);
1714 return;
1715 }
1716#endif
1717
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1718 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1719
1363 if (reportmode) 1720 if (reportmode)
1364 { 1721 {
1365 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1724 MEvent.state = ev.state;
… …
1396 } 1753 }
1397 else 1754 else
1398 { 1755 {
1399 if (ev.button != MEvent.button) 1756 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1758
1401 switch (ev.button) 1759 switch (ev.button)
1402 { 1760 {
1403 case Button1: 1761 case Button1:
1762 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */
1764#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask);
1766#else
1767 selection.rect = false;
1768#endif
1769
1404 /* allow shift+left click to extend selection */ 1770 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1772 {
1407 if (MEvent.button == Button1 && clickintime) 1773 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1774 selection_rotate (ev.x, ev.y);
1409 else 1775 else
1410 selection_extend (ev.x, ev.y, 1); 1776 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1791 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1792 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1793 selection_rotate (ev.x, ev.y);
1428 else 1794 else
1429 selection_extend (ev.x, ev.y, 1); 1795 selection_extend (ev.x, ev.y, 1);
1796
1430 MEvent.button = Button3; 1797 MEvent.button = Button3;
1431 break; 1798 break;
1432 } 1799 }
1433 } 1800 }
1801
1434 MEvent.time = ev.time; 1802 MEvent.time = ev.time;
1435 return; 1803 return;
1436 } 1804 }
1437 1805
1438 /* 1806 /*
… …
1504 upordown = 1; /* down */ 1872 upordown = 1; /* down */
1505 } 1873 }
1506 if (upordown) 1874 if (upordown)
1507 { 1875 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1876#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1877 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1878#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1879 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1880 {
1513 if (upordown < 0) 1881 if (upordown < 0)
1514 scrollBar.setUp (); 1882 scrollBar.setUp ();
… …
1530 break; 1898 break;
1531 case R_SB_ALIGN_BOTTOM: 1899 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1900 csrO = scrollBar.bot - scrollBar.top;
1533 break; 1901 break;
1534 } 1902 }
1903
1535 if (scrollBar.style == R_SB_XTERM 1904 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 1905 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 1906 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 1907 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 1908
1540 scrollBar.setMotion (); 1909 scrollBar.setMotion ();
1541 break; 1910 break;
1542 1911
1543 case Button1: 1912 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1913 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1568 scr_page ((ev.button == Button1 ? DN : UP), 1937 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 1938 (TermWin.nrow
1570 * scrollbar_position (ev.y) 1939 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 1940 / scrollbar_size ()));
1572 } 1941 }
1942
1573 break; 1943 break;
1574 } 1944 }
1575 } 1945 }
1576 return; 1946 return;
1577 } 1947 }
… …
1589{ 1959{
1590 int reportmode = 0; 1960 int reportmode = 0;
1591 1961
1592 csrO = 0; /* reset csr Offset */ 1962 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 1963 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1964 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 1965
1596 if (scrollbar_isUpDn ()) 1966 if (scrollbar_isUpDn ())
1597 { 1967 {
1598 scrollBar.setIdle (); 1968 scrollBar.setIdle ();
1599 scrollbar_show (0); 1969 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1970#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 1971 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 1972#endif
1603
1604 } 1973 }
1974
1605#ifdef SELECTION_SCROLLING 1975#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 1976 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop();
1607#endif 1978#endif
1979
1608 if (ev.window == TermWin.vt) 1980 if (ev.window == TermWin.vt)
1609 { 1981 {
1982#if ISO_14755
1983 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return;
1986#endif
1610 if (reportmode) 1987 if (reportmode)
1611 { 1988 {
1612 /* mouse report from vt window */ 1989 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 1990 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 1991 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2005 MEvent.button = AnyButton;
1629 mouse_report (ev); 2006 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2007#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2008 return;
1632 } 2009 }
2010
1633 /* 2011 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2012 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2013 * when overriding mouse reporting
1636 */ 2014 */
1637 if (PrivateModes & PrivMode_mouse_report 2015 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2016 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2017 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2018 selection_extend (ev.x, ev.y, 0);
1641 2019
1642 switch (ev.button) 2020 switch (ev.button)
… …
1653 case Button5: 2031 case Button5:
1654 { 2032 {
1655 int i; 2033 int i;
1656 page_dirn v; 2034 page_dirn v;
1657 2035
1658 v = (ev.button == Button4) ? UP : DN; 2036 v = ev.button == Button4 ? UP : DN;
2037
1659 if (ev.state & ShiftMask) 2038 if (ev.state & ShiftMask)
1660 i = 1; 2039 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2040 else if (options & Opt_mouseWheelScrollPage)
1662 i = TermWin.nrow - 1; 2041 i = TermWin.nrow - 1;
1663 else 2042 else
1664 i = 5; 2043 i = 5;
2044
1665# ifdef MOUSE_SLIP_WHEELING 2045# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2046 if (ev.state & ControlMask)
1667 { 2047 {
1668 mouse_slip_wheel_speed += (v ? -1 : 1); 2048 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2051
2052 if (slip_wheel_ev.at < NOW)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054
2055 slip_wheel_ev.start ();
1670 } 2056 }
2057 else
2058 {
1671# endif 2059# endif
1672# ifdef JUMP_MOUSE_WHEEL 2060# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2061 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2062 scr_refresh (SMOOTH_REFRESH);
1681 scrollbar_show (1); 2063 scrollbar_show (1);
2064# else
2065 while (i--)
2066 {
2067 scr_page (v, 1);
2068 scr_refresh (SMOOTH_REFRESH);
2069 scrollbar_show (1);
2070 }
2071# endif
2072# ifdef MOUSE_SLIP_WHEELING
1682 } 2073 }
1683# endif 2074#endif
1684
1685 } 2075 }
1686 break; 2076 break;
1687#endif 2077#endif
1688
1689 } 2078 }
1690 } 2079 }
1691#ifdef MENUBAR 2080#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2081 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2082 menubar_control (ev);
1694#endif 2083#endif
1695} 2084}
1696 2085
1697#ifdef TRANSPARENT 2086#ifdef TRANSPARENT
1698#if TINTING 2087#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2088/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2089
1702static void 2090typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2091
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2092void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2093{
1710 /* No saturation */ 2094 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2095 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 int r, g, b; 2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i;
1714 2100
1715 b = ((uint16_t *) ptr)[x]; 2101 Visual* visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2102
1717 g = (b & 0x3e0) * gm; 2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2104
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2105 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2106 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2107 mask_g = visual->green_mask;
1722 } 2108 mask_b = visual->blue_mask;
1723 ptr += bpl; 2109
1724 } 2110 /* boring lookup table pre-initialization */
2111 switch (srcImage->bits_per_pixel) {
2112 case 15:
2113 if ((mask_r != 0x7c00) ||
2114 (mask_g != 0x03e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+32;
2121 sh_r = 10;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 16:
2126 if ((mask_r != 0xf800) ||
2127 (mask_g != 0x07e0) ||
2128 (mask_b != 0x001f))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2131 lookup_r = lookup;
2132 lookup_g = lookup+32;
2133 lookup_b = lookup+32+64;
2134 sh_r = 11;
2135 sh_g = 5;
2136 sh_b = 0;
2137 break;
2138 case 24:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 case 32:
2152 if ((mask_r != 0xff0000) ||
2153 (mask_g != 0x00ff00) ||
2154 (mask_b != 0x0000ff))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2157 lookup_r = lookup;
2158 lookup_g = lookup+256;
2159 lookup_b = lookup+256+256;
2160 sh_r = 16;
2161 sh_g = 8;
2162 sh_b = 0;
2163 break;
2164 default:
2165 return; /* we do not support this color depth */
2166 }
2167
2168 /* prepare limits for color transformation (each channel is handled separately) */
2169 if (shade < 0) {
2170 shade = -shade;
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = 65535-rm;
2175 lower_lim_g = 65535-gm;
2176 lower_lim_b = 65535-bm;
2177
2178 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2179 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2180 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2181
2182 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1725 } else { 2183 } else {
1726 for (y = h; --y >= 0;) { 2184 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2185 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2186
1730 b = ((uint16_t *) ptr)[x]; 2187 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2188
1732 g = (b & 0x3e0) * gm; 2189 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2190 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2191 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2192 }
1736 b |= (!(b >> 5) - 1); 2193
1737 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2194 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1738 | ((g >> 8) & 0x3e0) 2195 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2196 {
1740 } 2197 unsigned int tmp;
1741 ptr += bpl; 2198
2199 tmp = lower_lim_r;
2200 lower_lim_r = lower_lim_b;
2201 lower_lim_b = tmp;
2202
2203 tmp = upper_lim_r;
2204 upper_lim_r = upper_lim_b;
2205 upper_lim_b = tmp;
2206 }
2207
2208 /* fill our lookup tables */
2209 for (i = 0; i <= mask_r>>sh_r; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2213 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2214 lookup_r[i] = (tmp/65535)<<sh_r;
2215 }
2216 for (i = 0; i <= mask_g>>sh_g; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2220 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2221 lookup_g[i] = (tmp/65535)<<sh_g;
2222 }
2223 for (i = 0; i <= mask_b>>sh_b; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2227 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2228 lookup_b[i] = (tmp/65535)<<sh_b;
2229 }
2230
2231 /* apply table to input image (replacing colors by newly calculated ones) */
2232 switch (srcImage->bits_per_pixel)
2233 {
2234 case 15:
2235 {
2236 unsigned short *p1, *pf, *p, *pl;
2237 p1 = (unsigned short *) srcImage->data;
2238 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2239 while (p1 < pf)
2240 {
2241 p = p1;
2242 pl = p1 + srcImage->width;
2243 for (; p < pl; p++)
1742 } 2244 {
2245 *p = lookup_r[(*p & 0x7c00)>>10] |
2246 lookup_g[(*p & 0x03e0)>> 5] |
2247 lookup_b[(*p & 0x001f)];
2248 }
2249 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1743 } 2250 }
1744} 2251 break;
1745 2252 }
1746/* RGB 16 */ 2253 case 16:
1747static void 2254 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2255 unsigned short *p1, *pf, *p, *pl;
1749{ 2256 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2257 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2258 while (p1 < pf)
1752 2259 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2260 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2261 pl = p1 + srcImage->width;
1755 /* No saturation */ 2262 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2263 {
1770 } else { 2264 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2265 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2266 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2267 }
1786 ptr += bpl; 2268 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2269 }
2270 break;
2271 }
2272 case 24:
2273 {
2274 unsigned char *p1, *pf, *p, *pl;
2275 p1 = (unsigned char *) srcImage->data;
2276 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2277 while (p1 < pf)
2278 {
2279 p = p1;
2280 pl = p1 + srcImage->width * 3;
2281 for (; p < pl; p += 3)
1787 } 2282 {
2283 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2284 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2285 p[2] = lookup_r[(p[2] & 0x0000ff)];
2286 }
2287 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1788 } 2288 }
1789} 2289 break;
2290 }
2291 case 32:
2292 {
2293 RUINT32T *p1, *pf, *p, *pl;
2294 p1 = (RUINT32T *) srcImage->data;
2295 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1790 2296
1791/* RGB 24 */ 2297 while (p1 < pf)
1792static void 2298 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2299 p = p1;
1794{ 2300 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2301 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2302 {
1823 } else { 2303 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2304 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2305 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2306 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2307 }
1854 ptr += bpl; 2308 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2309 }
2310 break;
2311 }
1856 } 2312 }
1857}
1858 2313
1859/* RGB 32 */ 2314 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2315}
1930
1931#endif 2316#endif
1932 2317
1933/* 2318/*
1934 * Check our parents are still who we think they are. 2319 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2320 * Do transparency updates if required
… …
1945 Pixmap rootpixmap = None; 2330 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2331 XWindowAttributes wattr, wrootattr;
1947 2332
1948 pchanged = 0; 2333 pchanged = 0;
1949 2334
1950 if (!(Options & Opt_transparent)) 2335 if (!(options & Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2336 return pchanged; /* Don't try any more */
1952 2337
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2338 XGetWindowAttributes (display->display, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2339 rootdepth = wrootattr.depth;
1955 2340
… …
1958 if (rootdepth != wattr.depth) 2343 if (rootdepth != wattr.depth)
1959 { 2344 {
1960 if (am_transparent) 2345 if (am_transparent)
1961 { 2346 {
1962 pchanged = 1; 2347 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2349 am_transparent = am_pixmap_trans = 0;
1965 } 2350 }
1966 2351
1967 return pchanged; /* Don't try any more */ 2352 return pchanged; /* Don't try any more */
1968 } 2353 }
… …
1984 i = (xa[XA_XSETROOTID] 2369 i = (xa[XA_XSETROOTID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2372 &nitems, &bytes_after, &prop) == Success);
1988 2373
1989 if (!i || prop == NULL) 2374 if (!i || prop == NULL
2375#if TINTING
2376 || !rs[Rs_color + Color_tint]
2377#endif
2378 )
1990 have_pixmap = 0; 2379 have_pixmap = 0;
1991 else 2380 else
1992 { 2381 {
1993 have_pixmap = 1; 2382 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2383 rootpixmap = *(Pixmap *)prop;
… …
2056 XFreePixmap (display->display, TermWin.pixmap); 2445 XFreePixmap (display->display, TermWin.pixmap);
2057 2446
2058#if TINTING 2447#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2448 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2449 {
2061 unsigned short shade, rm, gm, bm; 2450 unsigned short rm, gm, bm;
2451 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2452
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2453 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2454
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2455 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2456 }
2076#endif 2457#endif
2077 2458
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2079 szHint.width, szHint.height, image->depth); 2460 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2463 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2464 XFreeGC (display->display, gc);
2084 XDestroyImage (image); 2465 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2086 TermWin.pixmap); 2467 XClearWindow (display->display, TermWin.parent[0]);
2087 2468
2088 if (!am_transparent || !am_pixmap_trans) 2469 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2470 pchanged = 1;
2090 2471
2091 am_transparent = am_pixmap_trans = 1; 2472 am_transparent = am_pixmap_trans = 1;
… …
2096 { 2477 {
2097 unsigned int n; 2478 unsigned int n;
2098 /* 2479 /*
2099 * InheritPixmap transparency 2480 * InheritPixmap transparency
2100 */ 2481 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 { 2483 {
2104 oldp = TermWin.parent[i]; 2484 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2485 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2486 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2487 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2488
2110 if (TermWin.parent[i] == display->root) 2489 if (TermWin.parent[i] == display->root)
2111 { 2490 {
2112 if (oldp != None) 2491 if (oldp != None)
2113 pchanged = 1; 2492 pchanged = 1;
… …
2124 if (pchanged) 2503 if (pchanged)
2125 { 2504 {
2126 for (; n < (unsigned int)i; n++) 2505 for (; n < (unsigned int)i; n++)
2127 { 2506 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2507 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2509 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break; 2511 break;
2134 } 2512 }
2135 } 2513 }
2136 } 2514 }
2137 2515
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 { 2517 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2520 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2521 /* XXX: also turn off Opt_transparent? */
2145 } 2522 }
2146 else 2523 else
2147 { 2524 {
2148#if WAIT_FOR_WM 2525#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2526 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2527 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2528 sleep (1);
2152#endif 2529#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2530 for (n = 0; n < (unsigned int)i; n++)
2531 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2533 XClearWindow (display->display, TermWin.parent[n]);
2534 }
2156 2535
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2158 am_transparent = 1; 2537 am_transparent = 1;
2159 } 2538 }
2160 2539
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 TermWin.parent[i] = None; 2541 TermWin.parent[i] = None;
2542 }
2543
2544 if (scrollBar.win)
2545 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle ();
2548 scrollbar_show (0);
2163 } 2549 }
2164 2550
2165 return pchanged; 2551 return pchanged;
2166} 2552}
2167#endif 2553#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2572 if (ch == NOCHAR) // TODO: improve
2187 break; 2573 break;
2188 2574
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2576 {
2577 if (!seen_input)
2578 {
2579 seen_input = 1;
2580 // many badly-written programs (e.g. jed) contain a race condition:
2581 // they first read the screensize and then install a SIGWINCH handler.
2582 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized.
2587 if (seen_resize)
2588 kill (-cmd_pid, SIGWINCH);
2589 }
2590
2191 /* Read a text string from the input buffer */ 2591 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2592 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2593 bool refreshnow = false;
2194 int nlines = 0; 2594 int nlines = 0;
2195 unicode_t *str = buf; 2595 unicode_t *str = buf;
2196 2596
2197 *str++ = ch;
2198
2199 for (;;) 2597 for (;;)
2200 { 2598 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2600 break;
2206 2601
2207 *str++ = ch; 2602 *str++ = ch;
2208 2603
2209 if (ch == C0_LF) 2604 if (ch == C0_LF)
2210 { 2605 {
2211 nlines++; 2606 nlines++;
2212 refresh_count++; 2607 refresh_count++;
2213 2608
2214 if (! (Options & Opt_jumpScroll) 2609 if (!(options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2216 { 2611 {
2217 refreshnow = true; 2612 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR; 2613 ch = NOCHAR;
2220 break; 2614 break;
2221 } 2615 }
2222 2616
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2618 if (nlines >= TermWin.nrow - 1)
2225 { 2619 {
2226 scr_add_lines (buf, nlines, str - buf); 2620 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2621 nlines = 0;
2228 str = buf; 2622 str = buf;
… …
2232 if (str >= buf + UBUFSIZ) 2626 if (str >= buf + UBUFSIZ)
2233 { 2627 {
2234 ch = NOCHAR; 2628 ch = NOCHAR;
2235 break; 2629 break;
2236 } 2630 }
2631
2632 seq_begin = cmdbuf_ptr;
2633 ch = next_char ();
2237 } 2634 }
2238 2635
2239 scr_add_lines (buf, nlines, str - buf); 2636 scr_add_lines (buf, nlines, str - buf);
2240 2637
2241 /* 2638 /*
2242 * If there have been a lot of new lines, then update the screen 2639 * If there have been a lot of new lines, then update the screen
2243 * What the heck I'll cheat and only refresh less than every page-full. 2640 * What the heck I'll cheat and only refresh less than every page-full.
2244 * the number of pages between refreshes is refresh_limit, which 2641 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2642 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2643 */
2250 if (refreshnow) 2644 if (refreshnow)
2251 { 2645 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2647 refresh_limit++;
2254 else 2648 else
2649 {
2650 flag = true;
2255 scr_refresh (refresh_type); 2651 scr_refresh (refresh_type);
2652 }
2256 } 2653 }
2257 2654
2258 } 2655 }
2259 else 2656 else
2260 { 2657 {
… …
2274 } 2671 }
2275 2672
2276 return flag; 2673 return flag;
2277} 2674}
2278 2675
2676// read the next octet
2677unicode_t
2678rxvt_term::next_octet ()
2679{
2680 return cmdbuf_ptr < cmdbuf_endp
2681 ? *cmdbuf_ptr++
2682 : NOCHAR;
2683}
2684
2279// read the next character 2685// read the next character
2280unicode_t 2686unicode_t
2281rxvt_term::next_char () 2687rxvt_term::next_char ()
2282{ 2688{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2689 while (cmdbuf_ptr < cmdbuf_endp)
… …
2314 */ 2720 */
2315unicode_t 2721unicode_t
2316rxvt_term::cmd_getc () 2722rxvt_term::cmd_getc ()
2317{ 2723{
2318 unicode_t c = next_char (); 2724 unicode_t c = next_char ();
2725
2726 if (c == NOCHAR)
2727 throw out_of_input;
2728
2729 return c;
2730}
2731
2732unicode_t
2733rxvt_term::cmd_get8 ()
2734{
2735 unicode_t c = next_octet ();
2319 2736
2320 if (c == NOCHAR) 2737 if (c == NOCHAR)
2321 throw out_of_input; 2738 throw out_of_input;
2322 2739
2323 return c; 2740 return c;
… …
2424 process_escape_seq (); 2841 process_escape_seq ();
2425 break; 2842 break;
2426 case C0_ENQ: /* terminal Status */ 2843 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2844 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2847 else
2431 tt_write ((unsigned char *)VT100_ANS, 2848 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2849 (unsigned int)strlen (VT100_ANS));
2433 break; 2850 break;
2434 case C0_BEL: /* bell */ 2851 case C0_BEL: /* bell */
2435 scr_bell (); 2852 scr_bell ();
2436 break; 2853 break;
2437 case C0_BS: /* backspace */ 2854 case C0_BS: /* backspace */
… …
2453 break; 2870 break;
2454 case C0_SI: /* shift in - acs */ 2871 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2872 scr_charset_choose (0);
2456 break; 2873 break;
2457 2874
2875#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2876 // 8-bit controls
2459 case 0x90: /* DCS */ 2877 case 0x90: /* DCS */
2460 process_dcs_seq (); 2878 process_dcs_seq ();
2461 break; 2879 break;
2462 case 0x9b: /* CSI */ 2880 case 0x9b: /* CSI */
2463 process_csi_seq (); 2881 process_csi_seq ();
2464 break; 2882 break;
2465 case 0x9d: /* CSI */ 2883 case 0x9d: /* CSI */
2466 process_osc_seq (); 2884 process_osc_seq ();
2467 break; 2885 break;
2886#endif
2468 } 2887 }
2469} 2888}
2470/*}}} */ 2889/*}}} */
2471 2890
2472 2891
… …
2534void 2953void
2535rxvt_term::process_escape_seq () 2954rxvt_term::process_escape_seq ()
2536{ 2955{
2537 unicode_t ch = cmd_getc (); 2956 unicode_t ch = cmd_getc ();
2538 2957
2539 if (PrivateModes & PrivMode_vt52) 2958 if (priv_modes & PrivMode_vt52)
2540 { 2959 {
2541 process_escape_vt52 (ch); 2960 process_escape_vt52 (ch);
2542 return; 2961 return;
2543 } 2962 }
2544 2963
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 2978 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 2979 break;
2561 case '+': 2980 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 2981 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 2982 break;
2564#ifndef NO_FRILLS 2983#if ENABLE_FRILLS
2565 case '6': 2984 case '6':
2566 scr_backindex (); 2985 scr_backindex ();
2567 break; 2986 break;
2568#endif 2987#endif
2569 case '7': 2988 case '7':
2570 scr_cursor (SAVE); 2989 scr_cursor (SAVE);
2571 break; 2990 break;
2572 case '8': 2991 case '8':
2573 scr_cursor (RESTORE); 2992 scr_cursor (RESTORE);
2574 break; 2993 break;
2575#ifndef NO_FRILLS 2994#if ENABLE_FRILLS
2576 case '9': 2995 case '9':
2577 scr_forwardindex (); 2996 scr_forwardindex ();
2578 break; 2997 break;
2579#endif 2998#endif
2580 case '=': 2999 case '=':
… …
2661 3080
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3081/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3082/* *INDENT-OFF* */
2664enum { 3083enum {
2665 CSI_ICH = 0x40, 3084 CSI_ICH = 0x40,
2666 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3085 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2667 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3086 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2668 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3087 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2669 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3088 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2670 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3089 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2671 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3090 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2880 break; 3299 break;
2881 3300
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3302 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3303 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3304 break;
2886 3305
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3307 process_sgr_mode (nargs, arg);
2889 break; 3308 break;
… …
2896 break; 3315 break;
2897 case 6: /* CPR requested */ 3316 case 6: /* CPR requested */
2898 scr_report_position (); 3317 scr_report_position ();
2899 break; 3318 break;
2900 case 7: /* unofficial extension */ 3319 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3320 if (options & Opt_insecure)
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3321 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3322 break;
2904 case 8: /* unofficial extension */ 3323 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3325 break;
2907 } 3326 }
… …
2943 break; 3362 break;
2944 3363
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3364 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3365 if (arg[0] == 4)
2947 scr_insert_mode (0); 3366 scr_insert_mode (0);
3367 else if (arg[0] == 20)
3368 priv_modes &= ~PrivMode_LFNL;
2948 break; 3369 break;
2949 3370
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3371 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3372 if (arg[0] == 4)
2952 scr_insert_mode (1); 3373 scr_insert_mode (1);
3374 else if (arg[0] == 20)
3375 priv_modes |= PrivMode_LFNL;
2953 break; 3376 break;
2954 3377
2955 /* 3378 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3379 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3380 */
… …
2969 break; 3392 break;
2970 case CSI_75: 3393 case CSI_75:
2971 scr_cursor (RESTORE); 3394 scr_cursor (RESTORE);
2972 break; 3395 break;
2973 3396
2974#ifndef NO_FRILLS 3397#if ENABLE_FRILLS
2975 case CSI_74: 3398 case CSI_74:
2976 process_window_ops (arg, nargs); 3399 process_window_ops (arg, nargs);
2977 break; 3400 break;
2978#endif 3401#endif
2979 3402
… …
2986 break; 3409 break;
2987 } 3410 }
2988} 3411}
2989/*}}} */ 3412/*}}} */
2990 3413
2991#ifndef NO_FRILLS 3414#if ENABLE_FRILLS
2992/* ARGSUSED */ 3415/* ARGSUSED */
2993void 3416void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3417rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3418{
2996 int x, y; 3419 int x, y;
… …
3063 break; 3486 break;
3064 case 19: /* report window size (chars) */ 3487 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break; 3489 break;
3067 case 20: /* report icon label */ 3490 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3491 {
3070 char *s; 3492 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3493 XGetIconName (display->display, TermWin.parent[0], &s);
3072 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s);
3073 } 3496 }
3074 break; 3497 break;
3075 case 21: /* report window title */ 3498 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3499 {
3078 char *s; 3500 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3501 XFetchName (display->display, TermWin.parent[0], &s);
3080 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s);
3081 } 3504 }
3082 break; 3505 break;
3083 } 3506 }
3084} 3507}
3085#endif 3508#endif
3086 3509
… …
3090 * ends_how is terminator used. returned input must be free()'d 3513 * ends_how is terminator used. returned input must be free()'d
3091 */ 3514 */
3092unsigned char * 3515unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3516rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3517{
3095 int seen_esc = 0; /* seen escape? */ 3518 unicode_t seen_esc = 0, ch;
3096 unsigned int n = 0; 3519 unsigned int n = 0;
3097 unsigned char *s; 3520 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3521 unsigned char string[STRING_MAX];
3100 3522
3101 while ((ch = cmd_getc ())) 3523 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3524 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3525 if (seen_esc)
3526 {
3107 if (ch == 0x5c) /* 7bit ST */ 3527 if (ch == 0x5c) /* 7bit ST */
3108 break; 3528 break;
3109 else 3529 else
3110 return NULL; 3530 return NULL;
3111 3531 }
3112 if (ch == C0_ESC) 3532 else if (ch == C0_ESC)
3113 { 3533 {
3114 seen_esc = 1; 3534 seen_esc = 1;
3115 continue; 3535 continue;
3116 } 3536 }
3537 else if (ch == C0_BEL || ch == CHAR_ST)
3538 break;
3117 else if (ch == C0_HT) 3539 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3540 return NULL; /* other control character - exit */
3541
3542 seen_esc = 0;
3121 3543
3122 if (n >= sizeof (string) - 1) 3544 if (n >= sizeof (string) - 1)
3123 // stop at some sane length 3545 // stop at some sane length
3124 return NULL; 3546 return NULL;
3125 3547
3548 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 ();
3550 else
3126 string[n++] = ch; 3551 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3552 }
3129 3553
3130 string[n++] = '\0'; 3554 string[n++] = '\0';
3131 3555
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL; 3557 return NULL;
3134 3558
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3560 strncpy (s, string, n);
3137 return s; 3561 return s;
3138} 3562}
3139 3563
3140/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
3141/* 3565/*
… …
3186void 3610void
3187rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3188{ 3612{
3189 if (str[0] == '?' && !str[1]) 3613 if (str[0] == '?' && !str[1])
3190 { 3614 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3615 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3616 pix_colors_focused[color].get (display, r, g, b);
3195 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3196 }
3197 } 3618 }
3198 else 3619 else
3199 set_window_color (color, str); 3620 set_window_color (color, str);
3200} 3621}
3201 3622
… …
3229{ 3650{
3230 int changed = 0; 3651 int changed = 0;
3231 int color; 3652 int color;
3232 char *buf, *name; 3653 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
3234 3656
3235 assert (str != NULL); 3657 assert (str != NULL);
3236 switch (op) 3658 switch (op)
3237 { 3659 {
3238 case XTerm_name: 3660 case XTerm_name:
… …
3287 break; 3709 break;
3288 3710
3289 case XTerm_Color: 3711 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3712 for (buf = (char *)str; buf && *buf;)
3291 { 3713 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3714 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3715 break;
3294 3716
3295 *name++ = '\0'; 3717 *name++ = '\0';
3296 color = atoi (buf); 3718 color = atoi (buf);
3297 3719
3298 if (color < 0 || color >= TOTAL_COLORS) 3720 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3721 break;
3300 3722
3301 if ((buf = STRCHR (name, ';')) != NULL) 3723 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3724 *buf++ = '\0';
3303 3725
3304 if (name[0] == '?' && !name[1]) 3726 if (name[0] == '?' && !name[1])
3305 { 3727 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3728 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3729 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3730 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3311 }
3312 } 3731 }
3313 else 3732 else
3314 set_window_color (color + minCOLOR, name); 3733 set_window_color (color + minCOLOR, name);
3315 } 3734 }
3316 break; 3735 break;
… …
3333 break; 3752 break;
3334#ifndef NO_BOLD_UNDERLINE_REVERSE 3753#ifndef NO_BOLD_UNDERLINE_REVERSE
3335 case XTerm_Color_BD: 3754 case XTerm_Color_BD:
3336 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3337 break; 3756 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3759 break;
3338 case XTerm_Color_UL: 3760 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3762 break;
3341 case XTerm_Color_RV: 3763 case XTerm_Color_RV:
3342 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3765 break;
3766#endif
3767#if TRANSPARENT && TINTING
3768 case XTerm_Color_tint:
3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3770 check_our_parents ();
3771 if (am_transparent)
3772 want_full_refresh = want_refresh = 1;
3343 break; 3773 break;
3344#endif 3774#endif
3345 3775
3346 case XTerm_Pixmap: 3776 case XTerm_Pixmap:
3347 if (*str != ';') 3777 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3780 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3781 set_bgPixmap (str); /* change pixmap */
3352#endif 3782#endif
3353 scr_touch (true); 3783 scr_touch (true);
3354 } 3784 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3785 while ((str = strchr (str, ';')) != NULL)
3356 { 3786 {
3357 str++; 3787 str++;
3358#if XPM_BACKGROUND 3788#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3789 changed += scale_pixmap (str);
3360#endif 3790#endif
… …
3379 case XTerm_logfile: 3809 case XTerm_logfile:
3380 // TODO, when secure mode? 3810 // TODO, when secure mode?
3381 break; 3811 break;
3382 3812
3383 case XTerm_font: 3813 case XTerm_font:
3814 op = URxvt_font;
3815 case URxvt_font:
3816#if ENABLE_STYLES
3817 case URxvt_boldFont:
3818 case URxvt_italicFont:
3819 case URxvt_boldItalicFont:
3820#endif
3384 if (query) 3821 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3825 resp);
3826 else
3385 { 3827 {
3386 if (Options & Opt_insecure) 3828 const char *&res = rs[Rs_font + (op - URxvt_font)];
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3829
3388 TermWin.fontset->fontdesc 3830 res = strdup (str);
3389 ? TermWin.fontset->fontdesc 3831 allocated.push_back ((void *)res);
3390 : "", 3832 set_fonts ();
3391 resp);
3392 } 3833 }
3393 else
3394 change_font (str);
3395 break; 3834 break;
3396 3835
3397#ifndef NO_FRILLS 3836#if ENABLE_FRILLS
3398 case XTerm_locale: 3837 case XTerm_locale:
3399 if (query) 3838 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3403 }
3404 else 3840 else
3405 { 3841 {
3406 set_locale (str); 3842 set_locale (str);
3407# ifdef USE_XIM 3843# ifdef USE_XIM
3408 im_cb (); 3844 im_cb ();
3409# endif 3845# endif
3410 } 3846 }
3411 break; 3847 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif 3848#endif
3422 3849
3423#ifdef MENUBAR 3850#ifdef MENUBAR
3424 case XTerm_Menu: 3851 case XTerm_Menu:
3425 if (Options & Opt_insecure) 3852 if (options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3853 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3854 break;
3428#endif 3855#endif
3429#if 0 3856#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3857 case XTerm_dumpscreen: /* no error notices */
… …
3457{ 3884{
3458 int state; 3885 int state;
3459 3886
3460 if (mode == 's') 3887 if (mode == 's')
3461 { 3888 {
3462 SavedModes |= (PrivateModes & bit); 3889 SavedModes |= (priv_modes & bit);
3463 return -1; 3890 return -1;
3464 } 3891 }
3465 else 3892 else
3466 { 3893 {
3467 if (mode == 'r') 3894 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3895 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3896 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3897 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3898 PrivMode (state, bit);
3472 } 3899 }
3473 3900
3474 return state; 3901 return state;
3475} 3902}
… …
3493 { 3, PrivMode_132 }, 3920 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3921 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 3922 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 3923 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 3924 { 7, PrivMode_Autowrap },
3925 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 3926 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3927#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 3928 { menuBar_esc, PrivMode_menuBar },
3501#endif 3929#endif
3930 // 18, 19 printing-related
3931 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 3932#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3933 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3934#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3935 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 3936 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3937 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3938 // 45 margin bell NYI
3512 // 46 start logging 3939 // 46 start logging
… …
3553 3980
3554 /* extra handling for values with state unkept */ 3981 /* extra handling for values with state unkept */
3555 switch (arg[i]) 3982 switch (arg[i])
3556 { 3983 {
3557 case 1048: /* alternative cursor save */ 3984 case 1048: /* alternative cursor save */
3985 case 1049:
3558 if (Options & Opt_secondaryScreen) 3986 if (options & Opt_secondaryScreen)
3559 if (mode == 0) 3987 if (mode == 0)
3560 scr_cursor (RESTORE); 3988 scr_cursor (RESTORE);
3561 else if (mode == 1) 3989 else if (mode == 1)
3562 scr_cursor (SAVE); 3990 scr_cursor (SAVE);
3563 break; 3991 break;
… …
3574 * within VT52 mode 4002 * within VT52 mode
3575 */ 4003 */
3576 PrivMode (1, PrivMode_vt52); 4004 PrivMode (1, PrivMode_vt52);
3577 break; 4005 break;
3578 case 3: /* 80/132 */ 4006 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4007 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3581 break; 4009 break;
3582 case 4: /* smooth scrolling */ 4010 case 4: /* smooth scrolling */
3583 if (state) 4011 if (state)
3584 Options &= ~Opt_jumpScroll; 4012 options &= ~Opt_jumpScroll;
3585 else 4013 else
3586 Options |= Opt_jumpScroll; 4014 options |= Opt_jumpScroll;
3587 break; 4015 break;
3588 case 5: /* reverse video */ 4016 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4017 scr_rvideo_mode (state);
3590 break; 4018 break;
3591 case 6: /* relative/absolute origins */ 4019 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4023 scr_autowrap (state);
3596 break; 4024 break;
3597 /* case 8: - auto repeat, can't do on a per window basis */ 4025 /* case 8: - auto repeat, can't do on a per window basis */
3598 case 9: /* X10 mouse reporting */ 4026 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4027 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4028 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4029 break;
3602#ifdef menuBar_esc 4030#ifdef menuBar_esc
3603 case menuBar_esc: 4031 case menuBar_esc:
3604#ifdef MENUBAR 4032#ifdef MENUBAR
3605 map_menuBar (state); 4033 map_menuBar (state);
… …
3625 break; 4053 break;
3626 /* case 66: - application key pad */ 4054 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4055 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4056 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4057 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4058 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4059 break;
3632#if 0 4060#if 0
3633 case 1001: 4061 case 1001:
3634 break; /* X11 mouse highlighting */ 4062 break; /* X11 mouse highlighting */
3635#endif 4063#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4064 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4065 if (state)
3638 Options &= ~Opt_scrollTtyOutput; 4066 options &= ~Opt_scrollTtyOutput;
3639 else 4067 else
3640 Options |= Opt_scrollTtyOutput; 4068 options |= Opt_scrollTtyOutput;
3641 break; 4069 break;
3642 case 1011: /* scroll to bottom on key press */ 4070 case 1011: /* scroll to bottom on key press */
3643 if (state) 4071 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4072 options |= Opt_scrollTtyKeypress;
3645 else 4073 else
3646 Options &= ~Opt_scrollTtyKeypress; 4074 options &= ~Opt_scrollTtyKeypress;
3647 break; 4075 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4076 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4077 if (options & Opt_secondaryScreen)
3650 if (current_screen != PRIMARY) 4078 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4079 scr_erase_screen (2);
3652 scr_change_screen (state); 4080 scr_change_screen (state);
3653 break; 4081 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4082 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4083 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4084 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4085 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4086 scr_erase_screen (2);
3659 break; 4087 break;
3660 default: 4088 default:
3661 break; 4089 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4115 rendset = 0, rendstyle = ~RS_None;
3688 break; 4116 break;
3689 case 1: 4117 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4118 rendset = 1, rendstyle = RS_Bold;
3691 break; 4119 break;
4120 //case 2: // low intensity
4121 case 3:
4122 rendset = 1, rendstyle = RS_Italic;
4123 break;
3692 case 4: 4124 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4125 rendset = 1, rendstyle = RS_Uline;
3694 break; 4126 break;
3695 case 5: 4127 case 5: // slowly blinking
4128 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4129 rendset = 1, rendstyle = RS_Blink;
3697 break; 4130 break;
3698 //case 6: // scoansi light background 4131 //case 6: // scoansi light background
3699 case 7: 4132 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4133 rendset = 1, rendstyle = RS_RVid;
3701 break; 4134 break;
3702 case 8: 4135 case 8:
3703 // invisible. NYI 4136 // invisible. NYI
3704 break; 4137 break;
4138 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4139 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4140 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4141 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4142 //...
4143 //case 19: // ninth alt font
4144 //case 20: // gothic
4145 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4146 rendset = 0, rendstyle = RS_Bold;
3710 break; 4147 break;
3711 case 22: 4148 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 4149 rendset = 0, rendstyle = RS_Bold;
4150 break;
4151 case 23: // disable italic
4152 rendset = 0, rendstyle = RS_Italic;
3713 break; 4153 break;
3714 case 24: 4154 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4155 rendset = 0, rendstyle = RS_Uline;
3716 break; 4156 break;
3717 case 25: 4157 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3719 break; 4159 break;
4160 case 26: // variable spacing (iso 8613)
4161 rendset = 0, rendstyle = RS_Blink;
4162 break;
3720 case 27: 4163 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4164 rendset = 0, rendstyle = RS_RVid;
3722 break; 4165 break;
3723 case 28:
3724 // visible. NYI 4166 //case 28: // visible. NYI
3725 break; 4167 //case 29: // not crossed-out
3726 } 4168 }
3727 4169
3728 if (rendset != -1) 4170 if (rendset != -1)
3729 { 4171 {
3730 scr_rendition (rendset, rendstyle); 4172 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4183 case 35:
3742 case 36: 4184 case 36:
3743 case 37: 4185 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4186 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4187 break;
3746#ifdef TTY_256COLOR 4188 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4189 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4190 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4191 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4192 i += 2;
3752 } 4193 }
3753 break; 4194 break;
3754#endif
3755 case 39: /* default fg */ 4195 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4196 scr_color (Color_fg, Color_fg);
3757 break; 4197 break;
3758 4198
3759 case 40: 4199 case 40:
… …
3764 case 45: 4204 case 45:
3765 case 46: 4205 case 46:
3766 case 47: 4206 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4207 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4208 break;
3769#ifdef TTY_256COLOR 4209 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4210 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4211 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4212 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4213 i += 2;
3775 } 4214 }
3776 break; 4215 break;
3777#endif
3778 case 49: /* default bg */ 4216 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4217 scr_color (Color_bg, Color_bg);
3780 break; 4218 break;
4219
4220 //case 50: // not variable spacing
3781 4221
3782#ifndef NO_BRIGHTCOLOR 4222#ifndef NO_BRIGHTCOLOR
3783 case 90: 4223 case 90:
3784 case 91: /* set bright fg color */ 4224 case 91: /* set bright fg color */
3785 case 92: 4225 case 92:
3786 case 93: 4226 case 93:
3787 case 94: 4227 case 94:
3788 case 95: 4228 case 95:
3789 case 96: 4229 case 96:
3790 case 97: 4230 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4231 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4232 break;
3794 case 100: 4233 case 100:
3795 case 101: /* set bright bg color */ 4234 case 101: /* set bright bg color */
3796 case 102: 4235 case 102:
3797 case 103: 4236 case 103:
3798 case 104: 4237 case 104:
3799 case 105: 4238 case 105:
3800 case 106: 4239 case 106:
3801 case 107: 4240 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4242 break;
3805#endif 4243#endif
3806 4244
3807 } 4245 }
3808 } 4246 }
… …
3815{ 4253{
3816 unicode_t ch, cmd = cmd_getc (); 4254 unicode_t ch, cmd = cmd_getc ();
3817 4255
3818 if (cmd == 'Q') 4256 if (cmd == 'Q')
3819 { /* query graphics */ 4257 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4258 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4259 return;
3822 } 4260 }
3823 /* swallow other graphics sequences until terminating ':' */ 4261 /* swallow other graphics sequences until terminating ':' */
3824 do 4262 do
3825 ch = cmd_getc (); 4263 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4278 unsigned char buf[256];
3841 4279
3842 va_start (arg_ptr, fmt); 4280 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4282 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4283 tt_write (buf, strlen (buf));
3846} 4284}
3847 4285
3848/* ---------------------------------------------------------------------- */ 4286/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4287/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4288 * or generated by us in response to a query ESC sequence.
3851 */ 4289 */
3852void 4290void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4292{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3856 4294
3857 if (len) 4295 if (len)
3858 { 4296 {
3859 if (v_buflen == 0) 4297 if (v_buflen == 0)
3860 { 4298 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3862 4300
3863 if ((unsigned int)written == len) 4301 if ((unsigned int)written == len)
3864 return; 4302 return;
3865 4303
3866 data += written; 4304 data += written;
… …
3874 v_buflen += len; 4312 v_buflen += len;
3875 } 4313 }
3876 4314
3877 for (;;) 4315 for (;;)
3878 { 4316 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3880 4318
3881 if (written > 0) 4319 if (written > 0)
3882 { 4320 {
3883 v_buflen -= written; 4321 v_buflen -= written;
3884 4322

Diff Legend

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