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.95 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.177 by root, Mon Dec 13 07:18:52 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;
… …
744rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1059{
746 SET_R (this); 1060 SET_R (this);
747 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
748 1062
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1063 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1064 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1065 while (pty_fill ())
754 if (cmd_parse ()) 1066 if (cmd_parse ())
755 break; 1067 break;
1068
1069 if (revents & EVENT_WRITE)
1070 pty_write ();
1071}
1072
1073void
1074rxvt_term::pointer_unblank ()
1075{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1077 recolour_cursor ();
1078
1079#ifdef POINTER_BLANK
1080 hidden_pointer = 0;
1081
1082 if (options & Opt_pointerBlank)
1083 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif
756} 1085}
757 1086
758#ifdef POINTER_BLANK 1087#ifdef POINTER_BLANK
759void 1088void
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 () 1089rxvt_term::pointer_blank ()
773{ 1090{
774 if (! (Options & Opt_pointerBlank)) 1091 if (! (options & Opt_pointerBlank))
775 return; 1092 return;
776 1093
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1094 XDefineCursor (display->display, TermWin.vt, blank_cursor);
778 XFlush (display->display); 1095 XFlush (display->display);
779 1096
… …
799 x = ev.x; 1116 x = ev.x;
800 y = ev.y; 1117 y = ev.y;
801 pixel_position (&x, &y); 1118 pixel_position (&x, &y);
802 1119
803 if (MEvent.button == AnyButton) 1120 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1121 button_number = 3;
806 }
807 else 1122 else
808 { 1123 {
809 button_number = MEvent.button - Button1; 1124 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1125 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1126 if (button_number >= 3)
812 button_number += (64 - 3); 1127 button_number += (64 - 3);
813 } 1128 }
814 1129
815 if (PrivateModes & PrivMode_MouseX10) 1130 if (priv_modes & PrivMode_MouseX10)
816 { 1131 {
817 /* 1132 /*
818 * do not report ButtonRelease 1133 * do not report ButtonRelease
819 * no state info allowed 1134 * no state info allowed
820 */ 1135 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1150 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1151 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1152#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1153 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1154#endif
840
841 } 1155 }
842 1156
843#ifdef DEBUG_MOUSEREPORT 1157#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1158 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1159 if (key_state & 16)
846 fputc ('C', stderr); 1160 fputc ('C', stderr);
847 if (key_state & 4) 1161 if (key_state & 4)
848 fputc ('S', stderr); 1162 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1166 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1167 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1168 button_number,
855 x + 1, 1169 x + 1,
856 y + 1); 1170 y + 1);
857#else 1171#endif
1172
858 tt_printf ("\033[M%c%c%c", 1173 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1174 (32 + button_number + key_state),
860 (32 + x + 1), 1175 (32 + x + 1),
861 (32 + y + 1)); 1176 (32 + y + 1));
862#endif
863} 1177}
864 1178
865#ifdef USING_W11LIB 1179#ifdef USING_W11LIB
866void 1180void
867rxvt_W11_process_x_event (XEvent *ev) 1181rxvt_W11_process_x_event (XEvent *ev)
… …
878{ 1192{
879 SET_R (this); 1193 SET_R (this);
880 SET_LOCALE (locale); 1194 SET_LOCALE (locale);
881 1195
882#if defined(CURSOR_BLINK) 1196#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1198 {
885 if (hidden_cursor) 1199 if (hidden_cursor)
886 { 1200 {
887 hidden_cursor = 0; 1201 hidden_cursor = 0;
888 want_refresh = 1; 1202 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1206 }
893#endif 1207#endif
894 1208
895#if defined(POINTER_BLANK) 1209#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1211 {
898 if (ev.type == MotionNotify 1212 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1213 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1214 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1215 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1218 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1219 pointer_blank ();
906 } 1220 }
907#endif 1221#endif
908 1222
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1223 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1224 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1225 unsigned int unused_mask;
917
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 1226
967 switch (ev.type) 1227 switch (ev.type)
968 { 1228 {
969 case KeyPress: 1229 case KeyPress:
1230#if ISO_14755
1231 if (!(iso14755buf & ISO_14755_52))
1232#endif
970 lookup_key (ev.xkey); 1233 lookup_key (ev.xkey);
1234
1235 break;
1236
1237 case KeyRelease:
1238 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1240 KeySym ks;
1241
1242 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1243#endif
1244
1245#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support
1247 if (iso14755buf)
1248 if (iso14755buf & ISO_14755_52)
1249 {
1250# if ENABLE_OVERLAY
1251 scr_overlay_off ();
1252# endif
1253# if ISO_14755
1254 // iso14755 part 5.2 handling: release time
1255 // first: controls
1256 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f)))
1259 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1261 commit_iso14755 ();
1262 return; // case-break;
1263 }
1264
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks)
1267 {
1268 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 ();
1270 return; // case-break;
1271 }
1272
1273 scr_bell ();
1274# endif
1275 iso14755buf = 0;
971 break; 1276 break;
1277 }
1278 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1279 {
1280# if ENABLE_OVERLAY
1281 scr_overlay_off ();
1282# endif
1283 if (iso14755buf & ISO_14755_51)
1284 commit_iso14755 ();
1285#if ISO_14755
1286 else if (iso14755buf & ISO_14755_STARTED)
1287 {
1288 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1289
1290 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1291 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1292 }
1293# endif
1294 else
1295 iso14755buf = 0;
1296 }
1297#endif
972 1298
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 if (! (ev.xkey.state & ControlMask)) 1300 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R)
977 mouse_slip_wheel_speed = 0; 1303 mouse_slip_wheel_speed = 0;
978 else 1304#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; 1305 break;
987 } 1306 }
988#endif
989 1307
990 case ButtonPress: 1308 case ButtonPress:
991 button_press (ev.xbutton); 1309 button_press (ev.xbutton);
992 break; 1310 break;
993 1311
… …
1017 0L, 1000000L, 1335 0L, 1000000L,
1018 False, AnyPropertyType, 1336 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1337 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1338 &Size, &RemainingBytes,
1021 &data); 1339 &data);
1022 XChangeProperty (display->display, display->root, 1340 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1341 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1342 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1029 } 1344 }
1030#endif /* OFFIX_DND */ 1345#endif /* OFFIX_DND */
1031 break; 1346 break;
1032 1347
1033 case MappingNotify: 1348 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1349 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1350 break;
1036 1351
1037 /* 1352 /*
1038 * XXX: this is not the _current_ arrangement 1353 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1354 * Here's my conclusion:
… …
1064 { 1379 {
1065 TermWin.focus = 1; 1380 TermWin.focus = 1;
1066 want_refresh = 1; 1381 want_refresh = 1;
1067#ifdef USE_XIM 1382#ifdef USE_XIM
1068 if (Input_Context != NULL) 1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1069 XSetICFocus (Input_Context); 1386 XSetICFocus (Input_Context);
1387 }
1070#endif 1388#endif
1071#ifdef CURSOR_BLINK 1389#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink) 1390 if (options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1074#endif 1399#endif
1075 1400
1076 } 1401 }
1077 break; 1402 break;
1078 1403
1079 case FocusOut: 1404 case FocusOut:
1080 if (TermWin.focus) 1405 if (TermWin.focus)
1081 { 1406 {
1082 TermWin.focus = 0; 1407 TermWin.focus = 0;
1083 want_refresh = 1; 1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1084#ifdef USE_XIM 1416#ifdef USE_XIM
1085 if (Input_Context != NULL) 1417 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context); 1418 XUnsetICFocus (Input_Context);
1087#endif 1419#endif
1088#ifdef CURSOR_BLINK 1420#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink) 1421 if (options & Opt_cursorBlink)
1090 cursor_blink_ev.stop (); 1422 cursor_blink_ev.stop ();
1091 hidden_cursor = 0; 1423 hidden_cursor = 0;
1092#endif 1424#endif
1093 1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1094 } 1432 }
1095 break; 1433 break;
1096 1434
1097 case ConfigureNotify: 1435 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1436 if (ev.xconfigure.window == TermWin.parent[0])
… …
1107 } 1445 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1447
1110 if (szHint.width != width || szHint.height != height) 1448 if (szHint.width != width || szHint.height != height)
1111 { 1449 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1450 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1451 resize_all_windows (width, height, 1);
1114 } 1452 }
1115#ifdef DEBUG_SIZE 1453
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1455 if (options & Opt_transparent)
1123 {
1124 check_our_parents (); 1456 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif 1457#endif
1129 } 1458 }
1459 break;
1460
1461 case PropertyNotify:
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1130 break; 1466 break;
1131 1467
1132 case SelectionClear: 1468 case SelectionClear:
1133 selection_clear (); 1469 selection_clear ();
1134 break; 1470 break;
1135 1471
1136 case SelectionNotify: 1472 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1475 break;
1141 1476
1142 case SelectionRequest: 1477 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1478 selection_send (ev.xselectionrequest);
1144 break; 1479 break;
… …
1165 1500
1166 case GraphicsExpose: 1501 case GraphicsExpose:
1167 case Expose: 1502 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1503 if (ev.xany.window == TermWin.vt)
1169 { 1504 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1505 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1506 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1507 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1174 // I don't understand this, so I changed it :) 1509
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1515
1178 // ev.xexpose.width, TermWin.height, False); 1516 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1517 }
1182 else 1518 else
1183 { 1519 {
1184 XEvent unused_event; 1520 XEvent unused_event;
1185 1521
… …
1195 } 1531 }
1196#ifdef MENUBAR 1532#ifdef MENUBAR
1197 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1198 menubar_expose (); 1534 menubar_expose ();
1199#endif 1535#endif
1536
1537#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window);
1540#endif
1200 } 1541 }
1201 break; 1542 break;
1202 1543
1203 case MotionNotify: 1544 case MotionNotify:
1204#ifdef POINTER_BLANK 1545#ifdef POINTER_BLANK
… …
1210 { 1551 {
1211 menubar_control (ev.xbutton); 1552 menubar_control (ev.xbutton);
1212 break; 1553 break;
1213 } 1554 }
1214#endif 1555#endif
1215 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1216 break; 1557 break;
1217 1558
1218 if (ev.xany.window == TermWin.vt) 1559 if (ev.xany.window == TermWin.vt)
1219 { 1560 {
1220 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1561 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1221 { 1562 {
1222 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1223 ; 1564 ;
1224 1565
1225 XQueryPointer (display->display, TermWin.vt, 1566 XQueryPointer (display->display, TermWin.vt,
1226 &unused_root, &unused_child, 1567 &unused_root, &unused_child,
1227 &unused_root_x, &unused_root_y, 1568 &unused_root_x, &unused_root_y,
1228 & (ev.xbutton.x), & (ev.xbutton.y), 1569 &ev.xbutton.x, &ev.xbutton.y,
1229 &unused_mask); 1570 &ev.xbutton.state);
1230#ifdef MOUSE_THRESHOLD 1571#ifdef MOUSE_THRESHOLD
1231 /* deal with a `jumpy' mouse */ 1572 /* deal with a `jumpy' mouse */
1232 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1573 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1233 { 1574 {
1234#endif 1575#endif
1576#if ISO_14755
1577 // 5.4
1578 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1579 {
1580 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1581 break;
1582 }
1583#endif
1235 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1584 selection_extend (ev.xbutton.x, ev.xbutton.y,
1236 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1585 ev.xbutton.state & Button3Mask ? 2 : 0);
1586
1237#ifdef SELECTION_SCROLLING 1587#ifdef SELECTION_SCROLLING
1238 if (ev.xbutton.y < TermWin.int_bwidth 1588 if (ev.xbutton.y < TermWin.int_bwidth
1239 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1240 { 1590 {
1241 int dist; 1591 int dist;
1242 1592
1243 pending_scroll_selection=1;
1244
1245 /* don't clobber the current delay if we are 1593 /* don't clobber the current delay if we are
1246 * already in the middle of scrolling. 1594 * already in the middle of scrolling.
1247 */ 1595 */
1248 if (scroll_selection_delay<=0) 1596 if (!sel_scroll_ev.active)
1249 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1597 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1250 1598
1251 /* save the event params so we can highlight 1599 /* save the event params so we can highlight
1252 * the selection in the pending-scroll loop 1600 * the selection in the pending-scroll loop
1253 */ 1601 */
1254 selection_save_x=ev.xbutton.x; 1602 selection_save_x = ev.xbutton.x;
1255 selection_save_y=ev.xbutton.y; 1603 selection_save_y = ev.xbutton.y;
1256 selection_save_state=
1257 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1258 1605
1259 /* calc number of lines to scroll */ 1606 /* calc number of lines to scroll */
1260 if (ev.xbutton.y<TermWin.int_bwidth) 1607 if (ev.xbutton.y < TermWin.int_bwidth)
1261 { 1608 {
1262 scroll_selection_dir = UP; 1609 scroll_selection_dir = UP;
1263 dist = TermWin.int_bwidth - ev.xbutton.y; 1610 dist = TermWin.int_bwidth - ev.xbutton.y;
1264 } 1611 }
1265 else 1612 else
1266 { 1613 {
1267 scroll_selection_dir = DN; 1614 scroll_selection_dir = DN;
1268 dist = ev.xbutton.y -
1269 (TermWin.int_bwidth + TermWin.height); 1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1270 } 1616 }
1617
1271 scroll_selection_lines= (Pixel2Height (dist)/ 1618 scroll_selection_lines = Pixel2Height (dist)
1272 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1619 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1;
1273 MIN_IT (scroll_selection_lines, 1621 MIN_IT (scroll_selection_lines,
1274 SELECTION_SCROLL_MAX_LINES); 1622 SELECTION_SCROLL_MAX_LINES);
1275 } 1623 }
1276 else 1624 else
1277 { 1625 {
1278 /* we are within the text window, so we 1626 /* we are within the text window, so we
1279 * shouldn't be scrolling 1627 * shouldn't be scrolling
1280 */ 1628 */
1281 pending_scroll_selection = 0; 1629 if (sel_scroll_ev.active)
1630 sel_scroll_ev.stop();
1282 } 1631 }
1283#endif 1632#endif
1284#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1285
1286 } 1634 }
1287#endif 1635#endif
1288
1289 } 1636 }
1290 } 1637 }
1291 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1292 { 1639 {
1293 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1294 MotionNotify, &ev)) ; 1641 MotionNotify, &ev))
1642 ;
1643
1295 XQueryPointer (display->display, scrollBar.win, 1644 XQueryPointer (display->display, scrollBar.win,
1296 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1297 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1298 & (ev.xbutton.x), & (ev.xbutton.y), 1647 &ev.xbutton.x, &ev.xbutton.y,
1299 &unused_mask); 1648 &unused_mask);
1300 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1301 scrollbar_size ()); 1650 scrollbar_size ());
1302 scr_refresh (refresh_type); 1651 scr_refresh (refresh_type);
1303 refresh_limit = 0; 1652 refresh_limit = 0;
… …
1305 } 1654 }
1306 break; 1655 break;
1307 } 1656 }
1308} 1657}
1309 1658
1659#if TRANSPARENT
1310void 1660void
1311rxvt_term::rootwin_cb (XEvent &ev) 1661rxvt_term::rootwin_cb (XEvent &ev)
1312{ 1662{
1313 SET_R (this); 1663 SET_R (this);
1314 SET_LOCALE (locale); 1664 SET_LOCALE (locale);
1315 1665
1316 switch (ev.type) 1666 switch (ev.type)
1317 { 1667 {
1318 case PropertyNotify: 1668 case PropertyNotify:
1319 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1320 {
1321 if (ev.xproperty.state == PropertyNewValue)
1322 selection_property (ev.xproperty.window, ev.xproperty.atom);
1323 break;
1324 }
1325#ifdef TRANSPARENT
1326 else
1327 {
1328 /* 1669 /*
1329 * if user used some Esetroot compatible prog to set the root bg, 1670 * if user used some Esetroot compatible prog to set the root bg,
1330 * use the property to determine the pixmap. We use it later on. 1671 * use the property to determine the pixmap. We use it later on.
1331 */ 1672 */
1332 if (xa[XA_XROOTPMAPID] == 0) 1673 if (xa[XA_XROOTPMAPID] == 0)
1333 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1334 1675
1335 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1336 return; 1677 return;
1337 }
1338 1678
1339 /* FALLTHROUGH */ 1679 /* FALLTHROUGH */
1340 case ReparentNotify: 1680 case ReparentNotify:
1341 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1342 want_full_refresh = 1; 1682 want_refresh = want_full_refresh = 1;
1343 break; 1683 break;
1344#endif
1345 } 1684 }
1346} 1685}
1686#endif
1347 1687
1348void 1688void
1349rxvt_term::button_press (XButtonEvent &ev) 1689rxvt_term::button_press (XButtonEvent &ev)
1350{ 1690{
1351 int reportmode = 0, clickintime; 1691 int reportmode = 0, clickintime;
1352 1692
1353 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1354 if (!bypass_keystate) 1694 if (!bypass_keystate)
1355 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1695 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696
1356 /* 1697 /*
1357 * VT window processing of button press 1698 * VT window processing of button press
1358 */ 1699 */
1359 if (ev.window == TermWin.vt) 1700 if (ev.window == TermWin.vt)
1360 { 1701 {
1702#if ISO_14755
1703 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 {
1706 iso14755_54 (ev.x, ev.y);
1707 return;
1708 }
1709#endif
1710
1361 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1711 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1712
1362 if (reportmode) 1713 if (reportmode)
1363 { 1714 {
1364 /* mouse report from vt window */ 1715 /* mouse report from vt window */
1365 /* save the xbutton state (for ButtonRelease) */ 1716 /* save the xbutton state (for ButtonRelease) */
1366 MEvent.state = ev.state; 1717 MEvent.state = ev.state;
… …
1395 } 1746 }
1396 else 1747 else
1397 { 1748 {
1398 if (ev.button != MEvent.button) 1749 if (ev.button != MEvent.button)
1399 MEvent.clicks = 0; 1750 MEvent.clicks = 0;
1751
1400 switch (ev.button) 1752 switch (ev.button)
1401 { 1753 {
1402 case Button1: 1754 case Button1:
1755 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */
1757#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask);
1759#else
1760 selection.rect = false;
1761#endif
1762
1403 /* allow shift+left click to extend selection */ 1763 /* allow shift+left click to extend selection */
1404 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1405 { 1765 {
1406 if (MEvent.button == Button1 && clickintime) 1766 if (MEvent.button == Button1 && clickintime)
1407 selection_rotate (ev.x, ev.y); 1767 selection_rotate (ev.x, ev.y);
1408 else 1768 else
1409 selection_extend (ev.x, ev.y, 1); 1769 selection_extend (ev.x, ev.y, 1);
… …
1424 case Button3: 1784 case Button3:
1425 if (MEvent.button == Button3 && clickintime) 1785 if (MEvent.button == Button3 && clickintime)
1426 selection_rotate (ev.x, ev.y); 1786 selection_rotate (ev.x, ev.y);
1427 else 1787 else
1428 selection_extend (ev.x, ev.y, 1); 1788 selection_extend (ev.x, ev.y, 1);
1789
1429 MEvent.button = Button3; 1790 MEvent.button = Button3;
1430 break; 1791 break;
1431 } 1792 }
1432 } 1793 }
1794
1433 MEvent.time = ev.time; 1795 MEvent.time = ev.time;
1434 return; 1796 return;
1435 } 1797 }
1436 1798
1437 /* 1799 /*
… …
1503 upordown = 1; /* down */ 1865 upordown = 1; /* down */
1504 } 1866 }
1505 if (upordown) 1867 if (upordown)
1506 { 1868 {
1507#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1869#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1508 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1870 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1509#endif 1871#endif
1510 if (scr_page (upordown < 0 ? UP : DN, 1)) 1872 if (scr_page (upordown < 0 ? UP : DN, 1))
1511 { 1873 {
1512 if (upordown < 0) 1874 if (upordown < 0)
1513 scrollBar.setUp (); 1875 scrollBar.setUp ();
… …
1529 break; 1891 break;
1530 case R_SB_ALIGN_BOTTOM: 1892 case R_SB_ALIGN_BOTTOM:
1531 csrO = scrollBar.bot - scrollBar.top; 1893 csrO = scrollBar.bot - scrollBar.top;
1532 break; 1894 break;
1533 } 1895 }
1896
1534 if (scrollBar.style == R_SB_XTERM 1897 if (scrollBar.style == R_SB_XTERM
1535 || scrollbar_above_slider (ev.y) 1898 || scrollbar_above_slider (ev.y)
1536 || scrollbar_below_slider (ev.y)) 1899 || scrollbar_below_slider (ev.y))
1537 scr_move_to ( scrollbar_position (ev.y) - csrO, 1900 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1538 scrollbar_size ()); 1901
1539 scrollBar.setMotion (); 1902 scrollBar.setMotion ();
1540 break; 1903 break;
1541 1904
1542 case Button1: 1905 case Button1:
1543 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1906 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1567 scr_page ((ev.button == Button1 ? DN : UP), 1930 scr_page ((ev.button == Button1 ? DN : UP),
1568 (TermWin.nrow 1931 (TermWin.nrow
1569 * scrollbar_position (ev.y) 1932 * scrollbar_position (ev.y)
1570 / scrollbar_size ())); 1933 / scrollbar_size ()));
1571 } 1934 }
1935
1572 break; 1936 break;
1573 } 1937 }
1574 } 1938 }
1575 return; 1939 return;
1576 } 1940 }
… …
1588{ 1952{
1589 int reportmode = 0; 1953 int reportmode = 0;
1590 1954
1591 csrO = 0; /* reset csr Offset */ 1955 csrO = 0; /* reset csr Offset */
1592 if (!bypass_keystate) 1956 if (!bypass_keystate)
1593 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1957 reportmode = !! (priv_modes & PrivMode_mouse_report);
1594 1958
1595 if (scrollbar_isUpDn ()) 1959 if (scrollbar_isUpDn ())
1596 { 1960 {
1597 scrollBar.setIdle (); 1961 scrollBar.setIdle ();
1598 scrollbar_show (0); 1962 scrollbar_show (0);
1599#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1600 refresh_type &= ~SMOOTH_REFRESH; 1964 refresh_type &= ~SMOOTH_REFRESH;
1601#endif 1965#endif
1602
1603 } 1966 }
1967
1604#ifdef SELECTION_SCROLLING 1968#ifdef SELECTION_SCROLLING
1605 pending_scroll_selection=0; 1969 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop();
1606#endif 1971#endif
1972
1607 if (ev.window == TermWin.vt) 1973 if (ev.window == TermWin.vt)
1608 { 1974 {
1975#if ISO_14755
1976 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return;
1979#endif
1609 if (reportmode) 1980 if (reportmode)
1610 { 1981 {
1611 /* mouse report from vt window */ 1982 /* mouse report from vt window */
1612 /* don't report release of wheel "buttons" */ 1983 /* don't report release of wheel "buttons" */
1613 if (ev.button >= 4) 1984 if (ev.button >= 4)
… …
1627 MEvent.button = AnyButton; 1998 MEvent.button = AnyButton;
1628 mouse_report (ev); 1999 mouse_report (ev);
1629#endif /* MOUSE_REPORT_DOUBLECLICK */ 2000#endif /* MOUSE_REPORT_DOUBLECLICK */
1630 return; 2001 return;
1631 } 2002 }
2003
1632 /* 2004 /*
1633 * dumb hack to compensate for the failure of click-and-drag 2005 * dumb hack to compensate for the failure of click-and-drag
1634 * when overriding mouse reporting 2006 * when overriding mouse reporting
1635 */ 2007 */
1636 if (PrivateModes & PrivMode_mouse_report 2008 if (priv_modes & PrivMode_mouse_report
1637 && bypass_keystate 2009 && bypass_keystate
1638 && ev.button == Button1 && MEvent.clicks <= 1) 2010 && ev.button == Button1 && MEvent.clicks <= 1)
1639 selection_extend (ev.x, ev.y, 0); 2011 selection_extend (ev.x, ev.y, 0);
1640 2012
1641 switch (ev.button) 2013 switch (ev.button)
… …
1652 case Button5: 2024 case Button5:
1653 { 2025 {
1654 int i; 2026 int i;
1655 page_dirn v; 2027 page_dirn v;
1656 2028
1657 v = (ev.button == Button4) ? UP : DN; 2029 v = ev.button == Button4 ? UP : DN;
2030
1658 if (ev.state & ShiftMask) 2031 if (ev.state & ShiftMask)
1659 i = 1; 2032 i = 1;
1660 else if ((Options & Opt_mouseWheelScrollPage)) 2033 else if (options & Opt_mouseWheelScrollPage)
1661 i = TermWin.nrow - 1; 2034 i = TermWin.nrow - 1;
1662 else 2035 else
1663 i = 5; 2036 i = 5;
2037
1664# ifdef MOUSE_SLIP_WHEELING 2038# ifdef MOUSE_SLIP_WHEELING
1665 if (ev.state & ControlMask) 2039 if (ev.state & ControlMask)
1666 { 2040 {
1667 mouse_slip_wheel_speed += (v ? -1 : 1); 2041 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2044
2045 if (slip_wheel_ev.at < NOW)
1668 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047
2048 slip_wheel_ev.start ();
1669 } 2049 }
2050 else
2051 {
1670# endif 2052# endif
1671# ifdef JUMP_MOUSE_WHEEL 2053# ifdef JUMP_MOUSE_WHEEL
1672 scr_page (v, i);
1673 scr_refresh (SMOOTH_REFRESH);
1674 scrollbar_show (1);
1675# else
1676 while (i--)
1677 {
1678 scr_page (v, 1); 2054 scr_page (v, i);
1679 scr_refresh (SMOOTH_REFRESH); 2055 scr_refresh (SMOOTH_REFRESH);
1680 scrollbar_show (1); 2056 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING
1681 } 2066 }
1682# endif 2067#endif
1683
1684 } 2068 }
1685 break; 2069 break;
1686#endif 2070#endif
1687
1688 } 2071 }
1689 } 2072 }
1690#ifdef MENUBAR 2073#ifdef MENUBAR
1691 else if (isMenuBarWindow (ev.window)) 2074 else if (isMenuBarWindow (ev.window))
1692 menubar_control (ev); 2075 menubar_control (ev);
1693#endif 2076#endif
1694} 2077}
1695 2078
1696#ifdef TRANSPARENT 2079#ifdef TRANSPARENT
1697#if TINTING 2080#if TINTING
1698/* shading taken from eterm-0.9.2 */ 2081/* taken from aterm-0.4.2 */
1699/* RGB 15 */
1700 2082
1701static void 2083typedef uint32_t RUINT32T;
1702shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1703{
1704 unsigned char *ptr;
1705 int x, y;
1706 2084
1707 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2085void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1708 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2086{
1709 /* No saturation */ 2087 int sh_r, sh_g, sh_b;
1710 for (y = h; --y >= 0;) { 2088 RUINT32T mask_r, mask_g, mask_b;
1711 for (x = -w; x < 0; x++) { 2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1712 int r, g, b; 2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i;
1713 2093
1714 b = ((uint16_t *) ptr)[x]; 2094 Visual* visual = display->visual;
1715 r = (b & 0x7c00) * rm; 2095
1716 g = (b & 0x3e0) * gm; 2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1717 b = (b & 0x1f) * bm; 2097
1718 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2098 /* for convenience */
1719 | ((g >> 8) & 0x3e0) 2099 mask_r = visual->red_mask;
1720 | ((b >> 8) & 0x1f); 2100 mask_g = visual->green_mask;
1721 } 2101 mask_b = visual->blue_mask;
1722 ptr += bpl; 2102
1723 } 2103 /* boring lookup table pre-initialization */
2104 switch (srcImage->bits_per_pixel) {
2105 case 15:
2106 if ((mask_r != 0x7c00) ||
2107 (mask_g != 0x03e0) ||
2108 (mask_b != 0x001f))
2109 return;
2110 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2111 lookup_r = lookup;
2112 lookup_g = lookup+32;
2113 lookup_b = lookup+32+32;
2114 sh_r = 10;
2115 sh_g = 5;
2116 sh_b = 0;
2117 break;
2118 case 16:
2119 if ((mask_r != 0xf800) ||
2120 (mask_g != 0x07e0) ||
2121 (mask_b != 0x001f))
2122 return;
2123 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2124 lookup_r = lookup;
2125 lookup_g = lookup+32;
2126 lookup_b = lookup+32+64;
2127 sh_r = 11;
2128 sh_g = 5;
2129 sh_b = 0;
2130 break;
2131 case 24:
2132 if ((mask_r != 0xff0000) ||
2133 (mask_g != 0x00ff00) ||
2134 (mask_b != 0x0000ff))
2135 return;
2136 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2137 lookup_r = lookup;
2138 lookup_g = lookup+256;
2139 lookup_b = lookup+256+256;
2140 sh_r = 16;
2141 sh_g = 8;
2142 sh_b = 0;
2143 break;
2144 case 32:
2145 if ((mask_r != 0xff0000) ||
2146 (mask_g != 0x00ff00) ||
2147 (mask_b != 0x0000ff))
2148 return;
2149 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2150 lookup_r = lookup;
2151 lookup_g = lookup+256;
2152 lookup_b = lookup+256+256;
2153 sh_r = 16;
2154 sh_g = 8;
2155 sh_b = 0;
2156 break;
2157 default:
2158 return; /* we do not support this color depth */
2159 }
2160
2161 /* prepare limits for color transformation (each channel is handled separately) */
2162 if (shade < 0) {
2163 shade = -shade;
2164 if (shade < 0) shade = 0;
2165 if (shade > 100) shade = 100;
2166
2167 lower_lim_r = 65535-rm;
2168 lower_lim_g = 65535-gm;
2169 lower_lim_b = 65535-bm;
2170
2171 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2172 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2173 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2174
2175 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1724 } else { 2176 } else {
1725 for (y = h; --y >= 0;) { 2177 if (shade < 0) shade = 0;
1726 for (x = -w; x < 0; x++) { 2178 if (shade > 100) shade = 100;
1727 int r, g, b;
1728 2179
1729 b = ((uint16_t *) ptr)[x]; 2180 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1730 r = (b & 0x7c00) * rm; 2181
1731 g = (b & 0x3e0) * gm; 2182 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1732 b = (b & 0x1f) * bm; 2183 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1733 r |= (!(r >> 15) - 1); 2184 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1734 g |= (!(g >> 10) - 1); 2185 }
1735 b |= (!(b >> 5) - 1); 2186
1736 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2187 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1737 | ((g >> 8) & 0x3e0) 2188 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1738 | ((b >> 8) & 0x1f); 2189 {
1739 } 2190 unsigned int tmp;
1740 ptr += bpl; 2191
2192 tmp = lower_lim_r;
2193 lower_lim_r = lower_lim_b;
2194 lower_lim_b = tmp;
2195
2196 tmp = upper_lim_r;
2197 upper_lim_r = upper_lim_b;
2198 upper_lim_b = tmp;
2199 }
2200
2201 /* fill our lookup tables */
2202 for (i = 0; i <= mask_r>>sh_r; i++)
2203 {
2204 RUINT32T tmp;
2205 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2206 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2207 lookup_r[i] = (tmp/65535)<<sh_r;
2208 }
2209 for (i = 0; i <= mask_g>>sh_g; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2213 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2214 lookup_g[i] = (tmp/65535)<<sh_g;
2215 }
2216 for (i = 0; i <= mask_b>>sh_b; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2220 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2221 lookup_b[i] = (tmp/65535)<<sh_b;
2222 }
2223
2224 /* apply table to input image (replacing colors by newly calculated ones) */
2225 switch (srcImage->bits_per_pixel)
2226 {
2227 case 15:
2228 {
2229 unsigned short *p1, *pf, *p, *pl;
2230 p1 = (unsigned short *) srcImage->data;
2231 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2232 while (p1 < pf)
2233 {
2234 p = p1;
2235 pl = p1 + srcImage->width;
2236 for (; p < pl; p++)
1741 } 2237 {
2238 *p = lookup_r[(*p & 0x7c00)>>10] |
2239 lookup_g[(*p & 0x03e0)>> 5] |
2240 lookup_b[(*p & 0x001f)];
2241 }
2242 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1742 } 2243 }
1743} 2244 break;
1744 2245 }
1745/* RGB 16 */ 2246 case 16:
1746static void 2247 {
1747shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2248 unsigned short *p1, *pf, *p, *pl;
1748{ 2249 p1 = (unsigned short *) srcImage->data;
1749 unsigned char *ptr; 2250 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1750 int x, y; 2251 while (p1 < pf)
1751 2252 {
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2253 p = p1;
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2254 pl = p1 + srcImage->width;
1754 /* No saturation */ 2255 for (; p < pl; p++)
1755 for (y = h; --y >= 0;) {
1756 for (x = -w; x < 0; x++) {
1757 int r, g, b;
1758
1759 b = ((uint16_t *) ptr)[x];
1760 r = (b & 0xf800) * rm;
1761 g = (b & 0x7e0) * gm;
1762 b = (b & 0x1f) * bm;
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1764 | ((g >> 8) & 0x7e0)
1765 | ((b >> 8) & 0x1f);
1766 }
1767 ptr += bpl;
1768 } 2256 {
1769 } else { 2257 *p = lookup_r[(*p & 0xf800)>>11] |
1770 for (y = h; --y >= 0;) { 2258 lookup_g[(*p & 0x07e0)>> 5] |
1771 for (x = -w; x < 0; x++) { 2259 lookup_b[(*p & 0x001f)];
1772 int r, g, b;
1773
1774 b = ((uint16_t *) ptr)[x];
1775 r = (b & 0xf800) * rm;
1776 g = (b & 0x7e0) * gm;
1777 b = (b & 0x1f) * bm;
1778 r |= (!(r >> 16) - 1);
1779 g |= (!(g >> 11) - 1);
1780 b |= (!(b >> 5) - 1);
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1782 | ((g >> 8) & 0x7e0)
1783 | ((b >> 8) & 0x1f);
1784 } 2260 }
1785 ptr += bpl; 2261 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2262 }
2263 break;
2264 }
2265 case 24:
2266 {
2267 unsigned char *p1, *pf, *p, *pl;
2268 p1 = (unsigned char *) srcImage->data;
2269 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2270 while (p1 < pf)
2271 {
2272 p = p1;
2273 pl = p1 + srcImage->width * 3;
2274 for (; p < pl; p += 3)
1786 } 2275 {
2276 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2277 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2278 p[2] = lookup_r[(p[2] & 0x0000ff)];
2279 }
2280 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2281 }
1788} 2282 break;
2283 }
2284 case 32:
2285 {
2286 RUINT32T *p1, *pf, *p, *pl;
2287 p1 = (RUINT32T *) srcImage->data;
2288 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1789 2289
1790/* RGB 24 */ 2290 while (p1 < pf)
1791static void 2291 {
1792shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2292 p = p1;
1793{ 2293 pl = p1 + srcImage->width;
1794 unsigned char *ptr; 2294 for (; p < pl; p++)
1795 int x, y;
1796
1797 ptr = (unsigned char *)data + (w * 3);
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1799 /* No saturation */
1800 for (y = h; --y >= 0;) {
1801 for (x = -(w * 3); x < 0; x += 3) {
1802 int r, g, b;
1803
1804 if (byteorder.big_endian()) {
1805 r = (ptr[x + 0] * rm) >> 8;
1806 g = (ptr[x + 1] * gm) >> 8;
1807 b = (ptr[x + 2] * bm) >> 8;
1808 ptr[x + 0] = r;
1809 ptr[x + 1] = g;
1810 ptr[x + 2] = b;
1811 } else {
1812 r = (ptr[x + 2] * rm) >> 8;
1813 g = (ptr[x + 1] * gm) >> 8;
1814 b = (ptr[x + 0] * bm) >> 8;
1815 ptr[x + 2] = r;
1816 ptr[x + 1] = g;
1817 ptr[x + 0] = b;
1818 }
1819 }
1820 ptr += bpl;
1821 } 2295 {
1822 } else { 2296 *p = lookup_r[(*p & 0xff0000)>>16] |
1823 for (y = h; --y >= 0;) { 2297 lookup_g[(*p & 0x00ff00)>> 8] |
1824 for (x = -(w * 3); x < 0; x += 3) { 2298 lookup_b[(*p & 0x0000ff)] |
1825 int r, g, b; 2299 (*p & ~0xffffff);
1826
1827 if (byteorder.big_endian()) {
1828 r = (ptr[x + 0] * rm) >> 8;
1829 g = (ptr[x + 1] * gm) >> 8;
1830 b = (ptr[x + 2] * bm) >> 8;
1831
1832 r |= (!(r >> 8) - 1);
1833 g |= (!(g >> 8) - 1);
1834 b |= (!(b >> 8) - 1);
1835
1836 ptr[x + 0] = r;
1837 ptr[x + 1] = g;
1838 ptr[x + 2] = b;
1839 } else {
1840 r = (ptr[x + 2] * rm) >> 8;
1841 g = (ptr[x + 1] * gm) >> 8;
1842 b = (ptr[x + 0] * bm) >> 8;
1843
1844 r |= (!(r >> 8) - 1);
1845 g |= (!(g >> 8) - 1);
1846 b |= (!(b >> 8) - 1);
1847
1848 ptr[x + 2] = r;
1849 ptr[x + 1] = g;
1850 ptr[x + 0] = b;
1851 }
1852 } 2300 }
1853 ptr += bpl; 2301 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1854 } 2302 }
2303 break;
2304 }
1855 } 2305 }
1856}
1857 2306
1858/* RGB 32 */ 2307 free (lookup);
1859static void
1860shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1861{
1862 unsigned char *ptr;
1863 int x, y;
1864
1865 ptr = (unsigned char *)data + (w * 4);
1866 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1867 /* No saturation */
1868 for (y = h; --y >= 0;) {
1869 if (byteorder.big_endian()) {
1870 for (x = -(w * 4); x < 0; x += 4) {
1871 int r, g, b;
1872
1873 r = (ptr[x + 1] * rm) >> 8;
1874 g = (ptr[x + 2] * gm) >> 8;
1875 b = (ptr[x + 3] * bm) >> 8;
1876 ptr[x + 1] = r;
1877 ptr[x + 2] = g;
1878 ptr[x + 3] = b;
1879 }
1880 } else {
1881 for (x = -(w * 4); x < 0; x += 4) {
1882 int r, g, b;
1883
1884 r = (ptr[x + 2] * rm) >> 8;
1885 g = (ptr[x + 1] * gm) >> 8;
1886 b = (ptr[x + 0] * bm) >> 8;
1887 ptr[x + 2] = r;
1888 ptr[x + 1] = g;
1889 ptr[x + 0] = b;
1890 }
1891 }
1892 ptr += bpl;
1893 }
1894 } else {
1895 for (y = h; --y >= 0;) {
1896 for (x = -(w * 4); x < 0; x += 4) {
1897 int r, g, b;
1898
1899 if (byteorder.big_endian()) {
1900 r = (ptr[x + 1] * rm) >> 8;
1901 g = (ptr[x + 2] * gm) >> 8;
1902 b = (ptr[x + 3] * bm) >> 8;
1903
1904 r |= (!(r >> 8) - 1);
1905 g |= (!(g >> 8) - 1);
1906 b |= (!(b >> 8) - 1);
1907
1908 ptr[x + 1] = r;
1909 ptr[x + 2] = g;
1910 ptr[x + 3] = b;
1911 } else {
1912 r = (ptr[x + 2] * rm) >> 8;
1913 g = (ptr[x + 1] * gm) >> 8;
1914 b = (ptr[x + 0] * bm) >> 8;
1915
1916 r |= (!(r >> 8) - 1);
1917 g |= (!(g >> 8) - 1);
1918 b |= (!(b >> 8) - 1);
1919
1920 ptr[x + 2] = r;
1921 ptr[x + 1] = g;
1922 ptr[x + 0] = b;
1923 }
1924 }
1925 ptr += bpl;
1926 }
1927 }
1928} 2308}
1929
1930#endif 2309#endif
1931 2310
1932/* 2311/*
1933 * Check our parents are still who we think they are. 2312 * Check our parents are still who we think they are.
1934 * Do transparency updates if required 2313 * Do transparency updates if required
… …
1944 Pixmap rootpixmap = None; 2323 Pixmap rootpixmap = None;
1945 XWindowAttributes wattr, wrootattr; 2324 XWindowAttributes wattr, wrootattr;
1946 2325
1947 pchanged = 0; 2326 pchanged = 0;
1948 2327
1949 if (!(Options & Opt_transparent)) 2328 if (!(options & Opt_transparent))
1950 return pchanged; /* Don't try any more */ 2329 return pchanged; /* Don't try any more */
1951 2330
1952 XGetWindowAttributes (display->display, display->root, &wrootattr); 2331 XGetWindowAttributes (display->display, display->root, &wrootattr);
1953 rootdepth = wrootattr.depth; 2332 rootdepth = wrootattr.depth;
1954 2333
… …
1957 if (rootdepth != wattr.depth) 2336 if (rootdepth != wattr.depth)
1958 { 2337 {
1959 if (am_transparent) 2338 if (am_transparent)
1960 { 2339 {
1961 pchanged = 1; 2340 pchanged = 1;
1962 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1963 am_transparent = am_pixmap_trans = 0; 2342 am_transparent = am_pixmap_trans = 0;
1964 } 2343 }
1965 2344
1966 return pchanged; /* Don't try any more */ 2345 return pchanged; /* Don't try any more */
1967 } 2346 }
… …
1983 i = (xa[XA_XSETROOTID] 2362 i = (xa[XA_XSETROOTID]
1984 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1985 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1986 &nitems, &bytes_after, &prop) == Success); 2365 &nitems, &bytes_after, &prop) == Success);
1987 2366
1988 if (!i || prop == NULL) 2367 if (!i || prop == NULL
2368#if TINTING
2369 || !rs[Rs_color + Color_tint]
2370#endif
2371 )
1989 have_pixmap = 0; 2372 have_pixmap = 0;
1990 else 2373 else
1991 { 2374 {
1992 have_pixmap = 1; 2375 have_pixmap = 1;
1993 rootpixmap = *(Pixmap *)prop; 2376 rootpixmap = *(Pixmap *)prop;
… …
2026 sy = 0; 2409 sy = 0;
2027 } 2410 }
2028 2411
2029 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2030 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2414
2415 XSync (display->display, False);
2031 allowedxerror = -1; 2416 allowedxerror = -1;
2032 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2033 2418
2034 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2035 /* XXX: may need a delay here? */ 2420 /* XXX: may need a delay here? */
… …
2055 XFreePixmap (display->display, TermWin.pixmap); 2440 XFreePixmap (display->display, TermWin.pixmap);
2056 2441
2057#if TINTING 2442#if TINTING
2058 if (ISSET_PIXCOLOR (Color_tint)) 2443 if (ISSET_PIXCOLOR (Color_tint))
2059 { 2444 {
2060 unsigned short shade, rm, gm, bm; 2445 unsigned short rm, gm, bm;
2446 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2061 2447
2062 PixColors[Color_tint].get (display, rm, gm, bm); 2448 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2063 2449
2064 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2450 ShadeXImage (display, image, shade, rm, gm, bm);
2065
2066 /* Determine bitshift and bitmask values */
2067 switch (image->bits_per_pixel)
2068 {
2069 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2070 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 }
2074 } 2451 }
2075#endif 2452#endif
2076 2453
2077 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2078 szHint.width, szHint.height, image->depth); 2455 szHint.width, szHint.height, image->depth);
2079 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2080 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2081 nx, ny, image->width, image->height); 2458 nx, ny, image->width, image->height);
2082 XFreeGC (display->display, gc); 2459 XFreeGC (display->display, gc);
2083 XDestroyImage (image); 2460 XDestroyImage (image);
2084 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2085 TermWin.pixmap); 2462 XClearWindow (display->display, TermWin.parent[0]);
2086 2463
2087 if (!am_transparent || !am_pixmap_trans) 2464 if (!am_transparent || !am_pixmap_trans)
2088 pchanged = 1; 2465 pchanged = 1;
2089 2466
2090 am_transparent = am_pixmap_trans = 1; 2467 am_transparent = am_pixmap_trans = 1;
2091 } 2468 }
2092 } 2469 }
2093 2470
2094 if (!am_pixmap_trans) 2471 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2473 else
2095 { 2474 {
2096 unsigned int n; 2475 unsigned int n;
2097 /* 2476 /*
2098 * InheritPixmap transparency 2477 * InheritPixmap transparency
2099 */ 2478 */
2100 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2101 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2102 { 2480 {
2103 oldp = TermWin.parent[i]; 2481 oldp = TermWin.parent[i];
2104 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2482 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2105 &TermWin.parent[i], &list, &n); 2483 &TermWin.parent[i], &list, &n);
2106 XFree (list); 2484 XFree (list);
2107 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2108 2485
2109 if (TermWin.parent[i] == display->root) 2486 if (TermWin.parent[i] == display->root)
2110 { 2487 {
2111 if (oldp != None) 2488 if (oldp != None)
2112 pchanged = 1; 2489 pchanged = 1;
… …
2123 if (pchanged) 2500 if (pchanged)
2124 { 2501 {
2125 for (; n < (unsigned int)i; n++) 2502 for (; n < (unsigned int)i; n++)
2126 { 2503 {
2127 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2128 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2129 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2130 { 2506 {
2131 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2132 break; 2508 break;
2133 } 2509 }
2134 } 2510 }
2135 } 2511 }
2136 2512
2137 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2138 { 2514 {
2139 D_X ((stderr, "InheritPixmap Turning off"));
2140 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2141 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2142 am_transparent = 0; 2517 am_transparent = 0;
2143 /* XXX: also turn off Opt_transparent? */ 2518 /* XXX: also turn off Opt_transparent? */
2144 } 2519 }
2145 else 2520 else
2146 { 2521 {
2147#if WAIT_FOR_WM 2522#if WAIT_FOR_WM
2148 /* wait (an arbitrary period) for the WM to do its thing 2523 /* wait (an arbitrary period) for the WM to do its thing
2149 * needed for fvwm2.2.2 (and before?) */ 2524 * needed for fvwm2.2.2 (and before?) */
2150 sleep (1); 2525 sleep (1);
2151#endif 2526#endif
2152 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2153 for (n = 0; n < (unsigned int)i; n++) 2527 for (n = 0; n < (unsigned int)i; n++)
2528 {
2154 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]);
2531 }
2155 2532
2156 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2157 am_transparent = 1; 2534 am_transparent = 1;
2158 } 2535 }
2159 2536
2160 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2161 TermWin.parent[i] = None; 2538 TermWin.parent[i] = None;
2539 }
2540
2541 if (scrollBar.win)
2542 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle ();
2545 scrollbar_show (0);
2546 }
2547
2548 if (am_transparent)
2549 {
2550 want_refresh = want_full_refresh = 1;
2551 if (am_pixmap_trans)
2552 flush ();
2162 } 2553 }
2163 2554
2164 return pchanged; 2555 return pchanged;
2165} 2556}
2166#endif 2557#endif
… …
2185 if (ch == NOCHAR) // TODO: improve 2576 if (ch == NOCHAR) // TODO: improve
2186 break; 2577 break;
2187 2578
2188 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2189 { 2580 {
2581 if (!seen_input)
2582 {
2583 seen_input = 1;
2584 // many badly-written programs (e.g. jed) contain a race condition:
2585 // they first read the screensize and then install a SIGWINCH handler.
2586 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized.
2591 if (seen_resize)
2592 kill (-cmd_pid, SIGWINCH);
2593 }
2594
2190 /* Read a text string from the input buffer */ 2595 /* Read a text string from the input buffer */
2191 unicode_t buf[UBUFSIZ]; 2596 unicode_t buf[UBUFSIZ];
2192 bool refreshnow = false; 2597 bool refreshnow = false;
2193 int nlines = 0; 2598 int nlines = 0;
2194 unicode_t *str = buf; 2599 unicode_t *str = buf;
2195 2600
2196 *str++ = ch;
2197
2198 for (;;) 2601 for (;;)
2199 { 2602 {
2200 seq_begin = cmdbuf_ptr;
2201 ch = next_char ();
2202
2203 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2204 break; 2604 break;
2205 2605
2206 *str++ = ch; 2606 *str++ = ch;
2207 2607
2208 if (ch == C0_LF) 2608 if (ch == C0_LF)
2209 { 2609 {
2210 nlines++; 2610 nlines++;
2211 refresh_count++; 2611 refresh_count++;
2212 2612
2213 if (! (Options & Opt_jumpScroll) 2613 if (!(options & Opt_jumpScroll)
2214 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2215 { 2615 {
2216 refreshnow = true; 2616 refreshnow = true;
2217 flag = true;
2218 ch = NOCHAR; 2617 ch = NOCHAR;
2219 break; 2618 break;
2220 } 2619 }
2221 2620
2222 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2223 if (nlines >= TermWin.nrow - 1) 2622 if (nlines >= TermWin.nrow - 1)
2224 { 2623 {
2225 scr_add_lines (buf, nlines, str - buf); 2624 scr_add_lines (buf, nlines, str - buf);
2226 nlines = 0; 2625 nlines = 0;
2227 str = buf; 2626 str = buf;
… …
2231 if (str >= buf + UBUFSIZ) 2630 if (str >= buf + UBUFSIZ)
2232 { 2631 {
2233 ch = NOCHAR; 2632 ch = NOCHAR;
2234 break; 2633 break;
2235 } 2634 }
2635
2636 seq_begin = cmdbuf_ptr;
2637 ch = next_char ();
2236 } 2638 }
2237 2639
2238 scr_add_lines (buf, nlines, str - buf); 2640 scr_add_lines (buf, nlines, str - buf);
2239 2641
2240 /* 2642 /*
2241 * If there have been a lot of new lines, then update the screen 2643 * If there have been a lot of new lines, then update the screen
2242 * What the heck I'll cheat and only refresh less than every page-full. 2644 * What the heck I'll cheat and only refresh less than every page-full.
2243 * the number of pages between refreshes is refresh_limit, which 2645 * the number of pages between refreshes is refresh_limit, which
2244 * is incremented here because we must be doing flat-out scrolling. 2646 * is incremented here because we must be doing flat-out scrolling.
2245 *
2246 * refreshing should be correct for small scrolls, because of the
2247 * time-out
2248 */ 2647 */
2249 if (refreshnow) 2648 if (refreshnow)
2250 { 2649 {
2251 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2252 refresh_limit++; 2651 refresh_limit++;
2253 else 2652 else
2653 {
2654 flag = true;
2254 scr_refresh (refresh_type); 2655 scr_refresh (refresh_type);
2656 }
2255 } 2657 }
2256 2658
2257 } 2659 }
2258 else 2660 else
2259 { 2661 {
… …
2273 } 2675 }
2274 2676
2275 return flag; 2677 return flag;
2276} 2678}
2277 2679
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2278// read the next character 2689// read the next character
2279unicode_t 2690unicode_t
2280rxvt_term::next_char () 2691rxvt_term::next_char ()
2281{ 2692{
2282 while (cmdbuf_ptr < cmdbuf_endp) 2693 while (cmdbuf_ptr < cmdbuf_endp)
… …
2313 */ 2724 */
2314unicode_t 2725unicode_t
2315rxvt_term::cmd_getc () 2726rxvt_term::cmd_getc ()
2316{ 2727{
2317 unicode_t c = next_char (); 2728 unicode_t c = next_char ();
2729
2730 if (c == NOCHAR)
2731 throw out_of_input;
2732
2733 return c;
2734}
2735
2736unicode_t
2737rxvt_term::cmd_get8 ()
2738{
2739 unicode_t c = next_octet ();
2318 2740
2319 if (c == NOCHAR) 2741 if (c == NOCHAR)
2320 throw out_of_input; 2742 throw out_of_input;
2321 2743
2322 return c; 2744 return c;
… …
2423 process_escape_seq (); 2845 process_escape_seq ();
2424 break; 2846 break;
2425 case C0_ENQ: /* terminal Status */ 2847 case C0_ENQ: /* terminal Status */
2426 if (rs[Rs_answerbackstring]) 2848 if (rs[Rs_answerbackstring])
2427 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2428 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2429 else 2851 else
2430 tt_write ((unsigned char *)VT100_ANS, 2852 tt_write ((unsigned char *)VT100_ANS,
2431 (unsigned int)STRLEN (VT100_ANS)); 2853 (unsigned int)strlen (VT100_ANS));
2432 break; 2854 break;
2433 case C0_BEL: /* bell */ 2855 case C0_BEL: /* bell */
2434 scr_bell (); 2856 scr_bell ();
2435 break; 2857 break;
2436 case C0_BS: /* backspace */ 2858 case C0_BS: /* backspace */
… …
2452 break; 2874 break;
2453 case C0_SI: /* shift in - acs */ 2875 case C0_SI: /* shift in - acs */
2454 scr_charset_choose (0); 2876 scr_charset_choose (0);
2455 break; 2877 break;
2456 2878
2879#ifdef EIGHT_BIT_CONTROLS
2457 // 8-bit controls 2880 // 8-bit controls
2458 case 0x90: /* DCS */ 2881 case 0x90: /* DCS */
2459 process_dcs_seq (); 2882 process_dcs_seq ();
2460 break; 2883 break;
2461 case 0x9b: /* CSI */ 2884 case 0x9b: /* CSI */
2462 process_csi_seq (); 2885 process_csi_seq ();
2463 break; 2886 break;
2464 case 0x9d: /* CSI */ 2887 case 0x9d: /* CSI */
2465 process_osc_seq (); 2888 process_osc_seq ();
2466 break; 2889 break;
2890#endif
2467 } 2891 }
2468} 2892}
2469/*}}} */ 2893/*}}} */
2470 2894
2471 2895
… …
2533void 2957void
2534rxvt_term::process_escape_seq () 2958rxvt_term::process_escape_seq ()
2535{ 2959{
2536 unicode_t ch = cmd_getc (); 2960 unicode_t ch = cmd_getc ();
2537 2961
2538 if (PrivateModes & PrivMode_vt52) 2962 if (priv_modes & PrivMode_vt52)
2539 { 2963 {
2540 process_escape_vt52 (ch); 2964 process_escape_vt52 (ch);
2541 return; 2965 return;
2542 } 2966 }
2543 2967
… …
2558 scr_charset_set (2, (unsigned int)cmd_getc ()); 2982 scr_charset_set (2, (unsigned int)cmd_getc ());
2559 break; 2983 break;
2560 case '+': 2984 case '+':
2561 scr_charset_set (3, (unsigned int)cmd_getc ()); 2985 scr_charset_set (3, (unsigned int)cmd_getc ());
2562 break; 2986 break;
2563#ifndef NO_FRILLS 2987#if ENABLE_FRILLS
2564 case '6': 2988 case '6':
2565 scr_backindex (); 2989 scr_backindex ();
2566 break; 2990 break;
2567#endif 2991#endif
2568 case '7': 2992 case '7':
2569 scr_cursor (SAVE); 2993 scr_cursor (SAVE);
2570 break; 2994 break;
2571 case '8': 2995 case '8':
2572 scr_cursor (RESTORE); 2996 scr_cursor (RESTORE);
2573 break; 2997 break;
2574#ifndef NO_FRILLS 2998#if ENABLE_FRILLS
2575 case '9': 2999 case '9':
2576 scr_forwardindex (); 3000 scr_forwardindex ();
2577 break; 3001 break;
2578#endif 3002#endif
2579 case '=': 3003 case '=':
… …
2878 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2879 break; 3303 break;
2880 3304
2881 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2882 tt_write ((const unsigned char *)VT100_ANS, 3306 tt_write ((const unsigned char *)VT100_ANS,
2883 (unsigned int) (sizeof (VT100_ANS) - 1)); 3307 (unsigned int) (sizeof (VT100_ANS) - 1));
2884 break; 3308 break;
2885 3309
2886 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2887 process_sgr_mode (nargs, arg); 3311 process_sgr_mode (nargs, arg);
2888 break; 3312 break;
… …
2895 break; 3319 break;
2896 case 6: /* CPR requested */ 3320 case 6: /* CPR requested */
2897 scr_report_position (); 3321 scr_report_position ();
2898 break; 3322 break;
2899 case 7: /* unofficial extension */ 3323 case 7: /* unofficial extension */
2900 if (Options & Opt_insecure) 3324 if (options & Opt_insecure)
2901 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3325 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2902 break; 3326 break;
2903 case 8: /* unofficial extension */ 3327 case 8: /* unofficial extension */
2904 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2905 break; 3329 break;
2906 } 3330 }
… …
2942 break; 3366 break;
2943 3367
2944 case CSI_RM: /* 8.3.107: RESET MODE */ 3368 case CSI_RM: /* 8.3.107: RESET MODE */
2945 if (arg[0] == 4) 3369 if (arg[0] == 4)
2946 scr_insert_mode (0); 3370 scr_insert_mode (0);
3371 else if (arg[0] == 20)
3372 priv_modes &= ~PrivMode_LFNL;
2947 break; 3373 break;
2948 3374
2949 case CSI_SM: /* 8.3.126: SET MODE */ 3375 case CSI_SM: /* 8.3.126: SET MODE */
2950 if (arg[0] == 4) 3376 if (arg[0] == 4)
2951 scr_insert_mode (1); 3377 scr_insert_mode (1);
3378 else if (arg[0] == 20)
3379 priv_modes |= PrivMode_LFNL;
2952 break; 3380 break;
2953 3381
2954 /* 3382 /*
2955 * PRIVATE USE beyond this point. All CSI_7? sequences here 3383 * PRIVATE USE beyond this point. All CSI_7? sequences here
2956 */ 3384 */
… …
2968 break; 3396 break;
2969 case CSI_75: 3397 case CSI_75:
2970 scr_cursor (RESTORE); 3398 scr_cursor (RESTORE);
2971 break; 3399 break;
2972 3400
2973#ifndef NO_FRILLS 3401#if ENABLE_FRILLS
2974 case CSI_74: 3402 case CSI_74:
2975 process_window_ops (arg, nargs); 3403 process_window_ops (arg, nargs);
2976 break; 3404 break;
2977#endif 3405#endif
2978 3406
… …
2985 break; 3413 break;
2986 } 3414 }
2987} 3415}
2988/*}}} */ 3416/*}}} */
2989 3417
2990#ifndef NO_FRILLS 3418#if ENABLE_FRILLS
2991/* ARGSUSED */ 3419/* ARGSUSED */
2992void 3420void
2993rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3421rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2994{ 3422{
2995 int x, y; 3423 int x, y;
… …
3062 break; 3490 break;
3063 case 19: /* report window size (chars) */ 3491 case 19: /* report window size (chars) */
3064 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3065 break; 3493 break;
3066 case 20: /* report icon label */ 3494 case 20: /* report icon label */
3067 if (Options & Opt_insecure)
3068 { 3495 {
3069 char *s; 3496 char *s;
3070 XGetIconName (display->display, TermWin.parent[0], &s); 3497 XGetIconName (display->display, TermWin.parent[0], &s);
3071 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s);
3072 } 3500 }
3073 break; 3501 break;
3074 case 21: /* report window title */ 3502 case 21: /* report window title */
3075 if (Options & Opt_insecure)
3076 { 3503 {
3077 char *s; 3504 char *s;
3078 XFetchName (display->display, TermWin.parent[0], &s); 3505 XFetchName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s);
3080 } 3508 }
3081 break; 3509 break;
3082 } 3510 }
3083} 3511}
3084#endif 3512#endif
3085 3513
… …
3089 * ends_how is terminator used. returned input must be free()'d 3517 * ends_how is terminator used. returned input must be free()'d
3090 */ 3518 */
3091unsigned char * 3519unsigned char *
3092rxvt_term::get_to_st (unicode_t &ends_how) 3520rxvt_term::get_to_st (unicode_t &ends_how)
3093{ 3521{
3094 int seen_esc = 0; /* seen escape? */ 3522 unicode_t ch;
3523 bool seen_esc = false;
3095 unsigned int n = 0; 3524 unsigned int n = 0;
3096 unsigned char *s;
3097 unicode_t ch;
3098 unsigned char string[STRING_MAX]; 3525 wchar_t string[STRING_MAX];
3099 3526
3100 while ((ch = cmd_getc ())) 3527 while ((ch = cmd_getc ()) != NOCHAR)
3101 { 3528 {
3102 if (ch == C0_BEL || ch == CHAR_ST)
3103 break;
3104
3105 if (seen_esc) 3529 if (seen_esc)
3530 {
3106 if (ch == 0x5c) /* 7bit ST */ 3531 if (ch == 0x5c) /* 7bit ST */
3107 break; 3532 break;
3108 else 3533 else
3109 return NULL; 3534 return NULL;
3110 3535 }
3111 if (ch == C0_ESC) 3536 else if (ch == C0_ESC)
3112 { 3537 {
3113 seen_esc = 1; 3538 seen_esc = true;
3114 continue; 3539 continue;
3115 } 3540 }
3541 else if (ch == C0_BEL || ch == CHAR_ST)
3542 break;
3116 else if (ch == C0_HT) 3543 else if (ch < 0x20)
3117 ch = ' '; /* translate '\t' to space */
3118 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3119 return NULL; /* other control character - exit */ 3544 return NULL; /* other control character - exit */
3545
3546 seen_esc = false;
3120 3547
3121 if (n >= sizeof (string) - 1) 3548 if (n >= sizeof (string) - 1)
3122 // stop at some sane length 3549 // stop at some sane length
3123 return NULL; 3550 return NULL;
3124 3551
3552 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 ();
3554 else
3125 string[n++] = ch; 3555 string[n++] = ch;
3126 seen_esc = 0;
3127 } 3556 }
3128 3557
3129 string[n++] = '\0'; 3558 string[n++] = '\0';
3130 3559
3131 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3132 return NULL;
3133
3134 ends_how = (ch == 0x5c ? C0_ESC : ch); 3560 ends_how = (ch == 0x5c ? C0_ESC : ch);
3135 STRNCPY (s, string, n); 3561
3136 return s; 3562 return (unsigned char *)rxvt_wcstombs (string);
3137} 3563}
3138 3564
3139/*----------------------------------------------------------------------*/ 3565/*----------------------------------------------------------------------*/
3140/* 3566/*
3141 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3185void 3611void
3186rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3187{ 3613{
3188 if (str[0] == '?' && !str[1]) 3614 if (str[0] == '?' && !str[1])
3189 { 3615 {
3190 if (Options & Opt_insecure)
3191 {
3192 unsigned short r, g, b; 3616 unsigned short r, g, b;
3193 PixColors[color].get (display, r, g, b); 3617 pix_colors_focused[color].get (display, r, g, b);
3194 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3618 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3195 }
3196 } 3619 }
3197 else 3620 else
3198 set_window_color (color, str); 3621 set_window_color (color, str);
3199} 3622}
3200 3623
… …
3228{ 3651{
3229 int changed = 0; 3652 int changed = 0;
3230 int color; 3653 int color;
3231 char *buf, *name; 3654 char *buf, *name;
3232 bool query = str[0] == '?' && !str[1]; 3655 bool query = str[0] == '?' && !str[1];
3656 int saveop = op;
3233 3657
3234 assert (str != NULL); 3658 assert (str != NULL);
3235 switch (op) 3659 switch (op)
3236 { 3660 {
3237 case XTerm_name: 3661 case XTerm_name:
… …
3244 set_title (str); 3668 set_title (str);
3245 break; 3669 break;
3246 case XTerm_property: 3670 case XTerm_property:
3247 if (str[0] == '?') 3671 if (str[0] == '?')
3248 { 3672 {
3249 Atom prop = XInternAtom (display->display, str + 1, True); 3673 Atom prop = display->atom (str + 1);
3250 Atom actual_type; 3674 Atom actual_type;
3251 int actual_format; 3675 int actual_format;
3252 unsigned long nitems; 3676 unsigned long nitems;
3253 unsigned long bytes_after; 3677 unsigned long bytes_after;
3254 unsigned char *value = 0; 3678 unsigned char *value = 0;
… …
3272 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3696 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3273 3697
3274 if (eq) 3698 if (eq)
3275 { 3699 {
3276 *eq = 0; 3700 *eq = 0;
3277 XChangeProperty (display->display, TermWin.parent[0], 3701 set_utf8_property (display->atom (str), eq + 1);
3278 display->atom (str), XA_STRING, 8,
3279 PropModeReplace, (unsigned char *)eq + 1,
3280 strlen (eq + 1));
3281 } 3702 }
3282 else 3703 else
3283 XDeleteProperty (display->display, TermWin.parent[0], 3704 XDeleteProperty (display->display, TermWin.parent[0],
3284 display->atom (str)); 3705 display->atom (str));
3285 } 3706 }
3286 break; 3707 break;
3287 3708
3288 case XTerm_Color: 3709 case XTerm_Color:
3289 for (buf = (char *)str; buf && *buf;) 3710 for (buf = (char *)str; buf && *buf;)
3290 { 3711 {
3291 if ((name = STRCHR (buf, ';')) == NULL) 3712 if ((name = strchr (buf, ';')) == NULL)
3292 break; 3713 break;
3293 3714
3294 *name++ = '\0'; 3715 *name++ = '\0';
3295 color = atoi (buf); 3716 color = atoi (buf);
3296 3717
3297 if (color < 0 || color >= TOTAL_COLORS) 3718 if (color < 0 || color >= TOTAL_COLORS)
3298 break; 3719 break;
3299 3720
3300 if ((buf = STRCHR (name, ';')) != NULL) 3721 if ((buf = strchr (name, ';')) != NULL)
3301 *buf++ = '\0'; 3722 *buf++ = '\0';
3302 3723
3303 if (name[0] == '?' && !name[1]) 3724 if (name[0] == '?' && !name[1])
3304 { 3725 {
3305 if (Options & Opt_insecure)
3306 {
3307 unsigned short r, g, b; 3726 unsigned short r, g, b;
3308 PixColors[color + minCOLOR].get (display, r, g, b); 3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3309 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3310 }
3311 } 3729 }
3312 else 3730 else
3313 set_window_color (color + minCOLOR, name); 3731 set_window_color (color + minCOLOR, name);
3314 } 3732 }
3315 break; 3733 break;
… …
3332 break; 3750 break;
3333#ifndef NO_BOLD_UNDERLINE_REVERSE 3751#ifndef NO_BOLD_UNDERLINE_REVERSE
3334 case XTerm_Color_BD: 3752 case XTerm_Color_BD:
3335 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3336 break; 3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3337 case XTerm_Color_UL: 3758 case XTerm_Color_UL:
3338 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3339 break; 3760 break;
3340 case XTerm_Color_RV: 3761 case XTerm_Color_RV:
3341 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break;
3764#endif
3765#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3768 check_our_parents ();
3769 if (am_transparent)
3770 want_full_refresh = want_refresh = 1;
3342 break; 3771 break;
3343#endif 3772#endif
3344 3773
3345 case XTerm_Pixmap: 3774 case XTerm_Pixmap:
3346 if (*str != ';') 3775 if (*str != ';')
… …
3349 scale_pixmap (""); /* reset to default scaling */ 3778 scale_pixmap (""); /* reset to default scaling */
3350 set_bgPixmap (str); /* change pixmap */ 3779 set_bgPixmap (str); /* change pixmap */
3351#endif 3780#endif
3352 scr_touch (true); 3781 scr_touch (true);
3353 } 3782 }
3354 while ((str = STRCHR (str, ';')) != NULL) 3783 while ((str = strchr (str, ';')) != NULL)
3355 { 3784 {
3356 str++; 3785 str++;
3357#if XPM_BACKGROUND 3786#if XPM_BACKGROUND
3358 changed += scale_pixmap (str); 3787 changed += scale_pixmap (str);
3359#endif 3788#endif
… …
3378 case XTerm_logfile: 3807 case XTerm_logfile:
3379 // TODO, when secure mode? 3808 // TODO, when secure mode?
3380 break; 3809 break;
3381 3810
3382 case XTerm_font: 3811 case XTerm_font:
3812 op = URxvt_font;
3813 case URxvt_font:
3814#if ENABLE_STYLES
3815 case URxvt_boldFont:
3816 case URxvt_italicFont:
3817 case URxvt_boldItalicFont:
3818#endif
3383 if (query) 3819 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3823 resp);
3824 else
3384 { 3825 {
3385 if (Options & Opt_insecure) 3826 const char *&res = rs[Rs_font + (op - URxvt_font)];
3386 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3827
3387 TermWin.fontset->fontdesc 3828 res = strdup (str);
3388 ? TermWin.fontset->fontdesc 3829 allocated.push_back ((void *)res);
3389 : "", 3830 set_fonts ();
3390 resp);
3391 } 3831 }
3392 else
3393 change_font (str);
3394 break; 3832 break;
3395 3833
3396#ifndef NO_FRILLS 3834#if ENABLE_FRILLS
3397 case XTerm_locale: 3835 case XTerm_locale:
3398 if (query) 3836 if (query)
3399 {
3400 if (Options & Opt_insecure)
3401 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3402 }
3403 else 3838 else
3404 { 3839 {
3405 set_locale (str); 3840 set_locale (str);
3406# ifdef USE_XIM 3841# ifdef USE_XIM
3407 im_cb (); 3842 im_cb ();
3408# endif 3843# endif
3409 } 3844 }
3410 break; 3845 break;
3411
3412 case XTerm_findfont:
3413 if (Options & Opt_insecure)
3414 {
3415 int fid = TermWin.fontset->find_font (atoi (str));
3416 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3417 fid, (*TermWin.fontset)[fid]->name, resp);
3418 }
3419 break;
3420#endif 3846#endif
3421 3847
3422#ifdef MENUBAR 3848#ifdef MENUBAR
3423 case XTerm_Menu: 3849 case XTerm_Menu:
3424 if (Options & Opt_insecure) 3850 if (options & Opt_insecure)
3425 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3426 break; 3852 break;
3427#endif 3853#endif
3428#if 0 3854#if 0
3429 case XTerm_dumpscreen: /* no error notices */ 3855 case XTerm_dumpscreen: /* no error notices */
… …
3456{ 3882{
3457 int state; 3883 int state;
3458 3884
3459 if (mode == 's') 3885 if (mode == 's')
3460 { 3886 {
3461 SavedModes |= (PrivateModes & bit); 3887 SavedModes |= (priv_modes & bit);
3462 return -1; 3888 return -1;
3463 } 3889 }
3464 else 3890 else
3465 { 3891 {
3466 if (mode == 'r') 3892 if (mode == 'r')
3467 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3893 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3468 else 3894 else
3469 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3895 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3470 PrivMode (state, bit); 3896 PrivMode (state, bit);
3471 } 3897 }
3472 3898
3473 return state; 3899 return state;
3474} 3900}
… …
3492 { 3, PrivMode_132 }, 3918 { 3, PrivMode_132 },
3493 { 4, PrivMode_smoothScroll }, 3919 { 4, PrivMode_smoothScroll },
3494 { 5, PrivMode_rVideo }, 3920 { 5, PrivMode_rVideo },
3495 { 6, PrivMode_relOrigin }, 3921 { 6, PrivMode_relOrigin },
3496 { 7, PrivMode_Autowrap }, 3922 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode
3497 { 9, PrivMode_MouseX10 }, 3924 { 9, PrivMode_MouseX10 },
3498#ifdef menuBar_esc 3925#ifdef menuBar_esc
3499 { menuBar_esc, PrivMode_menuBar }, 3926 { menuBar_esc, PrivMode_menuBar },
3500#endif 3927#endif
3928 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor },
3501#ifdef scrollBar_esc 3930#ifdef scrollBar_esc
3502 { scrollBar_esc, PrivMode_scrollBar }, 3931 { scrollBar_esc, PrivMode_scrollBar },
3503#endif 3932#endif
3504 // 18, 19 printing-related
3505 { 25, PrivMode_VisibleCursor },
3506 // 30 show scrollbar rxvt. extension
3507 { 35, PrivMode_ShiftKeys }, // rxvt extension 3933 { 35, PrivMode_ShiftKeys }, // rxvt extension
3508 { 40, PrivMode_132OK }, 3934 { 40, PrivMode_132OK },
3509 // 41 xterm more fixes NYI 3935 // 41 xterm more fixes NYI
3510 // 45 margin bell NYI 3936 // 45 margin bell NYI
3511 // 46 start logging 3937 // 46 start logging
… …
3552 3978
3553 /* extra handling for values with state unkept */ 3979 /* extra handling for values with state unkept */
3554 switch (arg[i]) 3980 switch (arg[i])
3555 { 3981 {
3556 case 1048: /* alternative cursor save */ 3982 case 1048: /* alternative cursor save */
3983 case 1049:
3557 if (Options & Opt_secondaryScreen) 3984 if (options & Opt_secondaryScreen)
3558 if (mode == 0) 3985 if (mode == 0)
3559 scr_cursor (RESTORE); 3986 scr_cursor (RESTORE);
3560 else if (mode == 1) 3987 else if (mode == 1)
3561 scr_cursor (SAVE); 3988 scr_cursor (SAVE);
3562 break; 3989 break;
… …
3573 * within VT52 mode 4000 * within VT52 mode
3574 */ 4001 */
3575 PrivMode (1, PrivMode_vt52); 4002 PrivMode (1, PrivMode_vt52);
3576 break; 4003 break;
3577 case 3: /* 80/132 */ 4004 case 3: /* 80/132 */
3578 if (PrivateModes & PrivMode_132OK) 4005 if (priv_modes & PrivMode_132OK)
3579 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3580 break; 4007 break;
3581 case 4: /* smooth scrolling */ 4008 case 4: /* smooth scrolling */
3582 if (state) 4009 if (state)
3583 Options &= ~Opt_jumpScroll; 4010 options &= ~Opt_jumpScroll;
3584 else 4011 else
3585 Options |= Opt_jumpScroll; 4012 options |= Opt_jumpScroll;
3586 break; 4013 break;
3587 case 5: /* reverse video */ 4014 case 5: /* reverse video */
3588 scr_rvideo_mode (state); 4015 scr_rvideo_mode (state);
3589 break; 4016 break;
3590 case 6: /* relative/absolute origins */ 4017 case 6: /* relative/absolute origins */
… …
3594 scr_autowrap (state); 4021 scr_autowrap (state);
3595 break; 4022 break;
3596 /* case 8: - auto repeat, can't do on a per window basis */ 4023 /* case 8: - auto repeat, can't do on a per window basis */
3597 case 9: /* X10 mouse reporting */ 4024 case 9: /* X10 mouse reporting */
3598 if (state) /* orthogonal */ 4025 if (state) /* orthogonal */
3599 PrivateModes &= ~PrivMode_MouseX11; 4026 priv_modes &= ~PrivMode_MouseX11;
3600 break; 4027 break;
3601#ifdef menuBar_esc 4028#ifdef menuBar_esc
3602 case menuBar_esc: 4029 case menuBar_esc:
3603#ifdef MENUBAR 4030#ifdef MENUBAR
3604 map_menuBar (state); 4031 map_menuBar (state);
… …
3624 break; 4051 break;
3625 /* case 66: - application key pad */ 4052 /* case 66: - application key pad */
3626 /* case 67: - backspace key */ 4053 /* case 67: - backspace key */
3627 case 1000: /* X11 mouse reporting */ 4054 case 1000: /* X11 mouse reporting */
3628 if (state) /* orthogonal */ 4055 if (state) /* orthogonal */
3629 PrivateModes &= ~PrivMode_MouseX10; 4056 priv_modes &= ~PrivMode_MouseX10;
3630 break; 4057 break;
3631#if 0 4058#if 0
3632 case 1001: 4059 case 1001:
3633 break; /* X11 mouse highlighting */ 4060 break; /* X11 mouse highlighting */
3634#endif 4061#endif
3635 case 1010: /* scroll to bottom on TTY output inhibit */ 4062 case 1010: /* scroll to bottom on TTY output inhibit */
3636 if (state) 4063 if (state)
3637 Options &= ~Opt_scrollTtyOutput; 4064 options &= ~Opt_scrollTtyOutput;
3638 else 4065 else
3639 Options |= Opt_scrollTtyOutput; 4066 options |= Opt_scrollTtyOutput;
3640 break; 4067 break;
3641 case 1011: /* scroll to bottom on key press */ 4068 case 1011: /* scroll to bottom on key press */
3642 if (state) 4069 if (state)
3643 Options |= Opt_scrollTtyKeypress; 4070 options |= Opt_scrollTtyKeypress;
3644 else 4071 else
3645 Options &= ~Opt_scrollTtyKeypress; 4072 options &= ~Opt_scrollTtyKeypress;
3646 break; 4073 break;
3647 case 1047: /* secondary screen w/ clearing last */ 4074 case 1047: /* secondary screen w/ clearing last */
3648 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3649 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3650 scr_erase_screen (2); 4077 scr_erase_screen (2);
3651 scr_change_screen (state); 4078 scr_change_screen (state);
3652 break; 4079 break;
3653 case 1049: /* secondary screen w/ clearing first */ 4080 case 1049: /* secondary screen w/ clearing first */
3654 scr_change_screen (state); 4081 scr_change_screen (state);
3655 if (Options & Opt_secondaryScreen) 4082 if (options & Opt_secondaryScreen)
3656 if (current_screen != PRIMARY) 4083 if (current_screen != PRIMARY)
3657 scr_erase_screen (2); 4084 scr_erase_screen (2);
3658 break; 4085 break;
3659 default: 4086 default:
3660 break; 4087 break;
… …
3686 rendset = 0, rendstyle = ~RS_None; 4113 rendset = 0, rendstyle = ~RS_None;
3687 break; 4114 break;
3688 case 1: 4115 case 1:
3689 rendset = 1, rendstyle = RS_Bold; 4116 rendset = 1, rendstyle = RS_Bold;
3690 break; 4117 break;
4118 //case 2: // low intensity
4119 case 3:
4120 rendset = 1, rendstyle = RS_Italic;
4121 break;
3691 case 4: 4122 case 4:
3692 rendset = 1, rendstyle = RS_Uline; 4123 rendset = 1, rendstyle = RS_Uline;
3693 break; 4124 break;
3694 case 5: 4125 case 5: // slowly blinking
4126 case 6: // rapidly blinking
3695 rendset = 1, rendstyle = RS_Blink; 4127 rendset = 1, rendstyle = RS_Blink;
3696 break; 4128 break;
3697 //case 6: // scoansi light background 4129 //case 6: // scoansi light background
3698 case 7: 4130 case 7:
3699 rendset = 1, rendstyle = RS_RVid; 4131 rendset = 1, rendstyle = RS_RVid;
3700 break; 4132 break;
3701 case 8: 4133 case 8:
3702 // invisible. NYI 4134 // invisible. NYI
3703 break; 4135 break;
4136 //case 9: // crossed out
3704 //case 10: // scoansi acs off 4137 //case 10: // scoansi acs off, primary font
3705 //case 11: // scoansi acs on 4138 //case 11: // scoansi acs on, first alt font
3706 //case 12: // scoansi acs on, |0x80 4139 //case 12: // scoansi acs on, |0x80, second alt font
3707 case 21: // disable bold, blink and invis (some terminals use this) 4140 //...
4141 //case 19: // ninth alt font
4142 //case 20: // gothic
4143 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3708 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4144 rendset = 0, rendstyle = RS_Bold;
3709 break; 4145 break;
3710 case 22: 4146 case 22: // normal intensity
3711 rendset = 0, rendstyle = RS_Bold; 4147 rendset = 0, rendstyle = RS_Bold;
4148 break;
4149 case 23: // disable italic
4150 rendset = 0, rendstyle = RS_Italic;
3712 break; 4151 break;
3713 case 24: 4152 case 24:
3714 rendset = 0, rendstyle = RS_Uline; 4153 rendset = 0, rendstyle = RS_Uline;
3715 break; 4154 break;
3716 case 25: 4155 case 25:
3717 rendset = 0, rendstyle = RS_Blink; 4156 rendset = 0, rendstyle = RS_Blink;
3718 break; 4157 break;
4158 case 26: // variable spacing (iso 8613)
4159 rendset = 0, rendstyle = RS_Blink;
4160 break;
3719 case 27: 4161 case 27:
3720 rendset = 0, rendstyle = RS_RVid; 4162 rendset = 0, rendstyle = RS_RVid;
3721 break; 4163 break;
3722 case 28:
3723 // visible. NYI 4164 //case 28: // visible. NYI
3724 break; 4165 //case 29: // not crossed-out
3725 } 4166 }
3726 4167
3727 if (rendset != -1) 4168 if (rendset != -1)
3728 { 4169 {
3729 scr_rendition (rendset, rendstyle); 4170 scr_rendition (rendset, rendstyle);
… …
3740 case 35: 4181 case 35:
3741 case 36: 4182 case 36:
3742 case 37: 4183 case 37:
3743 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4184 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3744 break; 4185 break;
3745#ifdef TTY_256COLOR 4186 case 38: // set fg color, ISO 8613-6
3746 case 38:
3747 if (nargs > i + 2 && arg[i + 1] == 5) 4187 if (nargs > i + 2 && arg[i + 1] == 5)
3748 { 4188 {
3749 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4189 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3750 i += 2; 4190 i += 2;
3751 } 4191 }
3752 break; 4192 break;
3753#endif
3754 case 39: /* default fg */ 4193 case 39: /* default fg */
3755 scr_color (Color_fg, Color_fg); 4194 scr_color (Color_fg, Color_fg);
3756 break; 4195 break;
3757 4196
3758 case 40: 4197 case 40:
… …
3763 case 45: 4202 case 45:
3764 case 46: 4203 case 46:
3765 case 47: 4204 case 47:
3766 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4205 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3767 break; 4206 break;
3768#ifdef TTY_256COLOR 4207 case 48: // set bg color, ISO 8613-6
3769 case 48:
3770 if (nargs > i + 2 && arg[i + 1] == 5) 4208 if (nargs > i + 2 && arg[i + 1] == 5)
3771 { 4209 {
3772 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4210 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3773 i += 2; 4211 i += 2;
3774 } 4212 }
3775 break; 4213 break;
3776#endif
3777 case 49: /* default bg */ 4214 case 49: /* default bg */
3778 scr_color (Color_bg, Color_bg); 4215 scr_color (Color_bg, Color_bg);
3779 break; 4216 break;
4217
4218 //case 50: // not variable spacing
3780 4219
3781#ifndef NO_BRIGHTCOLOR 4220#ifndef NO_BRIGHTCOLOR
3782 case 90: 4221 case 90:
3783 case 91: /* set bright fg color */ 4222 case 91: /* set bright fg color */
3784 case 92: 4223 case 92:
3785 case 93: 4224 case 93:
3786 case 94: 4225 case 94:
3787 case 95: 4226 case 95:
3788 case 96: 4227 case 96:
3789 case 97: 4228 case 97:
3790 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4229 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3791 Color_fg);
3792 break; 4230 break;
3793 case 100: 4231 case 100:
3794 case 101: /* set bright bg color */ 4232 case 101: /* set bright bg color */
3795 case 102: 4233 case 102:
3796 case 103: 4234 case 103:
3797 case 104: 4235 case 104:
3798 case 105: 4236 case 105:
3799 case 106: 4237 case 106:
3800 case 107: 4238 case 107:
3801 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3802 Color_bg);
3803 break; 4240 break;
3804#endif 4241#endif
3805 4242
3806 } 4243 }
3807 } 4244 }
… …
3814{ 4251{
3815 unicode_t ch, cmd = cmd_getc (); 4252 unicode_t ch, cmd = cmd_getc ();
3816 4253
3817 if (cmd == 'Q') 4254 if (cmd == 'Q')
3818 { /* query graphics */ 4255 { /* query graphics */
3819 tt_printf ("\033G0\n"); /* no graphics */ 4256 tt_printf ("\033G0\012"); /* no graphics */
3820 return; 4257 return;
3821 } 4258 }
3822 /* swallow other graphics sequences until terminating ':' */ 4259 /* swallow other graphics sequences until terminating ':' */
3823 do 4260 do
3824 ch = cmd_getc (); 4261 ch = cmd_getc ();
… …
3839 unsigned char buf[256]; 4276 unsigned char buf[256];
3840 4277
3841 va_start (arg_ptr, fmt); 4278 va_start (arg_ptr, fmt);
3842 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3843 va_end (arg_ptr); 4280 va_end (arg_ptr);
3844 tt_write (buf, STRLEN (buf)); 4281 tt_write (buf, strlen (buf));
3845} 4282}
3846 4283
3847/* ---------------------------------------------------------------------- */ 4284/* ---------------------------------------------------------------------- */
3848/* Write data to the pty as typed by the user, pasted with the mouse, 4285/* Write data to the pty as typed by the user, pasted with the mouse,
3849 * or generated by us in response to a query ESC sequence. 4286 * or generated by us in response to a query ESC sequence.
3850 */ 4287 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289
3851void 4290void
3852rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4291rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3853{ 4292{
3854 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4293 if (v_buflen == 0)
4294 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3855 4296
3856 if (len) 4297 if ((unsigned int)written == len)
4298 return;
4299
4300 data += written;
4301 len -= written;
3857 { 4302 }
4303
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4305
4306 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len;
4308
4309 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310}
4311
4312void rxvt_term::pty_write ()
4313{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
3858 if (v_buflen == 0) 4320 if (v_buflen == 0)
3859 { 4321 {
3860 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3861
3862 if ((unsigned int)written == len)
3863 return;
3864
3865 data += written;
3866 len -= written;
3867 }
3868
3869
3870 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3871
3872 memcpy (v_buffer + v_buflen, data, len);
3873 v_buflen += len;
3874 }
3875
3876 for (;;)
3877 {
3878 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3879
3880 if (written > 0)
3881 {
3882 v_buflen -= written;
3883
3884 if (v_buflen == 0)
3885 {
3886 free (v_buffer); 4322 free (v_buffer);
3887 v_buffer = 0; 4323 v_buffer = 0;
3888 v_buflen = 0; 4324 v_buflen = 0;
3889 4325
3890 pty_ev.set (EVENT_READ); 4326 pty_ev.set (EVENT_READ);
3891 return;
3892 }
3893
3894 memmove (v_buffer, v_buffer + written, v_buflen);
3895 }
3896 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3897 // original code just ignores this...
3898 destroy ();
3899 else
3900 {
3901 pty_ev.set (EVENT_READ | EVENT_WRITE);
3902 return; 4327 return;
3903 } 4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
3904 } 4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
3905} 4335}
3906 4336
3907/*----------------------- end-of-file (C source) -----------------------*/ 4337/*----------------------- end-of-file (C source) -----------------------*/
3908 4338

Diff Legend

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