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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.168 by root, Sun Sep 5 09:32:59 2004 UTC

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

Diff Legend

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