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.51 by pcg, Sun Feb 22 08:28:36 2004 UTC vs.
Revision 1.176 by root, Mon Dec 13 01:29:03 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#include <wchar.h>
54#include <signal.h>
54 55
55/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
57
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62
63#if ENABLE_FRILLS || ISO_14755
64
65#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1)
67#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
68#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
69#define ISO_14755_MASK 0x0fffffffUL
70
71#if ISO_14755
72static unsigned short iso14755_symtab[] = {
73 // keysym, unicode
74 XK_Left, 0x2190,
75 XK_KP_Left, 0x2190,
76 XK_Up, 0x2191,
77 XK_KP_Up, 0x2191,
78 XK_Right, 0x2192,
79 XK_KP_Right, 0x2192,
80 XK_Down, 0x2193,
81 XK_KP_Down, 0x2193,
82 XK_Linefeed, 0x21b4,
83 XK_Return, 0x21b5,
84 XK_KP_Enter, 0x21b5,
85
86 XK_Prior, 0x21de,
87 XK_Next, 0x21df,
88 XK_Tab, 0x21e5,
89 XK_ISO_Left_Tab, 0x21e6,
90 XK_Shift_L, 0x21e7,
91 XK_Shift_R, 0x21e7,
92
93 XK_Shift_Lock, 0x21eb,
94 XK_ISO_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_Caps_Lock, 0x21ec,
97 XK_Num_Lock, 0x21ed,
98 XK_ISO_Level3_Shift, 0x21ee,
99 XK_ISO_Level3_Lock, 0x21ef,
100 XK_ISO_Group_Lock, 0x21f0,
101 XK_Home, 0x21f1,
102 XK_End, 0x21f2,
103
104 XK_Execute, 0x2318,
105 XK_Begin, 0x2320,
106 XK_Delete, 0x2326,
107 XK_Clear, 0x2327,
108 XK_BackSpace, 0x232b,
109 XK_Insert, 0x2380,
110 XK_Control_L, 0x2388,
111 XK_Control_R, 0x2388,
112 XK_Pause, 0x2389,
113 XK_Break, 0x238a,
114 XK_Escape, 0x238b,
115 XK_Undo, 0x238c,
116 XK_Print, 0x2399,
117
118 XK_space, 0x2423,
119 XK_KP_Space, 0x2422,
120 0,
121};
122
123void
124rxvt_term::iso14755_54 (int x, int y)
125{
126 x = Pixel2Col (x);
127 y = Pixel2Row (y);
128
129 if (x < 0 || x >= TermWin.ncol
130 || y < 0 || y >= TermWin.nrow)
131 return;
132
133 for (;;)
134 {
135 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x];
136
137 if (t != NOCHAR || !x)
138 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x],
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54;
142 break;
143 }
144
145 x--;
146 }
147
148}
149#endif
150
151#if ENABLE_OVERLAY
152void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{
155 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2;
158 int len;
159
160#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch))
162 {
163 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr);
166 }
167 else
168#endif
169 {
170 ch2 = ch;
171
172 alloc = 0;
173 chr = &ch2;
174 len = 1;
175 }
176
177 int width = strlen (f->name);
178
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182
183 for (int y = 0; y < len; y++)
184 {
185 char buf[9];
186
187 ch = *chr++;
188
189 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '=');
192#if !UNICODE3
193 if (ch >= 0x10000)
194 ch = 0xfffd;
195#endif
196 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r);
198 }
199
200 scr_overlay_set (0, len, f->name);
201
202#if ENABLE_COMBINING
203 if (alloc)
204 delete [] alloc;
205#endif
206}
207#endif
208
209void
210rxvt_term::commit_iso14755 ()
211{
212 wchar_t ch[2];
213
214 ch[0] = iso14755buf & ISO_14755_MASK;
215 ch[1] = 0;
216
217 if (iso14755buf & ISO_14755_51)
218 {
219 char mb[16];
220 int len;
221
222 // allow verbatim 0-bytes and control-bytes to be entered
223 if (ch[0] >= 0x20)
224 len = wcstombs (mb, ch, 16);
225 else
226 {
227 mb[0] = ch[0];
228 len = 1;
229 }
230
231 if (len > 0)
232 tt_write ((unsigned char *)mb, len);
233 else
234 scr_bell ();
235 }
236
237 iso14755buf = 0;
238}
239
240int
241rxvt_term::hex_keyval (XKeyEvent &ev)
242{
243 // check wether this event corresponds to a hex digit
244 // if the modifiers had not been pressed.
245 for (int index = 0; index < 8; index++)
246 {
247 KeySym k = XLookupKeysym (&ev, index);
248
249 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
250 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
251 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
252 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
253 }
254
255 return -1;
256}
257#endif
56 258
57/*{{{ Convert the keypress event into a string */ 259/*{{{ Convert the keypress event into a string */
58void 260void
59rxvt_term::lookup_key (XKeyEvent &ev) 261rxvt_term::lookup_key (XKeyEvent &ev)
60{ 262{
… …
88#ifdef USE_XIM 290#ifdef USE_XIM
89 if (Input_Context) 291 if (Input_Context)
90 { 292 {
91 Status status_return; 293 Status status_return;
92 294
295#if 0
93#ifdef X_HAVE_UTF8_STRING 296#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 297 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 299 KBUFSZ, &keysym, &status_return);
97 else 300 else
301#endif
98#endif 302#endif
99 { 303 {
100 wchar_t wkbuf[KBUFSZ + 1]; 304 wchar_t wkbuf[KBUFSZ + 1];
101 305
102 // the XOpenIM manpage lies about hardcoding the locale 306 // the XOpenIM manpage lies about hardcoding the locale
… …
110 SET_LOCALE (locale); 314 SET_LOCALE (locale);
111 315
112 if (status_return == XLookupChars 316 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 317 || status_return == XLookupBoth)
114 { 318 {
319 /* make sure the user can type ctrl-@, i.e. NUL */
320 if (len == 1 && *wkbuf == 0)
321 {
322 kbuf[0] = 0;
323 len = 1;
324 }
325 else
326 {
115 wkbuf[len] = 0; 327 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 328 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 329 if (len < 0)
118 len = 0; 330 len = 0;
331 }
119 } 332 }
120 else 333 else
121 len = 0; 334 len = 0;
122 } 335 }
123 336
… …
131 valid_keysym = keysym != NoSymbol; 344 valid_keysym = keysym != NoSymbol;
132 } 345 }
133 346
134 if (valid_keysym) 347 if (valid_keysym)
135 { 348 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 349 if (TermWin.saveLines)
158 { 350 {
159#ifdef UNSHIFTED_SCROLLKEYS 351#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 352 if (!ctrl && !meta)
161 {
162#else 353#else
163 if (IS_SCROLL_MOD) 354 if (IS_SCROLL_MOD)
355#endif
164 { 356 {
165#endif
166 int lnsppg; 357 int lnsppg;
167 358
168#ifdef PAGING_CONTEXT_LINES 359#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
170#else 361#else
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 410 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 411 {
221 keysym += (XK_F11 - XK_F1); 412 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 413 shft = 0; /* turn off Shift */
223 } 414 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 415 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 416 {
226 switch (keysym) 417 switch (keysym)
227 { 418 {
228 /* normal XTerm key bindings */ 419 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 420 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 421 selection_request (ev.time, 0, 0);
231 return; 422 return;
423#if TODO
232 /* rxvt extras */ 424 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 425 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (FONT_UP); 426 change_font (FONT_UP);
235 return; 427 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 428 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (FONT_DN); 429 change_font (FONT_DN);
238 return; 430 return;
431#endif
239 } 432 }
240 } 433 }
241 } 434 }
435
436#if ENABLE_FRILLS || ISO_14755
437 // ISO 14755 support
438 if (shft && ctrl)
439 {
440 int hv;
441
442 if (iso14755buf & ISO_14755_51
443 && (keysym == XK_space || keysym == XK_KP_Space
444 || keysym == XK_Return || keysym == XK_KP_Enter))
445 {
446 commit_iso14755 ();
447 iso14755buf = ISO_14755_51;
448# if ISO_14755
449 iso14755_51 (0);
450# endif
451 return;
452 }
453 else if ((hv = hex_keyval (ev)) >= 0)
454 {
455 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
456 | hv | ISO_14755_51;
457# if ISO_14755
458 iso14755_51 (iso14755buf & ISO_14755_MASK);
459# endif
460 return;
461 }
462 else
463 {
464# if ENABLE_OVERLAY
465 scr_overlay_off ();
466# endif
467 iso14755buf = 0;
468 }
469 }
470 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
471 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
472 if (!(iso14755buf & ISO_14755_STARTED))
473 {
474 iso14755buf |= ISO_14755_STARTED;
475# if ENABLE_OVERLAY
476 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
477 scr_overlay_set (0, 0, "ISO 14755 mode");
478# endif
479 }
480#endif
481
242#ifdef PRINTPIPE 482#ifdef PRINTPIPE
243 if (keysym == XK_Print) 483 if (keysym == XK_Print)
244 { 484 {
245 scr_printscreen (ctrl | shft); 485 scr_printscreen (ctrl | shft);
246 return; 486 return;
… …
252#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
253 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
254 { 494 {
255 unsigned int l; 495 unsigned int l;
256 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
257 const unsigned char ch = C0_ESC;
258 497
259 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
260 l = (unsigned int)*kbuf0++; 499 l = (unsigned int)*kbuf0++;
261 500
262 /* escape prefix */ 501 /* escape prefix */
263 if (meta) 502 if (meta
264# ifdef META8_OPTION 503# ifdef META8_OPTION
265 if (meta_char == C0_ESC) 504 && meta_char == C0_ESC
266# endif 505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
267 tt_write (&ch, 1); 509 tt_write (&ch, 1);
510 }
511
268 tt_write (kbuf0, l); 512 tt_write (kbuf0, l);
269 return; 513 return;
270 } 514 }
271 else 515 else
272#endif 516#endif
… …
274 newlen = 1; 518 newlen = 1;
275 switch (keysym) 519 switch (keysym)
276 { 520 {
277#ifndef NO_BACKSPACE_KEY 521#ifndef NO_BACKSPACE_KEY
278 case XK_BackSpace: 522 case XK_BackSpace:
279 if (PrivateModes & PrivMode_HaveBackSpace) 523 if (priv_modes & PrivMode_HaveBackSpace)
280 { 524 {
281 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 525 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
282 ^ !!ctrl) ? '\b' : '\177'; 526 ^ !!ctrl) ? '\b' : '\177';
283 kbuf[1] = '\0'; 527 kbuf[1] = '\0';
284 } 528 }
285 else 529 else
286 STRCPY (kbuf, key_backspace); 530 strcpy (kbuf, key_backspace);
287# ifdef MULTICHAR_SET
288 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
289 {
290 int col, row;
291
292 newlen = STRLEN (kbuf);
293 col = screen.cur.col - 1;
294 row = screen.cur.row + TermWin.saveLines;
295 if (IS_MULTI2 (screen.rend[row][col]))
296 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
297 }
298# endif
299 break; 531 break;
300#endif 532#endif
301#ifndef NO_DELETE_KEY 533#ifndef NO_DELETE_KEY
302 case XK_Delete: 534 case XK_Delete:
303 STRCPY (kbuf, key_delete); 535 strcpy (kbuf, key_delete);
304# ifdef MULTICHAR_SET
305 if (Options & Opt_mc_hack)
306 {
307 int col, row;
308
309 newlen = STRLEN (kbuf);
310 col = screen.cur.col;
311 row = screen.cur.row + TermWin.saveLines;
312 if (IS_MULTI1 (screen.rend[row][col]))
313 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
314 }
315# endif
316 break; 536 break;
317#endif 537#endif
318 case XK_Tab: 538 case XK_Tab:
319 if (shft) 539 if (shft)
320 STRCPY (kbuf, "\033[Z"); 540 strcpy (kbuf, "\033[Z");
321 else 541 else
322 { 542 {
323#ifdef CTRL_TAB_MAKES_META 543#ifdef CTRL_TAB_MAKES_META
324 if (ctrl) 544 if (ctrl)
325 meta = 1; 545 meta = 1;
… …
331 newlen = 0; 551 newlen = 0;
332 } 552 }
333 break; 553 break;
334 554
335#ifdef XK_KP_Left 555#ifdef XK_KP_Left
336 case XK_KP_Up: /* \033Ox or standard */ 556 case XK_KP_Up: /* \033Ox or standard */
337 case XK_KP_Down: /* \033Or or standard */ 557 case XK_KP_Down: /* \033Or or standard */
338 case XK_KP_Right: /* \033Ov or standard */ 558 case XK_KP_Right: /* \033Ov or standard */
339 case XK_KP_Left: /* \033Ot or standard */ 559 case XK_KP_Left: /* \033Ot or standard */
340 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
341 { 561 {
342 STRCPY (kbuf, "\033OZ"); 562 strcpy (kbuf, "\033OZ");
343 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 563 kbuf[2] = "txvr"[keysym - XK_KP_Left];
344 break; 564 break;
345 } 565 }
346 else 566 else
347 /* translate to std. cursor key */ 567 /* translate to std. cursor key */
… …
350#endif 570#endif
351 case XK_Up: /* "\033[A" */ 571 case XK_Up: /* "\033[A" */
352 case XK_Down: /* "\033[B" */ 572 case XK_Down: /* "\033[B" */
353 case XK_Right: /* "\033[C" */ 573 case XK_Right: /* "\033[C" */
354 case XK_Left: /* "\033[D" */ 574 case XK_Left: /* "\033[D" */
355 STRCPY (kbuf, "\033[Z"); 575 strcpy (kbuf, "\033[Z");
356 kbuf[2] = "DACB"[keysym - XK_Left]; 576 kbuf[2] = "DACB"[keysym - XK_Left];
357 /* do Shift first */ 577 /* do Shift first */
358 if (shft) 578 if (shft)
359 kbuf[2] = "dacb"[keysym - XK_Left]; 579 kbuf[2] = "dacb"[keysym - XK_Left];
360 else if (ctrl) 580 else if (ctrl)
361 { 581 {
362 kbuf[1] = 'O'; 582 kbuf[1] = 'O';
363 kbuf[2] = "dacb"[keysym - XK_Left]; 583 kbuf[2] = "dacb"[keysym - XK_Left];
364 } 584 }
365 else if (PrivateModes & PrivMode_aplCUR) 585 else if (priv_modes & PrivMode_aplCUR)
366 kbuf[1] = 'O'; 586 kbuf[1] = 'O';
367#ifdef MULTICHAR_SET
368 //TODO: ??
369 if (Options & Opt_mc_hack)
370 {
371 int col, row, m;
372
373 col = screen.cur.col;
374 row = screen.cur.row + TermWin.saveLines;
375 m = 0;
376 if (keysym == XK_Right
377 && IS_MULTI1 (screen.rend[row][col]))
378 m = 1;
379 else if (keysym == XK_Left)
380 {
381 if (col > 0)
382 {
383 if (IS_MULTI2 (screen.rend[row][col - 1]))
384 m = 1;
385 }
386 else if (screen.cur.row > 0)
387 {
388 col = screen.tlen[--row];
389 if (col == -1)
390 col = TermWin.ncol - 1;
391 else
392 col--;
393 if (col > 0
394 && IS_MULTI2 (screen.rend[row][col]))
395 m = 1;
396 }
397 }
398 if (m)
399 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
400 }
401#endif
402 break; 587 break;
403 588
404#ifndef UNSHIFTED_SCROLLKEYS 589#ifndef UNSHIFTED_SCROLLKEYS
405# ifdef XK_KP_Prior 590# ifdef XK_KP_Prior
406 case XK_KP_Prior: 591 case XK_KP_Prior:
407 /* allow shift to override */ 592 /* allow shift to override */
408 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
409 { 594 {
410 STRCPY (kbuf, "\033Oy"); 595 strcpy (kbuf, "\033Oy");
411 break; 596 break;
412 } 597 }
413 /* FALLTHROUGH */ 598 /* FALLTHROUGH */
414# endif 599# endif
415 case XK_Prior: 600 case XK_Prior:
416 STRCPY (kbuf, "\033[5~"); 601 strcpy (kbuf, "\033[5~");
417 break; 602 break;
418# ifdef XK_KP_Next 603# ifdef XK_KP_Next
419 case XK_KP_Next: 604 case XK_KP_Next:
420 /* allow shift to override */ 605 /* allow shift to override */
421 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 606 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
422 { 607 {
423 STRCPY (kbuf, "\033Os"); 608 strcpy (kbuf, "\033Os");
424 break; 609 break;
425 } 610 }
426 /* FALLTHROUGH */ 611 /* FALLTHROUGH */
427# endif 612# endif
428 case XK_Next: 613 case XK_Next:
429 STRCPY (kbuf, "\033[6~"); 614 strcpy (kbuf, "\033[6~");
430 break; 615 break;
431#endif 616#endif
432 case XK_KP_Enter: 617 case XK_KP_Enter:
433 /* allow shift to override */ 618 /* allow shift to override */
434 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 619 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
435 { 620 {
436 STRCPY (kbuf, "\033OM"); 621 strcpy (kbuf, "\033OM");
622 break;
623 }
624
625 /* FALLTHROUGH */
626
627 case XK_Return:
628 if (priv_modes & PrivMode_LFNL)
629 {
630 kbuf[0] = '\015';
631 kbuf[1] = '\012';
632 kbuf[2] = '\0';
437 } 633 }
438 else 634 else
439 { 635 {
440 kbuf[0] = '\r'; 636 kbuf[0] = '\015';
441 kbuf[1] = '\0'; 637 kbuf[1] = '\0';
442 } 638 }
443 break; 639 break;
444 640
445#ifdef XK_KP_Begin 641#ifdef XK_KP_Begin
446 case XK_KP_Begin: 642 case XK_KP_Begin:
447 STRCPY (kbuf, "\033Ou"); 643 strcpy (kbuf, "\033Ou");
448 break; 644 break;
449 645
450 case XK_KP_Insert: 646 case XK_KP_Insert:
451 STRCPY (kbuf, "\033Op"); 647 strcpy (kbuf, "\033Op");
452 break; 648 break;
453 649
454 case XK_KP_Delete: 650 case XK_KP_Delete:
455 STRCPY (kbuf, "\033On"); 651 strcpy (kbuf, "\033On");
456 break; 652 break;
457#endif 653#endif
458 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
459 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
460 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
461 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
462 STRCPY (kbuf, "\033OP"); 658 strcpy (kbuf, "\033OP");
463 kbuf[2] += (keysym - XK_KP_F1); 659 kbuf[2] += (keysym - XK_KP_F1);
464 break; 660 break;
465 661
466 case XK_KP_Multiply: /* "\033Oj" : "*" */ 662 case XK_KP_Multiply: /* "\033Oj" : "*" */
467 case XK_KP_Add: /* "\033Ok" : "+" */ 663 case XK_KP_Add: /* "\033Ok" : "+" */
… …
478 case XK_KP_6: /* "\033Ov" : "6" */ 674 case XK_KP_6: /* "\033Ov" : "6" */
479 case XK_KP_7: /* "\033Ow" : "7" */ 675 case XK_KP_7: /* "\033Ow" : "7" */
480 case XK_KP_8: /* "\033Ox" : "8" */ 676 case XK_KP_8: /* "\033Ox" : "8" */
481 case XK_KP_9: /* "\033Oy" : "9" */ 677 case XK_KP_9: /* "\033Oy" : "9" */
482 /* allow shift to override */ 678 /* allow shift to override */
483 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 679 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
484 { 680 {
485 STRCPY (kbuf, "\033Oj"); 681 strcpy (kbuf, "\033Oj");
486 kbuf[2] += (keysym - XK_KP_Multiply); 682 kbuf[2] += (keysym - XK_KP_Multiply);
487 } 683 }
488 else 684 else
489 { 685 {
490 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 686 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
491 kbuf[1] = '\0'; 687 kbuf[1] = '\0';
492 } 688 }
493 break; 689 break;
494 690
495 case XK_Find: 691 case XK_Find:
496 STRCPY (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
497 break; 693 break;
498 case XK_Insert: 694 case XK_Insert:
499 STRCPY (kbuf, "\033[2~"); 695 strcpy (kbuf, "\033[2~");
500 break; 696 break;
501#ifdef DXK_Remove /* support for DEC remove like key */ 697#ifdef DXK_Remove /* support for DEC remove like key */
502 case DXK_Remove: 698 case DXK_Remove:
503 /* FALLTHROUGH */ 699 /* FALLTHROUGH */
504#endif 700#endif
505 case XK_Execute: 701 case XK_Execute:
506 STRCPY (kbuf, "\033[3~"); 702 strcpy (kbuf, "\033[3~");
507 break; 703 break;
508 case XK_Select: 704 case XK_Select:
509 STRCPY (kbuf, "\033[4~"); 705 strcpy (kbuf, "\033[4~");
510 break; 706 break;
511#ifdef XK_KP_End 707#ifdef XK_KP_End
512 case XK_KP_End: 708 case XK_KP_End:
513 /* allow shift to override */ 709 /* allow shift to override */
514 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 710 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
515 { 711 {
516 STRCPY (kbuf, "\033Oq"); 712 strcpy (kbuf, "\033Oq");
517 break; 713 break;
518 } 714 }
519 /* FALLTHROUGH */ 715 /* FALLTHROUGH */
520#endif 716#endif
521 case XK_End: 717 case XK_End:
522 STRCPY (kbuf, KS_END); 718 strcpy (kbuf, KS_END);
523 break; 719 break;
524#ifdef XK_KP_Home 720#ifdef XK_KP_Home
525 case XK_KP_Home: 721 case XK_KP_Home:
526 /* allow shift to override */ 722 /* allow shift to override */
527 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 723 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
528 { 724 {
529 STRCPY (kbuf, "\033Ow"); 725 strcpy (kbuf, "\033Ow");
530 break; 726 break;
531 } 727 }
532 /* FALLTHROUGH */ 728 /* FALLTHROUGH */
533#endif 729#endif
534 case XK_Home: 730 case XK_Home:
535 STRCPY (kbuf, KS_HOME); 731 strcpy (kbuf, KS_HOME);
536 break; 732 break;
537 733
538#define FKEY(n, fkey) \ 734#define FKEY(n, fkey) \
539 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 735 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
540 736
… …
593 default: 789 default:
594 newlen = 0; 790 newlen = 0;
595 break; 791 break;
596 } 792 }
597 if (newlen) 793 if (newlen)
598 len = STRLEN (kbuf); 794 len = strlen (kbuf);
599 } 795 }
796
600 /* 797 /*
601 * Pass meta for all function keys, if 'meta' option set 798 * Pass meta for all function keys, if 'meta' option set
602 */ 799 */
603#ifdef META8_OPTION 800#ifdef META8_OPTION
604 if (meta && (meta_char == 0x80) && len > 0) 801 if (meta && (meta_char == 0x80) && len > 0)
… …
619 { 816 {
620 unsigned char *ch; 817 unsigned char *ch;
621 818
622 for (ch = kbuf; ch < kbuf + len; ch++) 819 for (ch = kbuf; ch < kbuf + len; ch++)
623 *ch |= 0x80; 820 *ch |= 0x80;
821
624 meta = 0; 822 meta = 0;
625 } 823 }
626#endif 824#endif
627 /* nil */ ; 825 /* nil */ ;
628 } 826 }
629 } 827 }
630 828
631 if (len <= 0) 829 if (len <= 0)
632 return; /* not mapped */ 830 return; /* not mapped */
633 831
634 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
635 if (TermWin.view_start) 833 if (TermWin.view_start)
636 { 834 {
637 TermWin.view_start = 0; 835 TermWin.view_start = 0;
638 want_refresh = 1; 836 want_refresh = 1;
639 } 837 }
… …
653 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 851 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
654 852
655 /* escape prefix */ 853 /* escape prefix */
656 if (meta 854 if (meta
657#ifdef META8_OPTION 855#ifdef META8_OPTION
658 && (meta_char == C0_ESC) 856 && meta_char == C0_ESC
659#endif 857#endif
660 ) 858 )
661 { 859 {
662 const unsigned char ch = C0_ESC; 860 const unsigned char ch = C0_ESC;
663
664 tt_write (&ch, 1); 861 tt_write (&ch, 1);
665 } 862 }
863
666#ifdef DEBUG_CMD 864#if defined(DEBUG_CMD)
667 if (debug_key)
668 { /* Display keyboard buffer contents */ 865 /* Display keyboard buffer contents */
669 char *p; 866 unsigned char *p;
670 int i; 867 int i;
671 868
672 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 869 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
673 for (i = 0, p = kbuf; i < len; i++, p++) 870 for (i = 0, p = kbuf; i < len; i++, p++)
674 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 871 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
675 fprintf (stderr, "'\n"); 872 fprintf (stderr, "'\n");
676 }
677#endif /* DEBUG_CMD */ 873#endif /* DEBUG_CMD */
678 tt_write (kbuf, (unsigned int)len); 874 tt_write (kbuf, (unsigned int)len);
679} 875}
680/*}}} */ 876/*}}} */
681 877
… …
683/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
684/* attempt to `write' count to the input buffer */ 880/* attempt to `write' count to the input buffer */
685unsigned int 881unsigned int
686rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 882rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
687{ 883{
688 unsigned int n, s; 884 unsigned int n, s;
689 885
690 n = cmdbuf_ptr - cmdbuf_base; 886 n = cmdbuf_ptr - cmdbuf_base;
691 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
888
692 if (n > 0 && s < count) 889 if (n > 0 && s < count)
693 { 890 {
694 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 891 memmove (cmdbuf_base, cmdbuf_ptr,
695 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 892 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
696 cmdbuf_ptr = cmdbuf_base; 893 cmdbuf_ptr = cmdbuf_base;
697 cmdbuf_endp -= n; 894 cmdbuf_endp -= n;
698 s += n; 895 s += n;
699 } 896 }
897
700 if (count > s) 898 if (count > s)
701 { 899 {
702 rxvt_print_error ("data loss: cmd_write too large"); 900 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
703 count = s; 901 count = s;
704 } 902 }
903
705 for (; count--;) 904 for (; count--;)
706 *cmdbuf_endp++ = *str++; 905 *cmdbuf_endp++ = *str++;
906
907 cmd_parse ();
908
707 return 0; 909 return 0;
708} 910}
709#endif /* MENUBAR_MAX */ 911#endif /* MENUBAR_MAX */
710 912
711void 913void
712rxvt_term::flush () 914rxvt_term::flush ()
713{ 915{
916 flush_ev.stop ();
917
714#ifdef TRANSPARENT 918#ifdef TRANSPARENT
715 if (want_full_refresh) 919 if (want_full_refresh)
716 { 920 {
717 want_full_refresh = 0; 921 want_full_refresh = 0;
718 scr_clear (); 922 scr_clear ();
719 scr_touch (false); 923 scr_touch (false);
720 want_refresh = 1;
721 } 924 }
722#endif 925#endif
723 926
724 if (want_refresh) 927 if (want_refresh)
725 { 928 {
726 scr_refresh (refresh_type); 929 scr_refresh (refresh_type);
727 scrollbar_show (1); 930 scrollbar_show (1);
728#ifdef USE_XIM 931#ifdef USE_XIM
729 IMSendSpot (); 932 IMSendSpot ();
730#endif 933#endif
731
732 } 934 }
733 935
734 display->flush (); 936 display->flush ();
735} 937}
736 938
… …
738rxvt_term::check_cb (check_watcher &w) 940rxvt_term::check_cb (check_watcher &w)
739{ 941{
740 SET_R (this); 942 SET_R (this);
741 SET_LOCALE (locale); 943 SET_LOCALE (locale);
742 944
945 display->flush ();
946
947 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01);
949}
950
951void
952rxvt_term::flush_cb (time_watcher &w)
953{
954 SET_R (this);
955 SET_LOCALE (locale);
956
957 refresh_limit = 1;
958 refresh_count = 0;
743 flush (); 959 flush ();
744} 960}
745 961
746#ifdef CURSOR_BLINK 962#ifdef CURSOR_BLINK
747void 963void
… …
765 w.start (w.at + TEXT_BLINK_INTERVAL); 981 w.start (w.at + TEXT_BLINK_INTERVAL);
766 } 982 }
767} 983}
768#endif 984#endif
769 985
986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
987void
988rxvt_term::cont_scroll_cb (time_watcher &w)
989{
990 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 }
997}
998#endif
999
1000#ifdef SELECTION_SCROLLING
1001void
1002rxvt_term::sel_scroll_cb (time_watcher &w)
1003{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 }
1011}
1012#endif
1013
1014#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1015void
1016rxvt_term::slip_wheel_cb (time_watcher &w)
1017{
1018 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed))
1021 {
1022 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 }
1026}
1027#endif
1028
770bool 1029bool
771rxvt_term::pty_fill () 1030rxvt_term::pty_fill ()
772{ 1031{
773 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033
1034 if (CBUFSIZ == n)
1035 {
1036 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n");
1037 n = 0;
1038 }
774 1039
775 memmove (cmdbuf_base, cmdbuf_ptr, n); 1040 memmove (cmdbuf_base, cmdbuf_ptr, n);
776 cmdbuf_ptr = cmdbuf_base; 1041 cmdbuf_ptr = cmdbuf_base;
777 cmdbuf_endp = cmdbuf_ptr + n; 1042 cmdbuf_endp = cmdbuf_ptr + n;
778 1043
779 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
780 1045
781 if (n > 0) 1046 if (n > 0)
782 { 1047 {
783 cmdbuf_endp += n; 1048 cmdbuf_endp += n;
784 return true; 1049 return true;
785 } 1050 }
786 else if (n < 0 && errno != EAGAIN) 1051 else if (n < 0 && errno != EAGAIN)
787 destroy (); 1052 destroy ();
788 1053
789 return false; 1054 return false;
790} 1055}
791 1056
792void 1057void
793rxvt_term::pty_cb (io_watcher &w, short revents) 1058rxvt_term::pty_cb (io_watcher &w, short revents)
… …
796 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
797 1062
798 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
799 tt_write (0, 0); 1064 tt_write (0, 0);
800 else if (revents & EVENT_READ) 1065 else if (revents & EVENT_READ)
801 {
802 bool flag = true;
803
804 // loop, but don't allow a single term to monopolize us 1066 // loop, but don't allow a single term to monopolize us
805 // the number of loops is fully arbitrary, and thus wrong
806 while (flag && pty_fill ()) 1067 while (pty_fill ())
807 { 1068 if (cmd_parse ())
808 if (!seen_input)
809 {
810 seen_input = 1;
811 /* once we know the shell is running, send the screen size. Again! */
812 tt_winch ();
813 }
814
815 uint32_t ch = NOCHAR;
816
817 for (;;)
818 {
819 if (ch == NOCHAR)
820 ch = next_char ();
821
822 if (ch == NOCHAR) // TODO: improve
823 break; 1069 break;
824
825 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
826 {
827 /* Read a text string from the input buffer */
828 uint32_t buf[BUFSIZ];
829 bool refreshnow = false;
830 int nlines = 0;
831 uint32_t *str = buf;
832
833 *str++ = ch;
834
835 for (;;)
836 {
837 ch = next_char ();
838
839 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
840 break;
841 else
842 {
843 *str++ = ch;
844
845 if (ch == '\n')
846 {
847 nlines++;
848 refresh_count++;
849
850 if (! (Options & Opt_jumpScroll)
851 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
852 {
853 refreshnow = true;
854 flag = false;
855 ch = NOCHAR;
856 break;
857 }
858
859 // scr_add_lines only works for nlines < TermWin.nrow - 1.
860 if (nlines >= TermWin.nrow - 1)
861 {
862 scr_add_lines (buf, nlines, str - buf);
863 nlines = 0;
864 str = buf;
865 }
866 }
867
868 if (str >= buf + BUFSIZ)
869 {
870 ch = NOCHAR;
871 break;
872 }
873 }
874 }
875
876 scr_add_lines (buf, nlines, str - buf);
877
878 /*
879 * If there have been a lot of new lines, then update the screen
880 * What the heck I'll cheat and only refresh less than every page-full.
881 * the number of pages between refreshes is refresh_limit, which
882 * is incremented here because we must be doing flat-out scrolling.
883 *
884 * refreshing should be correct for small scrolls, because of the
885 * time-out
886 */
887 if (refreshnow)
888 {
889 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
890 refresh_limit++;
891
892 scr_refresh (refresh_type);
893 }
894
895 }
896 else
897 {
898 switch (ch)
899 {
900 default:
901 process_nonprinting (ch);
902 break;
903 case C0_ESC: /* escape char */
904 process_escape_seq ();
905 break;
906 /*case 0x9b: */ /* CSI */
907 /* process_csi_seq (); */
908 }
909
910 ch = NOCHAR;
911 }
912 }
913 }
914 }
915} 1070}
916 1071
917// read the next character, currently handles UTF-8 1072void
918// will probably handle all sorts of other stuff in the future 1073rxvt_term::pointer_unblank ()
919uint32_t
920rxvt_term::next_char ()
921{ 1074{
922 while (cmdbuf_ptr < cmdbuf_endp) 1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
923 { 1076 recolour_cursor ();
924 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
925 return *cmdbuf_ptr++;
926 1077
927 wchar_t wc; 1078#ifdef POINTER_BLANK
928 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1079 hidden_pointer = 0;
929 1080
930 if (len == (size_t)-2) 1081 if (options & Opt_pointerBlank)
931 return NOCHAR; 1082 pointer_ev.start (NOW + pointerBlankDelay);
932 1083#endif
933 if (len == (size_t)-1)
934 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
935
936 // assume wchar == unicode
937 cmdbuf_ptr += len;
938 return wc;
939 }
940
941 return NOCHAR;
942}
943
944/* rxvt_cmd_getc () - Return next input character */
945/*
946 * Return the next input character after first passing any keyboard input
947 * to the command.
948 */
949uint32_t
950rxvt_term::cmd_getc ()
951{
952 for (;;)
953 {
954 uint32_t c = next_char ();
955 if (c != NOCHAR)
956 return c;
957
958 // incomplete sequences should occur rarely, still, a better solution
959 // would be preferred. either setjmp/longjmp or better design.
960 fcntl (cmd_fd, F_SETFL, 0);
961 pty_fill ();
962 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
963 }
964} 1084}
965 1085
966#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
967void 1087void
968rxvt_term::pointer_unblank ()
969{
970 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
971 recolour_cursor ();
972
973 hidden_pointer = 0;
974
975 if (Options & Opt_pointerBlank)
976 pointer_ev.start (NOW + pointerBlankDelay);
977}
978
979void
980rxvt_term::pointer_blank () 1088rxvt_term::pointer_blank ()
981{ 1089{
982 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
983 return; 1091 return;
984 1092
985 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
986 XFlush (display->display); 1094 XFlush (display->display);
987 1095
… …
997 pointer_blank (); 1105 pointer_blank ();
998} 1106}
999#endif 1107#endif
1000 1108
1001void 1109void
1002rxvt_term::mouse_report (const XButtonEvent &ev) 1110rxvt_term::mouse_report (XButtonEvent &ev)
1003{ 1111{
1004 int button_number, key_state = 0; 1112 int button_number, key_state = 0;
1005 int x, y; 1113 int x, y;
1006 1114
1007 x = ev.x; 1115 x = ev.x;
1008 y = ev.y; 1116 y = ev.y;
1009 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
1010 1118
1011 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
1012 {
1013 button_number = 3; 1120 button_number = 3;
1014 }
1015 else 1121 else
1016 { 1122 {
1017 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
1018 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
1019 if (button_number >= 3) 1125 if (button_number >= 3)
1020 button_number += (64 - 3); 1126 button_number += (64 - 3);
1021 } 1127 }
1022 1128
1023 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
1024 { 1130 {
1025 /* 1131 /*
1026 * do not report ButtonRelease 1132 * do not report ButtonRelease
1027 * no state info allowed 1133 * no state info allowed
1028 */ 1134 */
… …
1043 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1044 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
1045#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
1046 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1047#endif 1153#endif
1048
1049 } 1154 }
1050 1155
1051#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
1052 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
1053 if (key_state & 16) 1158 if (key_state & 16)
1054 fputc ('C', stderr); 1159 fputc ('C', stderr);
1055 if (key_state & 4) 1160 if (key_state & 4)
1056 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
1060 fputc ('2', stderr); 1165 fputc ('2', stderr);
1061 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
1062 button_number, 1167 button_number,
1063 x + 1, 1168 x + 1,
1064 y + 1); 1169 y + 1);
1065#else 1170#endif
1171
1066 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
1067 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
1068 (32 + x + 1), 1174 (32 + x + 1),
1069 (32 + y + 1)); 1175 (32 + y + 1));
1070#endif
1071} 1176}
1072 1177
1073#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
1074void 1179void
1075rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
1086{ 1191{
1087 SET_R (this); 1192 SET_R (this);
1088 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
1089 1194
1090#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
1091 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1092 { 1197 {
1093 if (hidden_cursor) 1198 if (hidden_cursor)
1094 { 1199 {
1095 hidden_cursor = 0; 1200 hidden_cursor = 0;
1096 want_refresh = 1; 1201 want_refresh = 1;
… …
1099 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1100 } 1205 }
1101#endif 1206#endif
1102 1207
1103#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
1104 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1105 { 1210 {
1106 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
1107 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
1108 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
1109 if (hidden_pointer) 1214 if (hidden_pointer)
… …
1112 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
1113 pointer_blank (); 1218 pointer_blank ();
1114 } 1219 }
1115#endif 1220#endif
1116 1221
1117#ifdef USE_XIM
1118 if (XFilterEvent (&ev, None))
1119 return;
1120#endif
1121
1122 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
1123 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
1124 unsigned int unused_mask; 1224 unsigned int unused_mask;
1125
1126#ifdef DEBUG_X
1127 const char *const eventnames[] =
1128 { /* mason - this matches my system */
1129 "",
1130 "",
1131 "KeyPress",
1132 "KeyRelease",
1133 "ButtonPress",
1134 "ButtonRelease",
1135 "MotionNotify",
1136 "EnterNotify",
1137 "LeaveNotify",
1138 "FocusIn",
1139 "FocusOut",
1140 "KeymapNotify",
1141 "Expose",
1142 "GraphicsExpose",
1143 "NoExpose",
1144 "VisibilityNotify",
1145 "CreateNotify",
1146 "DestroyNotify",
1147 "UnmapNotify",
1148 "MapNotify",
1149 "MapRequest",
1150 "ReparentNotify",
1151 "ConfigureNotify",
1152 "ConfigureRequest",
1153 "GravityNotify",
1154 "ResizeRequest",
1155 "CirculateNotify",
1156 "CirculateRequest",
1157 "PropertyNotify",
1158 "SelectionClear",
1159 "SelectionRequest",
1160 "SelectionNotify",
1161 "ColormapNotify",
1162 "ClientMessage",
1163 "MappingNotify"
1164 };
1165#endif
1166
1167#ifdef DEBUG_X
1168 struct timeval tp;
1169 struct tm *ltt;
1170 (void)gettimeofday (&tp, NULL);
1171 ltt = localtime (& (tp.tv_sec));
1172 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));
1173#endif
1174 1225
1175 switch (ev.type) 1226 switch (ev.type)
1176 { 1227 {
1177 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
1178 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
1179 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
1180 1297
1181#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1182 case KeyRelease:
1183 {
1184 if (! (ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
1185 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
1186 else 1303#endif
1187 {
1188 KeySym ks;
1189
1190 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1191 if (ks == XK_Control_L || ks == XK_Control_R)
1192 mouse_slip_wheel_speed = 0;
1193 }
1194 break; 1304 break;
1195 } 1305 }
1196#endif
1197 1306
1198 case ButtonPress: 1307 case ButtonPress:
1199 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1200 break; 1309 break;
1201 1310
… …
1213 && (ev.xclient.data.l[0] == DndFile 1322 && (ev.xclient.data.l[0] == DndFile
1214 || ev.xclient.data.l[0] == DndDir 1323 || ev.xclient.data.l[0] == DndDir
1215 || ev.xclient.data.l[0] == DndLink)) 1324 || ev.xclient.data.l[0] == DndLink))
1216 { 1325 {
1217 /* Get Dnd data */ 1326 /* Get Dnd data */
1218 Atom ActualType; 1327 Atom ActualType;
1219 int ActualFormat; 1328 int ActualFormat;
1220 unsigned char *data; 1329 unsigned char *data;
1221 unsigned long Size, RemainingBytes; 1330 unsigned long Size, RemainingBytes;
1222 1331
1223 XGetWindowProperty (display->display, display->root, 1332 XGetWindowProperty (display->display, display->root,
1224 xa[XA_DNDSELECTION], 1333 xa[XA_DNDSELECTION],
1225 0L, 1000000L, 1334 0L, 1000000L,
1226 False, AnyPropertyType, 1335 False, AnyPropertyType,
1227 &ActualType, &ActualFormat, 1336 &ActualType, &ActualFormat,
1228 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1229 &data); 1338 &data);
1230 XChangeProperty (display->display, display->root, 1339 set_string_property (XA_CUT_BUFFER0, data);
1231 XA_CUT_BUFFER0, XA_STRING, 1340 XFree (data);
1232 8, PropModeReplace,
1233 data, STRLEN (data));
1234 selection_paste (display->root, XA_CUT_BUFFER0, True); 1341 selection_paste (display->root, XA_CUT_BUFFER0, true);
1235 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1236 } 1343 }
1237#endif /* OFFIX_DND */ 1344#endif /* OFFIX_DND */
1238 break; 1345 break;
1239 1346
1240 case MappingNotify: 1347 case MappingNotify:
1241 XRefreshKeyboardMapping (& (ev.xmapping)); 1348 XRefreshKeyboardMapping (&ev.xmapping);
1242 break; 1349 break;
1243 1350
1244 /* 1351 /*
1245 * XXX: this is not the _current_ arrangement 1352 * XXX: this is not the _current_ arrangement
1246 * Here's my conclusion: 1353 * Here's my conclusion:
… …
1271 { 1378 {
1272 TermWin.focus = 1; 1379 TermWin.focus = 1;
1273 want_refresh = 1; 1380 want_refresh = 1;
1274#ifdef USE_XIM 1381#ifdef USE_XIM
1275 if (Input_Context != NULL) 1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1276 XSetICFocus (Input_Context); 1385 XSetICFocus (Input_Context);
1386 }
1277#endif 1387#endif
1278#ifdef CURSOR_BLINK 1388#ifdef CURSOR_BLINK
1279 if (Options & Opt_cursorBlink) 1389 if (options & Opt_cursorBlink)
1280 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1281#endif 1398#endif
1282 1399
1283 } 1400 }
1284 break; 1401 break;
1285 1402
1286 case FocusOut: 1403 case FocusOut:
1287 if (TermWin.focus) 1404 if (TermWin.focus)
1288 { 1405 {
1289 TermWin.focus = 0; 1406 TermWin.focus = 0;
1290 want_refresh = 1; 1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1291#ifdef USE_XIM 1415#ifdef USE_XIM
1292 if (Input_Context != NULL) 1416 if (Input_Context != NULL)
1293 XUnsetICFocus (Input_Context); 1417 XUnsetICFocus (Input_Context);
1294#endif 1418#endif
1295#ifdef CURSOR_BLINK 1419#ifdef CURSOR_BLINK
1296 if (Options & Opt_cursorBlink) 1420 if (options & Opt_cursorBlink)
1297 cursor_blink_ev.stop (); 1421 cursor_blink_ev.stop ();
1298 hidden_cursor = 0; 1422 hidden_cursor = 0;
1299#endif 1423#endif
1300 1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1301 } 1431 }
1302 break; 1432 break;
1303 1433
1304 case ConfigureNotify: 1434 case ConfigureNotify:
1305 if (ev.xconfigure.window == TermWin.parent[0]) 1435 if (ev.xconfigure.window == TermWin.parent[0])
… …
1314 } 1444 }
1315 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1316 1446
1317 if (szHint.width != width || szHint.height != height) 1447 if (szHint.width != width || szHint.height != height)
1318 { 1448 {
1319 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1449 seen_resize = 1;
1320 resize_all_windows (width, height, 1); 1450 resize_all_windows (width, height, 1);
1321 } 1451 }
1322#ifdef DEBUG_SIZE 1452
1323 else
1324 {
1325 D_SIZE ((stderr, "Size: Not resizing"));
1326 }
1327#endif
1328#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1329 if (Options & Opt_transparent) 1454 if (options & Opt_transparent)
1330 {
1331 check_our_parents (); 1455 check_our_parents ();
1332 if (am_transparent)
1333 want_full_refresh = 1;
1334 }
1335#endif 1456#endif
1336
1337 } 1457 }
1338 break; 1458 break;
1339 1459
1460 case PropertyNotify:
1461 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1462 && ev.xproperty.state == PropertyNewValue)
1463 selection_property (ev.xproperty.window, ev.xproperty.atom);
1464
1465 break;
1466
1340 case SelectionClear: 1467 case SelectionClear:
1341 display->set_selection_owner (0); 1468 selection_clear ();
1342 break; 1469 break;
1343 1470
1344 case SelectionNotify: 1471 case SelectionNotify:
1345 if (selection_wait == Sel_normal) 1472 if (selection_wait == Sel_normal)
1346 selection_paste (ev.xselection.requestor, 1473 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1347 ev.xselection.property, True);
1348 break; 1474 break;
1349 1475
1350 case SelectionRequest: 1476 case SelectionRequest:
1351 selection_send (ev.xselectionrequest); 1477 selection_send (ev.xselectionrequest);
1352 break; 1478 break;
… …
1373 1499
1374 case GraphicsExpose: 1500 case GraphicsExpose:
1375 case Expose: 1501 case Expose:
1376 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == TermWin.vt)
1377 { 1503 {
1378#ifdef NO_SLOW_LINK_SUPPORT 1504 do
1379 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1380 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1381#else 1507 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1382 // don't understand this, so commented it out 1508
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510
1511 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1383 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1384 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1385 //scr_expose (ev.xexpose.x, 0, 1514
1386 // ev.xexpose.width, TermWin.height, False); 1515 scr_refresh (refresh_type);
1387#endif
1388 want_refresh = 1;
1389 } 1516 }
1390 else 1517 else
1391 { 1518 {
1392 XEvent unused_event; 1519 XEvent unused_event;
1393 1520
1394 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1521 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1395 Expose, 1522 ;
1396 &unused_event)) ;
1397 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1523 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1398 GraphicsExpose, 1524 ;
1399 &unused_event)) ; 1525
1400 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1401 { 1527 {
1402 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1403 scrollbar_show (0); 1529 scrollbar_show (0);
1404 } 1530 }
1405#ifdef MENUBAR 1531#ifdef MENUBAR
1406 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1532 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1407 menubar_expose (); 1533 menubar_expose ();
1408#endif 1534#endif
1535
1536#ifdef TRANSPARENT
1537 if (am_transparent && ev.xany.window == TermWin.parent[0])
1538 XClearWindow (display->display, ev.xany.window);
1539#endif
1409 } 1540 }
1410 break; 1541 break;
1411 1542
1412 case MotionNotify: 1543 case MotionNotify:
1413#ifdef POINTER_BLANK 1544#ifdef POINTER_BLANK
… …
1415 pointer_unblank (); 1546 pointer_unblank ();
1416#endif 1547#endif
1417#if MENUBAR 1548#if MENUBAR
1418 if (isMenuBarWindow (ev.xany.window)) 1549 if (isMenuBarWindow (ev.xany.window))
1419 { 1550 {
1420 menubar_control (& (ev.xbutton)); 1551 menubar_control (ev.xbutton);
1421 break; 1552 break;
1422 } 1553 }
1423#endif 1554#endif
1424 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1425 break; 1556 break;
1426 1557
1427 if (ev.xany.window == TermWin.vt) 1558 if (ev.xany.window == TermWin.vt)
1428 { 1559 {
1429 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1560 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1430 { 1561 {
1431 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1562 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1432 ; 1563 ;
1433 1564
1434 XQueryPointer (display->display, TermWin.vt, 1565 XQueryPointer (display->display, TermWin.vt,
1435 &unused_root, &unused_child, 1566 &unused_root, &unused_child,
1436 &unused_root_x, &unused_root_y, 1567 &unused_root_x, &unused_root_y,
1437 & (ev.xbutton.x), & (ev.xbutton.y), 1568 &ev.xbutton.x, &ev.xbutton.y,
1438 &unused_mask); 1569 &ev.xbutton.state);
1439#ifdef MOUSE_THRESHOLD 1570#ifdef MOUSE_THRESHOLD
1440 /* deal with a `jumpy' mouse */ 1571 /* deal with a `jumpy' mouse */
1441 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1572 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1442 { 1573 {
1443#endif 1574#endif
1575#if ISO_14755
1576 // 5.4
1577 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1578 {
1579 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1580 break;
1581 }
1582#endif
1444 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1583 selection_extend (ev.xbutton.x, ev.xbutton.y,
1445 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1584 ev.xbutton.state & Button3Mask ? 2 : 0);
1585
1446#ifdef SELECTION_SCROLLING 1586#ifdef SELECTION_SCROLLING
1447 if (ev.xbutton.y < TermWin.int_bwidth 1587 if (ev.xbutton.y < TermWin.int_bwidth
1448 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1588 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1449 { 1589 {
1450 int dist; 1590 int dist;
1451 1591
1452 pending_scroll_selection=1;
1453
1454 /* don't clobber the current delay if we are 1592 /* don't clobber the current delay if we are
1455 * already in the middle of scrolling. 1593 * already in the middle of scrolling.
1456 */ 1594 */
1457 if (scroll_selection_delay<=0) 1595 if (!sel_scroll_ev.active)
1458 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1596 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1459 1597
1460 /* save the event params so we can highlight 1598 /* save the event params so we can highlight
1461 * the selection in the pending-scroll loop 1599 * the selection in the pending-scroll loop
1462 */ 1600 */
1463 selection_save_x=ev.xbutton.x; 1601 selection_save_x = ev.xbutton.x;
1464 selection_save_y=ev.xbutton.y; 1602 selection_save_y = ev.xbutton.y;
1465 selection_save_state=
1466 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1603 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1467 1604
1468 /* calc number of lines to scroll */ 1605 /* calc number of lines to scroll */
1469 if (ev.xbutton.y<TermWin.int_bwidth) 1606 if (ev.xbutton.y < TermWin.int_bwidth)
1470 { 1607 {
1471 scroll_selection_dir = UP; 1608 scroll_selection_dir = UP;
1472 dist = TermWin.int_bwidth - ev.xbutton.y; 1609 dist = TermWin.int_bwidth - ev.xbutton.y;
1473 } 1610 }
1474 else 1611 else
1475 { 1612 {
1476 scroll_selection_dir = DN; 1613 scroll_selection_dir = DN;
1477 dist = ev.xbutton.y -
1478 (TermWin.int_bwidth + TermWin.height); 1614 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1479 } 1615 }
1616
1480 scroll_selection_lines= (Pixel2Height (dist)/ 1617 scroll_selection_lines = Pixel2Height (dist)
1481 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1618 / SELECTION_SCROLL_LINE_SPEEDUP
1619 + 1;
1482 MIN_IT (scroll_selection_lines, 1620 MIN_IT (scroll_selection_lines,
1483 SELECTION_SCROLL_MAX_LINES); 1621 SELECTION_SCROLL_MAX_LINES);
1484 } 1622 }
1485 else 1623 else
1486 { 1624 {
1487 /* we are within the text window, so we 1625 /* we are within the text window, so we
1488 * shouldn't be scrolling 1626 * shouldn't be scrolling
1489 */ 1627 */
1490 pending_scroll_selection = 0; 1628 if (sel_scroll_ev.active)
1629 sel_scroll_ev.stop();
1491 } 1630 }
1492#endif 1631#endif
1493#ifdef MOUSE_THRESHOLD 1632#ifdef MOUSE_THRESHOLD
1494
1495 } 1633 }
1496#endif 1634#endif
1497
1498 } 1635 }
1499 } 1636 }
1500 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1637 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1501 { 1638 {
1502 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1639 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1503 MotionNotify, &ev)) ; 1640 MotionNotify, &ev))
1641 ;
1642
1504 XQueryPointer (display->display, scrollBar.win, 1643 XQueryPointer (display->display, scrollBar.win,
1505 &unused_root, &unused_child, 1644 &unused_root, &unused_child,
1506 &unused_root_x, &unused_root_y, 1645 &unused_root_x, &unused_root_y,
1507 & (ev.xbutton.x), & (ev.xbutton.y), 1646 &ev.xbutton.x, &ev.xbutton.y,
1508 &unused_mask); 1647 &unused_mask);
1509 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1648 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1510 scrollbar_size ()); 1649 scrollbar_size ());
1511 scr_refresh (refresh_type); 1650 scr_refresh (refresh_type);
1512 refresh_limit = 0; 1651 refresh_limit = 0;
… …
1514 } 1653 }
1515 break; 1654 break;
1516 } 1655 }
1517} 1656}
1518 1657
1658#if TRANSPARENT
1519void 1659void
1520rxvt_term::rootwin_cb (XEvent &ev) 1660rxvt_term::rootwin_cb (XEvent &ev)
1521{ 1661{
1522 SET_R (this); 1662 SET_R (this);
1523 SET_LOCALE (locale); 1663 SET_LOCALE (locale);
1524 1664
1525 switch (ev.type) 1665 switch (ev.type)
1526 { 1666 {
1527 case PropertyNotify: 1667 case PropertyNotify:
1528 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1529 {
1530 if (ev.xproperty.state == PropertyNewValue)
1531 selection_property (ev.xproperty.window, ev.xproperty.atom);
1532 break;
1533 }
1534#ifdef TRANSPARENT
1535 else
1536 {
1537 /* 1668 /*
1538 * if user used some Esetroot compatible prog to set the root bg, 1669 * if user used some Esetroot compatible prog to set the root bg,
1539 * use the property to determine the pixmap. We use it later on. 1670 * use the property to determine the pixmap. We use it later on.
1540 */ 1671 */
1541 if (xa[XA_XROOTPMAPID] == 0) 1672 if (xa[XA_XROOTPMAPID] == 0)
1542 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1543 1674
1544 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1545 return; 1676 return;
1546 }
1547 1677
1548 /* FALLTHROUGH */ 1678 /* FALLTHROUGH */
1549 case ReparentNotify: 1679 case ReparentNotify:
1550 if ((Options & Opt_transparent) && check_our_parents ()) 1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1551 if (am_transparent)
1552 want_full_refresh = 1; 1681 want_refresh = want_full_refresh = 1;
1553 break; 1682 break;
1554#endif
1555 } 1683 }
1556} 1684}
1685#endif
1557 1686
1558void 1687void
1559rxvt_term::button_press (const XButtonEvent &ev) 1688rxvt_term::button_press (XButtonEvent &ev)
1560{ 1689{
1561 int reportmode = 0, clickintime; 1690 int reportmode = 0, clickintime;
1562 1691
1563 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1692 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1564 if (!bypass_keystate) 1693 if (!bypass_keystate)
1565 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1694 reportmode = !! (priv_modes & PrivMode_mouse_report);
1695
1566 /* 1696 /*
1567 * VT window processing of button press 1697 * VT window processing of button press
1568 */ 1698 */
1569 if (ev.window == TermWin.vt) 1699 if (ev.window == TermWin.vt)
1570 { 1700 {
1701#if ISO_14755
1702 // 5.4
1703 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1704 {
1705 iso14755_54 (ev.x, ev.y);
1706 return;
1707 }
1708#endif
1709
1571 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1710 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1711
1572 if (reportmode) 1712 if (reportmode)
1573 { 1713 {
1574 /* mouse report from vt window */ 1714 /* mouse report from vt window */
1575 /* save the xbutton state (for ButtonRelease) */ 1715 /* save the xbutton state (for ButtonRelease) */
1576 MEvent.state = ev.state; 1716 MEvent.state = ev.state;
… …
1605 } 1745 }
1606 else 1746 else
1607 { 1747 {
1608 if (ev.button != MEvent.button) 1748 if (ev.button != MEvent.button)
1609 MEvent.clicks = 0; 1749 MEvent.clicks = 0;
1750
1610 switch (ev.button) 1751 switch (ev.button)
1611 { 1752 {
1612 case Button1: 1753 case Button1:
1754 /* allow meta + click to select rectangular areas */
1755 /* should be done in screen.C */
1756#if ENABLE_FRILLS
1757 selection.rect = !! (ev.state & ModMetaMask);
1758#else
1759 selection.rect = false;
1760#endif
1761
1613 /* allow shift+left click to extend selection */ 1762 /* allow shift+left click to extend selection */
1614 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1763 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1615 { 1764 {
1616 if (MEvent.button == Button1 && clickintime) 1765 if (MEvent.button == Button1 && clickintime)
1617 selection_rotate (ev.x, ev.y); 1766 selection_rotate (ev.x, ev.y);
1618 else 1767 else
1619 selection_extend (ev.x, ev.y, 1); 1768 selection_extend (ev.x, ev.y, 1);
… …
1634 case Button3: 1783 case Button3:
1635 if (MEvent.button == Button3 && clickintime) 1784 if (MEvent.button == Button3 && clickintime)
1636 selection_rotate (ev.x, ev.y); 1785 selection_rotate (ev.x, ev.y);
1637 else 1786 else
1638 selection_extend (ev.x, ev.y, 1); 1787 selection_extend (ev.x, ev.y, 1);
1788
1639 MEvent.button = Button3; 1789 MEvent.button = Button3;
1640 break; 1790 break;
1641 } 1791 }
1642 } 1792 }
1793
1643 MEvent.time = ev.time; 1794 MEvent.time = ev.time;
1644 return; 1795 return;
1645 } 1796 }
1646 1797
1647 /* 1798 /*
… …
1713 upordown = 1; /* down */ 1864 upordown = 1; /* down */
1714 } 1865 }
1715 if (upordown) 1866 if (upordown)
1716 { 1867 {
1717#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1868#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1718 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1869 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1719#endif 1870#endif
1720 if (scr_page (upordown < 0 ? UP : DN, 1)) 1871 if (scr_page (upordown < 0 ? UP : DN, 1))
1721 { 1872 {
1722 if (upordown < 0) 1873 if (upordown < 0)
1723 scrollBar.setUp (); 1874 scrollBar.setUp ();
… …
1739 break; 1890 break;
1740 case R_SB_ALIGN_BOTTOM: 1891 case R_SB_ALIGN_BOTTOM:
1741 csrO = scrollBar.bot - scrollBar.top; 1892 csrO = scrollBar.bot - scrollBar.top;
1742 break; 1893 break;
1743 } 1894 }
1895
1744 if (scrollBar.style == R_SB_XTERM 1896 if (scrollBar.style == R_SB_XTERM
1745 || scrollbar_above_slider (ev.y) 1897 || scrollbar_above_slider (ev.y)
1746 || scrollbar_below_slider (ev.y)) 1898 || scrollbar_below_slider (ev.y))
1747 scr_move_to ( scrollbar_position (ev.y) - csrO, 1899 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1748 scrollbar_size ()); 1900
1749 scrollBar.setMotion (); 1901 scrollBar.setMotion ();
1750 break; 1902 break;
1751 1903
1752 case Button1: 1904 case Button1:
1753 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1905 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1777 scr_page ((ev.button == Button1 ? DN : UP), 1929 scr_page ((ev.button == Button1 ? DN : UP),
1778 (TermWin.nrow 1930 (TermWin.nrow
1779 * scrollbar_position (ev.y) 1931 * scrollbar_position (ev.y)
1780 / scrollbar_size ())); 1932 / scrollbar_size ()));
1781 } 1933 }
1934
1782 break; 1935 break;
1783 } 1936 }
1784 } 1937 }
1785 return; 1938 return;
1786 } 1939 }
… …
1792 menubar_control (ev); 1945 menubar_control (ev);
1793#endif 1946#endif
1794} 1947}
1795 1948
1796void 1949void
1797rxvt_term::button_release (const XButtonEvent &ev) 1950rxvt_term::button_release (XButtonEvent &ev)
1798{ 1951{
1799 int reportmode = 0; 1952 int reportmode = 0;
1800 1953
1801 csrO = 0; /* reset csr Offset */ 1954 csrO = 0; /* reset csr Offset */
1802 if (!bypass_keystate) 1955 if (!bypass_keystate)
1803 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1956 reportmode = !! (priv_modes & PrivMode_mouse_report);
1804 1957
1805 if (scrollbar_isUpDn ()) 1958 if (scrollbar_isUpDn ())
1806 { 1959 {
1807 scrollBar.setIdle (); 1960 scrollBar.setIdle ();
1808 scrollbar_show (0); 1961 scrollbar_show (0);
1809#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1962#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1810 refresh_type &= ~SMOOTH_REFRESH; 1963 refresh_type &= ~SMOOTH_REFRESH;
1811#endif 1964#endif
1812
1813 } 1965 }
1966
1814#ifdef SELECTION_SCROLLING 1967#ifdef SELECTION_SCROLLING
1815 pending_scroll_selection=0; 1968 if (sel_scroll_ev.active)
1969 sel_scroll_ev.stop();
1816#endif 1970#endif
1971
1817 if (ev.window == TermWin.vt) 1972 if (ev.window == TermWin.vt)
1818 { 1973 {
1974#if ISO_14755
1975 // 5.4
1976 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1977 return;
1978#endif
1819 if (reportmode) 1979 if (reportmode)
1820 { 1980 {
1821 /* mouse report from vt window */ 1981 /* mouse report from vt window */
1822 /* don't report release of wheel "buttons" */ 1982 /* don't report release of wheel "buttons" */
1823 if (ev.button >= 4) 1983 if (ev.button >= 4)
… …
1837 MEvent.button = AnyButton; 1997 MEvent.button = AnyButton;
1838 mouse_report (ev); 1998 mouse_report (ev);
1839#endif /* MOUSE_REPORT_DOUBLECLICK */ 1999#endif /* MOUSE_REPORT_DOUBLECLICK */
1840 return; 2000 return;
1841 } 2001 }
2002
1842 /* 2003 /*
1843 * dumb hack to compensate for the failure of click-and-drag 2004 * dumb hack to compensate for the failure of click-and-drag
1844 * when overriding mouse reporting 2005 * when overriding mouse reporting
1845 */ 2006 */
1846 if (PrivateModes & PrivMode_mouse_report 2007 if (priv_modes & PrivMode_mouse_report
1847 && bypass_keystate 2008 && bypass_keystate
1848 && ev.button == Button1 && MEvent.clicks <= 1) 2009 && ev.button == Button1 && MEvent.clicks <= 1)
1849 selection_extend (ev.x, ev.y, 0); 2010 selection_extend (ev.x, ev.y, 0);
1850 2011
1851 switch (ev.button) 2012 switch (ev.button)
… …
1862 case Button5: 2023 case Button5:
1863 { 2024 {
1864 int i; 2025 int i;
1865 page_dirn v; 2026 page_dirn v;
1866 2027
1867 v = (ev.button == Button4) ? UP : DN; 2028 v = ev.button == Button4 ? UP : DN;
2029
1868 if (ev.state & ShiftMask) 2030 if (ev.state & ShiftMask)
1869 i = 1; 2031 i = 1;
1870 else if ((Options & Opt_mouseWheelScrollPage)) 2032 else if (options & Opt_mouseWheelScrollPage)
1871 i = TermWin.nrow - 1; 2033 i = TermWin.nrow - 1;
1872 else 2034 else
1873 i = 5; 2035 i = 5;
2036
1874# ifdef MOUSE_SLIP_WHEELING 2037# ifdef MOUSE_SLIP_WHEELING
1875 if (ev.state & ControlMask) 2038 if (ev.state & ControlMask)
1876 { 2039 {
1877 mouse_slip_wheel_speed += (v ? -1 : 1); 2040 mouse_slip_wheel_speed += v ? -1 : 1;
2041 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2042 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2043
2044 if (slip_wheel_ev.at < NOW)
1878 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2045 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2046
2047 slip_wheel_ev.start ();
1879 } 2048 }
2049 else
2050 {
1880# endif 2051# endif
1881# ifdef JUMP_MOUSE_WHEEL 2052# ifdef JUMP_MOUSE_WHEEL
1882 scr_page (v, i);
1883 scr_refresh (SMOOTH_REFRESH);
1884 scrollbar_show (1);
1885# else
1886 while (i--)
1887 {
1888 scr_page (v, 1); 2053 scr_page (v, i);
1889 scr_refresh (SMOOTH_REFRESH); 2054 scr_refresh (SMOOTH_REFRESH);
1890 scrollbar_show (1); 2055 scrollbar_show (1);
2056# else
2057 while (i--)
2058 {
2059 scr_page (v, 1);
2060 scr_refresh (SMOOTH_REFRESH);
2061 scrollbar_show (1);
2062 }
2063# endif
2064# ifdef MOUSE_SLIP_WHEELING
1891 } 2065 }
1892# endif 2066#endif
1893
1894 } 2067 }
1895 break; 2068 break;
1896#endif 2069#endif
1897
1898 } 2070 }
1899 } 2071 }
1900#ifdef MENUBAR 2072#ifdef MENUBAR
1901 else if (isMenuBarWindow (ev.window)) 2073 else if (isMenuBarWindow (ev.window))
1902 menubar_control (ev); 2074 menubar_control (ev);
1903#endif 2075#endif
1904} 2076}
1905 2077
1906
1907#ifdef TRANSPARENT 2078#ifdef TRANSPARENT
2079#if TINTING
2080/* taken from aterm-0.4.2 */
2081
2082typedef uint32_t RUINT32T;
2083
2084void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2085{
2086 int sh_r, sh_g, sh_b;
2087 RUINT32T mask_r, mask_g, mask_b;
2088 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2089 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2090 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2091 int i;
2092
2093 Visual* visual = display->visual;
2094
2095 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2096
2097 /* for convenience */
2098 mask_r = visual->red_mask;
2099 mask_g = visual->green_mask;
2100 mask_b = visual->blue_mask;
2101
2102 /* boring lookup table pre-initialization */
2103 switch (srcImage->bits_per_pixel) {
2104 case 15:
2105 if ((mask_r != 0x7c00) ||
2106 (mask_g != 0x03e0) ||
2107 (mask_b != 0x001f))
2108 return;
2109 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2110 lookup_r = lookup;
2111 lookup_g = lookup+32;
2112 lookup_b = lookup+32+32;
2113 sh_r = 10;
2114 sh_g = 5;
2115 sh_b = 0;
2116 break;
2117 case 16:
2118 if ((mask_r != 0xf800) ||
2119 (mask_g != 0x07e0) ||
2120 (mask_b != 0x001f))
2121 return;
2122 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2123 lookup_r = lookup;
2124 lookup_g = lookup+32;
2125 lookup_b = lookup+32+64;
2126 sh_r = 11;
2127 sh_g = 5;
2128 sh_b = 0;
2129 break;
2130 case 24:
2131 if ((mask_r != 0xff0000) ||
2132 (mask_g != 0x00ff00) ||
2133 (mask_b != 0x0000ff))
2134 return;
2135 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2136 lookup_r = lookup;
2137 lookup_g = lookup+256;
2138 lookup_b = lookup+256+256;
2139 sh_r = 16;
2140 sh_g = 8;
2141 sh_b = 0;
2142 break;
2143 case 32:
2144 if ((mask_r != 0xff0000) ||
2145 (mask_g != 0x00ff00) ||
2146 (mask_b != 0x0000ff))
2147 return;
2148 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2149 lookup_r = lookup;
2150 lookup_g = lookup+256;
2151 lookup_b = lookup+256+256;
2152 sh_r = 16;
2153 sh_g = 8;
2154 sh_b = 0;
2155 break;
2156 default:
2157 return; /* we do not support this color depth */
2158 }
2159
2160 /* prepare limits for color transformation (each channel is handled separately) */
2161 if (shade < 0) {
2162 shade = -shade;
2163 if (shade < 0) shade = 0;
2164 if (shade > 100) shade = 100;
2165
2166 lower_lim_r = 65535-rm;
2167 lower_lim_g = 65535-gm;
2168 lower_lim_b = 65535-bm;
2169
2170 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2171 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2172 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2173
2174 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2175 } else {
2176 if (shade < 0) shade = 0;
2177 if (shade > 100) shade = 100;
2178
2179 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2180
2181 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2182 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2183 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2184 }
2185
2186 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2187 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2188 {
2189 unsigned int tmp;
2190
2191 tmp = lower_lim_r;
2192 lower_lim_r = lower_lim_b;
2193 lower_lim_b = tmp;
2194
2195 tmp = upper_lim_r;
2196 upper_lim_r = upper_lim_b;
2197 upper_lim_b = tmp;
2198 }
2199
2200 /* fill our lookup tables */
2201 for (i = 0; i <= mask_r>>sh_r; i++)
2202 {
2203 RUINT32T tmp;
2204 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2205 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2206 lookup_r[i] = (tmp/65535)<<sh_r;
2207 }
2208 for (i = 0; i <= mask_g>>sh_g; i++)
2209 {
2210 RUINT32T tmp;
2211 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2212 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2213 lookup_g[i] = (tmp/65535)<<sh_g;
2214 }
2215 for (i = 0; i <= mask_b>>sh_b; i++)
2216 {
2217 RUINT32T tmp;
2218 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2219 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2220 lookup_b[i] = (tmp/65535)<<sh_b;
2221 }
2222
2223 /* apply table to input image (replacing colors by newly calculated ones) */
2224 switch (srcImage->bits_per_pixel)
2225 {
2226 case 15:
2227 {
2228 unsigned short *p1, *pf, *p, *pl;
2229 p1 = (unsigned short *) srcImage->data;
2230 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2231 while (p1 < pf)
2232 {
2233 p = p1;
2234 pl = p1 + srcImage->width;
2235 for (; p < pl; p++)
2236 {
2237 *p = lookup_r[(*p & 0x7c00)>>10] |
2238 lookup_g[(*p & 0x03e0)>> 5] |
2239 lookup_b[(*p & 0x001f)];
2240 }
2241 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2242 }
2243 break;
2244 }
2245 case 16:
2246 {
2247 unsigned short *p1, *pf, *p, *pl;
2248 p1 = (unsigned short *) srcImage->data;
2249 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2250 while (p1 < pf)
2251 {
2252 p = p1;
2253 pl = p1 + srcImage->width;
2254 for (; p < pl; p++)
2255 {
2256 *p = lookup_r[(*p & 0xf800)>>11] |
2257 lookup_g[(*p & 0x07e0)>> 5] |
2258 lookup_b[(*p & 0x001f)];
2259 }
2260 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2261 }
2262 break;
2263 }
2264 case 24:
2265 {
2266 unsigned char *p1, *pf, *p, *pl;
2267 p1 = (unsigned char *) srcImage->data;
2268 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width * 3;
2273 for (; p < pl; p += 3)
2274 {
2275 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2276 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2277 p[2] = lookup_r[(p[2] & 0x0000ff)];
2278 }
2279 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2280 }
2281 break;
2282 }
2283 case 32:
2284 {
2285 RUINT32T *p1, *pf, *p, *pl;
2286 p1 = (RUINT32T *) srcImage->data;
2287 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2288
2289 while (p1 < pf)
2290 {
2291 p = p1;
2292 pl = p1 + srcImage->width;
2293 for (; p < pl; p++)
2294 {
2295 *p = lookup_r[(*p & 0xff0000)>>16] |
2296 lookup_g[(*p & 0x00ff00)>> 8] |
2297 lookup_b[(*p & 0x0000ff)] |
2298 (*p & ~0xffffff);
2299 }
2300 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2301 }
2302 break;
2303 }
2304 }
2305
2306 free (lookup);
2307}
2308#endif
2309
1908/* 2310/*
1909 * Check our parents are still who we think they are. 2311 * Check our parents are still who we think they are.
1910 * Do transparency updates if required 2312 * Do transparency updates if required
1911 */ 2313 */
1912int 2314int
1913rxvt_term::check_our_parents () 2315rxvt_term::check_our_parents ()
1914{ 2316{
1915 int i, pchanged, aformat, have_pixmap, rootdepth; 2317 int i, pchanged, aformat, have_pixmap, rootdepth;
1916 unsigned long nitems, bytes_after; 2318 unsigned long nitems, bytes_after;
1917 Atom atype; 2319 Atom atype;
1918 unsigned char *prop = NULL; 2320 unsigned char *prop = NULL;
1919 Window root, oldp, *list; 2321 Window root, oldp, *list;
1920 Pixmap rootpixmap = None; 2322 Pixmap rootpixmap = None;
1921 XWindowAttributes wattr, wrootattr; 2323 XWindowAttributes wattr, wrootattr;
1922 2324
1923 pchanged = 0; 2325 pchanged = 0;
1924 2326
1925 if (! (Options & Opt_transparent)) 2327 if (!(options & Opt_transparent))
1926 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
1927 2329
1928 XGetWindowAttributes (display->display, display->root, &wrootattr); 2330 XGetWindowAttributes (display->display, display->root, &wrootattr);
1929 rootdepth = wrootattr.depth; 2331 rootdepth = wrootattr.depth;
1930 2332
1931 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2333 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2334
1932 if (rootdepth != wattr.depth) 2335 if (rootdepth != wattr.depth)
1933 { 2336 {
1934 if (am_transparent) 2337 if (am_transparent)
1935 { 2338 {
1936 pchanged = 1; 2339 pchanged = 1;
1937 XSetWindowBackground (display->display, TermWin.vt, 2340 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1938 PixColors[Color_bg]);
1939 am_transparent = am_pixmap_trans = 0; 2341 am_transparent = am_pixmap_trans = 0;
1940 } 2342 }
2343
1941 return pchanged; /* Don't try any more */ 2344 return pchanged; /* Don't try any more */
1942 } 2345 }
1943 2346
1944 /* Get all X ops out of the queue so that our information is up-to-date. */ 2347 /* Get all X ops out of the queue so that our information is up-to-date. */
1945 XSync (display->display, False); 2348 XSync (display->display, False);
… …
1947 /* 2350 /*
1948 * Make the frame window set by the window manager have 2351 * Make the frame window set by the window manager have
1949 * the root background. Some window managers put multiple nested frame 2352 * the root background. Some window managers put multiple nested frame
1950 * windows for each client, so we have to take care about that. 2353 * windows for each client, so we have to take care about that.
1951 */ 2354 */
1952 i = (xa[XA_XROOTPMAPID] != 0 2355 i = (xa[XA_XROOTPMAPID]
1953 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1954 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1955 &nitems, &bytes_after, &prop) == Success)); 2358 &nitems, &bytes_after, &prop) == Success);
2359
1956 if (!i || prop == NULL) 2360 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success);
2365
2366 if (!i || prop == NULL
2367#if TINTING
2368 || !rs[Rs_color + Color_tint]
2369#endif
2370 )
1957 have_pixmap = 0; 2371 have_pixmap = 0;
1958 else 2372 else
1959 { 2373 {
1960 have_pixmap = 1; 2374 have_pixmap = 1;
1961 rootpixmap = * ((Pixmap *)prop); 2375 rootpixmap = *(Pixmap *)prop;
1962 XFree (prop); 2376 XFree (prop);
1963 } 2377 }
2378
1964 if (have_pixmap) 2379 if (have_pixmap)
1965 { 2380 {
1966 /* 2381 /*
1967 * Copy display->root pixmap transparency 2382 * Copy display->root pixmap transparency
1968 */ 2383 */
1969 int sx, sy, nx, ny; 2384 int sx, sy, nx, ny;
1970 unsigned int nw, nh; 2385 unsigned int nw, nh;
1971 Window cr; 2386 Window cr;
1972 XImage *image; 2387 XImage *image;
1973 GC gc; 2388 GC gc;
1974 XGCValues gcvalue; 2389 XGCValues gcvalue;
1975 2390
1976 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2391 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1977 0, 0, &sx, &sy, &cr); 2392 0, 0, &sx, &sy, &cr);
1978 nw = (unsigned int)szHint.width; 2393 nw = (unsigned int)szHint.width;
1979 nh = (unsigned int)szHint.height; 2394 nh = (unsigned int)szHint.height;
1980 nx = ny = 0; 2395 nx = ny = 0;
2396
1981 if (sx < 0) 2397 if (sx < 0)
1982 { 2398 {
1983 nw += sx; 2399 nw += sx;
1984 nx = -sx; 2400 nx = -sx;
1985 sx = 0; 2401 sx = 0;
1986 } 2402 }
2403
1987 if (sy < 0) 2404 if (sy < 0)
1988 { 2405 {
1989 nh += sy; 2406 nh += sy;
1990 ny = -sy; 2407 ny = -sy;
1991 sy = 0; 2408 sy = 0;
1992 } 2409 }
2410
1993 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2411 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1994 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2412 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2413
2414 XSync (display->display, False);
1995 allowedxerror = -1; 2415 allowedxerror = -1;
1996 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2416 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1997 ZPixmap); 2417
1998 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2418 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1999 /* XXX: may need a delay here? */ 2419 /* XXX: may need a delay here? */
2000 allowedxerror = 0; 2420 allowedxerror = 0;
2421
2001 if (image == NULL) 2422 if (image == NULL)
2002 { 2423 {
2003 if (am_transparent && am_pixmap_trans) 2424 if (am_transparent && am_pixmap_trans)
2004 { 2425 {
2005 pchanged = 1; 2426 pchanged = 1;
… …
2007 { 2428 {
2008 XFreePixmap (display->display, TermWin.pixmap); 2429 XFreePixmap (display->display, TermWin.pixmap);
2009 TermWin.pixmap = None; 2430 TermWin.pixmap = None;
2010 } 2431 }
2011 } 2432 }
2433
2012 am_pixmap_trans = 0; 2434 am_pixmap_trans = 0;
2013 } 2435 }
2014 else 2436 else
2015 { 2437 {
2016 if (TermWin.pixmap != None) 2438 if (TermWin.pixmap != None)
2017 XFreePixmap (display->display, TermWin.pixmap); 2439 XFreePixmap (display->display, TermWin.pixmap);
2440
2441#if TINTING
2442 if (ISSET_PIXCOLOR (Color_tint))
2443 {
2444 unsigned short rm, gm, bm;
2445 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2446
2447 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2448
2449 ShadeXImage (display, image, shade, rm, gm, bm);
2450 }
2451#endif
2452
2018 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2453 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2019 (unsigned int)szHint.width,
2020 (unsigned int)szHint.height, 2454 szHint.width, szHint.height, image->depth);
2021 (unsigned int)image->depth);
2022 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2455 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2023 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2456 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2024 nx, ny, (unsigned int)image->width,
2025 (unsigned int)image->height); 2457 nx, ny, image->width, image->height);
2026 XFreeGC (display->display, gc); 2458 XFreeGC (display->display, gc);
2027 XDestroyImage (image); 2459 XDestroyImage (image);
2028 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2460 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2029 TermWin.pixmap); 2461 XClearWindow (display->display, TermWin.parent[0]);
2462
2030 if (!am_transparent || !am_pixmap_trans) 2463 if (!am_transparent || !am_pixmap_trans)
2031 pchanged = 1; 2464 pchanged = 1;
2465
2032 am_transparent = am_pixmap_trans = 1; 2466 am_transparent = am_pixmap_trans = 1;
2033 } 2467 }
2034 } 2468 }
2469
2035 if (!am_pixmap_trans) 2470 if (am_pixmap_trans)
2471 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2472 else
2036 { 2473 {
2037 unsigned int n; 2474 unsigned int n;
2038 /* 2475 /*
2039 * InheritPixmap transparency 2476 * InheritPixmap transparency
2040 */ 2477 */
2041 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2042 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2478 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2043 i++)
2044 { 2479 {
2045 oldp = TermWin.parent[i]; 2480 oldp = TermWin.parent[i];
2046 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2481 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2047 &TermWin.parent[i], &list, &n); 2482 &TermWin.parent[i], &list, &n);
2048 XFree (list); 2483 XFree (list);
2049 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2484
2050 if (TermWin.parent[i] == display->root) 2485 if (TermWin.parent[i] == display->root)
2051 { 2486 {
2052 if (oldp != None) 2487 if (oldp != None)
2053 pchanged = 1; 2488 pchanged = 1;
2489
2054 break; 2490 break;
2055 } 2491 }
2492
2056 if (oldp != TermWin.parent[i]) 2493 if (oldp != TermWin.parent[i])
2057 pchanged = 1; 2494 pchanged = 1;
2058 } 2495 }
2496
2059 n = 0; 2497 n = 0;
2498
2060 if (pchanged) 2499 if (pchanged)
2061 { 2500 {
2062 for (; n < (unsigned int)i; n++) 2501 for (; n < (unsigned int)i; n++)
2063 { 2502 {
2064 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2503 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2065 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2066 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2504 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2067 { 2505 {
2068 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2506 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2069 break; 2507 break;
2070 } 2508 }
2071 } 2509 }
2072 } 2510 }
2073 if (n > (int) (sizeof (TermWin.parent) 2511
2074 / sizeof (TermWin.parent[0]))) 2512 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2075 { 2513 {
2076 D_X ((stderr, "InheritPixmap Turning off"));
2077 XSetWindowBackground (display->display, TermWin.parent[0], 2514 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2078 PixColors[Color_fg]);
2079 XSetWindowBackground (display->display, TermWin.vt, 2515 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2080 PixColors[Color_bg]);
2081 am_transparent = 0; 2516 am_transparent = 0;
2082 /* XXX: also turn off Opt_transparent? */ 2517 /* XXX: also turn off Opt_transparent? */
2083 } 2518 }
2084 else 2519 else
2085 { 2520 {
2521#if WAIT_FOR_WM
2086 /* wait (an arbitrary period) for the WM to do its thing 2522 /* wait (an arbitrary period) for the WM to do its thing
2087 * needed for fvwm2.2.2 (and before?) */ 2523 * needed for fvwm2.2.2 (and before?) */
2088# ifdef HAVE_NANOSLEEP
2089 struct timespec rqt;
2090
2091 rqt.tv_sec = 1;
2092 rqt.tv_nsec = 0;
2093 nanosleep (&rqt, NULL);
2094# else
2095 sleep (1); 2524 sleep (1);
2096# endif 2525#endif
2097 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2098 for (n = 0; n < (unsigned int)i; n++) 2526 for (n = 0; n < (unsigned int)i; n++)
2527 {
2099 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2528 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2100 ParentRelative); 2529 XClearWindow (display->display, TermWin.parent[n]);
2530 }
2531
2101 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2532 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2102 ParentRelative);
2103 am_transparent = 1; 2533 am_transparent = 1;
2104 } 2534 }
2535
2105 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2536 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2106 TermWin.parent[i] = None; 2537 TermWin.parent[i] = None;
2107 } 2538 }
2539
2540 if (scrollBar.win)
2541 {
2542 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2543 scrollBar.setIdle ();
2544 scrollbar_show (0);
2545 }
2546
2547 if (am_transparent)
2548 {
2549 want_refresh = want_full_refresh = 1;
2550 if (am_pixmap_trans)
2551 flush ();
2552 }
2553
2108 return pchanged; 2554 return pchanged;
2109} 2555}
2110#endif 2556#endif
2111 2557
2112/*}}} */ 2558/*}}} */
2559
2560bool
2561rxvt_term::cmd_parse ()
2562{
2563 bool flag = false;
2564 unicode_t ch = NOCHAR;
2565 unsigned char *seq_begin; // remember start of esc-sequence here
2566
2567 for (;;)
2568 {
2569 if (ch == NOCHAR)
2570 {
2571 seq_begin = cmdbuf_ptr;
2572 ch = next_char ();
2573 }
2574
2575 if (ch == NOCHAR) // TODO: improve
2576 break;
2577
2578 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2579 {
2580 if (!seen_input)
2581 {
2582 seen_input = 1;
2583 // many badly-written programs (e.g. jed) contain a race condition:
2584 // they first read the screensize and then install a SIGWINCH handler.
2585 // some window managers resize the window early, and these programs
2586 // then sometimes get the size wrong.
2587 // unfortunately other programs are even more buggy and dislike
2588 // being sent SIGWINCH, so only do it when we were in fact being
2589 // resized.
2590 if (seen_resize)
2591 kill (-cmd_pid, SIGWINCH);
2592 }
2593
2594 /* Read a text string from the input buffer */
2595 unicode_t buf[UBUFSIZ];
2596 bool refreshnow = false;
2597 int nlines = 0;
2598 unicode_t *str = buf;
2599
2600 for (;;)
2601 {
2602 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2603 break;
2604
2605 *str++ = ch;
2606
2607 if (ch == C0_LF)
2608 {
2609 nlines++;
2610 refresh_count++;
2611
2612 if (!(options & Opt_jumpScroll)
2613 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2614 {
2615 refreshnow = true;
2616 ch = NOCHAR;
2617 break;
2618 }
2619
2620 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2621 if (nlines >= TermWin.nrow - 1)
2622 {
2623 scr_add_lines (buf, nlines, str - buf);
2624 nlines = 0;
2625 str = buf;
2626 }
2627 }
2628
2629 if (str >= buf + UBUFSIZ)
2630 {
2631 ch = NOCHAR;
2632 break;
2633 }
2634
2635 seq_begin = cmdbuf_ptr;
2636 ch = next_char ();
2637 }
2638
2639 scr_add_lines (buf, nlines, str - buf);
2640
2641 /*
2642 * If there have been a lot of new lines, then update the screen
2643 * What the heck I'll cheat and only refresh less than every page-full.
2644 * the number of pages between refreshes is refresh_limit, which
2645 * is incremented here because we must be doing flat-out scrolling.
2646 */
2647 if (refreshnow)
2648 {
2649 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2650 refresh_limit++;
2651 else
2652 {
2653 flag = true;
2654 scr_refresh (refresh_type);
2655 }
2656 }
2657
2658 }
2659 else
2660 {
2661 try
2662 {
2663 process_nonprinting (ch);
2664 }
2665 catch (const class out_of_input &o)
2666 {
2667 // we ran out of input, retry later
2668 cmdbuf_ptr = seq_begin;
2669 break;
2670 }
2671
2672 ch = NOCHAR;
2673 }
2674 }
2675
2676 return flag;
2677}
2678
2679// read the next octet
2680unicode_t
2681rxvt_term::next_octet ()
2682{
2683 return cmdbuf_ptr < cmdbuf_endp
2684 ? *cmdbuf_ptr++
2685 : NOCHAR;
2686}
2687
2688// read the next character
2689unicode_t
2690rxvt_term::next_char ()
2691{
2692 while (cmdbuf_ptr < cmdbuf_endp)
2693 {
2694 // assume 7-bit to be ascii ALWAYS
2695 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2696 return *cmdbuf_ptr++;
2697
2698 wchar_t wc;
2699 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2700
2701 if (len == (size_t)-2)
2702 {
2703 // the mbstate stores incomplete sequences. didn't know this :/
2704 cmdbuf_ptr = cmdbuf_endp;
2705 break;
2706 }
2707
2708 if (len == (size_t)-1)
2709 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2710
2711 // assume wchar == unicode
2712 cmdbuf_ptr += len;
2713 return wc;
2714 }
2715
2716 return NOCHAR;
2717}
2718
2719/* rxvt_cmd_getc () - Return next input character */
2720/*
2721 * Return the next input character after first passing any keyboard input
2722 * to the command.
2723 */
2724unicode_t
2725rxvt_term::cmd_getc ()
2726{
2727 unicode_t c = next_char ();
2728
2729 if (c == NOCHAR)
2730 throw out_of_input;
2731
2732 return c;
2733}
2734
2735unicode_t
2736rxvt_term::cmd_get8 ()
2737{
2738 unicode_t c = next_octet ();
2739
2740 if (c == NOCHAR)
2741 throw out_of_input;
2742
2743 return c;
2744}
2113 2745
2114/*{{{ print pipe */ 2746/*{{{ print pipe */
2115/*----------------------------------------------------------------------*/ 2747/*----------------------------------------------------------------------*/
2116#ifdef PRINTPIPE 2748#ifdef PRINTPIPE
2117FILE * 2749FILE *
2118rxvt_term::popen_printer () 2750rxvt_term::popen_printer ()
2119{ 2751{
2120 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2752 FILE *stream = popen (rs[Rs_print_pipe], "w");
2121 2753
2122 if (stream == NULL) 2754 if (stream == NULL)
2123 rxvt_print_error ("can't open printer pipe"); 2755 rxvt_warn ("can't open printer pipe, not printing.\n");
2756
2124 return stream; 2757 return stream;
2125} 2758}
2126 2759
2127int 2760int
2128rxvt_term::pclose_printer (FILE *stream) 2761rxvt_term::pclose_printer (FILE *stream)
2129{ 2762{
2130 fflush (stream); 2763 fflush (stream);
2131 /* pclose () reported not to work on SunOS 4.1.3 */
2132# if defined (__sun__) /* TODO: RESOLVE THIS */
2133 /* pclose works provided SIGCHLD handler uses waitpid */
2134 return pclose (stream); /* return fclose (stream); */
2135# else
2136 return pclose (stream); 2764 return pclose (stream);
2137# endif
2138} 2765}
2139 2766
2140/* 2767/*
2141 * simulate attached vt100 printer 2768 * simulate attached vt100 printer
2142 */ 2769 */
2143void 2770void
2144rxvt_term::process_print_pipe () 2771rxvt_term::process_print_pipe ()
2145{ 2772{
2146 int done; 2773 int done;
2147 FILE *fd; 2774 FILE *fd;
2148 2775
2149 if ((fd = popen_printer ()) == NULL) 2776 if ((fd = popen_printer ()) == NULL)
2150 return; 2777 return;
2151 2778
2152 /* 2779 /*
2153 * Send all input to the printer until either ESC[4i or ESC[?4i 2780 * Send all input to the printer until either ESC[4i or ESC[?4i
2154 * is received. 2781 * is received.
2155 */ 2782 */
2156 for (done = 0; !done;) 2783 for (done = 0; !done;)
2157 { 2784 {
2158 unsigned char buf[8]; 2785 unsigned char buf[8];
2159 unsigned char ch; 2786 unicode_t ch;
2160 unsigned int i, len; 2787 unsigned int i, len;
2161 2788
2162 if ((ch = cmd_getc ()) != C0_ESC) 2789 if ((ch = cmd_getc ()) != C0_ESC)
2163 { 2790 {
2164 if (putc (ch, fd) == EOF) 2791 if (putc (ch, fd) == EOF)
2165 break; /* done = 1 */ 2792 break; /* done = 1 */
… …
2180 { 2807 {
2181 if ((buf[len++] = cmd_getc ()) == 'i') 2808 if ((buf[len++] = cmd_getc ()) == 'i')
2182 break; /* done = 1 */ 2809 break; /* done = 1 */
2183 } 2810 }
2184 } 2811 }
2812
2185 for (i = 0; i < len; i++) 2813 for (i = 0; i < len; i++)
2186 if (putc (buf[i], fd) == EOF) 2814 if (putc (buf[i], fd) == EOF)
2187 { 2815 {
2188 done = 1; 2816 done = 1;
2189 break; 2817 break;
2190 } 2818 }
2191 } 2819 }
2192 } 2820 }
2821
2193 pclose_printer (fd); 2822 pclose_printer (fd);
2194} 2823}
2195#endif /* PRINTPIPE */ 2824#endif /* PRINTPIPE */
2196/*}}} */ 2825/*}}} */
2197 2826
2198/* *INDENT-OFF* */ 2827/* *INDENT-OFF* */
2199enum { 2828enum {
2200 C1_40 = 0x40, 2829 C1_40 = 0x40,
2201 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2830 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2202 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2831 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2203 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2832 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2204 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2833 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2205}; 2834};
2206/* *INDENT-ON* */ 2835/* *INDENT-ON* */
2207 2836
2208/*{{{ process non-printing single characters */ 2837/*{{{ process non-printing single characters */
2209void 2838void
2210rxvt_term::process_nonprinting (unsigned char ch) 2839rxvt_term::process_nonprinting (unicode_t ch)
2211{ 2840{
2212 switch (ch) 2841 switch (ch)
2213 { 2842 {
2843 case C0_ESC:
2844 process_escape_seq ();
2845 break;
2214 case C0_ENQ: /* terminal Status */ 2846 case C0_ENQ: /* terminal Status */
2215 if (rs[Rs_answerbackstring]) 2847 if (rs[Rs_answerbackstring])
2216 tt_write (
2217 (const unsigned char *)rs[Rs_answerbackstring], 2848 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2218 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2849 (unsigned int)strlen (rs[Rs_answerbackstring]));
2219 else 2850 else
2220 tt_write ((unsigned char *)VT100_ANS, 2851 tt_write ((unsigned char *)VT100_ANS,
2221 (unsigned int)STRLEN (VT100_ANS)); 2852 (unsigned int)strlen (VT100_ANS));
2222 break; 2853 break;
2223 case C0_BEL: /* bell */ 2854 case C0_BEL: /* bell */
2224 scr_bell (); 2855 scr_bell ();
2225 break; 2856 break;
2226 case C0_BS: /* backspace */ 2857 case C0_BS: /* backspace */
… …
2241 scr_charset_choose (1); 2872 scr_charset_choose (1);
2242 break; 2873 break;
2243 case C0_SI: /* shift in - acs */ 2874 case C0_SI: /* shift in - acs */
2244 scr_charset_choose (0); 2875 scr_charset_choose (0);
2245 break; 2876 break;
2877
2878#ifdef EIGHT_BIT_CONTROLS
2879 // 8-bit controls
2880 case 0x90: /* DCS */
2881 process_dcs_seq ();
2882 break;
2883 case 0x9b: /* CSI */
2884 process_csi_seq ();
2885 break;
2886 case 0x9d: /* CSI */
2887 process_osc_seq ();
2888 break;
2889#endif
2246 } 2890 }
2247} 2891}
2248/*}}} */ 2892/*}}} */
2249 2893
2250 2894
2251/*{{{ process VT52 escape sequences */ 2895/*{{{ process VT52 escape sequences */
2252void 2896void
2253rxvt_term::process_escape_vt52 (unsigned char ch) 2897rxvt_term::process_escape_vt52 (unicode_t ch)
2254{ 2898{
2255 int row, col; 2899 int row, col;
2256 2900
2257 switch (ch) 2901 switch (ch)
2258 { 2902 {
… …
2310 2954
2311/*{{{ process escape sequences */ 2955/*{{{ process escape sequences */
2312void 2956void
2313rxvt_term::process_escape_seq () 2957rxvt_term::process_escape_seq ()
2314{ 2958{
2315 unsigned char ch = cmd_getc (); 2959 unicode_t ch = cmd_getc ();
2316 2960
2317 if (PrivateModes & PrivMode_vt52) 2961 if (priv_modes & PrivMode_vt52)
2318 { 2962 {
2319 process_escape_vt52 (ch); 2963 process_escape_vt52 (ch);
2320 return; 2964 return;
2321 } 2965 }
2322 2966
… …
2337 scr_charset_set (2, (unsigned int)cmd_getc ()); 2981 scr_charset_set (2, (unsigned int)cmd_getc ());
2338 break; 2982 break;
2339 case '+': 2983 case '+':
2340 scr_charset_set (3, (unsigned int)cmd_getc ()); 2984 scr_charset_set (3, (unsigned int)cmd_getc ());
2341 break; 2985 break;
2342#ifdef MULTICHAR_SET 2986#if ENABLE_FRILLS
2343 case '$':
2344 scr_charset_set (-2, (unsigned int)cmd_getc ());
2345 break;
2346#endif
2347#ifndef NO_FRILLS
2348 case '6': 2987 case '6':
2349 scr_backindex (); 2988 scr_backindex ();
2350 break; 2989 break;
2351#endif 2990#endif
2352 case '7': 2991 case '7':
2353 scr_cursor (SAVE); 2992 scr_cursor (SAVE);
2354 break; 2993 break;
2355 case '8': 2994 case '8':
2356 scr_cursor (RESTORE); 2995 scr_cursor (RESTORE);
2357 break; 2996 break;
2358#ifndef NO_FRILLS 2997#if ENABLE_FRILLS
2359 case '9': 2998 case '9':
2360 scr_forwardindex (); 2999 scr_forwardindex ();
2361 break; 3000 break;
2362#endif 3001#endif
2363 case '=': 3002 case '=':
… …
2373 break; 3012 break;
2374 3013
2375 /* 8.3.87: NEXT LINE */ 3014 /* 8.3.87: NEXT LINE */
2376 case C1_NEL: /* ESC E */ 3015 case C1_NEL: /* ESC E */
2377 { 3016 {
2378 uint32_t nlcr[] = { '\n', '\r' }; 3017 unicode_t nlcr[] = { C0_LF, C0_CR };
2379 scr_add_lines (nlcr, 1, 2); 3018 scr_add_lines (nlcr, 1, 2);
2380 } 3019 }
2381 break; 3020 break;
2382 3021
2383 /* kidnapped escape sequence: Should be 8.3.48 */ 3022 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2394 case C1_RI: /* ESC M */ 3033 case C1_RI: /* ESC M */
2395 scr_index (DN); 3034 scr_index (DN);
2396 break; 3035 break;
2397 3036
2398 /* 8.3.142: SINGLE-SHIFT TWO */ 3037 /* 8.3.142: SINGLE-SHIFT TWO */
2399 /*case C1_SS2: scr_single_shift (2); break; */ 3038 /*case C1_SS2: scr_single_shift (2); break; */
2400 3039
2401 /* 8.3.143: SINGLE-SHIFT THREE */ 3040 /* 8.3.143: SINGLE-SHIFT THREE */
2402 /*case C1_SS3: scr_single_shift (3); break; */ 3041 /*case C1_SS3: scr_single_shift (3); break; */
2403 3042
2404 /* 8.3.27: DEVICE CONTROL STRING */ 3043 /* 8.3.27: DEVICE CONTROL STRING */
2405 case C1_DCS: /* ESC P */ 3044 case C1_DCS: /* ESC P */
2406 process_dcs_seq (); 3045 process_dcs_seq ();
2407 break; 3046 break;
… …
2422 process_osc_seq (); 3061 process_osc_seq ();
2423 break; 3062 break;
2424 3063
2425 /* 8.3.106: RESET TO INITIAL STATE */ 3064 /* 8.3.106: RESET TO INITIAL STATE */
2426 case 'c': 3065 case 'c':
3066 mbstate.reset ();
2427 scr_poweron (); 3067 scr_poweron ();
2428 scrollbar_show (1); 3068 scrollbar_show (1);
2429 break; 3069 break;
2430 3070
2431 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3071 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2443 3083
2444/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3084/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2445/* *INDENT-OFF* */ 3085/* *INDENT-OFF* */
2446enum { 3086enum {
2447 CSI_ICH = 0x40, 3087 CSI_ICH = 0x40,
2448 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3088 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2449 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3089 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2450 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3090 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2451 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3091 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2452 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3092 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2453 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3093 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2468 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3108 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2469 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3109 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2470 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3110 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2471 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3111 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2472 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3112 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2473 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3113 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2474 }; 3114 };
2475/* *INDENT-ON* */ 3115/* *INDENT-ON* */
2476 3116
2477void 3117void
2478rxvt_term::process_csi_seq () 3118rxvt_term::process_csi_seq ()
2479{ 3119{
2480 unsigned char ch, priv, i; 3120 unicode_t ch, priv, i;
2481 unsigned int nargs, p; 3121 unsigned int nargs, p;
2482 int n, ndef; 3122 int n, ndef;
2483 int arg[ESC_ARGS]; 3123 int arg[ESC_ARGS];
2484 3124
2485 for (nargs = ESC_ARGS; nargs > 0;) 3125 for (nargs = ESC_ARGS; nargs > 0;)
2486 arg[--nargs] = 0; 3126 arg[--nargs] = 0;
2487 3127
2488 priv = 0; 3128 priv = 0;
… …
2490 if (ch >= '<' && ch <= '?') 3130 if (ch >= '<' && ch <= '?')
2491 { /* '<' '=' '>' '?' */ 3131 { /* '<' '=' '>' '?' */
2492 priv = ch; 3132 priv = ch;
2493 ch = cmd_getc (); 3133 ch = cmd_getc ();
2494 } 3134 }
3135
2495 /* read any numerical arguments */ 3136 /* read any numerical arguments */
2496 for (n = -1; ch < CSI_ICH; ) 3137 for (n = -1; ch < CSI_ICH; )
2497 { 3138 {
2498 if (isdigit (ch)) 3139 if (isdigit (ch))
2499 { 3140 {
… …
2506 { 3147 {
2507 if (nargs < ESC_ARGS) 3148 if (nargs < ESC_ARGS)
2508 arg[nargs++] = n; 3149 arg[nargs++] = n;
2509 n = -1; 3150 n = -1;
2510 } 3151 }
2511 else if (ch == '\b') 3152 else if (IS_CONTROL (ch))
2512 {
2513 scr_backspace ();
2514 }
2515 else if (ch == C0_ESC)
2516 {
2517 process_escape_seq ();
2518 return;
2519 }
2520 else if (ch < ' ')
2521 {
2522 process_nonprinting (ch); 3153 process_nonprinting (ch);
2523 } 3154
2524 ch = cmd_getc (); 3155 ch = cmd_getc ();
2525 } 3156 }
2526 3157
2527 if (ch > CSI_7F) 3158 if (ch > CSI_7F)
2528 return; 3159 return;
… …
2670 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3301 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2671 break; 3302 break;
2672 3303
2673 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3304 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2674 tt_write ((const unsigned char *)VT100_ANS, 3305 tt_write ((const unsigned char *)VT100_ANS,
2675 (unsigned int) (sizeof (VT100_ANS) - 1)); 3306 (unsigned int) (sizeof (VT100_ANS) - 1));
2676 break; 3307 break;
2677 3308
2678 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3309 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2679 process_sgr_mode (nargs, arg); 3310 process_sgr_mode (nargs, arg);
2680 break; 3311 break;
… …
2686 tt_printf ("\033[0n"); 3317 tt_printf ("\033[0n");
2687 break; 3318 break;
2688 case 6: /* CPR requested */ 3319 case 6: /* CPR requested */
2689 scr_report_position (); 3320 scr_report_position ();
2690 break; 3321 break;
2691#if defined (ENABLE_DISPLAY_ANSWER)
2692 case 7: /* unofficial extension */ 3322 case 7: /* unofficial extension */
3323 if (options & Opt_insecure)
2693 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3324 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2694 break; 3325 break;
2695#endif
2696 case 8: /* unofficial extension */ 3326 case 8: /* unofficial extension */
2697 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3327 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2698 break; 3328 break;
2699 } 3329 }
2700 break; 3330 break;
2701 3331
2702 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3332 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2735 break; 3365 break;
2736 3366
2737 case CSI_RM: /* 8.3.107: RESET MODE */ 3367 case CSI_RM: /* 8.3.107: RESET MODE */
2738 if (arg[0] == 4) 3368 if (arg[0] == 4)
2739 scr_insert_mode (0); 3369 scr_insert_mode (0);
3370 else if (arg[0] == 20)
3371 priv_modes &= ~PrivMode_LFNL;
2740 break; 3372 break;
2741 3373
2742 case CSI_SM: /* 8.3.126: SET MODE */ 3374 case CSI_SM: /* 8.3.126: SET MODE */
2743 if (arg[0] == 4) 3375 if (arg[0] == 4)
2744 scr_insert_mode (1); 3376 scr_insert_mode (1);
3377 else if (arg[0] == 20)
3378 priv_modes |= PrivMode_LFNL;
2745 break; 3379 break;
2746 3380
2747 /* 3381 /*
2748 * PRIVATE USE beyond this point. All CSI_7? sequences here 3382 * PRIVATE USE beyond this point. All CSI_7? sequences here
2749 */ 3383 */
… …
2761 break; 3395 break;
2762 case CSI_75: 3396 case CSI_75:
2763 scr_cursor (RESTORE); 3397 scr_cursor (RESTORE);
2764 break; 3398 break;
2765 3399
2766#ifndef NO_FRILLS 3400#if ENABLE_FRILLS
2767 case CSI_74: 3401 case CSI_74:
2768 process_window_ops (arg, nargs); 3402 process_window_ops (arg, nargs);
2769 break; 3403 break;
2770#endif 3404#endif
2771 3405
2772 case CSI_78: /* DECREQTPARM */ 3406 case CSI_78: /* DECREQTPARM */
2773 if (arg[0] == 0 || arg[0] == 1) 3407 if (arg[0] == 0 || arg[0] == 1)
2774 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3408 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2775 /* FALLTHROUGH */ 3409 break;
2776 3410
2777 default: 3411 default:
2778 break; 3412 break;
2779 } 3413 }
2780} 3414}
2781/*}}} */ 3415/*}}} */
2782 3416
2783#ifndef NO_FRILLS 3417#if ENABLE_FRILLS
2784/* ARGSUSED */ 3418/* ARGSUSED */
2785void 3419void
2786rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3420rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2787{ 3421{
2788 int x, y; 3422 int x, y;
2789#if 0
2790 char *s;
2791#endif
2792 XWindowAttributes wattr; 3423 XWindowAttributes wattr;
2793 Window wdummy; 3424 Window wdummy;
2794 3425
2795 if (nargs == 0) 3426 if (nargs == 0)
2796 return; 3427 return;
3428
2797 switch (args[0]) 3429 switch (args[0])
2798 { 3430 {
2799 /* 3431 /*
2800 * commands 3432 * commands
2801 */ 3433 */
2802 case 1: /* deiconify window */ 3434 case 1: /* deiconify window */
2803 XMapWindow (display->display, TermWin.parent[0]); 3435 XMapWindow (display->display, TermWin.parent[0]);
2804 break; 3436 break;
2805 case 2: /* iconify window */ 3437 case 2: /* iconify window */
2806 XIconifyWindow (display->display, TermWin.parent[0], 3438 XIconifyWindow (display->display, TermWin.parent[0],
… …
2823 break; 3455 break;
2824 case 8: /* set size (chars) */ 3456 case 8: /* set size (chars) */
2825 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3457 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2826 (unsigned int) (args[1] * TermWin.fheight)); 3458 (unsigned int) (args[1] * TermWin.fheight));
2827 break; 3459 break;
3460
3461 //case 9: NYI, TODO, restore maximized window or maximize window
2828 default: 3462 default:
2829 if (args[0] >= 24) /* set height (chars) */ 3463 if (args[0] >= 24) /* set height (chars) */
2830 set_widthheight ((unsigned int)TermWin.width, 3464 set_widthheight ((unsigned int)TermWin.width,
2831 (unsigned int) (args[1] * TermWin.fheight)); 3465 (unsigned int) (args[1] * TermWin.fheight));
2832 break; 3466 break;
3467
3468
2833 /* 3469 /*
2834 * reports - some output format copied from XTerm 3470 * reports - some output format copied from XTerm
2835 */ 3471 */
2836 case 11: /* report window state */ 3472 case 11: /* report window state */
2837 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2838 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3474 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2839 break; 3475 break;
2840 case 13: /* report window position */ 3476 case 13: /* report window position */
2841 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3477 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2842 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3478 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2843 -wattr.border_width, -wattr.border_width, 3479 -wattr.border_width, -wattr.border_width,
2844 &x, &y, &wdummy); 3480 &x, &y, &wdummy);
2845 tt_printf ("\033[3;%d;%dt", x, y); 3481 tt_printf ("\033[3;%d;%dt", x, y);
2846 break; 3482 break;
2847 case 14: /* report window size (pixels) */ 3483 case 14: /* report window size (pixels) */
2848 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3484 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2849 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3485 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2850 break; 3486 break;
2851 case 18: /* report window size (chars) */ 3487 case 18: /* report text area size (chars) */
2852 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3488 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2853 break; 3489 break;
2854#if 0 /* XXX: currently disabled due to security concerns */ 3490 case 19: /* report window size (chars) */
3491 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3492 break;
2855 case 20: /* report icon label */ 3493 case 20: /* report icon label */
3494 {
3495 char *s;
2856 XGetIconName (display->display, TermWin.parent[0], &s); 3496 XGetIconName (display->display, TermWin.parent[0], &s);
2857 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3497 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3498 XFree (s);
3499 }
2858 break; 3500 break;
2859 case 21: /* report window title */ 3501 case 21: /* report window title */
3502 {
3503 char *s;
2860 XFetchName (display->display, TermWin.parent[0], &s); 3504 XFetchName (display->display, TermWin.parent[0], &s);
2861 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3505 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3506 XFree (s);
3507 }
2862 break; 3508 break;
2863#endif
2864
2865 } 3509 }
2866} 3510}
2867#endif 3511#endif
2868 3512
2869/*----------------------------------------------------------------------*/ 3513/*----------------------------------------------------------------------*/
2870/* 3514/*
2871 * get input up until STRING TERMINATOR (or BEL) 3515 * get input up until STRING TERMINATOR (or BEL)
2872 * ends_how is terminator used. returned input must be free ()d 3516 * ends_how is terminator used. returned input must be free()'d
2873 */ 3517 */
2874unsigned char * 3518unsigned char *
2875rxvt_term::get_to_st (unsigned char *ends_how) 3519rxvt_term::get_to_st (unicode_t &ends_how)
2876{ 3520{
2877 int seen_esc = 0; /* seen escape? */ 3521 unicode_t ch;
3522 bool seen_esc = false;
2878 unsigned int n = 0; 3523 unsigned int n = 0;
2879 unsigned char *s; 3524 wchar_t string[STRING_MAX];
2880 unsigned char ch, string[STRING_MAX];
2881 3525
2882 for (; (ch = cmd_getc ());) 3526 while ((ch = cmd_getc ()) != NOCHAR)
2883 { 3527 {
2884 if (ch == C0_BEL 3528 if (seen_esc)
2885 || ch == CHAR_ST 3529 {
2886 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3530 if (ch == 0x5c) /* 7bit ST */
2887 break; 3531 break;
3532 else
3533 return NULL;
3534 }
2888 if (ch == C0_ESC) 3535 else if (ch == C0_ESC)
2889 { 3536 {
2890 seen_esc = 1; 3537 seen_esc = true;
2891 continue; 3538 continue;
2892 } 3539 }
2893 else if (ch == '\t') 3540 else if (ch == C0_BEL || ch == CHAR_ST)
2894 ch = ' '; /* translate '\t' to space */ 3541 break;
2895 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3542 else if (ch < 0x20)
2896 return NULL; /* other control character - exit */ 3543 return NULL; /* other control character - exit */
3544
3545 seen_esc = false;
3546
2897 if (n < sizeof (string) - 1) 3547 if (n >= sizeof (string) - 1)
3548 // stop at some sane length
3549 return NULL;
3550
3551 if (ch == C0_SYN)
3552 string[n++] = cmd_get8 ();
3553 else
2898 string[n++] = ch; 3554 string[n++] = ch;
2899 seen_esc = 0;
2900 } 3555 }
3556
2901 string[n++] = '\0'; 3557 string[n++] = '\0';
2902 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3558
2903 return NULL;
2904 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
2905 STRNCPY (s, string, n); 3560
2906 return s; 3561 return (unsigned char *)rxvt_wcstombs (string);
2907} 3562}
2908 3563
2909/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
2910/* 3565/*
2911 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3566 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2912 */ 3567 */
2913void 3568void
2914rxvt_term::process_dcs_seq () 3569rxvt_term::process_dcs_seq ()
2915{ 3570{
2916 unsigned char eh, *s; 3571 unsigned char *s;
3572 unicode_t eh;
3573
2917 /* 3574 /*
2918 * Not handled yet 3575 * Not handled yet
2919 */ 3576 */
2920 s = get_to_st (&eh); 3577 s = get_to_st (eh);
2921 if (s) 3578 if (s)
2922 free (s); 3579 free (s);
3580
2923 return; 3581 return;
2924} 3582}
2925 3583
2926/*----------------------------------------------------------------------*/ 3584/*----------------------------------------------------------------------*/
2927/* 3585/*
2928 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3586 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2929 */ 3587 */
2930void 3588void
2931rxvt_term::process_osc_seq () 3589rxvt_term::process_osc_seq ()
2932{ 3590{
2933 unsigned char ch, eh, *s; 3591 unicode_t ch, eh;
2934 int arg; 3592 int arg;
2935 3593
2936 ch = cmd_getc (); 3594 ch = cmd_getc ();
2937 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3595 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2938 arg = arg * 10 + (ch - '0'); 3596 arg = arg * 10 + (ch - '0');
2939 3597
2940 if (ch == ';') 3598 if (ch == ';')
2941 { 3599 {
2942 s = get_to_st (&eh); 3600 unsigned char *s = get_to_st (eh);
3601
2943 if (s) 3602 if (s)
2944 { 3603 {
2945 /*
2946 * rxvt_menubar_dispatch () violates the constness of the string,
2947 * so do it here
2948 */
2949 if (arg == XTerm_Menu)
2950#if 0 /* XXX: currently disabled due to security concerns */
2951 menubar_dispatch ((char *)s);
2952#else
2953 (void)0;
2954#endif
2955 else
2956 xterm_seq (arg, (char *)s, eh); 3604 process_xterm_seq (arg, (char *)s, eh);
2957 free (s); 3605 free (s);
2958 } 3606 }
2959 } 3607 }
2960} 3608}
3609
3610void
3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3612{
3613 if (str[0] == '?' && !str[1])
3614 {
3615 unsigned short r, g, b;
3616 pix_colors_focused[color].get (display, r, g, b);
3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3618 }
3619 else
3620 set_window_color (color, str);
3621}
3622
2961/* 3623/*
2962 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2963 * 0 = change iconName/title 3625 * 0 = change iconName/title
2964 * 1 = change iconName 3626 * 1 = change iconName
2965 * 2 = change title 3627 * 2 = change title
2966 * 4 = change color 3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
2967 * 12 = change text color 3631 * 12 = change text color
2968 * 13 = change mouse foreground color 3632 * 13 = change mouse foreground color
2969 * 17 = change highlight character colour 3633 * 17 = change highlight character colour
2970 * 18 = change bold character color 3634 * 18 = change bold character color
2971 * 19 = change underlined character color 3635 * 19 = change underlined character color
2972 * 46 = change logfile (not implemented) 3636 * 46 = change logfile (not implemented)
2973 * 50 = change font 3637 * 50 = change font
2974 * 3638 *
2975 * rxvt extensions: 3639 * rxvt extensions:
2976 * 9 = change locale (NYI)
2977 * 10 = menu (may change in future)
2978 * 20 = bg pixmap 3640 * 20 = bg pixmap
2979 * 39 = change default fg color 3641 * 39 = change default fg color
2980 * 49 = change default bg color 3642 * 49 = change default bg color
2981 * 55 = dump scrollback buffer and all of screen 3643 * 55 = dump scrollback buffer and all of screen
3644 * 701 = change locale
3645 * 702 = find font
3646 * 703 = menu
2982 */ 3647 */
2983void 3648void
2984rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2985{ 3650{
2986 int changed = 0; 3651 int changed = 0;
2987 int color; 3652 int color;
2988 char *buf, *name; 3653 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
2989 3656
2990 assert (str != NULL); 3657 assert (str != NULL);
2991 switch (op) 3658 switch (op)
2992 { 3659 {
2993 case XTerm_name: 3660 case XTerm_name:
2994 set_title (str); 3661 set_title (str);
2995 /* FALLTHROUGH */ 3662 /* FALLTHROUGH */
2996 case XTerm_iconName: 3663 case XTerm_iconName:
2997 set_iconName (str); 3664 set_icon_name (str);
2998 break; 3665 break;
2999 case XTerm_title: 3666 case XTerm_title:
3000 set_title (str); 3667 set_title (str);
3001 break; 3668 break;
3669 case XTerm_property:
3670 if (str[0] == '?')
3671 {
3672 Atom prop = display->atom (str + 1);
3673 Atom actual_type;
3674 int actual_format;
3675 unsigned long nitems;
3676 unsigned long bytes_after;
3677 unsigned char *value = 0;
3678 const char *str = "";
3679
3680 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None
3686 && actual_format == 8)
3687 str = (const char *)(value);
3688
3689 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3690
3691 XFree (value);
3692 }
3693 else
3694 {
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696
3697 if (eq)
3698 {
3699 *eq = 0;
3700 set_utf8_property (display->atom (str), eq + 1);
3701 }
3702 else
3703 XDeleteProperty (display->display, TermWin.parent[0],
3704 display->atom (str));
3705 }
3706 break;
3707
3002 case XTerm_Color: 3708 case XTerm_Color:
3003 for (buf = (char *)str; buf && *buf;) 3709 for (buf = (char *)str; buf && *buf;)
3004 { 3710 {
3005 if ((name = STRCHR (buf, ';')) == NULL) 3711 if ((name = strchr (buf, ';')) == NULL)
3006 break; 3712 break;
3713
3007 *name++ = '\0'; 3714 *name++ = '\0';
3008 color = atoi (buf); 3715 color = atoi (buf);
3716
3009 if (color < 0 || color >= TOTAL_COLORS) 3717 if (color < 0 || color >= TOTAL_COLORS)
3010 break; 3718 break;
3719
3011 if ((buf = STRCHR (name, ';')) != NULL) 3720 if ((buf = strchr (name, ';')) != NULL)
3012 *buf++ = '\0'; 3721 *buf++ = '\0';
3722
3723 if (name[0] == '?' && !name[1])
3724 {
3725 unsigned short r, g, b;
3726 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3727 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3728 }
3729 else
3013 set_window_color (color + minCOLOR, name); 3730 set_window_color (color + minCOLOR, name);
3014 } 3731 }
3732 break;
3733 case XTerm_Color00:
3734 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3735 break;
3736 case XTerm_Color01:
3737 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3015 break; 3738 break;
3016#ifndef NO_CURSORCOLOR 3739#ifndef NO_CURSORCOLOR
3017 case XTerm_Color_cursor: 3740 case XTerm_Color_cursor:
3018 set_window_color (Color_cursor, str); 3741 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3019 break; 3742 break;
3020#endif 3743#endif
3021 case XTerm_Color_pointer: 3744 case XTerm_Color_pointer_fg:
3022 set_window_color (Color_pointer, str); 3745 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3746 break;
3747 case XTerm_Color_pointer_bg:
3748 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3023 break; 3749 break;
3024#ifndef NO_BOLD_UNDERLINE_REVERSE 3750#ifndef NO_BOLD_UNDERLINE_REVERSE
3025 case XTerm_Color_BD: 3751 case XTerm_Color_BD:
3026 set_window_color (Color_BD, str); 3752 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3753 break;
3754 case XTerm_Color_IT:
3755 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3027 break; 3756 break;
3028 case XTerm_Color_UL: 3757 case XTerm_Color_UL:
3029 set_window_color (Color_UL, str); 3758 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3030 break; 3759 break;
3031 case XTerm_Color_RV: 3760 case XTerm_Color_RV:
3032 set_window_color (Color_RV, str); 3761 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3033 break; 3762 break;
3034#endif 3763#endif
3035 3764#if TRANSPARENT && TINTING
3036 case XTerm_Menu: 3765 case XTerm_Color_tint:
3037 /* 3766 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3038 * rxvt_menubar_dispatch () violates the constness of the string, 3767 check_our_parents ();
3039 * so DON'T do it here 3768 if (am_transparent)
3040 */ 3769 want_full_refresh = want_refresh = 1;
3041 break; 3770 break;
3771#endif
3772
3042 case XTerm_Pixmap: 3773 case XTerm_Pixmap:
3043 if (*str != ';') 3774 if (*str != ';')
3044 { 3775 {
3045#if XPM_BACKGROUND 3776#if XPM_BACKGROUND
3046 scale_pixmap (""); /* reset to default scaling */ 3777 scale_pixmap (""); /* reset to default scaling */
3047 set_bgPixmap (str); /* change pixmap */ 3778 set_bgPixmap (str); /* change pixmap */
3048#endif 3779#endif
3049 scr_touch (true); 3780 scr_touch (true);
3050 } 3781 }
3051 while ((str = STRCHR (str, ';')) != NULL) 3782 while ((str = strchr (str, ';')) != NULL)
3052 { 3783 {
3053 str++; 3784 str++;
3054#if XPM_BACKGROUND 3785#if XPM_BACKGROUND
3055 changed += scale_pixmap (str); 3786 changed += scale_pixmap (str);
3056#endif 3787#endif
… …
3069 set_window_color (Color_fg, str); 3800 set_window_color (Color_fg, str);
3070 break; 3801 break;
3071 case XTerm_restoreBG: 3802 case XTerm_restoreBG:
3072 set_window_color (Color_bg, str); 3803 set_window_color (Color_bg, str);
3073 break; 3804 break;
3805
3074 case XTerm_logfile: 3806 case XTerm_logfile:
3807 // TODO, when secure mode?
3075 break; 3808 break;
3809
3076 case XTerm_font: 3810 case XTerm_font:
3077 change_font (str); 3811 op = URxvt_font;
3812 case URxvt_font:
3813#if ENABLE_STYLES
3814 case URxvt_boldFont:
3815 case URxvt_italicFont:
3816 case URxvt_boldItalicFont:
3817#endif
3818 if (query)
3819 tt_printf ("\33]%d;%-.250s%c", saveop,
3820 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3821 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3822 resp);
3823 else
3824 {
3825 const char *&res = rs[Rs_font + (op - URxvt_font)];
3826
3827 res = strdup (str);
3828 allocated.push_back ((void *)res);
3829 set_fonts ();
3830 }
3078 break; 3831 break;
3832
3833#if ENABLE_FRILLS
3079 case XTerm_locale: 3834 case XTerm_locale:
3080 /* TODO */ 3835 if (query)
3836 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3837 else
3838 {
3839 set_locale (str);
3840# ifdef USE_XIM
3841 im_cb ();
3842# endif
3843 }
3844 break;
3845#endif
3846
3847#ifdef MENUBAR
3848 case XTerm_Menu:
3849 if (options & Opt_insecure)
3850 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3081 break; 3851 break;
3852#endif
3082#if 0 3853#if 0
3083 case XTerm_dumpscreen: /* no error notices */ 3854 case XTerm_dumpscreen: /* no error notices */
3084 { 3855 {
3085 int fd; 3856 int fd;
3086 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3857 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3087 { 3858 {
3088 scr_dump (fd); 3859 scr_dump (fd);
3089 close (fd); 3860 close (fd);
3090 } 3861 }
3091 } 3862 }
3092 break; 3863 break;
3093#endif 3864#endif
3094
3095 } 3865 }
3096} 3866}
3097/*----------------------------------------------------------------------*/ 3867/*----------------------------------------------------------------------*/
3098 3868
3099/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3869/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3107 * so no need for fancy checking 3877 * so no need for fancy checking
3108 */ 3878 */
3109int 3879int
3110rxvt_term::privcases (int mode, unsigned long bit) 3880rxvt_term::privcases (int mode, unsigned long bit)
3111{ 3881{
3112 int state; 3882 int state;
3113 3883
3114 if (mode == 's') 3884 if (mode == 's')
3115 { 3885 {
3116 SavedModes |= (PrivateModes & bit); 3886 SavedModes |= (priv_modes & bit);
3117 return -1; 3887 return -1;
3118 } 3888 }
3119 else 3889 else
3120 { 3890 {
3121 if (mode == 'r') 3891 if (mode == 'r')
3122 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3892 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3123 else 3893 else
3124 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3894 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3125 PrivMode (state, bit); 3895 PrivMode (state, bit);
3126 } 3896 }
3897
3127 return state; 3898 return state;
3128} 3899}
3129 3900
3130/* we're not using priv _yet_ */ 3901/* we're not using priv _yet_ */
3131void 3902void
3132rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3903rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3133{ 3904{
3134 unsigned int i, j; 3905 unsigned int i, j;
3135 int state; 3906 int state;
3907
3136 static const struct 3908 static const struct
3137 { 3909 {
3138 const int argval; 3910 const int argval;
3139 const unsigned long bit; 3911 const unsigned long bit;
3140 } 3912 }
3913
3141 argtopriv[] = { 3914 argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 3915 { 1, PrivMode_aplCUR },
3143 { 2, PrivMode_vt52 }, 3916 { 2, PrivMode_vt52 },
3144 { 3, PrivMode_132 }, 3917 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3918 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3919 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3920 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3921 { 7, PrivMode_Autowrap },
3922 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3923 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3924#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3925 { menuBar_esc, PrivMode_menuBar },
3152#endif 3926#endif
3927 // 18, 19 printing-related
3928 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3929#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3930 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3931#endif
3156 { 25, PrivMode_VisibleCursor },
3157 { 35, PrivMode_ShiftKeys }, 3932 { 35, PrivMode_ShiftKeys }, // rxvt extension
3158 { 40, PrivMode_132OK }, 3933 { 40, PrivMode_132OK },
3934 // 41 xterm more fixes NYI
3935 // 45 margin bell NYI
3936 // 46 start logging
3159 { 47, PrivMode_Screen }, 3937 { 47, PrivMode_Screen },
3160 { 66, PrivMode_aplKP }, 3938 { 66, PrivMode_aplKP },
3161#ifndef NO_BACKSPACE_KEY 3939#ifndef NO_BACKSPACE_KEY
3162 { 67, PrivMode_BackSpace }, 3940 { 67, PrivMode_BackSpace },
3163#endif 3941#endif
3164 { 1000, PrivMode_MouseX11 }, 3942 { 1000, PrivMode_MouseX11 },
3943 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3944 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3945 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3165 { 1010, PrivMode_TtyOutputInh }, 3946 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3166 { 1011, PrivMode_Keypress }, 3947 { 1011, PrivMode_Keypress }, // rxvt extension
3948 // 1035 enable modifiers for alt, numlock NYI
3949 // 1036 send ESC for meta keys NYI
3950 // 1037 send DEL for keypad delete NYI
3167 { 1047, PrivMode_Screen }, 3951 { 1047, PrivMode_Screen },
3952 // 1048 save and restore cursor
3168 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3953 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3954 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3169 }; 3955 };
3170 3956
3171 if (nargs == 0) 3957 if (nargs == 0)
3172 return; 3958 return;
3173 3959
… …
3188 state = privcases (mode, argtopriv[j].bit); 3974 state = privcases (mode, argtopriv[j].bit);
3189 break; 3975 break;
3190 } 3976 }
3191 3977
3192 /* extra handling for values with state unkept */ 3978 /* extra handling for values with state unkept */
3193 if (state == -1)
3194 switch (arg[i]) 3979 switch (arg[i])
3195 { 3980 {
3196 case 1048: /* alternative cursor save */ 3981 case 1048: /* alternative cursor save */
3982 case 1049:
3983 if (options & Opt_secondaryScreen)
3197 if (mode == 0) 3984 if (mode == 0)
3198 scr_cursor (RESTORE); 3985 scr_cursor (RESTORE);
3199 else if (mode == 1) 3986 else if (mode == 1)
3200 scr_cursor (SAVE); 3987 scr_cursor (SAVE);
3201 /* FALLTHROUGH */
3202 default:
3203 continue; /* for (;i;) */
3204 }
3205
3206 /* extra handling for values with valid 0 or 1 state */
3207 switch (arg[i])
3208 {
3209 /* case 1: - application cursor keys */
3210 case 2: /* VT52 mode */
3211 /* oddball mode. should be set regardless of set/reset
3212 * parameter. Return from VT52 mode with an ESC < from
3213 * within VT52 mode
3214 */
3215 PrivMode (1, PrivMode_vt52);
3216 break; 3988 break;
3989 }
3990
3991 if (state >= 0)
3992 /* extra handling for values with valid 0 or 1 state */
3993 switch (arg[i])
3994 {
3995 /* case 1: - application cursor keys */
3996 case 2: /* VT52 mode */
3997 /* oddball mode. should be set regardless of set/reset
3998 * parameter. Return from VT52 mode with an ESC < from
3999 * within VT52 mode
4000 */
4001 PrivMode (1, PrivMode_vt52);
4002 break;
3217 case 3: /* 80/132 */ 4003 case 3: /* 80/132 */
3218 if (PrivateModes & PrivMode_132OK) 4004 if (priv_modes & PrivMode_132OK)
3219 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 4005 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3220 (unsigned int)TermWin.height);
3221 break; 4006 break;
3222 case 4: /* smooth scrolling */ 4007 case 4: /* smooth scrolling */
3223 if (state) 4008 if (state)
3224 Options &= ~Opt_jumpScroll; 4009 options &= ~Opt_jumpScroll;
3225 else 4010 else
3226 Options |= Opt_jumpScroll; 4011 options |= Opt_jumpScroll;
3227 break; 4012 break;
3228 case 5: /* reverse video */ 4013 case 5: /* reverse video */
3229 scr_rvideo_mode (state); 4014 scr_rvideo_mode (state);
3230 break; 4015 break;
3231 case 6: /* relative/absolute origins */ 4016 case 6: /* relative/absolute origins */
3232 scr_relative_origin (state); 4017 scr_relative_origin (state);
3233 break; 4018 break;
3234 case 7: /* autowrap */ 4019 case 7: /* autowrap */
3235 scr_autowrap (state); 4020 scr_autowrap (state);
3236 break; 4021 break;
3237 /* case 8: - auto repeat, can't do on a per window basis */ 4022 /* case 8: - auto repeat, can't do on a per window basis */
3238 case 9: /* X10 mouse reporting */ 4023 case 9: /* X10 mouse reporting */
3239 if (state) /* orthogonal */ 4024 if (state) /* orthogonal */
3240 PrivateModes &= ~ (PrivMode_MouseX11); 4025 priv_modes &= ~PrivMode_MouseX11;
3241 break; 4026 break;
3242#ifdef menuBar_esc 4027#ifdef menuBar_esc
3243 case menuBar_esc: 4028 case menuBar_esc:
3244#ifdef MENUBAR 4029#ifdef MENUBAR
3245 map_menuBar (state); 4030 map_menuBar (state);
3246#endif 4031#endif
3247 break; 4032 break;
3248#endif 4033#endif
3249#ifdef scrollBar_esc 4034#ifdef scrollBar_esc
3250 case scrollBar_esc: 4035 case scrollBar_esc:
3251 if (scrollbar_mapping (state)) 4036 if (scrollbar_mapping (state))
3252 { 4037 {
3253 resize_all_windows (0, 0, 0); 4038 resize_all_windows (0, 0, 0);
3254 scr_touch (true); 4039 scr_touch (true);
3255 } 4040 }
3256 break; 4041 break;
3257#endif 4042#endif
3258 case 25: /* visible/invisible cursor */ 4043 case 25: /* visible/invisible cursor */
3259 scr_cursor_visible (state); 4044 scr_cursor_visible (state);
3260 break; 4045 break;
3261 /* case 35: - shift keys */ 4046 /* case 35: - shift keys */
3262 /* case 40: - 80 <--> 132 mode */ 4047 /* case 40: - 80 <--> 132 mode */
3263 case 47: /* secondary screen */ 4048 case 47: /* secondary screen */
3264 scr_change_screen (state); 4049 scr_change_screen (state);
3265 break; 4050 break;
3266 /* case 66: - application key pad */ 4051 /* case 66: - application key pad */
3267 /* case 67: - backspace key */ 4052 /* case 67: - backspace key */
3268 case 1000: /* X11 mouse reporting */ 4053 case 1000: /* X11 mouse reporting */
3269 if (state) /* orthogonal */ 4054 if (state) /* orthogonal */
3270 PrivateModes &= ~ (PrivMode_MouseX10); 4055 priv_modes &= ~PrivMode_MouseX10;
3271 break; 4056 break;
3272#if 0 4057#if 0
3273 case 1001: 4058 case 1001:
3274 break; /* X11 mouse highlighting */ 4059 break; /* X11 mouse highlighting */
3275#endif 4060#endif
3276 case 1010: /* scroll to bottom on TTY output inhibit */ 4061 case 1010: /* scroll to bottom on TTY output inhibit */
3277 if (state) 4062 if (state)
3278 Options &= ~Opt_scrollTtyOutput; 4063 options &= ~Opt_scrollTtyOutput;
3279 else 4064 else
3280 Options |= Opt_scrollTtyOutput; 4065 options |= Opt_scrollTtyOutput;
3281 break; 4066 break;
3282 case 1011: /* scroll to bottom on key press */ 4067 case 1011: /* scroll to bottom on key press */
3283 if (state) 4068 if (state)
3284 Options |= Opt_scrollTtyKeypress; 4069 options |= Opt_scrollTtyKeypress;
3285 else 4070 else
3286 Options &= ~Opt_scrollTtyKeypress; 4071 options &= ~Opt_scrollTtyKeypress;
3287 break; 4072 break;
3288 case 1047: /* secondary screen w/ clearing */ 4073 case 1047: /* secondary screen w/ clearing last */
3289 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4074 if (options & Opt_secondaryScreen)
3290 if (current_screen != PRIMARY) 4075 if (current_screen != PRIMARY)
3291 scr_erase_screen (2); 4076 scr_erase_screen (2);
3292 scr_change_screen (state); 4077 scr_change_screen (state);
3293 /* FALLTHROUGH */
3294 default:
3295 break; 4078 break;
4079 case 1049: /* secondary screen w/ clearing first */
4080 scr_change_screen (state);
4081 if (options & Opt_secondaryScreen)
4082 if (current_screen != PRIMARY)
4083 scr_erase_screen (2);
4084 break;
4085 default:
4086 break;
3296 } 4087 }
3297 } 4088 }
3298} 4089}
3299/*}}} */ 4090/*}}} */
3300 4091
3301/*{{{ process sgr sequences */ 4092/*{{{ process sgr sequences */
3302void 4093void
3303rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4094rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3304{ 4095{
3305 unsigned int i; 4096 unsigned int i;
3306 short rendset; 4097 short rendset;
3307 int rendstyle; 4098 int rendstyle;
3308 4099
3309 if (nargs == 0) 4100 if (nargs == 0)
3310 { 4101 {
3311 scr_rendition (0, ~RS_None); 4102 scr_rendition (0, ~RS_None);
3312 return; 4103 return;
3313 } 4104 }
4105
3314 for (i = 0; i < nargs; i++) 4106 for (i = 0; i < nargs; i++)
3315 { 4107 {
3316 rendset = -1; 4108 rendset = -1;
3317 switch (arg[i]) 4109 switch (arg[i])
3318 { 4110 {
… …
3320 rendset = 0, rendstyle = ~RS_None; 4112 rendset = 0, rendstyle = ~RS_None;
3321 break; 4113 break;
3322 case 1: 4114 case 1:
3323 rendset = 1, rendstyle = RS_Bold; 4115 rendset = 1, rendstyle = RS_Bold;
3324 break; 4116 break;
4117 //case 2: // low intensity
4118 case 3:
4119 rendset = 1, rendstyle = RS_Italic;
4120 break;
3325 case 4: 4121 case 4:
3326 rendset = 1, rendstyle = RS_Uline; 4122 rendset = 1, rendstyle = RS_Uline;
3327 break; 4123 break;
3328 case 5: 4124 case 5: // slowly blinking
4125 case 6: // rapidly blinking
3329 rendset = 1, rendstyle = RS_Blink; 4126 rendset = 1, rendstyle = RS_Blink;
3330 break; 4127 break;
4128 //case 6: // scoansi light background
3331 case 7: 4129 case 7:
3332 rendset = 1, rendstyle = RS_RVid; 4130 rendset = 1, rendstyle = RS_RVid;
3333 break; 4131 break;
3334 case 22: 4132 case 8:
4133 // invisible. NYI
4134 break;
4135 //case 9: // crossed out
4136 //case 10: // scoansi acs off, primary font
4137 //case 11: // scoansi acs on, first alt font
4138 //case 12: // scoansi acs on, |0x80, second alt font
4139 //...
4140 //case 19: // ninth alt font
4141 //case 20: // gothic
4142 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3335 rendset = 0, rendstyle = RS_Bold; 4143 rendset = 0, rendstyle = RS_Bold;
4144 break;
4145 case 22: // normal intensity
4146 rendset = 0, rendstyle = RS_Bold;
4147 break;
4148 case 23: // disable italic
4149 rendset = 0, rendstyle = RS_Italic;
3336 break; 4150 break;
3337 case 24: 4151 case 24:
3338 rendset = 0, rendstyle = RS_Uline; 4152 rendset = 0, rendstyle = RS_Uline;
3339 break; 4153 break;
3340 case 25: 4154 case 25:
3341 rendset = 0, rendstyle = RS_Blink; 4155 rendset = 0, rendstyle = RS_Blink;
3342 break; 4156 break;
4157 case 26: // variable spacing (iso 8613)
4158 rendset = 0, rendstyle = RS_Blink;
4159 break;
3343 case 27: 4160 case 27:
3344 rendset = 0, rendstyle = RS_RVid; 4161 rendset = 0, rendstyle = RS_RVid;
3345 break; 4162 break;
4163 //case 28: // visible. NYI
4164 //case 29: // not crossed-out
3346 } 4165 }
4166
3347 if (rendset != -1) 4167 if (rendset != -1)
3348 { 4168 {
3349 scr_rendition (rendset, rendstyle); 4169 scr_rendition (rendset, rendstyle);
3350 continue; /* for (;i;) */ 4170 continue; /* for (;i;) */
3351 } 4171 }
… …
3358 case 33: 4178 case 33:
3359 case 34: 4179 case 34:
3360 case 35: 4180 case 35:
3361 case 36: 4181 case 36:
3362 case 37: 4182 case 37:
3363 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4183 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3364 Color_fg);
3365 break; 4184 break;
3366#ifdef TTY_256COLOR 4185 case 38: // set fg color, ISO 8613-6
3367 case 38:
3368 if (nargs > i + 2 && arg[i + 1] == 5) 4186 if (nargs > i + 2 && arg[i + 1] == 5)
3369 { 4187 {
3370 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4188 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3371 Color_fg);
3372 i += 2; 4189 i += 2;
3373 } 4190 }
3374 break; 4191 break;
3375#endif
3376 case 39: /* default fg */ 4192 case 39: /* default fg */
3377 scr_color (Color_fg, Color_fg); 4193 scr_color (Color_fg, Color_fg);
3378 break; 4194 break;
3379 4195
3380 case 40: 4196 case 40:
… …
3383 case 43: 4199 case 43:
3384 case 44: 4200 case 44:
3385 case 45: 4201 case 45:
3386 case 46: 4202 case 46:
3387 case 47: 4203 case 47:
3388 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4204 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3389 Color_bg);
3390 break; 4205 break;
3391#ifdef TTY_256COLOR 4206 case 48: // set bg color, ISO 8613-6
3392 case 48:
3393 if (nargs > i + 2 && arg[i + 1] == 5) 4207 if (nargs > i + 2 && arg[i + 1] == 5)
3394 { 4208 {
3395 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4209 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3396 Color_bg);
3397 i += 2; 4210 i += 2;
3398 } 4211 }
3399 break; 4212 break;
3400#endif
3401 case 49: /* default bg */ 4213 case 49: /* default bg */
3402 scr_color (Color_bg, Color_bg); 4214 scr_color (Color_bg, Color_bg);
3403 break; 4215 break;
4216
4217 //case 50: // not variable spacing
3404 4218
3405#ifndef NO_BRIGHTCOLOR 4219#ifndef NO_BRIGHTCOLOR
3406 case 90: 4220 case 90:
3407 case 91: /* set bright fg color */ 4221 case 91: /* set bright fg color */
3408 case 92: 4222 case 92:
3409 case 93: 4223 case 93:
3410 case 94: 4224 case 94:
3411 case 95: 4225 case 95:
3412 case 96: 4226 case 96:
3413 case 97: 4227 case 97:
3414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4228 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3415 Color_fg);
3416 break; 4229 break;
3417 case 100: 4230 case 100:
3418 case 101: /* set bright bg color */ 4231 case 101: /* set bright bg color */
3419 case 102: 4232 case 102:
3420 case 103: 4233 case 103:
3421 case 104: 4234 case 104:
3422 case 105: 4235 case 105:
3423 case 106: 4236 case 106:
3424 case 107: 4237 case 107:
3425 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4238 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3426 Color_bg);
3427 break; 4239 break;
3428#endif 4240#endif
3429 4241
3430 } 4242 }
3431 } 4243 }
3432} 4244}
3433/*}}} */ 4245/*}}} */
3434 4246
3435/*{{{ process Rob Nation's own graphics mode sequences */ 4247/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3436void 4248void
3437rxvt_term::process_graphics () 4249rxvt_term::process_graphics ()
3438{ 4250{
3439 unsigned char ch, cmd = cmd_getc (); 4251 unicode_t ch, cmd = cmd_getc ();
3440 4252
3441 if (cmd == 'Q') 4253 if (cmd == 'Q')
3442 { /* query graphics */ 4254 { /* query graphics */
3443 tt_printf ("\033G0\n"); /* no graphics */ 4255 tt_printf ("\033G0\012"); /* no graphics */
3444 return; 4256 return;
3445 } 4257 }
3446 /* swallow other graphics sequences until terminating ':' */ 4258 /* swallow other graphics sequences until terminating ':' */
3447 do 4259 do
3448 ch = cmd_getc (); 4260 ch = cmd_getc ();
… …
3463 unsigned char buf[256]; 4275 unsigned char buf[256];
3464 4276
3465 va_start (arg_ptr, fmt); 4277 va_start (arg_ptr, fmt);
3466 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4278 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3467 va_end (arg_ptr); 4279 va_end (arg_ptr);
3468 tt_write (buf, STRLEN (buf)); 4280 tt_write (buf, strlen (buf));
3469} 4281}
3470 4282
3471/* ---------------------------------------------------------------------- */ 4283/* ---------------------------------------------------------------------- */
3472/* Write data to the pty as typed by the user, pasted with the mouse, 4284/* Write data to the pty as typed by the user, pasted with the mouse,
3473 * or generated by us in response to a query ESC sequence. 4285 * or generated by us in response to a query ESC sequence.
3474 */ 4286 */
3475void 4287void
3476rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4288rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3477{ 4289{
3478 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3479 4291
3480 if (len) 4292 if (len)
3481 { 4293 {
3482 if (v_buflen == 0) 4294 if (v_buflen == 0)
3483 { 4295 {
3484 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3485 4297
3486 if ((unsigned int)written == len) 4298 if ((unsigned int)written == len)
3487 return; 4299 return;
3488 4300
3489 data += written; 4301 data += written;
… …
3497 v_buflen += len; 4309 v_buflen += len;
3498 } 4310 }
3499 4311
3500 for (;;) 4312 for (;;)
3501 { 4313 {
3502 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3503 4315
3504 if (written > 0) 4316 if (written > 0)
3505 { 4317 {
3506 v_buflen -= written; 4318 v_buflen -= written;
3507 4319

Diff Legend

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