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

Diff Legend

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