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.14 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.42 by pcg, Thu Feb 12 01:42:03 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: command.C,v 1.14 2003/12/08 23:14:40 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
48#include "../config.h" /* NECESSARY */ 47#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 48#include "rxvt.h" /* NECESSARY */
50#include "version.h" 49#include "version.h"
51#include "command.h" 50#include "command.h"
52 51
52#include <wchar.h>
53
53/*----------------------------------------------------------------------*/ 54/*----------------------------------------------------------------------*/
54 55
55/*{{{ Convert the keypress event into a string */ 56/*{{{ Convert the keypress event into a string */
56/* INTPROTO */
57void 57void
58rxvt_lookup_key(pR_ XKeyEvent *ev) 58rxvt_term::lookup_key (XKeyEvent &ev)
59{ 59{
60 int ctrl, meta, shft, len; 60 int ctrl, meta, shft, len;
61 unsigned int newlen; 61 unsigned int newlen;
62 KeySym keysym; 62 KeySym keysym;
63#ifdef DEBUG_CMD 63#ifdef DEBUG_CMD
64 static int debug_key = 1; /* accessible by a debugger only */ 64 static int debug_key = 1; /* accessible by a debugger only */
65#endif 65#endif
66 int valid_keysym; 66 int valid_keysym;
67 unsigned char *kbuf = R->kbuf; 67 unsigned char kbuf[KBUFSZ];
68 68
69/* 69 /*
70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 70 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
71 * escape sequence to toggle the Keypad. 71 * escape sequence to toggle the Keypad.
72 * 72 *
73 * Always permit `shift' to override the current setting 73 * Always permit `shift' to override the current setting
74 */ 74 */
75 shft = (ev->state & ShiftMask); 75 shft = (ev.state & ShiftMask);
76 ctrl = (ev->state & ControlMask); 76 ctrl = (ev.state & ControlMask);
77 meta = (ev->state & R->ModMetaMask); 77 meta = (ev.state & ModMetaMask);
78 78
79 if (R->numlock_state || (ev->state & R->ModNumLockMask)) 79 if (numlock_state || (ev.state & ModNumLockMask))
80 { 80 {
81 R->numlock_state = (ev->state & R->ModNumLockMask); 81 numlock_state = (ev.state & ModNumLockMask);
82 PrivMode((!R->numlock_state), PrivMode_aplKP); 82 PrivMode((!numlock_state), PrivMode_aplKP);
83 } 83 }
84 84
85 kbuf[0] = 0; 85 kbuf[0] = 0;
86 86
87#ifdef USE_XIM 87#ifdef USE_XIM
88 if (R->Input_Context) 88 if (Input_Context)
89 { 89 {
90 Status status_return; 90 Status status_return;
91 91
92#ifdef X_HAVE_UTF8_STRING 92#ifdef X_HAVE_UTF8_STRING
93 if (enc_utf8 && 0)
93 len = Xutf8LookupString(R->Input_Context, ev, (char *)kbuf, 94 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
94 KBUFSZ, &keysym, &status_return); 95 KBUFSZ, &keysym, &status_return);
95#else 96 else
97#endif
98
99 {
100 wchar_t wkbuf[KBUFSZ + 1];
101
102 // the XOpenIM manpage lies about hardcoding the locale
103 // at the point of XOpenIM, so temporarily switch locales
104 if (rs[Rs_imLocale])
105 SET_LOCALE (rs[Rs_imLocale]);
106 // assume wchar_t == unicode or better
96 len = XmbLookupString(R->Input_Context, ev, (char *)kbuf, 107 len = XwcLookupString (Input_Context, &ev, wkbuf,
97 KBUFSZ, &keysym, &status_return); 108 KBUFSZ, &keysym, &status_return);
98#endif 109 if (rs[Rs_imLocale])
110 SET_LOCALE (locale);
111
112 if (status_return == XLookupChars
113 || status_return == XLookupBoth)
114 {
115 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0)
118 len = 0;
119 }
120 else
121 len = 0;
122 }
123
99 valid_keysym = ((status_return == XLookupKeySym) 124 valid_keysym = status_return == XLookupKeySym
100 || (status_return == XLookupBoth)); 125 || status_return == XLookupBoth;
101 } 126 }
102 else 127 else
103#endif 128#endif
129
104 { 130 {
105 len = XLookupString(ev, (char *)kbuf, KBUFSZ, &keysym, &R->compose); 131 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose);
106 valid_keysym = !len; 132 valid_keysym = !len;
107 } 133 }
108 134
109 if (valid_keysym) 135 if (valid_keysym)
110 { 136 {
111/* for some backwards compatibility */ 137 /* for some backwards compatibility */
112#if defined(HOTKEY_CTRL) || defined(HOTKEY_META) 138#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
113# ifdef HOTKEY_CTRL 139# ifdef HOTKEY_CTRL
114 if (ctrl) 140 if (ctrl)
115# else 141# else
116 if (meta) 142 if (meta)
117# endif 143# endif
118 { 144 {
119 if (keysym == R->ks_bigfont) 145 if (keysym == ks_bigfont)
120 { 146 {
121 rxvt_change_font(aR_ 0, FONT_UP); 147 change_font (0, FONT_UP);
122 return; 148 return;
123 } 149 }
124 else if (keysym == R->ks_smallfont) 150 else if (keysym == ks_smallfont)
125 { 151 {
126 rxvt_change_font(aR_ 0, FONT_DN); 152 change_font (0, FONT_DN);
127 return; 153 return;
154 }
128 } 155 }
129 }
130#endif 156#endif
131 157
132 if (R->TermWin.saveLines) { 158 if (TermWin.saveLines)
159 {
133#ifdef UNSHIFTED_SCROLLKEYS 160#ifdef UNSHIFTED_SCROLLKEYS
134 if (!ctrl && !meta) { 161 if (!ctrl && !meta)
162 {
135#else 163#else
136 if (IS_SCROLL_MOD) { 164 if (IS_SCROLL_MOD)
165 {
137#endif 166#endif
138 int lnsppg; 167 int lnsppg;
139 168
140#ifdef PAGING_CONTEXT_LINES 169#ifdef PAGING_CONTEXT_LINES
141 lnsppg = R->TermWin.nrow - PAGING_CONTEXT_LINES; 170 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
142#else 171#else
143 lnsppg = R->TermWin.nrow * 4 / 5; 172 lnsppg = TermWin.nrow * 4 / 5;
144#endif 173#endif
145 if (keysym == XK_Prior) { 174 if (keysym == XK_Prior)
146 rxvt_scr_page(aR_ UP, lnsppg); 175 {
147 return; 176 scr_page (UP, lnsppg);
177 return;
178 }
148 } else if (keysym == XK_Next) { 179 else if (keysym == XK_Next)
149 rxvt_scr_page(aR_ DN, lnsppg); 180 {
150 return; 181 scr_page (DN, lnsppg);
151 } 182 return;
152 } 183 }
184 }
153#ifdef SCROLL_ON_UPDOWN_KEYS 185#ifdef SCROLL_ON_UPDOWN_KEYS
154 if (IS_SCROLL_MOD) { 186 if (IS_SCROLL_MOD)
155 if (keysym == XK_Up) { 187 {
156 rxvt_scr_page(aR_ UP, 1); 188 if (keysym == XK_Up)
157 return; 189 {
190 scr_page (UP, 1);
191 return;
192 }
158 } else if (keysym == XK_Down) { 193 else if (keysym == XK_Down)
159 rxvt_scr_page(aR_ DN, 1); 194 {
160 return; 195 scr_page (DN, 1);
161 } 196 return;
162 } 197 }
198 }
163#endif 199#endif
164#ifdef SCROLL_ON_HOMEEND_KEYS 200#ifdef SCROLL_ON_HOMEEND_KEYS
165 if (IS_SCROLL_MOD) { 201 if (IS_SCROLL_MOD)
166 if (keysym == XK_Home) { 202 {
167 rxvt_scr_move_to(aR_ 0, 1); 203 if (keysym == XK_Home)
168 return; 204 {
205 scr_move_to (0, 1);
206 return;
207 }
169 } else if (keysym == XK_End) { 208 else if (keysym == XK_End)
170 rxvt_scr_move_to(aR_ 1, 0); 209 {
171 return; 210 scr_move_to (1, 0);
172 } 211 return;
173 } 212 }
213 }
174#endif 214#endif
175 }
176 215
177 if (shft) { 216 }
217
218 if (shft)
219 {
178 /* Shift + F1 - F10 generates F11 - F20 */ 220 /* Shift + F1 - F10 generates F11 - F20 */
179 if (keysym >= XK_F1 && keysym <= XK_F10) { 221 if (keysym >= XK_F1 && keysym <= XK_F10)
222 {
180 keysym += (XK_F11 - XK_F1); 223 keysym += (XK_F11 - XK_F1);
181 shft = 0; /* turn off Shift */ 224 shft = 0; /* turn off Shift */
225 }
182 } else if (!ctrl && !meta && (R->PrivateModes & PrivMode_ShiftKeys)) { 226 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys))
183 switch (keysym) { 227 {
184 /* normal XTerm key bindings */ 228 switch (keysym)
229 {
230 /* normal XTerm key bindings */
185 case XK_Insert: /* Shift+Insert = paste mouse selection */ 231 case XK_Insert: /* Shift+Insert = paste mouse selection */
186 rxvt_selection_request(aR_ ev->time, 0, 0); 232 selection_request (ev.time, 0, 0);
187 return; 233 return;
188 /* rxvt extras */ 234 /* rxvt extras */
189 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 235 case XK_KP_Add: /* Shift+KP_Add = bigger font */
190 rxvt_change_font(aR_ 0, FONT_UP); 236 change_font (0, FONT_UP);
191 return; 237 return;
192 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 238 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
193 rxvt_change_font(aR_ 0, FONT_DN); 239 change_font (0, FONT_DN);
194 return; 240 return;
195 } 241 }
196 } 242 }
197 } 243 }
198#ifdef PRINTPIPE 244#ifdef PRINTPIPE
199 if (keysym == XK_Print) { 245 if (keysym == XK_Print)
200 rxvt_scr_printscreen(aR_ ctrl | shft); 246 {
247 scr_printscreen (ctrl | shft);
201 return; 248 return;
202 } 249 }
203#endif 250#endif
204#ifdef GREEK_SUPPORT 251#ifdef GREEK_SUPPORT
205 if (keysym == R->ks_greekmodeswith) { 252 if (keysym == ks_greekmodeswith)
206 R->greek_mode = !R->greek_mode; 253 {
254 greek_mode = !greek_mode;
207 if (R->greek_mode) { 255 if (greek_mode)
208 rxvt_xterm_seq(aR_ XTerm_title, 256 {
257 xterm_seq (XTerm_title,
209 (greek_getmode() == GREEK_ELOT928 258 (greek_getmode() == GREEK_ELOT928
210 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST); 259 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
211 greek_reset(); 260 greek_reset();
212 } else 261 }
262 else
213 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 263 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
214 return; 264 return;
215 } 265 }
216#endif 266#endif
217 267
218 if (keysym >= 0xFF00 && keysym <= 0xFFFF) { 268 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
269 {
219#ifdef KEYSYM_RESOURCE 270#ifdef KEYSYM_RESOURCE
220 if (!(shft | ctrl) && R->Keysym_map[keysym & 0xFF] != NULL) { 271 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
221 unsigned int l; 272 {
273 unsigned int l;
222 const unsigned char *kbuf0; 274 const unsigned char *kbuf0;
223 const unsigned char ch = C0_ESC; 275 const unsigned char ch = C0_ESC;
224 276
225 kbuf0 = (R->Keysym_map[keysym & 0xFF]); 277 kbuf0 = (Keysym_map[keysym & 0xFF]);
226 l = (unsigned int)*kbuf0++; 278 l = (unsigned int)*kbuf0++;
227 279
228 /* escape prefix */ 280 /* escape prefix */
229 if (meta) 281 if (meta)
230# ifdef META8_OPTION 282# ifdef META8_OPTION
231 if (R->meta_char == C0_ESC) 283 if (meta_char == C0_ESC)
232# endif 284# endif
233 R->tt_write (&ch, 1); 285 tt_write (&ch, 1);
234 R->tt_write (kbuf0, l); 286 tt_write (kbuf0, l);
235 return; 287 return;
236 } else 288 }
289 else
237#endif 290#endif
238 { 291
239 newlen = 1; 292 {
240 switch (keysym) { 293 newlen = 1;
294 switch (keysym)
295 {
241#ifndef NO_BACKSPACE_KEY 296#ifndef NO_BACKSPACE_KEY
242 case XK_BackSpace: 297 case XK_BackSpace:
243 if (R->PrivateModes & PrivMode_HaveBackSpace) { 298 if (PrivateModes & PrivMode_HaveBackSpace)
299 {
244 kbuf[0] = (!!(R->PrivateModes & PrivMode_BackSpace) 300 kbuf[0] = (!!(PrivateModes & PrivMode_BackSpace)
245 ^ !!ctrl) ? '\b' : '\177'; 301 ^ !!ctrl) ? '\b' : '\177';
246 kbuf[1] = '\0'; 302 kbuf[1] = '\0';
247 } else 303 }
248 STRCPY(kbuf, R->key_backspace); 304 else
305 STRCPY(kbuf, key_backspace);
249# ifdef MULTICHAR_SET 306# ifdef MULTICHAR_SET
250 if ((R->Options & Opt_mc_hack) && R->screen.cur.col > 0) { 307 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
251 int col, row; 308 {
309 int col, row;
252 310
253 newlen = STRLEN(kbuf); 311 newlen = STRLEN(kbuf);
254 col = R->screen.cur.col - 1; 312 col = screen.cur.col - 1;
255 row = R->screen.cur.row + R->TermWin.saveLines; 313 row = screen.cur.row + TermWin.saveLines;
256 if (IS_MULTI2(R->screen.rend[row][col])) 314 if (IS_MULTI2(screen.rend[row][col]))
257 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 315 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
258 } 316 }
259# endif 317# endif
260 break; 318 break;
261#endif 319#endif
262#ifndef NO_DELETE_KEY 320#ifndef NO_DELETE_KEY
263 case XK_Delete: 321 case XK_Delete:
264 STRCPY(kbuf, R->key_delete); 322 STRCPY(kbuf, key_delete);
265# ifdef MULTICHAR_SET 323# ifdef MULTICHAR_SET
266 if (R->Options & Opt_mc_hack) { 324 if (Options & Opt_mc_hack)
267 int col, row; 325 {
268 326 int col, row;
269 newlen = STRLEN(kbuf); 327
270 col = R->screen.cur.col; 328 newlen = STRLEN(kbuf);
271 row = R->screen.cur.row + R->TermWin.saveLines; 329 col = screen.cur.col;
272 if (IS_MULTI1(R->screen.rend[row][col])) 330 row = screen.cur.row + TermWin.saveLines;
331 if (IS_MULTI1(screen.rend[row][col]))
273 MEMMOVE(kbuf + newlen, kbuf, newlen + 1); 332 MEMMOVE(kbuf + newlen, kbuf, newlen + 1);
274 } 333 }
275# endif 334# endif
276 break; 335 break;
277#endif 336#endif
278 case XK_Tab: 337 case XK_Tab:
279 if (shft) 338 if (shft)
280 STRCPY(kbuf, "\033[Z"); 339 STRCPY(kbuf, "\033[Z");
281 else { 340 else
341 {
282#ifdef CTRL_TAB_MAKES_META 342#ifdef CTRL_TAB_MAKES_META
283 if (ctrl) 343 if (ctrl)
284 meta = 1; 344 meta = 1;
285#endif 345#endif
286#ifdef MOD4_TAB_MAKES_META 346#ifdef MOD4_TAB_MAKES_META
287 if (ev->state & Mod4Mask) 347 if (ev.state & Mod4Mask)
288 meta = 1; 348 meta = 1;
289#endif 349#endif
290 newlen = 0; 350 newlen = 0;
291 } 351 }
292 break; 352 break;
293 353
294 354
295#ifdef XK_KP_Left 355#ifdef XK_KP_Left
296 case XK_KP_Up: /* \033Ox or standard */ 356 case XK_KP_Up: /* \033Ox or standard */
297 case XK_KP_Down: /* \033Or or standard */ 357 case XK_KP_Down: /* \033Or or standard */
298 case XK_KP_Right: /* \033Ov or standard */ 358 case XK_KP_Right: /* \033Ov or standard */
299 case XK_KP_Left: /* \033Ot or standard */ 359 case XK_KP_Left: /* \033Ot or standard */
300 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 360 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
301 STRCPY(kbuf, "\033OZ"); 361 {
302 kbuf[2] = ("txvr"[keysym - XK_KP_Left]); 362 STRCPY(kbuf, "\033OZ");
303 break; 363 kbuf[2] = ("txvr"[keysym - XK_KP_Left]);
304 } else 364 break;
365 }
366 else
305 /* translate to std. cursor key */ 367 /* translate to std. cursor key */
306 keysym = XK_Left + (keysym - XK_KP_Left); 368 keysym = XK_Left + (keysym - XK_KP_Left);
307 /* FALLTHROUGH */ 369 /* FALLTHROUGH */
308#endif 370#endif
309 case XK_Up: /* "\033[A" */ 371 case XK_Up: /* "\033[A" */
310 case XK_Down: /* "\033[B" */ 372 case XK_Down: /* "\033[B" */
311 case XK_Right: /* "\033[C" */ 373 case XK_Right: /* "\033[C" */
312 case XK_Left: /* "\033[D" */ 374 case XK_Left: /* "\033[D" */
313 STRCPY(kbuf, "\033[Z"); 375 STRCPY(kbuf, "\033[Z");
314 kbuf[2] = ("DACB"[keysym - XK_Left]); 376 kbuf[2] = ("DACB"[keysym - XK_Left]);
315 /* do Shift first */ 377 /* do Shift first */
316 if (shft) 378 if (shft)
317 kbuf[2] = ("dacb"[keysym - XK_Left]); 379 kbuf[2] = ("dacb"[keysym - XK_Left]);
318 else if (ctrl) { 380 else if (ctrl)
319 kbuf[1] = 'O'; 381 {
320 kbuf[2] = ("dacb"[keysym - XK_Left]); 382 kbuf[1] = 'O';
321 } else if (R->PrivateModes & PrivMode_aplCUR) 383 kbuf[2] = ("dacb"[keysym - XK_Left]);
322 kbuf[1] = 'O'; 384 }
385 else if (PrivateModes & PrivMode_aplCUR)
386 kbuf[1] = 'O';
323#ifdef MULTICHAR_SET 387#ifdef MULTICHAR_SET
324 //TODO: ?? 388 //TODO: ??
325 if (R->Options & Opt_mc_hack) { 389 if (Options & Opt_mc_hack)
326 int col, row, m; 390 {
391 int col, row, m;
327 392
328 col = R->screen.cur.col; 393 col = screen.cur.col;
329 row = R->screen.cur.row + R->TermWin.saveLines; 394 row = screen.cur.row + TermWin.saveLines;
330 m = 0; 395 m = 0;
331 if (keysym == XK_Right 396 if (keysym == XK_Right
332 && IS_MULTI1(R->screen.rend[row][col])) 397 && IS_MULTI1(screen.rend[row][col]))
333 m = 1; 398 m = 1;
334 else if (keysym == XK_Left) { 399 else if (keysym == XK_Left)
335 if (col > 0) { 400 {
336 if (IS_MULTI2(R->screen.rend[row][col - 1])) 401 if (col > 0)
337 m = 1; 402 {
338 } else if (R->screen.cur.row > 0) { 403 if (IS_MULTI2(screen.rend[row][col - 1]))
339 col = R->screen.tlen[--row]; 404 m = 1;
340 if (col == -1) 405 }
341 col = R->TermWin.ncol - 1; 406 else if (screen.cur.row > 0)
342 else 407 {
343 col--; 408 col = screen.tlen[--row];
344 if (col > 0 409 if (col == -1)
345 && IS_MULTI2(R->screen.rend[row][col])) 410 col = TermWin.ncol - 1;
346 m = 1; 411 else
347 } 412 col--;
348 } 413 if (col > 0
349 if (m) 414 && IS_MULTI2(screen.rend[row][col]))
350 MEMMOVE(kbuf + 3, kbuf, 3 + 1); 415 m = 1;
351 } 416 }
417 }
418 if (m)
419 MEMMOVE(kbuf + 3, kbuf, 3 + 1);
420 }
352#endif 421#endif
353 break; 422 break;
354 423
355#ifndef UNSHIFTED_SCROLLKEYS 424#ifndef UNSHIFTED_SCROLLKEYS
356# ifdef XK_KP_Prior 425# ifdef XK_KP_Prior
357 case XK_KP_Prior: 426 case XK_KP_Prior:
358 /* allow shift to override */ 427 /* allow shift to override */
359 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 428 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
360 STRCPY(kbuf, "\033Oy"); 429 {
361 break; 430 STRCPY(kbuf, "\033Oy");
362 } 431 break;
363 /* FALLTHROUGH */ 432 }
433 /* FALLTHROUGH */
364# endif 434# endif
365 case XK_Prior: 435 case XK_Prior:
366 STRCPY(kbuf, "\033[5~"); 436 STRCPY(kbuf, "\033[5~");
367 break; 437 break;
368# ifdef XK_KP_Next 438# ifdef XK_KP_Next
369 case XK_KP_Next: 439 case XK_KP_Next:
370 /* allow shift to override */ 440 /* allow shift to override */
371 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 441 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
372 STRCPY(kbuf, "\033Os"); 442 {
373 break; 443 STRCPY(kbuf, "\033Os");
374 } 444 break;
375 /* FALLTHROUGH */ 445 }
446 /* FALLTHROUGH */
376# endif 447# endif
377 case XK_Next: 448 case XK_Next:
378 STRCPY(kbuf, "\033[6~"); 449 STRCPY(kbuf, "\033[6~");
379 break; 450 break;
380#endif 451#endif
381 case XK_KP_Enter: 452 case XK_KP_Enter:
382 /* allow shift to override */ 453 /* allow shift to override */
383 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
384 STRCPY(kbuf, "\033OM"); 455 {
385 } else { 456 STRCPY(kbuf, "\033OM");
386 kbuf[0] = '\r'; 457 }
387 kbuf[1] = '\0'; 458 else
388 } 459 {
389 break; 460 kbuf[0] = '\r';
461 kbuf[1] = '\0';
462 }
463 break;
390 464
391#ifdef XK_KP_Begin 465#ifdef XK_KP_Begin
392 case XK_KP_Begin: 466 case XK_KP_Begin:
393 STRCPY(kbuf, "\033Ou"); 467 STRCPY(kbuf, "\033Ou");
394 break; 468 break;
395 469
396 case XK_KP_Insert: 470 case XK_KP_Insert:
397 STRCPY(kbuf, "\033Op"); 471 STRCPY(kbuf, "\033Op");
398 break; 472 break;
399 473
400 case XK_KP_Delete: 474 case XK_KP_Delete:
401 STRCPY(kbuf, "\033On"); 475 STRCPY(kbuf, "\033On");
402 break; 476 break;
403#endif 477#endif
404 case XK_KP_F1: /* "\033OP" */ 478 case XK_KP_F1: /* "\033OP" */
405 case XK_KP_F2: /* "\033OQ" */ 479 case XK_KP_F2: /* "\033OQ" */
406 case XK_KP_F3: /* "\033OR" */ 480 case XK_KP_F3: /* "\033OR" */
407 case XK_KP_F4: /* "\033OS" */ 481 case XK_KP_F4: /* "\033OS" */
408 STRCPY(kbuf, "\033OP"); 482 STRCPY(kbuf, "\033OP");
409 kbuf[2] += (keysym - XK_KP_F1); 483 kbuf[2] += (keysym - XK_KP_F1);
410 break; 484 break;
411 485
412 case XK_KP_Multiply: /* "\033Oj" : "*" */ 486 case XK_KP_Multiply: /* "\033Oj" : "*" */
413 case XK_KP_Add: /* "\033Ok" : "+" */ 487 case XK_KP_Add: /* "\033Ok" : "+" */
414 case XK_KP_Separator: /* "\033Ol" : "," */ 488 case XK_KP_Separator: /* "\033Ol" : "," */
415 case XK_KP_Subtract: /* "\033Om" : "-" */ 489 case XK_KP_Subtract: /* "\033Om" : "-" */
416 case XK_KP_Decimal: /* "\033On" : "." */ 490 case XK_KP_Decimal: /* "\033On" : "." */
417 case XK_KP_Divide: /* "\033Oo" : "/" */ 491 case XK_KP_Divide: /* "\033Oo" : "/" */
418 case XK_KP_0: /* "\033Op" : "0" */ 492 case XK_KP_0: /* "\033Op" : "0" */
419 case XK_KP_1: /* "\033Oq" : "1" */ 493 case XK_KP_1: /* "\033Oq" : "1" */
420 case XK_KP_2: /* "\033Or" : "2" */ 494 case XK_KP_2: /* "\033Or" : "2" */
421 case XK_KP_3: /* "\033Os" : "3" */ 495 case XK_KP_3: /* "\033Os" : "3" */
422 case XK_KP_4: /* "\033Ot" : "4" */ 496 case XK_KP_4: /* "\033Ot" : "4" */
423 case XK_KP_5: /* "\033Ou" : "5" */ 497 case XK_KP_5: /* "\033Ou" : "5" */
424 case XK_KP_6: /* "\033Ov" : "6" */ 498 case XK_KP_6: /* "\033Ov" : "6" */
425 case XK_KP_7: /* "\033Ow" : "7" */ 499 case XK_KP_7: /* "\033Ow" : "7" */
426 case XK_KP_8: /* "\033Ox" : "8" */ 500 case XK_KP_8: /* "\033Ox" : "8" */
427 case XK_KP_9: /* "\033Oy" : "9" */ 501 case XK_KP_9: /* "\033Oy" : "9" */
428 /* allow shift to override */ 502 /* allow shift to override */
429 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 503 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
430 STRCPY(kbuf, "\033Oj"); 504 {
431 kbuf[2] += (keysym - XK_KP_Multiply); 505 STRCPY(kbuf, "\033Oj");
432 } else { 506 kbuf[2] += (keysym - XK_KP_Multiply);
507 }
508 else
509 {
433 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 510 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
434 kbuf[1] = '\0'; 511 kbuf[1] = '\0';
435 } 512 }
436 break; 513 break;
437 514
438 case XK_Find: 515 case XK_Find:
439 STRCPY(kbuf, "\033[1~"); 516 STRCPY(kbuf, "\033[1~");
440 break; 517 break;
441 case XK_Insert: 518 case XK_Insert:
442 STRCPY(kbuf, "\033[2~"); 519 STRCPY(kbuf, "\033[2~");
443 break; 520 break;
444#ifdef DXK_Remove /* support for DEC remove like key */ 521#ifdef DXK_Remove /* support for DEC remove like key */
445 case DXK_Remove: 522 case DXK_Remove:
446 /* FALLTHROUGH */ 523 /* FALLTHROUGH */
447#endif 524#endif
448 case XK_Execute: 525 case XK_Execute:
449 STRCPY(kbuf, "\033[3~"); 526 STRCPY(kbuf, "\033[3~");
450 break; 527 break;
451 case XK_Select: 528 case XK_Select:
452 STRCPY(kbuf, "\033[4~"); 529 STRCPY(kbuf, "\033[4~");
453 break; 530 break;
454#ifdef XK_KP_End 531#ifdef XK_KP_End
455 case XK_KP_End: 532 case XK_KP_End:
456 /* allow shift to override */ 533 /* allow shift to override */
457 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 534 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
458 STRCPY(kbuf, "\033Oq"); 535 {
459 break; 536 STRCPY(kbuf, "\033Oq");
460 } 537 break;
461 /* FALLTHROUGH */ 538 }
539 /* FALLTHROUGH */
462#endif 540#endif
463 case XK_End: 541 case XK_End:
464 STRCPY(kbuf, KS_END); 542 STRCPY(kbuf, KS_END);
465 break; 543 break;
466#ifdef XK_KP_Home 544#ifdef XK_KP_Home
467 case XK_KP_Home: 545 case XK_KP_Home:
468 /* allow shift to override */ 546 /* allow shift to override */
469 if ((R->PrivateModes & PrivMode_aplKP) ? !shft : shft) { 547 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft)
470 STRCPY(kbuf, "\033Ow"); 548 {
471 break; 549 STRCPY(kbuf, "\033Ow");
472 } 550 break;
473 /* FALLTHROUGH */ 551 }
552 /* FALLTHROUGH */
474#endif 553#endif
475 case XK_Home: 554 case XK_Home:
476 STRCPY(kbuf, KS_HOME); 555 STRCPY(kbuf, KS_HOME);
477 break; 556 break;
478 557
479#define FKEY(n, fkey) \ 558#define FKEY(n, fkey) \
480 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey))) 559 sprintf((char *)kbuf,"\033[%2d~", (int)((n) + (keysym - fkey)))
481 560
482 case XK_F1: /* "\033[11~" */ 561 case XK_F1: /* "\033[11~" */
483 case XK_F2: /* "\033[12~" */ 562 case XK_F2: /* "\033[12~" */
484 case XK_F3: /* "\033[13~" */ 563 case XK_F3: /* "\033[13~" */
485 case XK_F4: /* "\033[14~" */ 564 case XK_F4: /* "\033[14~" */
486 case XK_F5: /* "\033[15~" */ 565 case XK_F5: /* "\033[15~" */
487 FKEY(11, XK_F1); 566 FKEY(11, XK_F1);
488 break; 567 break;
489 case XK_F6: /* "\033[17~" */ 568 case XK_F6: /* "\033[17~" */
490 case XK_F7: /* "\033[18~" */ 569 case XK_F7: /* "\033[18~" */
491 case XK_F8: /* "\033[19~" */ 570 case XK_F8: /* "\033[19~" */
492 case XK_F9: /* "\033[20~" */ 571 case XK_F9: /* "\033[20~" */
493 case XK_F10: /* "\033[21~" */ 572 case XK_F10: /* "\033[21~" */
494 FKEY(17, XK_F6); 573 FKEY(17, XK_F6);
495 break; 574 break;
496 case XK_F11: /* "\033[23~" */ 575 case XK_F11: /* "\033[23~" */
497 case XK_F12: /* "\033[24~" */ 576 case XK_F12: /* "\033[24~" */
498 case XK_F13: /* "\033[25~" */ 577 case XK_F13: /* "\033[25~" */
499 case XK_F14: /* "\033[26~" */ 578 case XK_F14: /* "\033[26~" */
500 FKEY(23, XK_F11); 579 FKEY(23, XK_F11);
501 break; 580 break;
502 case XK_F15: /* "\033[28~" */ 581 case XK_F15: /* "\033[28~" */
503 case XK_F16: /* "\033[29~" */ 582 case XK_F16: /* "\033[29~" */
504 FKEY(28, XK_F15); 583 FKEY(28, XK_F15);
505 break; 584 break;
506 case XK_Help: /* "\033[28~" */ 585 case XK_Help: /* "\033[28~" */
507 FKEY(28, XK_Help); 586 FKEY(28, XK_Help);
508 break; 587 break;
509 case XK_Menu: /* "\033[29~" */ 588 case XK_Menu: /* "\033[29~" */
510 FKEY(29, XK_Menu); 589 FKEY(29, XK_Menu);
511 break; 590 break;
512 case XK_F17: /* "\033[31~" */ 591 case XK_F17: /* "\033[31~" */
513 case XK_F18: /* "\033[32~" */ 592 case XK_F18: /* "\033[32~" */
514 case XK_F19: /* "\033[33~" */ 593 case XK_F19: /* "\033[33~" */
515 case XK_F20: /* "\033[34~" */ 594 case XK_F20: /* "\033[34~" */
516 case XK_F21: /* "\033[35~" */ 595 case XK_F21: /* "\033[35~" */
517 case XK_F22: /* "\033[36~" */ 596 case XK_F22: /* "\033[36~" */
518 case XK_F23: /* "\033[37~" */ 597 case XK_F23: /* "\033[37~" */
519 case XK_F24: /* "\033[38~" */ 598 case XK_F24: /* "\033[38~" */
520 case XK_F25: /* "\033[39~" */ 599 case XK_F25: /* "\033[39~" */
521 case XK_F26: /* "\033[40~" */ 600 case XK_F26: /* "\033[40~" */
522 case XK_F27: /* "\033[41~" */ 601 case XK_F27: /* "\033[41~" */
523 case XK_F28: /* "\033[42~" */ 602 case XK_F28: /* "\033[42~" */
524 case XK_F29: /* "\033[43~" */ 603 case XK_F29: /* "\033[43~" */
525 case XK_F30: /* "\033[44~" */ 604 case XK_F30: /* "\033[44~" */
526 case XK_F31: /* "\033[45~" */ 605 case XK_F31: /* "\033[45~" */
527 case XK_F32: /* "\033[46~" */ 606 case XK_F32: /* "\033[46~" */
528 case XK_F33: /* "\033[47~" */ 607 case XK_F33: /* "\033[47~" */
529 case XK_F34: /* "\033[48~" */ 608 case XK_F34: /* "\033[48~" */
530 case XK_F35: /* "\033[49~" */ 609 case XK_F35: /* "\033[49~" */
531 FKEY(31, XK_F17); 610 FKEY(31, XK_F17);
532 break; 611 break;
533#undef FKEY 612#undef FKEY
534 default: 613 default:
535 newlen = 0; 614 newlen = 0;
536 break; 615 break;
537 } 616 }
538 if (newlen) 617 if (newlen)
539 len = STRLEN(kbuf); 618 len = STRLEN(kbuf);
540 } 619 }
541 /* 620 /*
542 * Pass meta for all function keys, if 'meta' option set 621 * Pass meta for all function keys, if 'meta' option set
543 */ 622 */
544#ifdef META8_OPTION 623#ifdef META8_OPTION
545 if (meta && (R->meta_char == 0x80) && len > 0) 624 if (meta && (meta_char == 0x80) && len > 0)
546 kbuf[len - 1] |= 0x80; 625 kbuf[len - 1] |= 0x80;
547#endif 626#endif
627
628 }
548 } else if (ctrl && keysym == XK_minus) { 629 else if (ctrl && keysym == XK_minus)
630 {
549 len = 1; 631 len = 1;
550 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 632 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
551 } else { 633 }
634 else
635 {
552#ifdef META8_OPTION 636#ifdef META8_OPTION
553 /* set 8-bit on */ 637 /* set 8-bit on */
554 if (meta && (R->meta_char == 0x80)) { 638 if (meta && (meta_char == 0x80))
555 unsigned char *ch; 639 {
640 unsigned char *ch;
556 641
557 for (ch = kbuf; ch < kbuf + len; ch++) 642 for (ch = kbuf; ch < kbuf + len; ch++)
558 *ch |= 0x80; 643 *ch |= 0x80;
559 meta = 0; 644 meta = 0;
560 } 645 }
561#endif 646#endif
562#ifdef GREEK_SUPPORT 647#ifdef GREEK_SUPPORT
563 if (R->greek_mode) 648 if (greek_mode)
564 len = greek_xlat(kbuf, len); 649 len = greek_xlat(kbuf, len);
565#endif 650#endif
566 /* nil */ ; 651 /* nil */ ;
567 } 652 }
653 }
654
655 if (len <= 0)
656 return; /* not mapped */
657
658 if (Options & Opt_scrollTtyKeypress)
659 if (TermWin.view_start)
660 {
661 TermWin.view_start = 0;
662 want_refresh = 1;
568 } 663 }
569 664
570 if (len <= 0) 665 /*
571 return; /* not mapped */
572
573 if (R->Options & Opt_scrollTtyKeypress)
574 if (R->TermWin.view_start) {
575 R->TermWin.view_start = 0;
576 R->want_refresh = 1;
577 }
578
579/*
580 * these modifications only affect the static keybuffer 666 * these modifications only affect the static keybuffer
581 * pass Shift/Control indicators for function keys ending with `~' 667 * pass Shift/Control indicators for function keys ending with `~'
582 * 668 *
583 * eg, 669 * eg,
584 * Prior = "ESC[5~" 670 * Prior = "ESC[5~"
585 * Shift+Prior = "ESC[5$" 671 * Shift+Prior = "ESC[5$"
586 * Ctrl+Prior = "ESC[5^" 672 * Ctrl+Prior = "ESC[5^"
587 * Ctrl+Shift+Prior = "ESC[5@" 673 * Ctrl+Shift+Prior = "ESC[5@"
588 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>). 674 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
589 */ 675 */
590 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~') 676 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
591 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 677 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
592 678
593/* escape prefix */ 679 /* escape prefix */
594 if (meta 680 if (meta
595#ifdef META8_OPTION 681#ifdef META8_OPTION
596 && (R->meta_char == C0_ESC) 682 && (meta_char == C0_ESC)
597#endif 683#endif
598 ) { 684 )
685 {
599 const unsigned char ch = C0_ESC; 686 const unsigned char ch = C0_ESC;
600 687
601 R->tt_write(&ch, 1); 688 tt_write(&ch, 1);
602 } 689 }
603#ifdef DEBUG_CMD 690#ifdef DEBUG_CMD
691 if (debug_key)
604 if (debug_key) { /* Display keyboard buffer contents */ 692 { /* Display keyboard buffer contents */
605 char *p; 693 char *p;
606 int i; 694 int i;
607 695
608 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 696 fprintf(stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
609 for (i = 0, p = kbuf; i < len; i++, p++) 697 for (i = 0, p = kbuf; i < len; i++, p++)
610 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 698 fprintf(stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
611 fprintf(stderr, "'\n"); 699 fprintf(stderr, "'\n");
612 } 700 }
613#endif /* DEBUG_CMD */ 701#endif /* DEBUG_CMD */
614 R->tt_write(kbuf, (unsigned int)len); 702 tt_write (kbuf, (unsigned int)len);
615} 703}
616/*}}} */ 704/*}}} */
617 705
618#if (MENUBAR_MAX) 706#if (MENUBAR_MAX)
619/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */ 707/*{{{ rxvt_cmd_write(), rxvt_cmd_getc() */
620/* attempt to `write' count to the input buffer */ 708/* attempt to `write' count to the input buffer */
621/* EXTPROTO */
622unsigned int 709unsigned int
623rxvt_cmd_write(pR_ const unsigned char *str, unsigned int count) 710rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
624{ 711{
625 unsigned int n, s; 712 unsigned int n, s;
626 unsigned char *cmdbuf_base = R->cmdbuf_base,
627 *cmdbuf_endp = R->cmdbuf_endp,
628 *cmdbuf_ptr = R->cmdbuf_ptr;
629 713
630 n = cmdbuf_ptr - cmdbuf_base; 714 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 715 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
632 if (n > 0 && s < count) { 716 if (n > 0 && s < count)
717 {
633 MEMMOVE(cmdbuf_base, cmdbuf_ptr, 718 MEMMOVE(cmdbuf_base, cmdbuf_ptr,
634 (unsigned int)(cmdbuf_endp - cmdbuf_ptr)); 719 (unsigned int)(cmdbuf_endp - cmdbuf_ptr));
635 cmdbuf_ptr = cmdbuf_base; 720 cmdbuf_ptr = cmdbuf_base;
636 cmdbuf_endp -= n; 721 cmdbuf_endp -= n;
637 s += n; 722 s += n;
638 } 723 }
639 if (count > s) { 724 if (count > s)
725 {
640 rxvt_print_error("data loss: cmd_write too large"); 726 rxvt_print_error("data loss: cmd_write too large");
641 count = s; 727 count = s;
642 } 728 }
643 for (; count--;) 729 for (; count--;)
644 *cmdbuf_endp++ = *str++; 730 *cmdbuf_endp++ = *str++;
645 R->cmdbuf_ptr = cmdbuf_ptr;
646 R->cmdbuf_endp = cmdbuf_endp;
647 return 0; 731 return 0;
648} 732}
649#endif /* MENUBAR_MAX */ 733#endif /* MENUBAR_MAX */
650 734
651void 735void
652rxvt_term::flush () 736rxvt_term::flush ()
653{ 737{
654#ifdef TRANSPARENT 738#ifdef TRANSPARENT
655 if (want_full_refresh) 739 if (want_full_refresh)
656 { 740 {
657 want_full_refresh = 0; 741 want_full_refresh = 0;
658 rxvt_scr_clear (this); 742 scr_clear ();
659 rxvt_scr_touch (this, False); 743 scr_touch (false);
660 want_refresh = 1; 744 want_refresh = 1;
661 } 745 }
662#endif 746#endif
663 747
664 if (want_refresh) 748 if (want_refresh)
665 { 749 {
666 rxvt_scr_refresh (this, refresh_type); 750 scr_refresh (refresh_type);
667 rxvt_scrollbar_show (this, 1); 751 scrollbar_show (1);
668#ifdef USE_XIM 752#ifdef USE_XIM
669 rxvt_IMSendSpot (this); 753 IMSendSpot ();
670#endif 754#endif
671 }
672 755
673 XFlush (Xdisplay); 756 }
674#if 0 757
675 if (XPending (Xdisplay)) process_x_events (); 758 display->flush ();
676 if (XPending (Xdisplay)) process_x_events ();
677#endif
678} 759}
679 760
680void 761void
681rxvt_term::check_cb (check_watcher &w) 762rxvt_term::check_cb (check_watcher &w)
682{ 763{
683 SET_R (this); 764 SET_R (this);
765 SET_LOCALE (locale);
684 766
685 flush (); 767 flush ();
686} 768}
687 769
770#ifdef CURSOR_BLINK
688void 771void
689rxvt_term::process_x_events ()
690{
691 do
692 {
693 XEvent xev;
694
695 XNextEvent (Xdisplay, &xev);
696
697#if defined(CURSOR_BLINK)
698 if ((Options & Opt_cursorBlink)
699 && xev.type == KeyPress)
700 {
701 if (hidden_cursor)
702 {
703 hidden_cursor = 0;
704 want_refresh = 1;
705 }
706
707 blink_ev.start (NOW + BLINK_INTERVAL);
708 }
709#endif
710
711#if defined(POINTER_BLANK)
712 if ((Options & Opt_pointerBlank)
713 && (pointerBlankDelay > 0))
714 {
715 if (xev.type == MotionNotify
716 || xev.type == ButtonPress
717 || xev.type == ButtonRelease)
718 if (hidden_pointer)
719 pointer_unblank ();
720
721 if (xev.type == KeyPress && hidden_pointer == 0)
722 pointer_blank ();
723 }
724#endif
725
726#ifdef USE_XIM
727 if (!XFilterEvent (&xev, xev.xany.window))
728#endif
729 rxvt_process_x_event (this, &xev);
730 }
731 while (XPending (Xdisplay));
732}
733
734void
735rxvt_term::blink_cb (time_watcher &w) 772rxvt_term::cursor_blink_cb (time_watcher &w)
736{ 773{
737 SET_R (this);
738
739 w.at += BLINK_INTERVAL;
740 hidden_cursor = !hidden_cursor; 774 hidden_cursor = !hidden_cursor;
741 want_refresh = 1; 775 want_refresh = 1;
742}
743 776
777 w.start (w.at + BLINK_INTERVAL);
778}
779#endif
780
781#ifdef TEXT_BLINK
744void 782void
745rxvt_term::x_cb (io_watcher &w, short revents) 783rxvt_term::text_blink_cb (time_watcher &w)
746{ 784{
747 SET_R (this); 785 if (scr_refresh_rend (RS_Blink, RS_Blink))
748 786 {
749 process_x_events (); 787 hidden_text = !hidden_text;
788 want_refresh = 1;
789 w.start (w.at + TEXT_BLINK_INTERVAL);
790 }
750} 791}
792#endif
751 793
752bool 794bool
753rxvt_term::pty_fill () 795rxvt_term::pty_fill ()
754{ 796{
755 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 797 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
756 798
757 memmove (cmdbuf_base, cmdbuf_ptr, n); 799 memmove (cmdbuf_base, cmdbuf_ptr, n);
758 cmdbuf_ptr = cmdbuf_base; 800 cmdbuf_ptr = cmdbuf_base;
759 cmdbuf_endp = cmdbuf_ptr + n; 801 cmdbuf_endp = cmdbuf_ptr + n;
760 802
761 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 803 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n);
762 804
763 if (n > 0) 805 if (n > 0)
764 { 806 {
765 cmdbuf_endp += n; 807 cmdbuf_endp += n;
… …
773 815
774void 816void
775rxvt_term::pty_cb (io_watcher &w, short revents) 817rxvt_term::pty_cb (io_watcher &w, short revents)
776{ 818{
777 SET_R (this); 819 SET_R (this);
820 SET_LOCALE (locale);
778 821
779 if (revents & EVENT_WRITE) 822 if (revents & EVENT_WRITE)
780 tt_write (0, 0); 823 tt_write (0, 0);
781 else if (revents & EVENT_READ) 824 else if (revents & EVENT_READ)
782 { 825 {
… …
834 refreshnow = true; 877 refreshnow = true;
835 flag = false; 878 flag = false;
836 ch = NOCHAR; 879 ch = NOCHAR;
837 break; 880 break;
838 } 881 }
882
883 // scr_add_lines only works for nlines < TermWin.nrow - 1.
884 if (nlines >= TermWin.nrow - 1)
885 {
886 scr_add_lines (buf, nlines, str - buf);
887 nlines = 0;
888 str = buf;
889 }
839 } 890 }
840 891
841 if (str >= buf + BUFSIZ) 892 if (str >= buf + BUFSIZ)
842 { 893 {
843 ch = NOCHAR; 894 ch = NOCHAR;
844 break; 895 break;
845 } 896 }
846 } 897 }
847 } 898 }
848 899
849 rxvt_scr_add_lines (this, buf, nlines, str - buf); 900 scr_add_lines (buf, nlines, str - buf);
850 901
851 /* 902 /*
852 * If there have been a lot of new lines, then update the screen 903 * If there have been a lot of new lines, then update the screen
853 * What the heck I'll cheat and only refresh less than every page-full. 904 * What the heck I'll cheat and only refresh less than every page-full.
854 * the number of pages between refreshes is refresh_limit, which 905 * the number of pages between refreshes is refresh_limit, which
… …
860 if (refreshnow) 911 if (refreshnow)
861 { 912 {
862 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 913 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
863 refresh_limit++; 914 refresh_limit++;
864 915
865 rxvt_scr_refresh (this, refresh_type); 916 scr_refresh (refresh_type);
866 } 917 }
867 918
868 } 919 }
869 else 920 else
870 { 921 {
871 switch (ch) 922 switch (ch)
872 { 923 {
873 default: 924 default:
874 rxvt_process_nonprinting (this, ch); 925 process_nonprinting (ch);
875 break; 926 break;
876 case C0_ESC: /* escape char */ 927 case C0_ESC: /* escape char */
877 rxvt_process_escape_seq (this); 928 process_escape_seq ();
878 break; 929 break;
879 /*case 0x9b: */ /* CSI */ 930 /*case 0x9b: */ /* CSI */
880 /* rxvt_process_csi_seq (this); */ 931 /* process_csi_seq (); */
881 } 932 }
882 933
883 ch = NOCHAR; 934 ch = NOCHAR;
884 } 935 }
885 } 936 }
… …
890// read the next character, currently handles UTF-8 941// read the next character, currently handles UTF-8
891// will probably handle all sorts of other stuff in the future 942// will probably handle all sorts of other stuff in the future
892uint32_t 943uint32_t
893rxvt_term::next_char () 944rxvt_term::next_char ()
894{ 945{
895 struct mbstate &s = mbstate;
896
897 while (cmdbuf_ptr < cmdbuf_endp) 946 while (cmdbuf_ptr < cmdbuf_endp)
898 { 947 {
899 uint8_t ch = *cmdbuf_ptr; 948 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
900
901 if (s.cnt)
902 {
903 if ((ch & 0xc0) == 0x80)
904 {
905 cmdbuf_ptr++;
906
907 /* continuation */
908 s.reg = (s.reg << 6) | (ch & 0x7f);
909
910 if (--s.cnt == 0 && s.reg >= 128) /* if !inrange then corruption or Racking */
911 return s.reg;
912
913 continue;
914 }
915 else
916 {
917 s.cnt = 0;
918 return s.orig; /* the _occasional_ non-utf-8 character may slip through... */
919 }
920 }
921
922 if ((ch & 0xc0) == 0xc0)
923 {
924 cmdbuf_ptr++; 949 return *cmdbuf_ptr++;
925 950
926 /* first byte */ 951 wchar_t wc;
927 s.orig = ch; /* for broken encodings */ 952 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, &mbstate.mbs);
928 s.reg = ch; 953
929 if ((ch & 0xe0) == 0xc0) { s.reg &= 0x1f; s.cnt = 1; } 954 if (len == (size_t)-2)
930 if ((ch & 0xf0) == 0xe0) { s.reg &= 0x0f; s.cnt = 2; } 955 return NOCHAR;
931 if ((ch & 0xf8) == 0xf0) { s.reg &= 0x07; s.cnt = 3; } 956
932 if ((ch & 0xfc) == 0xf8) { s.reg &= 0x03; s.cnt = 4; } 957 if (len == (size_t)-1)
933 if ((ch & 0xfe) == 0xfc) { s.reg &= 0x01; s.cnt = 5; } 958 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
934 } 959
935 else 960 // assume wchar == unicode
936 { 961 cmdbuf_ptr += len;
937 cmdbuf_ptr++; /* _occasional_ non-utf8 may slip through... */
938 return ch; 962 return wc;
939 }
940 } 963 }
941 964
942 return NOCHAR; 965 return NOCHAR;
943} 966}
944 967
945/* rxvt_cmd_getc() - Return next input character */ 968/* rxvt_cmd_getc() - Return next input character */
946/* 969/*
947 * Return the next input character after first passing any keyboard input 970 * Return the next input character after first passing any keyboard input
948 * to the command. 971 * to the command.
949 */ 972 */
950/* INTPROTO */
951uint32_t 973uint32_t
952rxvt_cmd_getc(pR) 974rxvt_term::cmd_getc ()
953{ 975{
954 for (;;) 976 for (;;)
955 { 977 {
956 uint32_t c = R->next_char (); 978 uint32_t c = next_char ();
957 if (c != NOCHAR) 979 if (c != NOCHAR)
958 return c; 980 return c;
959 981
960 // incomplete sequences should occur rarely, still, a better solution 982 // incomplete sequences should occur rarely, still, a better solution
961 // would be preferred. either setjmp/longjmp or better design. 983 // would be preferred. either setjmp/longjmp or better design.
962 fcntl (R->cmd_fd, F_SETFL, 0); 984 fcntl (cmd_fd, F_SETFL, 0);
963 R->pty_fill (); 985 pty_fill ();
964 fcntl (R->cmd_fd, F_SETFL, O_NONBLOCK); 986 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
965 }
966
967#if 0
968#define TIMEOUT_USEC 5000
969 fd_set readfds;
970 int quick_timeout, select_res;
971 int want_motion_time, want_keypress_time;
972 struct timeval value;
973#if defined(POINTER_BLANK) || defined(CURSOR_BLINK)
974 struct timeval tp;
975#endif
976
977 for (;;) {
978 /* loop until we can return something */
979
980 if (R->v_bufstr < R->v_bufptr) /* output any pending chars */
981 R->tt_write(NULL, 0);
982
983#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
984 if (R->mouse_slip_wheel_speed) {
985 quick_timeout = 1;
986 if (!R->mouse_slip_wheel_delay--
987 && rxvt_scr_page(aR_ R->mouse_slip_wheel_speed > 0 ? UP : DN,
988 abs(R->mouse_slip_wheel_speed))) {
989 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
990 R->refresh_type |= SMOOTH_REFRESH;
991 R->want_refresh = 1;
992 } 987 }
993 }
994#endif /* MOUSE_WHEEL && MOUSE_SLIP_WHEELING */
995#ifdef SELECTION_SCROLLING
996 if (R->pending_scroll_selection) {
997 quick_timeout = 1;
998 if (!R->scroll_selection_delay--
999 && rxvt_scr_page(aR_ R->scroll_selection_dir,
1000 R->scroll_selection_lines)) {
1001 rxvt_selection_extend(aR_ R->selection_save_x,
1002 R->selection_save_y, R->selection_save_state);
1003 R->scroll_selection_delay = SCROLLBAR_CONTINUOUS_DELAY;
1004 R->refresh_type |= SMOOTH_REFRESH;
1005 R->want_refresh = 1;
1006 }
1007 }
1008#endif
1009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1010 if (scrollbar_isUp() || scrollbar_isDn()) {
1011 quick_timeout = 1;
1012 if (!R->scroll_arrow_delay--
1013 && rxvt_scr_page(aR_ scrollbar_isUp() ? UP : DN, 1)) {
1014 R->scroll_arrow_delay = SCROLLBAR_CONTINUOUS_DELAY;
1015 R->refresh_type |= SMOOTH_REFRESH;
1016 R->want_refresh = 1;
1017 }
1018 }
1019#endif /* NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING */
1020
1021#ifdef TRANSPARENT
1022 quick_timeout |= R->want_full_refresh;
1023#endif
1024#endif
1025} 988}
1026 989
990#ifdef POINTER_BLANK
1027void 991void
1028rxvt_term::pointer_unblank () 992rxvt_term::pointer_unblank ()
1029{ 993{
1030 XDefineCursor (Xdisplay, TermWin.vt, TermWin_cursor); 994 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1031 rxvt_recolour_cursor (this); 995 recolour_cursor ();
1032 996
1033#ifdef POINTER_BLANK
1034 hidden_pointer = 0; 997 hidden_pointer = 0;
1035 998
1036 if (Options & Opt_pointerBlank) 999 if (Options & Opt_pointerBlank)
1037 pointer_ev.start (NOW + pointerBlankDelay); 1000 pointer_ev.start (NOW + pointerBlankDelay);
1038#endif
1039} 1001}
1040 1002
1041#ifdef POINTER_BLANK
1042void 1003void
1043rxvt_term::pointer_blank () 1004rxvt_term::pointer_blank ()
1044{ 1005{
1045 pointer_ev.stop ();
1046
1047 if (!(Options & Opt_pointerBlank)) 1006 if (!(Options & Opt_pointerBlank))
1048 return; 1007 return;
1049 1008
1050 XDefineCursor (Xdisplay, TermWin.vt, blank_cursor); 1009 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1051 XFlush (Xdisplay); 1010 XFlush (display->display);
1052 1011
1053 hidden_pointer = 1; 1012 hidden_pointer = 1;
1054} 1013}
1055 1014
1056void 1015void
1057rxvt_term::pointer_cb (time_watcher &w) 1016rxvt_term::pointer_cb (time_watcher &w)
1058{ 1017{
1059 SET_R (this); 1018 SET_R (this);
1019 SET_LOCALE (locale);
1060 1020
1061 pointer_blank (); 1021 pointer_blank ();
1062} 1022}
1063#endif 1023#endif
1064 1024
1065/* INTPROTO */
1066void 1025void
1067rxvt_mouse_report(pR_ const XButtonEvent *ev) 1026rxvt_term::mouse_report (const XButtonEvent &ev)
1068{ 1027{
1069 int button_number, key_state = 0; 1028 int button_number, key_state = 0;
1070 int x, y; 1029 int x, y;
1071 1030
1072 x = ev->x; 1031 x = ev.x;
1073 y = ev->y; 1032 y = ev.y;
1074 rxvt_pixel_position(aR_ &x, &y); 1033 pixel_position (&x, &y);
1075 1034
1076 if (R->MEvent.button == AnyButton) { 1035 if (MEvent.button == AnyButton)
1036 {
1077 button_number = 3; 1037 button_number = 3;
1078 } else { 1038 }
1039 else
1040 {
1079 button_number = R->MEvent.button - Button1; 1041 button_number = MEvent.button - Button1;
1080 /* add 0x3D for wheel events, like xterm does */ 1042 /* add 0x3D for wheel events, like xterm does */
1081 if (button_number >= 3) 1043 if (button_number >= 3)
1082 button_number += (64 - 3); 1044 button_number += (64 - 3);
1083 } 1045 }
1084 1046
1085 if (R->PrivateModes & PrivMode_MouseX10) { 1047 if (PrivateModes & PrivMode_MouseX10)
1048 {
1086 /* 1049 /*
1087 * do not report ButtonRelease 1050 * do not report ButtonRelease
1088 * no state info allowed 1051 * no state info allowed
1089 */ 1052 */
1090 key_state = 0; 1053 key_state = 0;
1091 if (button_number == 3) 1054 if (button_number == 3)
1092 return; 1055 return;
1093 } else { 1056 }
1057 else
1058 {
1094 /* XTerm mouse reporting needs these values: 1059 /* XTerm mouse reporting needs these values:
1095 * 4 = Shift 1060 * 4 = Shift
1096 * 8 = Meta 1061 * 8 = Meta
1097 * 16 = Control 1062 * 16 = Control
1098 * plus will add in our own Double-Click reporting 1063 * plus will add in our own Double-Click reporting
1099 * 32 = Double Click 1064 * 32 = Double Click
1100 */ 1065 */
1101 key_state = ((R->MEvent.state & ShiftMask) ? 4 : 0) 1066 key_state = ((MEvent.state & ShiftMask) ? 4 : 0)
1102 + ((R->MEvent.state & R->ModMetaMask) ? 8 : 0) 1067 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1103 + ((R->MEvent.state & ControlMask) ? 16 : 0); 1068 + ((MEvent.state & ControlMask) ? 16 : 0);
1104#ifdef MOUSE_REPORT_DOUBLECLICK 1069#ifdef MOUSE_REPORT_DOUBLECLICK
1105 key_state += ((R->MEvent.clicks > 1) ? 32 : 0); 1070 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1106#endif 1071#endif
1072
1107 } 1073 }
1108 1074
1109#ifdef DEBUG_MOUSEREPORT 1075#ifdef DEBUG_MOUSEREPORT
1110 fprintf(stderr, "Mouse ["); 1076 fprintf(stderr, "Mouse [");
1111 if (key_state & 16) 1077 if (key_state & 16)
1112 fputc('C', stderr); 1078 fputc('C', stderr);
1113 if (key_state & 4) 1079 if (key_state & 4)
1114 fputc('S', stderr); 1080 fputc('S', stderr);
1115 if (key_state & 8) 1081 if (key_state & 8)
1116 fputc('A', stderr); 1082 fputc('A', stderr);
1117 if (key_state & 32) 1083 if (key_state & 32)
1118 fputc('2', stderr); 1084 fputc('2', stderr);
1119 fprintf(stderr, "]: <%d>, %d/%d\n", 1085 fprintf(stderr, "]: <%d>, %d/%d\n",
1120 button_number, 1086 button_number,
1121 x + 1, 1087 x + 1,
1122 y + 1); 1088 y + 1);
1123#else 1089#else
1124 R->tt_printf("\033[M%c%c%c", 1090 tt_printf("\033[M%c%c%c",
1125 (32 + button_number + key_state), 1091 (32 + button_number + key_state),
1126 (32 + x + 1), 1092 (32 + x + 1),
1127 (32 + y + 1)); 1093 (32 + y + 1));
1128#endif 1094#endif
1129} 1095}
1130 1096
1131#ifdef USING_W11LIB 1097#ifdef USING_W11LIB
1132/* EXTPROTO */
1133void 1098void
1134rxvt_W11_process_x_event(XEvent *ev) 1099rxvt_W11_process_x_event(XEvent *ev)
1135{ 1100{
1136 rxvt_t *r = rxvt_get_r(); 1101 rxvt_t *r = rxvt_get_r();
1137 1102
1138 rxvt_process_x_event(aR_ ev); 1103 x_cb (*ev);
1139} 1104}
1140#endif 1105#endif
1141 1106
1142/*{{{ process an X event */ 1107/*{{{ process an X event */
1143/* INTPROTO */
1144void 1108void
1145rxvt_process_x_event(pR_ XEvent *ev) 1109rxvt_term::x_cb (XEvent &ev)
1146{ 1110{
1147 int i, want_timeout; 1111 SET_R (this);
1112 SET_LOCALE (locale);
1113
1114#if defined(CURSOR_BLINK)
1115 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
1116 {
1117 if (hidden_cursor)
1118 {
1119 hidden_cursor = 0;
1120 want_refresh = 1;
1121 }
1122
1123 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1124 }
1125#endif
1126
1127#if defined(POINTER_BLANK)
1128 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
1129 {
1130 if (ev.type == MotionNotify
1131 || ev.type == ButtonPress
1132 || ev.type == ButtonRelease)
1133 if (hidden_pointer)
1134 pointer_unblank ();
1135
1136 if (ev.type == KeyPress && hidden_pointer == 0)
1137 pointer_blank ();
1138 }
1139#endif
1140
1141#ifdef USE_XIM
1142 if (XFilterEvent (&ev, None))
1143 return;
1144#endif
1145
1148 Window unused_root, unused_child; 1146 Window unused_root, unused_child;
1149 int unused_root_x, unused_root_y; 1147 int unused_root_x, unused_root_y;
1150 unsigned int unused_mask; 1148 unsigned int unused_mask;
1151 struct timeval tp;
1152 1149
1153#ifdef DEBUG_X 1150#ifdef DEBUG_X
1154 const char *const eventnames[] = 1151 const char *const eventnames[] =
1155 { /* mason - this matches my system */ 1152 { /* mason - this matches my system */
1156 "", 1153 "",
1157 "", 1154 "",
1158 "KeyPress", 1155 "KeyPress",
1159 "KeyRelease", 1156 "KeyRelease",
1160 "ButtonPress", 1157 "ButtonPress",
1161 "ButtonRelease", 1158 "ButtonRelease",
1162 "MotionNotify", 1159 "MotionNotify",
1163 "EnterNotify", 1160 "EnterNotify",
1164 "LeaveNotify", 1161 "LeaveNotify",
1165 "FocusIn", 1162 "FocusIn",
1166 "FocusOut", 1163 "FocusOut",
1167 "KeymapNotify", 1164 "KeymapNotify",
1168 "Expose", 1165 "Expose",
1169 "GraphicsExpose", 1166 "GraphicsExpose",
1170 "NoExpose", 1167 "NoExpose",
1171 "VisibilityNotify", 1168 "VisibilityNotify",
1172 "CreateNotify", 1169 "CreateNotify",
1173 "DestroyNotify", 1170 "DestroyNotify",
1174 "UnmapNotify", 1171 "UnmapNotify",
1175 "MapNotify", 1172 "MapNotify",
1176 "MapRequest", 1173 "MapRequest",
1177 "ReparentNotify", 1174 "ReparentNotify",
1178 "ConfigureNotify", 1175 "ConfigureNotify",
1179 "ConfigureRequest", 1176 "ConfigureRequest",
1180 "GravityNotify", 1177 "GravityNotify",
1181 "ResizeRequest", 1178 "ResizeRequest",
1182 "CirculateNotify", 1179 "CirculateNotify",
1183 "CirculateRequest", 1180 "CirculateRequest",
1184 "PropertyNotify", 1181 "PropertyNotify",
1185 "SelectionClear", 1182 "SelectionClear",
1186 "SelectionRequest", 1183 "SelectionRequest",
1187 "SelectionNotify", 1184 "SelectionNotify",
1188 "ColormapNotify", 1185 "ColormapNotify",
1189 "ClientMessage", 1186 "ClientMessage",
1190 "MappingNotify" 1187 "MappingNotify"
1191 }; 1188 };
1192 struct tm *ltt;
1193#endif 1189#endif
1194
1195 /*
1196 * check if we need to get the time for any timeouts
1197 */
1198
1199 for (i = NUM_TIMEOUTS; i--; )
1200 if (R->timeout[i].tv_sec) {
1201 want_timeout = 1;
1202 break;
1203 }
1204
1205#ifndef DEBUG_X
1206 if (want_timeout)
1207#endif
1208 (void)gettimeofday(&tp, NULL);
1209 1190
1210#ifdef DEBUG_X 1191#ifdef DEBUG_X
1192 struct timeval tp;
1193 struct tm *ltt;
1194 (void)gettimeofday(&tp, NULL);
1211 ltt = localtime(&(tp.tv_sec)); 1195 ltt = localtime(&(tp.tv_sec));
1212 D_X((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev->type], (ev->xany.window == R->TermWin.parent[0] ? "parent" : (ev->xany.window == R->TermWin.vt ? "vt" : (ev->xany.window == R->scrollBar.win ? "scroll" : (ev->xany.window == R->menuBar.win ? "menubar" : "UNKNOWN")))), (ev->xany.window == R->TermWin.parent[0] ? R->TermWin.parent[0] : (ev->xany.window == R->TermWin.vt ? R->TermWin.vt : (ev->xany.window == R->scrollBar.win ? R->scrollBar.win : (ev->xany.window == R->menuBar.win ? R->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)); 1196 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));
1213#endif 1197#endif
1214 1198
1215 /* X event timeouts */
1216 if (want_timeout)
1217 for (i = NUM_TIMEOUTS; i--; ) {
1218 if (R->timeout[i].tv_sec == 0)
1219 continue;
1220 if ((tp.tv_sec < R->timeout[i].tv_sec)
1221 || (tp.tv_sec == R->timeout[i].tv_sec
1222 && tp.tv_usec < R->timeout[i].tv_usec))
1223 continue;
1224 R->timeout[i].tv_sec = 0;
1225 switch(i) {
1226 case TIMEOUT_INCR:
1227 rxvt_print_error("data loss: timeout on INCR selection paste");
1228 R->selection_wait = Sel_none;
1229 break;
1230 default:
1231 break;
1232 }
1233 }
1234
1235 switch (ev->type) { 1199 switch (ev.type)
1200 {
1236 case KeyPress: 1201 case KeyPress:
1237 rxvt_lookup_key(aR_ (XKeyEvent *)ev); 1202 lookup_key (ev.xkey);
1238 break; 1203 break;
1239 1204
1240#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1205#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1241 case KeyRelease: 1206 case KeyRelease:
1242 { 1207 {
1243 if (!(ev->xkey.state & ControlMask)) 1208 if (!(ev.xkey.state & ControlMask))
1244 R->mouse_slip_wheel_speed = 0; 1209 mouse_slip_wheel_speed = 0;
1245 else { 1210 else
1246 KeySym ks; 1211 {
1247 1212 KeySym ks;
1213
1248 ks = XKeycodeToKeysym(R->Xdisplay, ev->xkey.keycode, 0); 1214 ks = XKeycodeToKeysym(display->display, ev.xkey.keycode, 0);
1249 if (ks == XK_Control_L || ks == XK_Control_R) 1215 if (ks == XK_Control_L || ks == XK_Control_R)
1250 R->mouse_slip_wheel_speed = 0; 1216 mouse_slip_wheel_speed = 0;
1251 } 1217 }
1252 break; 1218 break;
1253 } 1219 }
1254#endif 1220#endif
1255 1221
1256 case ButtonPress: 1222 case ButtonPress:
1257 rxvt_button_press(aR_ (XButtonEvent *)ev); 1223 button_press (ev.xbutton);
1258 break; 1224 break;
1259 1225
1260 case ButtonRelease: 1226 case ButtonRelease:
1261 rxvt_button_release(aR_ (XButtonEvent *)ev); 1227 button_release (ev.xbutton);
1262 break; 1228 break;
1263 1229
1264 case ClientMessage: 1230 case ClientMessage:
1265 if (ev->xclient.format == 32 1231 if (ev.xclient.format == 32
1266 && (Atom)ev->xclient.data.l[0] == R->xa[XA_WMDELETEWINDOW]) 1232 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1267 R->destroy (); 1233 destroy ();
1268#ifdef OFFIX_DND 1234#ifdef OFFIX_DND
1269 /* OffiX Dnd (drag 'n' drop) protocol */ 1235 /* OffiX Dnd (drag 'n' drop) protocol */
1270 else if (ev->xclient.message_type == R->xa[XA_DNDPROTOCOL] 1236 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1271 && (ev->xclient.data.l[0] == DndFile 1237 && (ev.xclient.data.l[0] == DndFile
1272 || ev->xclient.data.l[0] == DndDir 1238 || ev.xclient.data.l[0] == DndDir
1273 || ev->xclient.data.l[0] == DndLink)) { 1239 || ev.xclient.data.l[0] == DndLink))
1274 /* Get Dnd data */ 1240 {
1241 /* Get Dnd data */
1275 Atom ActualType; 1242 Atom ActualType;
1276 int ActualFormat; 1243 int ActualFormat;
1277 unsigned char *data; 1244 unsigned char *data;
1278 unsigned long Size, RemainingBytes; 1245 unsigned long Size, RemainingBytes;
1279 1246
1280 XGetWindowProperty(R->Xdisplay, Xroot, 1247 XGetWindowProperty(display->display, display->root,
1281 R->xa[XA_DNDSELECTION], 1248 xa[XA_DNDSELECTION],
1282 0L, 1000000L, 1249 0L, 1000000L,
1283 False, AnyPropertyType, 1250 False, AnyPropertyType,
1284 &ActualType, &ActualFormat, 1251 &ActualType, &ActualFormat,
1285 &Size, &RemainingBytes, 1252 &Size, &RemainingBytes,
1286 &data); 1253 &data);
1287 XChangeProperty(R->Xdisplay, Xroot, 1254 XChangeProperty(display->display, display->root,
1288 XA_CUT_BUFFER0, XA_STRING, 1255 XA_CUT_BUFFER0, XA_STRING,
1289 8, PropModeReplace, 1256 8, PropModeReplace,
1290 data, STRLEN(data)); 1257 data, STRLEN(data));
1291 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, True); 1258 selection_paste (display->root, XA_CUT_BUFFER0, True);
1292 XSetInputFocus(R->Xdisplay, Xroot, RevertToNone, CurrentTime); 1259 XSetInputFocus(display->display, display->root, RevertToNone, CurrentTime);
1293 } 1260 }
1294#endif /* OFFIX_DND */ 1261#endif /* OFFIX_DND */
1295 break; 1262 break;
1296 1263
1297 case MappingNotify: 1264 case MappingNotify:
1298 XRefreshKeyboardMapping(&(ev->xmapping)); 1265 XRefreshKeyboardMapping(&(ev.xmapping));
1299 break; 1266 break;
1300 1267
1301 /* 1268 /*
1302 * XXX: this is not the _current_ arrangement 1269 * XXX: this is not the _current_ arrangement
1303 * Here's my conclusion: 1270 * Here's my conclusion:
1304 * If the window is completely unobscured, use bitblt's 1271 * If the window is completely unobscured, use bitblt's
1305 * to scroll. Even then, they're only used when doing partial 1272 * to scroll. Even then, they're only used when doing partial
1306 * screen scrolling. When partially obscured, we have to fill 1273 * screen scrolling. When partially obscured, we have to fill
1307 * in the GraphicsExpose parts, which means that after each refresh, 1274 * in the GraphicsExpose parts, which means that after each refresh,
1308 * we need to wait for the graphics expose or Noexpose events, 1275 * we need to wait for the graphics expose or Noexpose events,
1309 * which ought to make things real slow! 1276 * which ought to make things real slow!
1310 */ 1277 */
1311 case VisibilityNotify: 1278 case VisibilityNotify:
1312 switch (ev->xvisibility.state) 1279 switch (ev.xvisibility.state)
1313 { 1280 {
1314 case VisibilityUnobscured: 1281 case VisibilityUnobscured:
1315 R->refresh_type = FAST_REFRESH; 1282 refresh_type = FAST_REFRESH;
1316 break; 1283 break;
1317 case VisibilityPartiallyObscured: 1284 case VisibilityPartiallyObscured:
1318 R->refresh_type = SLOW_REFRESH; 1285 refresh_type = SLOW_REFRESH;
1319 break; 1286 break;
1320 default: 1287 default:
1321 R->refresh_type = NO_REFRESH; 1288 refresh_type = NO_REFRESH;
1322 break; 1289 break;
1323 } 1290 }
1324 break; 1291 break;
1325 1292
1326 case FocusIn: 1293 case FocusIn:
1327 if (!R->TermWin.focus) { 1294 if (!TermWin.focus)
1328 R->TermWin.focus = 1; 1295 {
1329 R->want_refresh = 1; 1296 TermWin.focus = 1;
1297 want_refresh = 1;
1330#ifdef USE_XIM 1298#ifdef USE_XIM
1331 if (R->Input_Context != NULL) 1299 if (Input_Context != NULL)
1332 XSetICFocus(R->Input_Context); 1300 XSetICFocus(Input_Context);
1333#endif 1301#endif
1334#ifdef CURSOR_BLINK 1302#ifdef CURSOR_BLINK
1335 if (R->Options & Opt_cursorBlink) 1303 if (Options & Opt_cursorBlink)
1336 R->blink_ev.start (NOW + BLINK_INTERVAL); 1304 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1337#endif 1305#endif
1338 }
1339 break;
1340 1306
1307 }
1308 break;
1309
1341 case FocusOut: 1310 case FocusOut:
1342 if (R->TermWin.focus) { 1311 if (TermWin.focus)
1343 R->TermWin.focus = 0; 1312 {
1344 R->want_refresh = 1; 1313 TermWin.focus = 0;
1314 want_refresh = 1;
1345#ifdef USE_XIM 1315#ifdef USE_XIM
1346 if (R->Input_Context != NULL) 1316 if (Input_Context != NULL)
1347 XUnsetICFocus(R->Input_Context); 1317 XUnsetICFocus(Input_Context);
1348#endif 1318#endif
1349#ifdef CURSOR_BLINK 1319#ifdef CURSOR_BLINK
1350 if (R->Options & Opt_cursorBlink) 1320 if (Options & Opt_cursorBlink)
1351 R->blink_ev.stop (); 1321 cursor_blink_ev.stop ();
1352 R->hidden_cursor = 0; 1322 hidden_cursor = 0;
1353#endif 1323#endif
1354 }
1355 break;
1356 1324
1325 }
1326 break;
1327
1357 case ConfigureNotify: 1328 case ConfigureNotify:
1358 if (ev->xconfigure.window == R->TermWin.parent[0]) { 1329 if (ev.xconfigure.window == TermWin.parent[0])
1359 int height, width; 1330 {
1331 int height, width;
1360 1332
1333 do
1361 do { /* Wrap lots of configures into one */ 1334 { /* Wrap lots of configures into one */
1362 width = ev->xconfigure.width; 1335 width = ev.xconfigure.width;
1363 height = ev->xconfigure.height; 1336 height = ev.xconfigure.height;
1364 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1337 D_SIZE((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1365 } while (XCheckTypedWindowEvent(R->Xdisplay, ev->xconfigure.window, 1338 }
1366 ConfigureNotify, ev)); 1339 while (XCheckTypedWindowEvent(display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1340
1367 if (R->szHint.width != width || R->szHint.height != height) { 1341 if (szHint.width != width || szHint.height != height)
1342 {
1368 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", R->szHint.width, R->szHint.height)); 1343 D_SIZE((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1369 rxvt_resize_all_windows(aR_ (unsigned int)width, 1344 resize_all_windows (width, height, 1);
1370 (unsigned int)height, 1); 1345 }
1371 }
1372#ifdef DEBUG_SIZE 1346#ifdef DEBUG_SIZE
1373 else { 1347 else
1348 {
1374 D_SIZE((stderr, "Size: Not resizing")); 1349 D_SIZE((stderr, "Size: Not resizing"));
1375 } 1350 }
1376#endif 1351#endif
1377#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1352#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1378 if (R->Options & Opt_transparent) { 1353 if (Options & Opt_transparent)
1379 rxvt_check_our_parents(aR); 1354 {
1380 if (R->am_transparent) 1355 check_our_parents ();
1381 R->want_full_refresh = 1; 1356 if (am_transparent)
1382 } 1357 want_full_refresh = 1;
1358 }
1383#endif 1359#endif
1384 }
1385 break;
1386 1360
1361 }
1362 break;
1363
1387 case SelectionClear: 1364 case SelectionClear:
1388 rxvt_selection_clear(aR); 1365 display->set_selection_owner (0);
1389 break; 1366 break;
1390 1367
1391 case SelectionNotify: 1368 case SelectionNotify:
1392 if (R->selection_wait == Sel_normal) 1369 if (selection_wait == Sel_normal)
1393 rxvt_selection_paste(aR_ ev->xselection.requestor, 1370 selection_paste (ev.xselection.requestor,
1394 ev->xselection.property, True); 1371 ev.xselection.property, True);
1395 break; 1372 break;
1396 1373
1397 case SelectionRequest: 1374 case SelectionRequest:
1398 rxvt_selection_send(aR_ &(ev->xselectionrequest)); 1375 selection_send (ev.xselectionrequest);
1399 break; 1376 break;
1400 1377
1401 case UnmapNotify: 1378 case UnmapNotify:
1402 R->TermWin.mapped = 0; 1379 TermWin.mapped = 0;
1403 break; 1380#ifdef TEXT_BLINK
1381 text_blink_ev.stop ();
1382#endif
1383 break;
1404 1384
1405 case MapNotify: 1385 case MapNotify:
1406 R->TermWin.mapped = 1; 1386 TermWin.mapped = 1;
1407 break; 1387#ifdef TEXT_BLINK
1408 1388 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1409 case PropertyNotify: 1389#endif
1410 if (ev->xproperty.atom == R->xa[XA_VT_SELECTION]) {
1411 if (ev->xproperty.state == PropertyNewValue)
1412 rxvt_selection_property(aR_ ev->xproperty.window,
1413 ev->xproperty.atom);
1414 break; 1390 break;
1415 } 1391
1416#ifdef TRANSPARENT 1392#ifdef TRANSPARENT
1417 /*
1418 * if user used some Esetroot compatible prog to set the root bg,
1419 * use the property to determine the pixmap. We use it later on.
1420 */
1421 if (R->xa[XA_XROOTPMAPID] == 0)
1422 R->xa[XA_XROOTPMAPID] = XInternAtom(R->Xdisplay,
1423 "_XROOTPMAP_ID", False);
1424 if (ev->xproperty.atom != R->xa[XA_XROOTPMAPID])
1425 break;
1426 /* FALLTHROUGH */
1427 case ReparentNotify: 1393 case ReparentNotify:
1428 if ((R->Options & Opt_transparent) && rxvt_check_our_parents(aR)) { 1394 rootwin_cb (ev);
1429 if (R->am_transparent) 1395 break;
1430 R->want_full_refresh = 1;
1431 }
1432#endif /* TRANSPARENT */ 1396#endif /* TRANSPARENT */
1433 break;
1434 1397
1435 case GraphicsExpose: 1398 case GraphicsExpose:
1436 case Expose: 1399 case Expose:
1437 if (ev->xany.window == R->TermWin.vt) { 1400 if (ev.xany.window == TermWin.vt)
1401 {
1438#ifdef NO_SLOW_LINK_SUPPORT 1402#ifdef NO_SLOW_LINK_SUPPORT
1439 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1403 scr_expose (ev.xexpose.x, ev.xexpose.y,
1440 ev->xexpose.width, ev->xexpose.height, False); 1404 ev.xexpose.width, ev.xexpose.height, False);
1441#else 1405#else
1442 // don't understand this, so commented it out 1406 // don't understand this, so commented it out
1443 rxvt_scr_expose(aR_ ev->xexpose.x, ev->xexpose.y, 1407 scr_expose (ev.xexpose.x, ev.xexpose.y,
1444 ev->xexpose.width, ev->xexpose.height, False); 1408 ev.xexpose.width, ev.xexpose.height, False);
1445 //rxvt_scr_expose(aR_ ev->xexpose.x, 0, 1409 //scr_expose (ev.xexpose.x, 0,
1446 // ev->xexpose.width, R->TermWin.height, False); 1410 // ev.xexpose.width, TermWin.height, False);
1447#endif 1411#endif
1448 R->want_refresh = 1; 1412 want_refresh = 1;
1449 } else { 1413 }
1450 XEvent unused_xevent; 1414 else
1415 {
1416 XEvent unused_event;
1451 1417
1452 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1418 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1453 Expose, 1419 Expose,
1454 &unused_xevent)) ; 1420 &unused_event)) ;
1455 while (XCheckTypedWindowEvent(R->Xdisplay, ev->xany.window, 1421 while (XCheckTypedWindowEvent(display->display, ev.xany.window,
1456 GraphicsExpose, 1422 GraphicsExpose,
1457 &unused_xevent)) ; 1423 &unused_event)) ;
1458 if (isScrollbarWindow(ev->xany.window)) { 1424 if (isScrollbarWindow(ev.xany.window))
1459 scrollbar_setIdle(); 1425 {
1460 rxvt_scrollbar_show(aR_ 0); 1426 scrollBar.setIdle();
1461 } 1427 scrollbar_show (0);
1428 }
1462#ifdef MENUBAR 1429#ifdef MENUBAR
1463 if (menubar_visible(aR) && isMenuBarWindow(ev->xany.window)) 1430 if (menubar_visible () && isMenuBarWindow(ev.xany.window))
1464 rxvt_menubar_expose(aR); 1431 menubar_expose ();
1465#endif 1432#endif
1466#ifdef RXVT_GRAPHICS 1433#ifdef RXVT_GRAPHICS
1467 rxvt_Gr_expose(aR_ ev->xany.window); 1434 Gr_expose (ev.xany.window);
1468#endif 1435#endif
1469 }
1470 break;
1471 1436
1437 }
1438 break;
1439
1472 case MotionNotify: 1440 case MotionNotify:
1473#ifdef POINTER_BLANK 1441#ifdef POINTER_BLANK
1474 if (R->hidden_pointer) 1442 if (hidden_pointer)
1475 R->pointer_unblank (); 1443 pointer_unblank ();
1476#endif 1444#endif
1477#if MENUBAR 1445#if MENUBAR
1478 if (isMenuBarWindow(ev->xany.window)) { 1446 if (isMenuBarWindow(ev.xany.window))
1479 rxvt_menubar_control(aR_ &(ev->xbutton)); 1447 {
1480 break; 1448 menubar_control (&(ev.xbutton));
1481 } 1449 break;
1450 }
1482#endif 1451#endif
1483 if ((R->PrivateModes & PrivMode_mouse_report) && !(R->bypass_keystate)) 1452 if ((PrivateModes & PrivMode_mouse_report) && !(bypass_keystate))
1484 break; 1453 break;
1485 1454
1486 if (ev->xany.window == R->TermWin.vt) { 1455 if (ev.xany.window == TermWin.vt)
1456 {
1487 if ((ev->xbutton.state & (Button1Mask | Button3Mask))) { 1457 if ((ev.xbutton.state & (Button1Mask | Button3Mask)))
1488 while (XCheckTypedWindowEvent(R->Xdisplay, R->TermWin.vt, 1458 {
1489 MotionNotify, ev)) ; 1459 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1490 XQueryPointer(R->Xdisplay, R->TermWin.vt, 1460 ;
1491 &unused_root, &unused_child, 1461
1492 &unused_root_x, &unused_root_y, 1462 XQueryPointer(display->display, TermWin.vt,
1493 &(ev->xbutton.x), &(ev->xbutton.y), 1463 &unused_root, &unused_child,
1494 &unused_mask); 1464 &unused_root_x, &unused_root_y,
1465 &(ev.xbutton.x), &(ev.xbutton.y),
1466 &unused_mask);
1495#ifdef MOUSE_THRESHOLD 1467#ifdef MOUSE_THRESHOLD
1496 /* deal with a `jumpy' mouse */ 1468 /* deal with a `jumpy' mouse */
1497 if ((ev->xmotion.time - R->MEvent.time) > MOUSE_THRESHOLD) { 1469 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1470 {
1498#endif 1471#endif
1499 rxvt_selection_extend(aR_ (ev->xbutton.x), (ev->xbutton.y), 1472 selection_extend ((ev.xbutton.x), (ev.xbutton.y),
1500 (ev->xbutton.state & Button3Mask) ? 2 : 0); 1473 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1501#ifdef SELECTION_SCROLLING 1474#ifdef SELECTION_SCROLLING
1502 if (ev->xbutton.y<R->TermWin.int_bwidth || 1475 if (ev.xbutton.y < TermWin.int_bwidth
1503 Pixel2Row(ev->xbutton.y)>(R->TermWin.nrow-1)) { 1476 || Pixel2Row(ev.xbutton.y) > (TermWin.nrow-1))
1504 int dist; 1477 {
1505 1478 int dist;
1506 R->pending_scroll_selection=1; 1479
1507 1480 pending_scroll_selection=1;
1481
1508 /* don't clobber the current delay if we are 1482 /* don't clobber the current delay if we are
1509 * already in the middle of scrolling. 1483 * already in the middle of scrolling.
1510 */ 1484 */
1511 if (R->scroll_selection_delay<=0) 1485 if (scroll_selection_delay<=0)
1512 R->scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1486 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY;
1513 1487
1514 /* save the event params so we can highlight 1488 /* save the event params so we can highlight
1515 * the selection in the pending-scroll loop 1489 * the selection in the pending-scroll loop
1516 */ 1490 */
1517 R->selection_save_x=ev->xbutton.x; 1491 selection_save_x=ev.xbutton.x;
1518 R->selection_save_y=ev->xbutton.y; 1492 selection_save_y=ev.xbutton.y;
1519 R->selection_save_state= 1493 selection_save_state=
1520 (ev->xbutton.state & Button3Mask) ? 2 : 0; 1494 (ev.xbutton.state & Button3Mask) ? 2 : 0;
1521 1495
1522 /* calc number of lines to scroll */ 1496 /* calc number of lines to scroll */
1523 if (ev->xbutton.y<R->TermWin.int_bwidth) { 1497 if (ev.xbutton.y<TermWin.int_bwidth)
1524 R->scroll_selection_dir = UP; 1498 {
1525 dist = R->TermWin.int_bwidth - ev->xbutton.y; 1499 scroll_selection_dir = UP;
1526 } 1500 dist = TermWin.int_bwidth - ev.xbutton.y;
1527 else { 1501 }
1528 R->scroll_selection_dir = DN; 1502 else
1529 dist = ev->xbutton.y - 1503 {
1530 (R->TermWin.int_bwidth + R->TermWin.height); 1504 scroll_selection_dir = DN;
1531 } 1505 dist = ev.xbutton.y -
1532 R->scroll_selection_lines=(Pixel2Height(dist)/ 1506 (TermWin.int_bwidth + TermWin.height);
1533 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1507 }
1534 MIN_IT(R->scroll_selection_lines, 1508 scroll_selection_lines=(Pixel2Height(dist)/
1535 SELECTION_SCROLL_MAX_LINES); 1509 SELECTION_SCROLL_LINE_SPEEDUP)+1;
1536 } 1510 MIN_IT(scroll_selection_lines,
1537 else { 1511 SELECTION_SCROLL_MAX_LINES);
1512 }
1513 else
1514 {
1538 /* we are within the text window, so we 1515 /* we are within the text window, so we
1539 * shouldn't be scrolling 1516 * shouldn't be scrolling
1540 */ 1517 */
1541 R->pending_scroll_selection = 0; 1518 pending_scroll_selection = 0;
1542 } 1519 }
1543#endif 1520#endif
1544#ifdef MOUSE_THRESHOLD 1521#ifdef MOUSE_THRESHOLD
1545 } 1522
1523 }
1546#endif 1524#endif
1525
1526 }
1527 }
1528 else if (isScrollbarWindow(ev.xany.window) && scrollbar_isMotion())
1529 {
1530 while (XCheckTypedWindowEvent(display->display, scrollBar.win,
1531 MotionNotify, &ev)) ;
1532 XQueryPointer(display->display, scrollBar.win,
1533 &unused_root, &unused_child,
1534 &unused_root_x, &unused_root_y,
1535 &(ev.xbutton.x), &(ev.xbutton.y),
1536 &unused_mask);
1537 scr_move_to (scrollbar_position(ev.xbutton.y) - csrO,
1538 scrollbar_size());
1539 scr_refresh (refresh_type);
1540 refresh_limit = 0;
1541 scrollbar_show (1);
1542 }
1543 break;
1547 } 1544 }
1548 } else if (isScrollbarWindow(ev->xany.window) && scrollbar_isMotion()) {
1549 while (XCheckTypedWindowEvent(R->Xdisplay, R->scrollBar.win,
1550 MotionNotify, ev)) ;
1551 XQueryPointer(R->Xdisplay, R->scrollBar.win,
1552 &unused_root, &unused_child,
1553 &unused_root_x, &unused_root_y,
1554 &(ev->xbutton.x), &(ev->xbutton.y),
1555 &unused_mask);
1556 rxvt_scr_move_to(aR_ scrollbar_position(ev->xbutton.y) - R->csrO,
1557 scrollbar_size());
1558 rxvt_scr_refresh(aR_ R->refresh_type);
1559 R->refresh_limit = 0;
1560 rxvt_scrollbar_show(aR_ 1);
1561 }
1562 break;
1563 }
1564} 1545}
1565 1546
1566/* INTPROTO */
1567void 1547void
1548rxvt_term::rootwin_cb (XEvent &ev)
1549{
1550 SET_R (this);
1551 SET_LOCALE (locale);
1552
1553 switch (ev.type)
1554 {
1555 case PropertyNotify:
1556 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1557 {
1558 if (ev.xproperty.state == PropertyNewValue)
1559 selection_property (ev.xproperty.window, ev.xproperty.atom);
1560 break;
1561 }
1562#ifdef TRANSPARENT
1563 else
1564 {
1565 /*
1566 * if user used some Esetroot compatible prog to set the root bg,
1567 * use the property to determine the pixmap. We use it later on.
1568 */
1569 if (xa[XA_XROOTPMAPID] == 0)
1570 xa[XA_XROOTPMAPID] = XInternAtom(display->display, "_XROOTPMAP_ID", False);
1571
1572 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1573 return;
1574 }
1575
1576 /* FALLTHROUGH */
1577 case ReparentNotify:
1578 if ((Options & Opt_transparent) && check_our_parents ())
1579 if (am_transparent)
1580 want_full_refresh = 1;
1581 break;
1582#endif
1583 }
1584}
1585
1586void
1568rxvt_button_press(pR_ XButtonEvent *ev) 1587rxvt_term::button_press (const XButtonEvent &ev)
1569{ 1588{
1570 int reportmode = 0, clickintime; 1589 int reportmode = 0, clickintime;
1571 1590
1572 R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask); 1591 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1573 if (!R->bypass_keystate) 1592 if (!bypass_keystate)
1574 reportmode = !!(R->PrivateModes & PrivMode_mouse_report); 1593 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1575/* 1594 /*
1576 * VT window processing of button press 1595 * VT window processing of button press
1577 */ 1596 */
1578 if (ev->window == R->TermWin.vt) 1597 if (ev.window == TermWin.vt)
1579 { 1598 {
1580#if RXVT_GRAPHICS 1599#if RXVT_GRAPHICS
1581 if (ev->subwindow != None) 1600 if (ev.subwindow != None)
1582 rxvt_Gr_ButtonPress(ev->x, ev->y); 1601 rxvt_Gr_ButtonPress (ev.x, ev.y);
1583 else 1602 else
1584#endif 1603#endif
1604
1605 {
1606 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1607 if (reportmode)
1585 { 1608 {
1586 clickintime = ev->time - R->MEvent.time < MULTICLICK_TIME; 1609 /* mouse report from vt window */
1610 /* save the xbutton state (for ButtonRelease) */
1611 MEvent.state = ev.state;
1612#ifdef MOUSE_REPORT_DOUBLECLICK
1613 if (ev.button == MEvent.button && clickintime)
1614 {
1615 /* same button, within alloted time */
1616 MEvent.clicks++;
1617 if (MEvent.clicks > 1)
1618 {
1619 /* only report double clicks */
1620 MEvent.clicks = 2;
1621 mouse_report (ev);
1622
1623 /* don't report the release */
1624 MEvent.clicks = 0;
1625 MEvent.button = AnyButton;
1626 }
1627 }
1628 else
1629 {
1630 /* different button, or time expired */
1631 MEvent.clicks = 1;
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634 }
1635#else
1636 MEvent.button = ev.button;
1637 mouse_report (ev);
1638#endif /* MOUSE_REPORT_DOUBLECLICK */
1639
1640 }
1641 else
1642 {
1643 if (ev.button != MEvent.button)
1644 MEvent.clicks = 0;
1645 switch (ev.button)
1646 {
1647 case Button1:
1648 /* allow shift+left click to extend selection */
1649 if (ev.state & ShiftMask && !(PrivateModes & PrivMode_mouse_report))
1650 {
1651 if (MEvent.button == Button1 && clickintime)
1652 selection_rotate (ev.x, ev.y);
1653 else
1654 selection_extend (ev.x, ev.y, 1);
1655 }
1656 else
1657 {
1658 if (MEvent.button == Button1 && clickintime)
1659 MEvent.clicks++;
1660 else
1661 MEvent.clicks = 1;
1662
1663 selection_click (MEvent.clicks, ev.x, ev.y);
1664 }
1665
1666 MEvent.button = Button1;
1667 break;
1668
1669 case Button3:
1670 if (MEvent.button == Button3 && clickintime)
1671 selection_rotate (ev.x, ev.y);
1672 else
1673 selection_extend (ev.x, ev.y, 1);
1674 MEvent.button = Button3;
1675 break;
1676 }
1677 }
1678 MEvent.time = ev.time;
1679 return;
1680 }
1681 }
1682
1683 /*
1684 * Scrollbar window processing of button press
1685 */
1686 if (isScrollbarWindow(ev.window))
1687 {
1688 scrollBar.setIdle ();
1689 /*
1690 * Rxvt-style scrollbar:
1691 * move up if mouse is above slider
1692 * move dn if mouse is below slider
1693 *
1694 * XTerm-style scrollbar:
1695 * Move display proportional to pointer location
1696 * pointer near top -> scroll one line
1697 * pointer near bot -> scroll full page
1698 */
1699#ifndef NO_SCROLLBAR_REPORT
1587 if (reportmode) 1700 if (reportmode)
1701 {
1702 /*
1703 * Mouse report disabled scrollbar:
1704 * arrow buttons - send up/down
1705 * click on scrollbar - send pageup/down
1706 */
1707 if ((scrollBar.style == R_SB_NEXT
1708 && scrollbarnext_upButton(ev.y))
1709 || (scrollBar.style == R_SB_RXVT
1710 && scrollbarrxvt_upButton(ev.y)))
1711 tt_printf("\033[A");
1712 else if ((scrollBar.style == R_SB_NEXT
1713 && scrollbarnext_dnButton(ev.y))
1714 || (scrollBar.style == R_SB_RXVT
1715 && scrollbarrxvt_dnButton(ev.y)))
1716 tt_printf("\033[B");
1717 else
1718 switch (ev.button)
1588 { 1719 {
1720 case Button2:
1721 tt_printf("\014");
1722 break;
1723 case Button1:
1724 tt_printf("\033[6~");
1725 break;
1726 case Button3:
1727 tt_printf("\033[5~");
1728 break;
1729 }
1730 }
1731 else
1732#endif /* NO_SCROLLBAR_REPORT */
1733
1734 {
1735 char upordown = 0;
1736
1737 if (scrollBar.style == R_SB_NEXT)
1738 {
1739 if (scrollbarnext_upButton(ev.y))
1740 upordown = -1; /* up */
1741 else if (scrollbarnext_dnButton(ev.y))
1742 upordown = 1; /* down */
1743 }
1744 else if (scrollBar.style == R_SB_RXVT)
1745 {
1746 if (scrollbarrxvt_upButton(ev.y))
1747 upordown = -1; /* up */
1748 else if (scrollbarrxvt_dnButton(ev.y))
1749 upordown = 1; /* down */
1750 }
1751 if (upordown)
1752 {
1753#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1754 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1755#endif
1756 if (scr_page (upordown < 0 ? UP : DN, 1))
1757 {
1758 if (upordown < 0)
1759 scrollBar.setUp ();
1760 else
1761 scrollBar.setDn ();
1762 }
1763 }
1764 else
1765 switch (ev.button)
1766 {
1767 case Button2:
1768 switch (scrollbar_align)
1769 {
1770 case R_SB_ALIGN_TOP:
1771 csrO = 0;
1772 break;
1773 case R_SB_ALIGN_CENTRE:
1774 csrO = (scrollBar.bot - scrollBar.top) / 2;
1775 break;
1776 case R_SB_ALIGN_BOTTOM:
1777 csrO = scrollBar.bot - scrollBar.top;
1778 break;
1779 }
1780 if (scrollBar.style == R_SB_XTERM
1781 || scrollbar_above_slider(ev.y)
1782 || scrollbar_below_slider(ev.y))
1783 scr_move_to ( scrollbar_position(ev.y) - csrO,
1784 scrollbar_size());
1785 scrollBar.setMotion ();
1786 break;
1787
1788 case Button1:
1789 if (scrollbar_align == R_SB_ALIGN_CENTRE)
1790 csrO = ev.y - scrollBar.top;
1791 /* FALLTHROUGH */
1792
1793 case Button3:
1794 if (scrollBar.style != R_SB_XTERM)
1795 {
1796 if (scrollbar_above_slider(ev.y))
1797# ifdef RXVT_SCROLL_FULL
1798 scr_page (UP, TermWin.nrow - 1);
1799# else
1800 scr_page (UP, TermWin.nrow / 4);
1801# endif
1802 else if (scrollbar_below_slider(ev.y))
1803# ifdef RXVT_SCROLL_FULL
1804 scr_page (DN, TermWin.nrow - 1);
1805# else
1806 scr_page (DN, TermWin.nrow / 4);
1807# endif
1808 else
1809 scrollBar.setMotion ();
1810 }
1811 else
1812 {
1813 scr_page ((ev.button == Button1 ? DN : UP),
1814 (TermWin.nrow
1815 * scrollbar_position(ev.y)
1816 / scrollbar_size()));
1817 }
1818 break;
1819 }
1820 }
1821 return;
1822 }
1823#if MENUBAR
1824 /*
1825 * Menubar window processing of button press
1826 */
1827 if (isMenuBarWindow(ev.window))
1828 menubar_control (ev);
1829#endif
1830}
1831
1832void
1833rxvt_term::button_release (const XButtonEvent &ev)
1834{
1835 int reportmode = 0;
1836
1837 csrO = 0; /* reset csr Offset */
1838 if (!bypass_keystate)
1839 reportmode = !!(PrivateModes & PrivMode_mouse_report);
1840
1841 if (scrollbar_isUpDn())
1842 {
1843 scrollBar.setIdle ();
1844 scrollbar_show (0);
1845#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1846 refresh_type &= ~SMOOTH_REFRESH;
1847#endif
1848
1849 }
1850#ifdef SELECTION_SCROLLING
1851 pending_scroll_selection=0;
1852#endif
1853 if (ev.window == TermWin.vt)
1854 {
1855#ifdef RXVT_GRAPHICS
1856 if (ev.subwindow != None)
1857 rxvt_Gr_ButtonRelease(ev.x, ev.y);
1858 else
1859#endif
1860
1861 {
1862 if (reportmode)
1863 {
1589 /* mouse report from vt window */ 1864 /* mouse report from vt window */
1590 /* save the xbutton state (for ButtonRelease) */ 1865 /* don't report release of wheel "buttons" */
1591 R->MEvent.state = ev->state; 1866 if (ev.button >= 4)
1867 return;
1592#ifdef MOUSE_REPORT_DOUBLECLICK 1868#ifdef MOUSE_REPORT_DOUBLECLICK
1593 if (ev->button == R->MEvent.button && clickintime) 1869 /* only report the release of 'slow' single clicks */
1870 if (MEvent.button != AnyButton
1871 && (ev.button != MEvent.button
1872 || (ev.time - MEvent.time
1873 > MULTICLICK_TIME / 2)))
1594 { 1874 {
1595 /* same button, within alloted time */ 1875 MEvent.clicks = 0;
1596 R->MEvent.clicks++; 1876 MEvent.button = AnyButton;
1597 if (R->MEvent.clicks > 1) 1877 mouse_report (ev);
1598 {
1599 /* only report double clicks */
1600 R->MEvent.clicks = 2;
1601 rxvt_mouse_report(aR_ ev);
1602
1603 /* don't report the release */
1604 R->MEvent.clicks = 0;
1605 R->MEvent.button = AnyButton;
1606 }
1607 }
1608 else
1609 { 1878 }
1610 /* different button, or time expired */ 1879#else /* MOUSE_REPORT_DOUBLECLICK */
1611 R->MEvent.clicks = 1; 1880 MEvent.button = AnyButton;
1612 R->MEvent.button = ev->button; 1881 mouse_report (ev);
1613 rxvt_mouse_report(aR_ ev);
1614 }
1615#else
1616 R->MEvent.button = ev->button;
1617 rxvt_mouse_report(aR_ ev);
1618#endif /* MOUSE_REPORT_DOUBLECLICK */ 1882#endif /* MOUSE_REPORT_DOUBLECLICK */
1619 }
1620 else
1621 { 1883 return;
1622 if (ev->button != R->MEvent.button)
1623 R->MEvent.clicks = 0;
1624 switch (ev->button)
1625 {
1626 case Button1:
1627 if (R->MEvent.button == Button1 && clickintime)
1628 R->MEvent.clicks++;
1629 else
1630 R->MEvent.clicks = 1;
1631 rxvt_selection_click(aR_ R->MEvent.clicks, ev->x, ev->y);
1632 R->MEvent.button = Button1;
1633 break;
1634
1635 case Button3:
1636 if (R->MEvent.button == Button3 && clickintime)
1637 rxvt_selection_rotate(aR_ ev->x, ev->y);
1638 else
1639 rxvt_selection_extend(aR_ ev->x, ev->y, 1);
1640 R->MEvent.button = Button3;
1641 break;
1642 } 1884 }
1643 }
1644 R->MEvent.time = ev->time;
1645 return;
1646 }
1647 }
1648
1649/*
1650 * Scrollbar window processing of button press
1651 */
1652 if (isScrollbarWindow(ev->window))
1653 {
1654 scrollbar_setIdle();
1655 /*
1656 * Rxvt-style scrollbar:
1657 * move up if mouse is above slider
1658 * move dn if mouse is below slider
1659 *
1660 * XTerm-style scrollbar:
1661 * Move display proportional to pointer location
1662 * pointer near top -> scroll one line
1663 * pointer near bot -> scroll full page
1664 */
1665#ifndef NO_SCROLLBAR_REPORT
1666 if (reportmode) {
1667 /*
1668 * Mouse report disabled scrollbar:
1669 * arrow buttons - send up/down
1670 * click on scrollbar - send pageup/down
1671 */
1672 if ((R->scrollBar.style == R_SB_NEXT
1673 && scrollbarnext_upButton(ev->y))
1674 || (R->scrollBar.style == R_SB_RXVT
1675 && scrollbarrxvt_upButton(ev->y)))
1676 R->tt_printf("\033[A");
1677 else if ((R->scrollBar.style == R_SB_NEXT
1678 && scrollbarnext_dnButton(ev->y))
1679 || (R->scrollBar.style == R_SB_RXVT
1680 && scrollbarrxvt_dnButton(ev->y)))
1681 R->tt_printf("\033[B");
1682 else
1683 switch (ev->button) {
1684 case Button2:
1685 R->tt_printf("\014");
1686 break;
1687 case Button1:
1688 R->tt_printf("\033[6~");
1689 break;
1690 case Button3:
1691 R->tt_printf("\033[5~");
1692 break;
1693 }
1694 }
1695 else
1696#endif /* NO_SCROLLBAR_REPORT */
1697 {
1698 char upordown = 0;
1699
1700 if (R->scrollBar.style == R_SB_NEXT) {
1701 if (scrollbarnext_upButton(ev->y))
1702 upordown = -1; /* up */
1703 else if (scrollbarnext_dnButton(ev->y))
1704 upordown = 1; /* down */
1705 } else if (R->scrollBar.style == R_SB_RXVT) {
1706 if (scrollbarrxvt_upButton(ev->y))
1707 upordown = -1; /* up */
1708 else if (scrollbarrxvt_dnButton(ev->y))
1709 upordown = 1; /* down */
1710 }
1711 if (upordown) {
1712#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1713 R->scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY;
1714#endif
1715 if (rxvt_scr_page(aR_ upordown < 0 ? UP : DN, 1)) {
1716 if (upordown < 0)
1717 scrollbar_setUp();
1718 else
1719 scrollbar_setDn();
1720 }
1721 } else
1722 switch (ev->button) {
1723 case Button2:
1724 switch (R->scrollbar_align) {
1725 case R_SB_ALIGN_TOP:
1726 R->csrO = 0;
1727 break;
1728 case R_SB_ALIGN_CENTRE:
1729 R->csrO = (R->scrollBar.bot - R->scrollBar.top) / 2;
1730 break;
1731 case R_SB_ALIGN_BOTTOM:
1732 R->csrO = R->scrollBar.bot - R->scrollBar.top;
1733 break;
1734 }
1735 if (R->scrollBar.style == R_SB_XTERM
1736 || scrollbar_above_slider(ev->y)
1737 || scrollbar_below_slider(ev->y))
1738 rxvt_scr_move_to(aR_
1739 scrollbar_position(ev->y) - R->csrO,
1740 scrollbar_size());
1741 scrollbar_setMotion();
1742 break;
1743
1744 case Button1:
1745 if (R->scrollbar_align == R_SB_ALIGN_CENTRE)
1746 R->csrO = ev->y - R->scrollBar.top;
1747 /* FALLTHROUGH */
1748
1749 case Button3:
1750 if (R->scrollBar.style != R_SB_XTERM) {
1751 if (scrollbar_above_slider(ev->y))
1752# ifdef RXVT_SCROLL_FULL
1753 rxvt_scr_page(aR_ UP, R->TermWin.nrow - 1);
1754# else
1755 rxvt_scr_page(aR_ UP, R->TermWin.nrow / 4);
1756# endif
1757 else if (scrollbar_below_slider(ev->y))
1758# ifdef RXVT_SCROLL_FULL
1759 rxvt_scr_page(aR_ DN, R->TermWin.nrow - 1);
1760# else
1761 rxvt_scr_page(aR_ DN, R->TermWin.nrow / 4);
1762# endif
1763 else
1764 scrollbar_setMotion();
1765 } else {
1766 rxvt_scr_page(aR_ (ev->button == Button1 ? DN : UP),
1767 (R->TermWin.nrow
1768 * scrollbar_position(ev->y)
1769 / scrollbar_size()));
1770 }
1771 break;
1772 }
1773 }
1774 return;
1775 }
1776#if MENUBAR
1777 /*
1778 * Menubar window processing of button press
1779 */
1780 if (isMenuBarWindow(ev->window))
1781 rxvt_menubar_control(aR_ ev);
1782#endif
1783}
1784
1785/* INTPROTO */
1786void
1787rxvt_button_release(pR_ XButtonEvent *ev)
1788{
1789 int reportmode = 0;
1790
1791 R->csrO = 0; /* reset csr Offset */
1792 if (!R->bypass_keystate)
1793 reportmode = !!(R->PrivateModes & PrivMode_mouse_report);
1794
1795 if (scrollbar_isUpDn()) {
1796 scrollbar_setIdle();
1797 rxvt_scrollbar_show(aR_ 0);
1798#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1799 R->refresh_type &= ~SMOOTH_REFRESH;
1800#endif
1801 }
1802#ifdef SELECTION_SCROLLING
1803 R->pending_scroll_selection=0;
1804#endif
1805 if (ev->window == R->TermWin.vt)
1806 {
1807#ifdef RXVT_GRAPHICS
1808 if (ev->subwindow != None)
1809 rxvt_Gr_ButtonRelease(ev->x, ev->y);
1810 else
1811#endif
1812 { 1885 /*
1813 if (reportmode)
1814 {
1815 /* mouse report from vt window */
1816 /* don't report release of wheel "buttons" */
1817 if (ev->button >= 4)
1818 return;
1819#ifdef MOUSE_REPORT_DOUBLECLICK
1820 /* only report the release of 'slow' single clicks */
1821 if (R->MEvent.button != AnyButton
1822 && (ev->button != R->MEvent.button
1823 || (ev->time - R->MEvent.time
1824 > MULTICLICK_TIME / 2)))
1825 {
1826 R->MEvent.clicks = 0;
1827 R->MEvent.button = AnyButton;
1828 rxvt_mouse_report(aR_ ev);
1829 }
1830#else /* MOUSE_REPORT_DOUBLECLICK */
1831 R->MEvent.button = AnyButton;
1832 rxvt_mouse_report(aR_ ev);
1833#endif /* MOUSE_REPORT_DOUBLECLICK */
1834 return;
1835 }
1836 /*
1837 * dumb hack to compensate for the failure of click-and-drag 1886 * dumb hack to compensate for the failure of click-and-drag
1838 * when overriding mouse reporting 1887 * when overriding mouse reporting
1839 */ 1888 */
1840 if (R->PrivateModes & PrivMode_mouse_report 1889 if (PrivateModes & PrivMode_mouse_report
1841 && R->bypass_keystate 1890 && bypass_keystate
1842 && ev->button == Button1 && R->MEvent.clicks <= 1) 1891 && ev.button == Button1 && MEvent.clicks <= 1)
1843 rxvt_selection_extend(aR_ ev->x, ev->y, 0); 1892 selection_extend (ev.x, ev.y, 0);
1844 1893
1845 switch (ev->button) { 1894 switch (ev.button)
1895 {
1846 case Button1: 1896 case Button1:
1847 case Button3: 1897 case Button3:
1848 rxvt_selection_make(aR_ ev->time); 1898 selection_make (ev.time);
1849 break; 1899 break;
1850 case Button2: 1900 case Button2:
1851 rxvt_selection_request(aR_ ev->time, ev->x, ev->y); 1901 selection_request (ev.time, ev.x, ev.y);
1852 break; 1902 break;
1853#ifdef MOUSE_WHEEL 1903#ifdef MOUSE_WHEEL
1854 case Button4: 1904 case Button4:
1855 case Button5: 1905 case Button5:
1856 { 1906 {
1857 int i, v; 1907 int i;
1908 page_dirn v;
1858 1909
1859 v = (ev->button == Button4) ? UP : DN; 1910 v = (ev.button == Button4) ? UP : DN;
1860 if (ev->state & ShiftMask) 1911 if (ev.state & ShiftMask)
1861 i = 1; 1912 i = 1;
1862 else if ((R->Options & Opt_mouseWheelScrollPage)) 1913 else if ((Options & Opt_mouseWheelScrollPage))
1863 i = R->TermWin.nrow - 1; 1914 i = TermWin.nrow - 1;
1864 else 1915 else
1865 i = 5; 1916 i = 5;
1866# ifdef MOUSE_SLIP_WHEELING 1917# ifdef MOUSE_SLIP_WHEELING
1867 if (ev->state & ControlMask) 1918 if (ev.state & ControlMask)
1868 { 1919 {
1869 R->mouse_slip_wheel_speed += (v ? -1 : 1); 1920 mouse_slip_wheel_speed += (v ? -1 : 1);
1870 R->mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 1921 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY;
1871 } 1922 }
1872# endif 1923# endif
1873# ifdef JUMP_MOUSE_WHEEL 1924# ifdef JUMP_MOUSE_WHEEL
1874 rxvt_scr_page(aR_ v, i); 1925 scr_page (v, i);
1875 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1926 scr_refresh (SMOOTH_REFRESH);
1876 rxvt_scrollbar_show(aR_ 1); 1927 scrollbar_show (1);
1877# else 1928# else
1878 for (; i--;) 1929 while (i--)
1879 { 1930 {
1880 rxvt_scr_page(aR_ v, 1); 1931 scr_page (v, 1);
1881 rxvt_scr_refresh(aR_ SMOOTH_REFRESH); 1932 scr_refresh (SMOOTH_REFRESH);
1882 rxvt_scrollbar_show(aR_ 1); 1933 scrollbar_show (1);
1883 } 1934 }
1884# endif 1935# endif
1885 } 1936
1886 break; 1937 }
1938 break;
1887#endif 1939#endif
1888 } 1940
1889 } 1941 }
1890 } 1942 }
1943 }
1891#ifdef MENUBAR 1944#ifdef MENUBAR
1892 else if (isMenuBarWindow(ev->window)) 1945 else if (isMenuBarWindow(ev.window))
1893 rxvt_menubar_control(aR_ ev); 1946 menubar_control (ev);
1894#endif 1947#endif
1895} 1948}
1896 1949
1897 1950
1898#ifdef TRANSPARENT 1951#ifdef TRANSPARENT
1899/* 1952/*
1900 * Check our parents are still who we think they are. 1953 * Check our parents are still who we think they are.
1901 * Do transparency updates if required 1954 * Do transparency updates if required
1902 */ 1955 */
1903/* EXTPROTO */
1904int 1956int
1905rxvt_check_our_parents(pR) 1957rxvt_term::check_our_parents ()
1906{ 1958{
1907 int i, pchanged, aformat, have_pixmap, rootdepth; 1959 int i, pchanged, aformat, have_pixmap, rootdepth;
1908 unsigned long nitems, bytes_after; 1960 unsigned long nitems, bytes_after;
1909 Atom atype; 1961 Atom atype;
1910 unsigned char *prop = NULL; 1962 unsigned char *prop = NULL;
1911 Window root, oldp, *list; 1963 Window root, oldp, *list;
1912 Pixmap rootpixmap = None; 1964 Pixmap rootpixmap = None;
1913 XWindowAttributes wattr, wrootattr; 1965 XWindowAttributes wattr, wrootattr;
1914 1966
1915 pchanged = 0; 1967 pchanged = 0;
1916 1968
1917 if (!(R->Options & Opt_transparent)) 1969 if (!(Options & Opt_transparent))
1918 return pchanged; /* Don't try any more */ 1970 return pchanged; /* Don't try any more */
1919 1971
1920 XGetWindowAttributes(R->Xdisplay, Xroot, &wrootattr); 1972 XGetWindowAttributes(display->display, display->root, &wrootattr);
1921 rootdepth = wrootattr.depth; 1973 rootdepth = wrootattr.depth;
1922 1974
1923 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 1975 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
1924 if (rootdepth != wattr.depth) { 1976 if (rootdepth != wattr.depth)
1977 {
1925 if (R->am_transparent) { 1978 if (am_transparent)
1979 {
1926 pchanged = 1; 1980 pchanged = 1;
1927 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1981 XSetWindowBackground(display->display, TermWin.vt,
1928 R->PixColors[Color_bg]); 1982 PixColors[Color_bg]);
1929 R->am_transparent = R->am_pixmap_trans = 0; 1983 am_transparent = am_pixmap_trans = 0;
1930 } 1984 }
1931 return pchanged; /* Don't try any more */ 1985 return pchanged; /* Don't try any more */
1932 } 1986 }
1933 1987
1934/* Get all X ops out of the queue so that our information is up-to-date. */ 1988 /* Get all X ops out of the queue so that our information is up-to-date. */
1935 XSync(R->Xdisplay, False); 1989 XSync(display->display, False);
1936 1990
1937/* 1991 /*
1938 * Make the frame window set by the window manager have 1992 * Make the frame window set by the window manager have
1939 * the root background. Some window managers put multiple nested frame 1993 * the root background. Some window managers put multiple nested frame
1940 * windows for each client, so we have to take care about that. 1994 * windows for each client, so we have to take care about that.
1941 */ 1995 */
1942 i = (R->xa[XA_XROOTPMAPID] != 0 1996 i = (xa[XA_XROOTPMAPID] != 0
1943 && (XGetWindowProperty(R->Xdisplay, Xroot, R->xa[XA_XROOTPMAPID], 1997 && (XGetWindowProperty(display->display, display->root, xa[XA_XROOTPMAPID],
1944 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1998 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1945 &nitems, &bytes_after, &prop) == Success)); 1999 &nitems, &bytes_after, &prop) == Success));
1946 if (!i || prop == NULL) 2000 if (!i || prop == NULL)
1947 have_pixmap = 0; 2001 have_pixmap = 0;
1948 else { 2002 else
2003 {
1949 have_pixmap = 1; 2004 have_pixmap = 1;
1950 rootpixmap = *((Pixmap *)prop); 2005 rootpixmap = *((Pixmap *)prop);
1951 XFree(prop); 2006 XFree(prop);
1952 } 2007 }
1953 if (have_pixmap) { 2008 if (have_pixmap)
1954/* 2009 {
2010 /*
1955 * Copy Xroot pixmap transparency 2011 * Copy display->root pixmap transparency
1956 */ 2012 */
1957 int sx, sy, nx, ny; 2013 int sx, sy, nx, ny;
1958 unsigned int nw, nh; 2014 unsigned int nw, nh;
1959 Window cr; 2015 Window cr;
1960 XImage *image; 2016 XImage *image;
1961 GC gc; 2017 GC gc;
1962 XGCValues gcvalue; 2018 XGCValues gcvalue;
1963 2019
1964 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 2020 XTranslateCoordinates(display->display, TermWin.parent[0], display->root,
1965 0, 0, &sx, &sy, &cr); 2021 0, 0, &sx, &sy, &cr);
1966 nw = (unsigned int)R->szHint.width; 2022 nw = (unsigned int)szHint.width;
1967 nh = (unsigned int)R->szHint.height; 2023 nh = (unsigned int)szHint.height;
1968 nx = ny = 0; 2024 nx = ny = 0;
1969 if (sx < 0) { 2025 if (sx < 0)
2026 {
1970 nw += sx; 2027 nw += sx;
1971 nx = -sx; 2028 nx = -sx;
1972 sx = 0; 2029 sx = 0;
1973 } 2030 }
1974 if (sy < 0) { 2031 if (sy < 0)
2032 {
1975 nh += sy; 2033 nh += sy;
1976 ny = -sy; 2034 ny = -sy;
1977 sy = 0; 2035 sy = 0;
1978 } 2036 }
1979 MIN_IT(nw, (unsigned int)(wrootattr.width - sx)); 2037 MIN_IT(nw, (unsigned int)(wrootattr.width - sx));
1980 MIN_IT(nh, (unsigned int)(wrootattr.height - sy)); 2038 MIN_IT(nh, (unsigned int)(wrootattr.height - sy));
1981 R->allowedxerror = -1; 2039 allowedxerror = -1;
1982 image = XGetImage(R->Xdisplay, rootpixmap, sx, sy, nw, nh, AllPlanes, 2040 image = XGetImage(display->display, rootpixmap, sx, sy, nw, nh, AllPlanes,
1983 ZPixmap); 2041 ZPixmap);
1984 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1985 /* XXX: may need a delay here? */ 2043 /* XXX: may need a delay here? */
1986 R->allowedxerror = 0; 2044 allowedxerror = 0;
1987 if (image == NULL) { 2045 if (image == NULL)
2046 {
1988 if (R->am_transparent && R->am_pixmap_trans) { 2047 if (am_transparent && am_pixmap_trans)
1989 pchanged = 1; 2048 {
2049 pchanged = 1;
2050 if (TermWin.pixmap != None)
2051 {
2052 XFreePixmap(display->display, TermWin.pixmap);
2053 TermWin.pixmap = None;
2054 }
2055 }
2056 am_pixmap_trans = 0;
2057 }
2058 else
2059 {
1990 if (R->TermWin.pixmap != None) { 2060 if (TermWin.pixmap != None)
1991 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 2061 XFreePixmap(display->display, TermWin.pixmap);
1992 R->TermWin.pixmap = None; 2062 TermWin.pixmap = XCreatePixmap(display->display, TermWin.vt,
1993 } 2063 (unsigned int)szHint.width,
2064 (unsigned int)szHint.height,
2065 (unsigned int)image->depth);
2066 gc = XCreateGC(display->display, TermWin.vt, 0UL, &gcvalue);
2067 XPutImage(display->display, TermWin.pixmap, gc, image, 0, 0,
2068 nx, ny, (unsigned int)image->width,
2069 (unsigned int)image->height);
2070 XFreeGC(display->display, gc);
2071 XDestroyImage(image);
2072 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2073 TermWin.pixmap);
2074 if (!am_transparent || !am_pixmap_trans)
2075 pchanged = 1;
2076 am_transparent = am_pixmap_trans = 1;
2077 }
1994 } 2078 }
1995 R->am_pixmap_trans = 0;
1996 } else {
1997 if (R->TermWin.pixmap != None)
1998 XFreePixmap(R->Xdisplay, R->TermWin.pixmap);
1999 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt,
2000 (unsigned int)R->szHint.width,
2001 (unsigned int)R->szHint.height,
2002 (unsigned int)image->depth);
2003 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 0UL, &gcvalue);
2004 XPutImage(R->Xdisplay, R->TermWin.pixmap, gc, image, 0, 0,
2005 nx, ny, (unsigned int)image->width,
2006 (unsigned int)image->height);
2007 XFreeGC(R->Xdisplay, gc);
2008 XDestroyImage(image);
2009 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt,
2010 R->TermWin.pixmap);
2011 if (!R->am_transparent || !R->am_pixmap_trans)
2012 pchanged = 1;
2013 R->am_transparent = R->am_pixmap_trans = 1;
2014 }
2015 }
2016 if (!R->am_pixmap_trans) { 2079 if (!am_pixmap_trans)
2080 {
2017 unsigned int n; 2081 unsigned int n;
2018/* 2082 /*
2019 * InheritPixmap transparency 2083 * InheritPixmap transparency
2020 */ 2084 */
2021 D_X((stderr, "InheritPixmap Seeking to %08lx", Xroot)); 2085 D_X((stderr, "InheritPixmap Seeking to %08lx", display->root));
2022 for (i = 1; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2086 for (i = 1; i < (int)(sizeof(TermWin.parent) / sizeof(Window));
2023 i++) { 2087 i++)
2088 {
2024 oldp = R->TermWin.parent[i]; 2089 oldp = TermWin.parent[i];
2025 XQueryTree(R->Xdisplay, R->TermWin.parent[i - 1], &root, 2090 XQueryTree(display->display, TermWin.parent[i - 1], &root,
2026 &R->TermWin.parent[i], &list, &n); 2091 &TermWin.parent[i], &list, &n);
2027 XFree(list); 2092 XFree(list);
2028 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, R->TermWin.parent[i])); 2093 D_X((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2029 if (R->TermWin.parent[i] == Xroot) { 2094 if (TermWin.parent[i] == display->root)
2030 if (oldp != None) 2095 {
2031 pchanged = 1; 2096 if (oldp != None)
2032 break; 2097 pchanged = 1;
2033 } 2098 break;
2099 }
2034 if (oldp != R->TermWin.parent[i]) 2100 if (oldp != TermWin.parent[i])
2035 pchanged = 1; 2101 pchanged = 1;
2036 } 2102 }
2037 n = 0; 2103 n = 0;
2038 if (pchanged) { 2104 if (pchanged)
2105 {
2039 for (; n < (unsigned int)i; n++) { 2106 for (; n < (unsigned int)i; n++)
2107 {
2040 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[n], &wattr); 2108 XGetWindowAttributes(display->display, TermWin.parent[n], &wattr);
2041 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2109 D_X((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2042 if (wattr.depth != rootdepth || wattr.class == InputOnly) { 2110 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2111 {
2043 n = (int)(sizeof(R->TermWin.parent) / sizeof(Window)) + 1; 2112 n = (int)(sizeof(TermWin.parent) / sizeof(Window)) + 1;
2044 break; 2113 break;
2045 } 2114 }
2046 } 2115 }
2047 } 2116 }
2048 if (n > (int)(sizeof(R->TermWin.parent) 2117 if (n > (int)(sizeof(TermWin.parent)
2049 / sizeof(R->TermWin.parent[0]))) { 2118 / sizeof(TermWin.parent[0])))
2119 {
2050 D_X((stderr, "InheritPixmap Turning off")); 2120 D_X((stderr, "InheritPixmap Turning off"));
2051 XSetWindowBackground(R->Xdisplay, R->TermWin.parent[0], 2121 XSetWindowBackground(display->display, TermWin.parent[0],
2052 R->PixColors[Color_fg]); 2122 PixColors[Color_fg]);
2053 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 2123 XSetWindowBackground(display->display, TermWin.vt,
2054 R->PixColors[Color_bg]); 2124 PixColors[Color_bg]);
2055 R->am_transparent = 0; 2125 am_transparent = 0;
2056 /* XXX: also turn off Opt_transparent? */ 2126 /* XXX: also turn off Opt_transparent? */
2057 } else { 2127 }
2128 else
2129 {
2058 /* wait (an arbitrary period) for the WM to do its thing 2130 /* wait (an arbitrary period) for the WM to do its thing
2059 * needed for fvwm2.2.2 (and before?) */ 2131 * needed for fvwm2.2.2 (and before?) */
2060# ifdef HAVE_NANOSLEEP 2132# ifdef HAVE_NANOSLEEP
2061 struct timespec rqt; 2133 struct timespec rqt;
2062 2134
2063 rqt.tv_sec = 1; 2135 rqt.tv_sec = 1;
2064 rqt.tv_nsec = 0; 2136 rqt.tv_nsec = 0;
2065 nanosleep(&rqt, NULL); 2137 nanosleep(&rqt, NULL);
2066# else 2138# else
2067 sleep(1); 2139 sleep(1);
2068# endif 2140# endif
2069 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); 2141 D_X((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2070 for (n = 0; n < (unsigned int)i; n++) 2142 for (n = 0; n < (unsigned int)i; n++)
2071 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.parent[n], 2143 XSetWindowBackgroundPixmap(display->display, TermWin.parent[n],
2072 ParentRelative); 2144 ParentRelative);
2073 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, 2145 XSetWindowBackgroundPixmap(display->display, TermWin.vt,
2074 ParentRelative); 2146 ParentRelative);
2075 R->am_transparent = 1; 2147 am_transparent = 1;
2076 } 2148 }
2077 for (; i < (int)(sizeof(R->TermWin.parent) / sizeof(Window)); i++) 2149 for (; i < (int)(sizeof(TermWin.parent) / sizeof(Window)); i++)
2078 R->TermWin.parent[i] = None; 2150 TermWin.parent[i] = None;
2079 } 2151 }
2080 return pchanged; 2152 return pchanged;
2081} 2153}
2082#endif 2154#endif
2083 2155
2084/*}}} */ 2156/*}}} */
2085 2157
2086/*{{{ print pipe */ 2158/*{{{ print pipe */
2087/*----------------------------------------------------------------------*/ 2159/*----------------------------------------------------------------------*/
2088#ifdef PRINTPIPE 2160#ifdef PRINTPIPE
2089/* EXTPROTO */ 2161FILE *
2090FILE *
2091rxvt_popen_printer(pR) 2162rxvt_term::popen_printer ()
2092{ 2163{
2093 FILE *stream = popen(R->rs[Rs_print_pipe], "w"); 2164 FILE *stream = popen(rs[Rs_print_pipe], "w");
2094 2165
2095 if (stream == NULL) 2166 if (stream == NULL)
2096 rxvt_print_error("can't open printer pipe"); 2167 rxvt_print_error("can't open printer pipe");
2097 return stream; 2168 return stream;
2098} 2169}
2099 2170
2100/* EXTPROTO */
2101int 2171int
2102rxvt_pclose_printer (FILE *stream) 2172rxvt_term::pclose_printer (FILE *stream)
2103{ 2173{
2104 fflush (stream); 2174 fflush (stream);
2105/* pclose() reported not to work on SunOS 4.1.3 */ 2175 /* pclose() reported not to work on SunOS 4.1.3 */
2106# if defined (__sun__) /* TODO: RESOLVE THIS */ 2176# if defined (__sun__) /* TODO: RESOLVE THIS */
2107/* pclose works provided SIGCHLD handler uses waitpid */ 2177 /* pclose works provided SIGCHLD handler uses waitpid */
2108 return pclose (stream); /* return fclose (stream); */ 2178 return pclose (stream); /* return fclose (stream); */
2109# else 2179# else
2110 return pclose (stream); 2180 return pclose (stream);
2111# endif 2181# endif
2112} 2182}
2113 2183
2114/* 2184/*
2115 * simulate attached vt100 printer 2185 * simulate attached vt100 printer
2116 */ 2186 */
2117/* INTPROTO */
2118void 2187void
2119rxvt_process_print_pipe(pR) 2188rxvt_term::process_print_pipe ()
2120{ 2189{
2121 int done; 2190 int done;
2122 FILE *fd; 2191 FILE *fd;
2123 2192
2124 if ((fd = rxvt_popen_printer(aR)) == NULL) 2193 if ((fd = popen_printer ()) == NULL)
2125 return; 2194 return;
2126 2195
2127/* 2196 /*
2128 * Send all input to the printer until either ESC[4i or ESC[?4i 2197 * Send all input to the printer until either ESC[4i or ESC[?4i
2129 * is received. 2198 * is received.
2130 */ 2199 */
2131 for (done = 0; !done;) { 2200 for (done = 0; !done;)
2201 {
2132 unsigned char buf[8]; 2202 unsigned char buf[8];
2133 unsigned char ch; 2203 unsigned char ch;
2134 unsigned int i, len; 2204 unsigned int i, len;
2135 2205
2136 if ((ch = rxvt_cmd_getc(aR)) != C0_ESC) { 2206 if ((ch = cmd_getc ()) != C0_ESC)
2207 {
2137 if (putc(ch, fd) == EOF) 2208 if (putc(ch, fd) == EOF)
2138 break; /* done = 1 */ 2209 break; /* done = 1 */
2139 } else { 2210 }
2211 else
2212 {
2140 len = 0; 2213 len = 0;
2141 buf[len++] = ch; 2214 buf[len++] = ch;
2142 2215
2143 if ((buf[len++] = rxvt_cmd_getc(aR)) == '[') { 2216 if ((buf[len++] = cmd_getc ()) == '[')
2144 if ((ch = rxvt_cmd_getc(aR)) == '?') { 2217 {
2145 buf[len++] = '?'; 2218 if ((ch = cmd_getc ()) == '?')
2146 ch = rxvt_cmd_getc(aR); 2219 {
2147 } 2220 buf[len++] = '?';
2221 ch = cmd_getc ();
2222 }
2148 if ((buf[len++] = ch) == '4') { 2223 if ((buf[len++] = ch) == '4')
2224 {
2149 if ((buf[len++] = rxvt_cmd_getc(aR)) == 'i') 2225 if ((buf[len++] = cmd_getc ()) == 'i')
2150 break; /* done = 1 */ 2226 break; /* done = 1 */
2151 } 2227 }
2228 }
2229 for (i = 0; i < len; i++)
2230 if (putc(buf[i], fd) == EOF)
2231 {
2232 done = 1;
2233 break;
2234 }
2235 }
2152 } 2236 }
2153 for (i = 0; i < len; i++)
2154 if (putc(buf[i], fd) == EOF) {
2155 done = 1;
2156 break;
2157 }
2158 }
2159 }
2160 rxvt_pclose_printer(fd); 2237 pclose_printer (fd);
2161} 2238}
2162#endif /* PRINTPIPE */ 2239#endif /* PRINTPIPE */
2163/*}}} */ 2240/*}}} */
2164 2241
2165/* *INDENT-OFF* */ 2242/* *INDENT-OFF* */
2166enum { 2243enum {
2167 C1_40 = 0x40, 2244 C1_40 = 0x40,
2168 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2245 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2169 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2246 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2170 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2247 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2171 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2248 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC
2172}; 2249};
2173/* *INDENT-ON* */ 2250/* *INDENT-ON* */
2174 2251
2175/*{{{ process non-printing single characters */ 2252/*{{{ process non-printing single characters */
2176/* INTPROTO */
2177void 2253void
2178rxvt_process_nonprinting(pR_ unsigned char ch) 2254rxvt_term::process_nonprinting (unsigned char ch)
2179{ 2255{
2180 switch (ch) { 2256 switch (ch)
2257 {
2181 case C0_ENQ: /* terminal Status */ 2258 case C0_ENQ: /* terminal Status */
2182 if (R->rs[Rs_answerbackstring]) 2259 if (rs[Rs_answerbackstring])
2183 R->tt_write( 2260 tt_write(
2184 (const unsigned char *)R->rs[Rs_answerbackstring], 2261 (const unsigned char *)rs[Rs_answerbackstring],
2185 (unsigned int)STRLEN(R->rs[Rs_answerbackstring])); 2262 (unsigned int)STRLEN(rs[Rs_answerbackstring]));
2186 else 2263 else
2187 R->tt_write((unsigned char *)VT100_ANS, 2264 tt_write((unsigned char *)VT100_ANS,
2188 (unsigned int)STRLEN(VT100_ANS)); 2265 (unsigned int)STRLEN(VT100_ANS));
2189 break; 2266 break;
2190 case C0_BEL: /* bell */ 2267 case C0_BEL: /* bell */
2191 rxvt_scr_bell(aR); 2268 scr_bell ();
2192 break; 2269 break;
2193 case C0_BS: /* backspace */ 2270 case C0_BS: /* backspace */
2194 rxvt_scr_backspace(aR); 2271 scr_backspace ();
2195 break; 2272 break;
2196 case C0_HT: /* tab */ 2273 case C0_HT: /* tab */
2197 rxvt_scr_tab(aR_ 1); 2274 scr_tab (1);
2198 break; 2275 break;
2199 case C0_CR: /* carriage return */ 2276 case C0_CR: /* carriage return */
2200 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 2277 scr_gotorc (0, 0, R_RELATIVE);
2201 break; 2278 break;
2202 case C0_VT: /* vertical tab, form feed */ 2279 case C0_VT: /* vertical tab, form feed */
2203 case C0_FF: 2280 case C0_FF:
2204 case C0_LF: /* line feed */ 2281 case C0_LF: /* line feed */
2205 rxvt_scr_index(aR_ UP); 2282 scr_index (UP);
2206 break; 2283 break;
2207 case C0_SO: /* shift out - acs */ 2284 case C0_SO: /* shift out - acs */
2208 rxvt_scr_charset_choose(aR_ 1); 2285 scr_charset_choose (1);
2209 break; 2286 break;
2210 case C0_SI: /* shift in - acs */ 2287 case C0_SI: /* shift in - acs */
2211 rxvt_scr_charset_choose(aR_ 0); 2288 scr_charset_choose (0);
2212 break; 2289 break;
2213 } 2290 }
2214} 2291}
2215/*}}} */ 2292/*}}} */
2216 2293
2217 2294
2218/*{{{ process VT52 escape sequences */ 2295/*{{{ process VT52 escape sequences */
2219/* INTPROTO */
2220void 2296void
2221rxvt_process_escape_vt52(pR_ unsigned char ch) 2297rxvt_term::process_escape_vt52 (unsigned char ch)
2222{ 2298{
2223 int row, col; 2299 int row, col;
2300
2301 switch (ch)
2224 2302 {
2225 switch (ch) {
2226 case 'A': /* cursor up */ 2303 case 'A': /* cursor up */
2227 rxvt_scr_gotorc(aR_ -1, 0, R_RELATIVE | C_RELATIVE); 2304 scr_gotorc (-1, 0, R_RELATIVE | C_RELATIVE);
2228 break; 2305 break;
2229 case 'B': /* cursor down */ 2306 case 'B': /* cursor down */
2230 rxvt_scr_gotorc(aR_ 1, 0, R_RELATIVE | C_RELATIVE); 2307 scr_gotorc (1, 0, R_RELATIVE | C_RELATIVE);
2231 break; 2308 break;
2232 case 'C': /* cursor right */ 2309 case 'C': /* cursor right */
2233 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 2310 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
2234 break; 2311 break;
2235 case 'D': /* cursor left */ 2312 case 'D': /* cursor left */
2236 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 2313 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
2237 break; 2314 break;
2238 case 'H': /* cursor home */ 2315 case 'H': /* cursor home */
2239 rxvt_scr_gotorc(aR_ 0, 0, 0); 2316 scr_gotorc (0, 0, 0);
2240 break; 2317 break;
2241 case 'I': /* cursor up and scroll down if needed */ 2318 case 'I': /* cursor up and scroll down if needed */
2242 rxvt_scr_index(aR_ DN); 2319 scr_index (DN);
2243 break; 2320 break;
2244 case 'J': /* erase to end of screen */ 2321 case 'J': /* erase to end of screen */
2245 rxvt_scr_erase_screen(aR_ 0); 2322 scr_erase_screen (0);
2246 break; 2323 break;
2247 case 'K': /* erase to end of line */ 2324 case 'K': /* erase to end of line */
2248 rxvt_scr_erase_line(aR_ 0); 2325 scr_erase_line (0);
2249 break; 2326 break;
2250 case 'Y': /* move to specified row and col */ 2327 case 'Y': /* move to specified row and col */
2251 /* full command is 'ESC Y row col' where row and col 2328 /* full command is 'ESC Y row col' where row and col
2252 * are encoded by adding 32 and sending the ascii 2329 * are encoded by adding 32 and sending the ascii
2253 * character. eg. SPACE = 0, '+' = 13, '0' = 18, 2330 * character. eg. SPACE = 0, '+' = 13, '0' = 18,
2254 * etc. */ 2331 * etc. */
2255 row = rxvt_cmd_getc(aR) - ' '; 2332 row = cmd_getc () - ' ';
2256 col = rxvt_cmd_getc(aR) - ' '; 2333 col = cmd_getc () - ' ';
2257 rxvt_scr_gotorc(aR_ row, col, 0); 2334 scr_gotorc (row, col, 0);
2258 break; 2335 break;
2259 case 'Z': /* identify the terminal type */ 2336 case 'Z': /* identify the terminal type */
2260 R->tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */ 2337 tt_printf("\033/Z"); /* I am a VT100 emulating a VT52 */
2261 break; 2338 break;
2262 case '<': /* turn off VT52 mode */ 2339 case '<': /* turn off VT52 mode */
2263 PrivMode(0, PrivMode_vt52); 2340 PrivMode(0, PrivMode_vt52);
2264 break; 2341 break;
2265 case 'F': /* use special graphics character set */ 2342 case 'F': /* use special graphics character set */
2266 case 'G': /* use regular character set */ 2343 case 'G': /* use regular character set */
2267 /* unimplemented */ 2344 /* unimplemented */
2268 break; 2345 break;
2269 case '=': /* use alternate keypad mode */ 2346 case '=': /* use alternate keypad mode */
2270 case '>': /* use regular keypad mode */ 2347 case '>': /* use regular keypad mode */
2271 /* unimplemented */ 2348 /* unimplemented */
2272 break; 2349 break;
2273 } 2350 }
2274} 2351}
2275/*}}} */ 2352/*}}} */
2276 2353
2277 2354
2278/*{{{ process escape sequences */ 2355/*{{{ process escape sequences */
2279/* INTPROTO */
2280void 2356void
2281rxvt_process_escape_seq(pR) 2357rxvt_term::process_escape_seq ()
2282{ 2358{
2283 unsigned char ch = rxvt_cmd_getc(aR); 2359 unsigned char ch = cmd_getc ();
2284 2360
2285 if (R->PrivateModes & PrivMode_vt52) { 2361 if (PrivateModes & PrivMode_vt52)
2286 rxvt_process_escape_vt52(aR_ ch);
2287 return;
2288 }
2289 2362 {
2363 process_escape_vt52 (ch);
2364 return;
2365 }
2366
2290 switch (ch) { 2367 switch (ch)
2368 {
2291 /* case 1: do_tek_mode (); break; */ 2369 /* case 1: do_tek_mode (); break; */
2292 case '#': 2370 case '#':
2293 if (rxvt_cmd_getc(aR) == '8') 2371 if (cmd_getc () == '8')
2294 rxvt_scr_E(aR); 2372 scr_E ();
2295 break; 2373 break;
2296 case '(': 2374 case '(':
2297 rxvt_scr_charset_set(aR_ 0, (unsigned int)rxvt_cmd_getc(aR)); 2375 scr_charset_set (0, (unsigned int)cmd_getc ());
2298 break; 2376 break;
2299 case ')': 2377 case ')':
2300 rxvt_scr_charset_set(aR_ 1, (unsigned int)rxvt_cmd_getc(aR)); 2378 scr_charset_set (1, (unsigned int)cmd_getc ());
2301 break; 2379 break;
2302 case '*': 2380 case '*':
2303 rxvt_scr_charset_set(aR_ 2, (unsigned int)rxvt_cmd_getc(aR)); 2381 scr_charset_set (2, (unsigned int)cmd_getc ());
2304 break; 2382 break;
2305 case '+': 2383 case '+':
2306 rxvt_scr_charset_set(aR_ 3, (unsigned int)rxvt_cmd_getc(aR)); 2384 scr_charset_set (3, (unsigned int)cmd_getc ());
2307 break; 2385 break;
2308#ifdef MULTICHAR_SET 2386#ifdef MULTICHAR_SET
2309 case '$': 2387 case '$':
2310 rxvt_scr_charset_set(aR_ -2, (unsigned int)rxvt_cmd_getc(aR)); 2388 scr_charset_set (-2, (unsigned int)cmd_getc ());
2311 break; 2389 break;
2312#endif 2390#endif
2313#ifndef NO_FRILLS 2391#ifndef NO_FRILLS
2314 case '6': 2392 case '6':
2315 rxvt_scr_backindex(aR); 2393 scr_backindex ();
2316 break; 2394 break;
2317#endif 2395#endif
2318 case '7': 2396 case '7':
2319 rxvt_scr_cursor(aR_ SAVE); 2397 scr_cursor (SAVE);
2320 break; 2398 break;
2321 case '8': 2399 case '8':
2322 rxvt_scr_cursor(aR_ RESTORE); 2400 scr_cursor (RESTORE);
2323 break; 2401 break;
2324#ifndef NO_FRILLS 2402#ifndef NO_FRILLS
2325 case '9': 2403 case '9':
2326 rxvt_scr_forwardindex(aR); 2404 scr_forwardindex ();
2327 break; 2405 break;
2328#endif 2406#endif
2329 case '=': 2407 case '=':
2330 case '>': 2408 case '>':
2331 PrivMode((ch == '='), PrivMode_aplKP); 2409 PrivMode((ch == '='), PrivMode_aplKP);
2332 break; 2410 break;
2333 2411
2334 case C1_40: 2412 case C1_40:
2335 rxvt_cmd_getc(aR); 2413 cmd_getc ();
2336 break; 2414 break;
2337 case C1_44: 2415 case C1_44:
2338 rxvt_scr_index(aR_ UP); 2416 scr_index (UP);
2339 break; 2417 break;
2340 2418
2341 /* 8.3.87: NEXT LINE */ 2419 /* 8.3.87: NEXT LINE */
2342 case C1_NEL: /* ESC E */ 2420 case C1_NEL: /* ESC E */
2343 { 2421 {
2344 uint32_t nlcr[] = { '\n', '\r' }; 2422 uint32_t nlcr[] = { '\n', '\r' };
2345 rxvt_scr_add_lines(aR_ nlcr, 1, 2); 2423 scr_add_lines (nlcr, 1, 2);
2346 } 2424 }
2347 break; 2425 break;
2348 2426
2349 /* kidnapped escape sequence: Should be 8.3.48 */ 2427 /* kidnapped escape sequence: Should be 8.3.48 */
2350 case C1_ESA: /* ESC G */ 2428 case C1_ESA: /* ESC G */
2351 rxvt_process_graphics(aR); 2429 process_graphics ();
2352 break; 2430 break;
2353 2431
2354 /* 8.3.63: CHARACTER TABULATION SET */ 2432 /* 8.3.63: CHARACTER TABULATION SET */
2355 case C1_HTS: /* ESC H */ 2433 case C1_HTS: /* ESC H */
2356 rxvt_scr_set_tab(aR_ 1); 2434 scr_set_tab (1);
2357 break; 2435 break;
2358 2436
2359 /* 8.3.105: REVERSE LINE FEED */ 2437 /* 8.3.105: REVERSE LINE FEED */
2360 case C1_RI: /* ESC M */ 2438 case C1_RI: /* ESC M */
2361 rxvt_scr_index(aR_ DN); 2439 scr_index (DN);
2362 break; 2440 break;
2363 2441
2364 /* 8.3.142: SINGLE-SHIFT TWO */ 2442 /* 8.3.142: SINGLE-SHIFT TWO */
2365 /*case C1_SS2: scr_single_shift (2); break; */ 2443 /*case C1_SS2: scr_single_shift (2); break; */
2366 2444
2367 /* 8.3.143: SINGLE-SHIFT THREE */ 2445 /* 8.3.143: SINGLE-SHIFT THREE */
2368 /*case C1_SS3: scr_single_shift (3); break; */ 2446 /*case C1_SS3: scr_single_shift (3); break; */
2369 2447
2370 /* 8.3.27: DEVICE CONTROL STRING */ 2448 /* 8.3.27: DEVICE CONTROL STRING */
2371 case C1_DCS: /* ESC P */ 2449 case C1_DCS: /* ESC P */
2372 rxvt_process_dcs_seq(aR); 2450 process_dcs_seq ();
2373 break; 2451 break;
2374 2452
2375 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2453 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2376 case C1_SCI: /* ESC Z */ 2454 case C1_SCI: /* ESC Z */
2377 R->tt_write((const unsigned char *)ESCZ_ANSWER, 2455 tt_write((const unsigned char *)ESCZ_ANSWER,
2378 (unsigned int)(sizeof(ESCZ_ANSWER) - 1)); 2456 (unsigned int)(sizeof(ESCZ_ANSWER) - 1));
2379 break; /* steal obsolete ESC [ c */ 2457 break; /* steal obsolete ESC [ c */
2380 2458
2381 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2459 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2382 case C1_CSI: /* ESC [ */ 2460 case C1_CSI: /* ESC [ */
2383 rxvt_process_csi_seq(aR); 2461 process_csi_seq ();
2384 break; 2462 break;
2385 2463
2386 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2464 /* 8.3.90: OPERATING SYSTEM COMMAND */
2387 case C1_OSC: /* ESC ] */ 2465 case C1_OSC: /* ESC ] */
2388 rxvt_process_osc_seq(aR); 2466 process_osc_seq ();
2389 break; 2467 break;
2390 2468
2391 /* 8.3.106: RESET TO INITIAL STATE */ 2469 /* 8.3.106: RESET TO INITIAL STATE */
2392 case 'c': 2470 case 'c':
2393 rxvt_scr_poweron(aR); 2471 scr_poweron ();
2394 rxvt_scrollbar_show(aR_ 1); 2472 scrollbar_show (1);
2395 break; 2473 break;
2396 2474
2397 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2475 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2398 case 'n': 2476 case 'n':
2399 rxvt_scr_charset_choose(aR_ 2); 2477 scr_charset_choose (2);
2400 break; 2478 break;
2401 2479
2402 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */ 2480 /* 8.3.81: LOCKING-SHIFT THREE (see ISO2022) */
2403 case 'o': 2481 case 'o':
2404 rxvt_scr_charset_choose(aR_ 3); 2482 scr_charset_choose (3);
2405 break; 2483 break;
2406 } 2484 }
2407} 2485}
2408/*}}} */ 2486/*}}} */
2409 2487
2410/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2488/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2411/* *INDENT-OFF* */ 2489/* *INDENT-OFF* */
2412enum { 2490enum {
2413 CSI_ICH = 0x40, 2491 CSI_ICH = 0x40,
2414 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2492 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2415 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2493 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2416 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2494 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2417 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2495 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2418 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2496 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2419 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2497 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2420 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2498 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2421 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2499 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2422}; 2500};
2423 2501
2424#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2502#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \
2425 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2503 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2426 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2504 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2427#define get_byte_array_bit(array, bit) \ 2505#define get_byte_array_bit(array, bit) \
2428 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7)))) 2506 (!!((array)[(bit) / 8] & (128 >> ((bit) & 7))))
2429 2507
2430const unsigned char csi_defaults[] = { 2508const unsigned char csi_defaults[] =
2509 {
2431 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2510 make_byte(1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2432 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2511 make_byte(1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2433 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2512 make_byte(1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2434 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2513 make_byte(1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2435 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2514 make_byte(1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2436 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2515 make_byte(0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2437 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2516 make_byte(0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2438 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 2517 make_byte(0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */
2439}; 2518 };
2440/* *INDENT-ON* */ 2519/* *INDENT-ON* */
2441 2520
2442/* INTPROTO */
2443void 2521void
2444rxvt_process_csi_seq(pR) 2522rxvt_term::process_csi_seq ()
2445{ 2523{
2446 unsigned char ch, priv, i; 2524 unsigned char ch, priv, i;
2447 unsigned int nargs, p; 2525 unsigned int nargs, p;
2448 int n, ndef; 2526 int n, ndef;
2449 int arg[ESC_ARGS]; 2527 int arg[ESC_ARGS];
2450 2528
2451 for (nargs = ESC_ARGS; nargs > 0;) 2529 for (nargs = ESC_ARGS; nargs > 0;)
2452 arg[--nargs] = 0; 2530 arg[--nargs] = 0;
2453 2531
2454 priv = 0; 2532 priv = 0;
2533 ch = cmd_getc ();
2534 if (ch >= '<' && ch <= '?')
2535 { /* '<' '=' '>' '?' */
2536 priv = ch;
2455 ch = rxvt_cmd_getc(aR); 2537 ch = cmd_getc ();
2456 if (ch >= '<' && ch <= '?') { /* '<' '=' '>' '?' */
2457 priv = ch;
2458 ch = rxvt_cmd_getc(aR);
2459 } 2538 }
2460/* read any numerical arguments */ 2539 /* read any numerical arguments */
2461 for (n = -1; ch < CSI_ICH; ) { 2540 for (n = -1; ch < CSI_ICH; )
2541 {
2462 if (isdigit(ch)) { 2542 if (isdigit(ch))
2543 {
2463 if (n < 0) 2544 if (n < 0)
2464 n = ch - '0'; 2545 n = ch - '0';
2465 else 2546 else
2466 n = n * 10 + ch - '0'; 2547 n = n * 10 + ch - '0';
2548 }
2467 } else if (ch == ';') { 2549 else if (ch == ';')
2550 {
2468 if (nargs < ESC_ARGS) 2551 if (nargs < ESC_ARGS)
2469 arg[nargs++] = n; 2552 arg[nargs++] = n;
2470 n = -1; 2553 n = -1;
2554 }
2471 } else if (ch == '\b') { 2555 else if (ch == '\b')
2472 rxvt_scr_backspace(aR); 2556 {
2557 scr_backspace ();
2558 }
2473 } else if (ch == C0_ESC) { 2559 else if (ch == C0_ESC)
2474 rxvt_process_escape_seq(aR); 2560 {
2561 process_escape_seq ();
2562 return;
2563 }
2564 else if (ch < ' ')
2565 {
2566 process_nonprinting (ch);
2567 }
2568 ch = cmd_getc ();
2569 }
2570
2571 if (ch > CSI_7F)
2475 return; 2572 return;
2476 } else if (ch < ' ') {
2477 rxvt_process_nonprinting(aR_ ch);
2478 }
2479 ch = rxvt_cmd_getc(aR);
2480 }
2481 2573
2482 if (ch > CSI_7F)
2483 return;
2484
2485 if (nargs < ESC_ARGS) 2574 if (nargs < ESC_ARGS)
2486 arg[nargs++] = n; 2575 arg[nargs++] = n;
2487 2576
2488 i = ch - CSI_ICH; 2577 i = ch - CSI_ICH;
2489 ndef = get_byte_array_bit(csi_defaults, i); 2578 ndef = get_byte_array_bit(csi_defaults, i);
2490 for (p = 0; p < nargs; p++) 2579 for (p = 0; p < nargs; p++)
2491 if (arg[p] == -1) 2580 if (arg[p] == -1)
2492 arg[p] = ndef; 2581 arg[p] = ndef;
2493 2582
2494#ifdef DEBUG_CMD 2583#ifdef DEBUG_CMD
2495 fprintf(stderr, "CSI "); 2584 fprintf(stderr, "CSI ");
2496 for (p = 0; p < nargs; p++) 2585 for (p = 0; p < nargs; p++)
2497 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); 2586 fprintf(stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2498 fprintf(stderr, "%c\n", ch); 2587 fprintf(stderr, "%c\n", ch);
2499#endif 2588#endif
2500 2589
2501/* 2590 /*
2502 * private mode handling 2591 * private mode handling
2503 */ 2592 */
2504 if (priv) { 2593 if (priv)
2505 switch (priv) { 2594 {
2506 case '>': 2595 switch (priv)
2596 {
2597 case '>':
2507 if (ch == CSI_DA) /* secondary device attributes */ 2598 if (ch == CSI_DA) /* secondary device attributes */
2508 R->tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING); 2599 tt_printf("\033[>%d;%-.8s;0c", 'R', VSTRING);
2509 break; 2600 break;
2510 case '?': 2601 case '?':
2511 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2602 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2512 rxvt_process_terminal_mode(aR_ ch, priv, nargs, arg); 2603 process_terminal_mode (ch, priv, nargs, arg);
2513 break; 2604 break;
2514 } 2605 }
2515 return; 2606 return;
2516 } 2607 }
2517 2608
2518 switch (ch) { 2609 switch (ch)
2519/* 2610 {
2611 /*
2520 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses) 2612 * ISO/IEC 6429:1992(E) CSI sequences (defaults in parentheses)
2521 */ 2613 */
2522#ifdef PRINTPIPE 2614#ifdef PRINTPIPE
2523 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */ 2615 case CSI_MC: /* 8.3.83: (0) MEDIA COPY */
2524 switch (arg[0]) { 2616 switch (arg[0])
2617 {
2525 case 0: /* initiate transfer to primary aux device */ 2618 case 0: /* initiate transfer to primary aux device */
2526 rxvt_scr_printscreen(aR_ 0); 2619 scr_printscreen (0);
2527 break; 2620 break;
2528 case 5: /* start relay to primary aux device */ 2621 case 5: /* start relay to primary aux device */
2529 rxvt_process_print_pipe(aR); 2622 process_print_pipe ();
2623 break;
2624 }
2530 break; 2625 break;
2531 }
2532 break;
2533#endif 2626#endif
2534 2627
2535 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2628 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2536 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2629 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2537 arg[0] = -arg[0]; 2630 arg[0] = -arg[0];
2538 /* FALLTHROUGH */ 2631 /* FALLTHROUGH */
2539 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2632 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2540 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2633 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2541 rxvt_scr_gotorc(aR_ arg[0], 0, RELATIVE); 2634 scr_gotorc (arg[0], 0, RELATIVE);
2542 break; 2635 break;
2543 2636
2544 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2637 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2545 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2638 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2546#ifdef ISO6429 2639#ifdef ISO6429
2547 arg[0] = -arg[0]; 2640 arg[0] = -arg[0];
2548#else /* emulate common DEC VTs */ 2641#else /* emulate common DEC VTs */
2549 arg[0] = arg[0] ? -arg[0] : -1; 2642 arg[0] = arg[0] ? -arg[0] : -1;
2550#endif 2643#endif
2551 /* FALLTHROUGH */ 2644 /* FALLTHROUGH */
2552 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */ 2645 case CSI_CUF: /* 8.3.20: (1) CURSOR RIGHT */
2553 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */ 2646 case CSI_HPR: /* 8.3.60: (1) CHARACTER POSITION FORWARD */
2554#ifdef ISO6429 2647#ifdef ISO6429
2555 rxvt_scr_gotorc(aR_ 0, arg[0], RELATIVE); 2648 scr_gotorc (0, arg[0], RELATIVE);
2556#else /* emulate common DEC VTs */ 2649#else /* emulate common DEC VTs */
2557 rxvt_scr_gotorc(aR_ 0, arg[0] ? arg[0] : 1, RELATIVE); 2650 scr_gotorc (0, arg[0] ? arg[0] : 1, RELATIVE);
2558#endif 2651#endif
2559 break; 2652 break;
2560 2653
2561 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */ 2654 case CSI_CPL: /* 8.3.13: (1) CURSOR PRECEDING LINE */
2562 arg[0] = -arg[0]; 2655 arg[0] = -arg[0];
2563 /* FALLTHROUGH */ 2656 /* FALLTHROUGH */
2564 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */ 2657 case CSI_CNL: /* 8.3.12: (1) CURSOR NEXT LINE */
2565 rxvt_scr_gotorc(aR_ arg[0], 0, R_RELATIVE); 2658 scr_gotorc (arg[0], 0, R_RELATIVE);
2566 break; 2659 break;
2567 2660
2568 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */ 2661 case CSI_CHA: /* 8.3.9: (1) CURSOR CHARACTER ABSOLUTE */
2569 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */ 2662 case CSI_HPA: /* 8.3.58: (1) CURSOR POSITION ABSOLUTE */
2570 rxvt_scr_gotorc(aR_ 0, arg[0] - 1, R_RELATIVE); 2663 scr_gotorc (0, arg[0] - 1, R_RELATIVE);
2571 break; 2664 break;
2572 2665
2573 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */ 2666 case CSI_VPA: /* 8.3.159: (1) LINE POSITION ABSOLUTE */
2574 rxvt_scr_gotorc(aR_ arg[0] - 1, 0, C_RELATIVE); 2667 scr_gotorc (arg[0] - 1, 0, C_RELATIVE);
2575 break; 2668 break;
2576 2669
2577 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */ 2670 case CSI_CUP: /* 8.3.21: (1,1) CURSOR POSITION */
2578 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */ 2671 case CSI_HVP: /* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
2579 rxvt_scr_gotorc(aR_ arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0); 2672 scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
2580 break; 2673 break;
2581 2674
2582 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */ 2675 case CSI_CBT: /* 8.3.7: (1) CURSOR BACKWARD TABULATION */
2583 arg[0] = -arg[0]; 2676 arg[0] = -arg[0];
2584 /* FALLTHROUGH */ 2677 /* FALLTHROUGH */
2585 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */ 2678 case CSI_CHT: /* 8.3.10: (1) CURSOR FORWARD TABULATION */
2586 rxvt_scr_tab(aR_ arg[0]); 2679 scr_tab (arg[0]);
2587 break; 2680 break;
2588 2681
2589 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */ 2682 case CSI_ED: /* 8.3.40: (0) ERASE IN PAGE */
2590 rxvt_scr_erase_screen(aR_ arg[0]); 2683 scr_erase_screen (arg[0]);
2591 break; 2684 break;
2592 2685
2593 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */ 2686 case CSI_EL: /* 8.3.42: (0) ERASE IN LINE */
2594 rxvt_scr_erase_line(aR_ arg[0]); 2687 scr_erase_line (arg[0]);
2595 break; 2688 break;
2596 2689
2597 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */ 2690 case CSI_ICH: /* 8.3.65: (1) INSERT CHARACTER */
2598 rxvt_scr_insdel_chars(aR_ arg[0], INSERT); 2691 scr_insdel_chars (arg[0], INSERT);
2599 break; 2692 break;
2600 2693
2601 case CSI_IL: /* 8.3.68: (1) INSERT LINE */ 2694 case CSI_IL: /* 8.3.68: (1) INSERT LINE */
2602 rxvt_scr_insdel_lines(aR_ arg[0], INSERT); 2695 scr_insdel_lines (arg[0], INSERT);
2603 break; 2696 break;
2604 2697
2605 case CSI_DL: /* 8.3.33: (1) DELETE LINE */ 2698 case CSI_DL: /* 8.3.33: (1) DELETE LINE */
2606 rxvt_scr_insdel_lines(aR_ arg[0], DELETE); 2699 scr_insdel_lines (arg[0], DELETE);
2607 break; 2700 break;
2608 2701
2609 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */ 2702 case CSI_ECH: /* 8.3.39: (1) ERASE CHARACTER */
2610 rxvt_scr_insdel_chars(aR_ arg[0], ERASE); 2703 scr_insdel_chars (arg[0], ERASE);
2611 break; 2704 break;
2612 2705
2613 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */ 2706 case CSI_DCH: /* 8.3.26: (1) DELETE CHARACTER */
2614 rxvt_scr_insdel_chars(aR_ arg[0], DELETE); 2707 scr_insdel_chars (arg[0], DELETE);
2615 break; 2708 break;
2616 2709
2617 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2710 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2618 arg[0] = -arg[0]; 2711 arg[0] = -arg[0];
2619 /* FALLTHROUGH */ 2712 /* FALLTHROUGH */
2620 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2713 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2621 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, arg[0], 0); 2714 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2622 break; 2715 break;
2623 2716
2624 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2717 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2625 R->tt_write((const unsigned char *)VT100_ANS, 2718 tt_write((const unsigned char *)VT100_ANS,
2626 (unsigned int)(sizeof(VT100_ANS) - 1)); 2719 (unsigned int)(sizeof(VT100_ANS) - 1));
2627 break; 2720 break;
2628 2721
2629 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2722 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2630 rxvt_process_sgr_mode(aR_ nargs, arg); 2723 process_sgr_mode (nargs, arg);
2631 break; 2724 break;
2632 2725
2633 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */ 2726 case CSI_DSR: /* 8.3.36: (0) DEVICE STATUS REPORT */
2634 switch (arg[0]) { 2727 switch (arg[0])
2728 {
2635 case 5: /* DSR requested */ 2729 case 5: /* DSR requested */
2636 R->tt_printf("\033[0n"); 2730 tt_printf("\033[0n");
2637 break; 2731 break;
2638 case 6: /* CPR requested */ 2732 case 6: /* CPR requested */
2639 rxvt_scr_report_position(aR); 2733 scr_report_position ();
2640 break; 2734 break;
2641#if defined (ENABLE_DISPLAY_ANSWER) 2735#if defined (ENABLE_DISPLAY_ANSWER)
2642 case 7: /* unofficial extension */ 2736 case 7: /* unofficial extension */
2643 R->tt_printf("%-.250s\n", R->rs[Rs_display_name]); 2737 tt_printf("%-.250s\n", rs[Rs_display_name]);
2644 break; 2738 break;
2645#endif 2739#endif
2646 case 8: /* unofficial extension */ 2740 case 8: /* unofficial extension */
2647 rxvt_xterm_seq(aR_ XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 2741 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
2742 break;
2743 }
2648 break; 2744 break;
2649 }
2650 break;
2651 2745
2652 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 2746 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
2653 switch (arg[0]) { 2747 switch (arg[0])
2748 {
2654 case 0: /* char tab stop cleared at active position */ 2749 case 0: /* char tab stop cleared at active position */
2655 rxvt_scr_set_tab(aR_ 0); 2750 scr_set_tab (0);
2656 break; 2751 break;
2657 /* case 1: */ /* line tab stop cleared in active line */ 2752 /* case 1: */ /* line tab stop cleared in active line */
2658 /* case 2: */ /* char tab stops cleared in active line */ 2753 /* case 2: */ /* char tab stops cleared in active line */
2659 case 3: /* all char tab stops are cleared */ 2754 case 3: /* all char tab stops are cleared */
2660 /* case 4: */ /* all line tab stops are cleared */ 2755 /* case 4: */ /* all line tab stops are cleared */
2661 case 5: /* all tab stops are cleared */ 2756 case 5: /* all tab stops are cleared */
2662 rxvt_scr_set_tab(aR_ -1); 2757 scr_set_tab (-1);
2758 break;
2759 }
2663 break; 2760 break;
2664 }
2665 break;
2666 2761
2667 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */ 2762 case CSI_CTC: /* 8.3.17: (0) CURSOR TABULATION CONTROL */
2668 switch (arg[0]) { 2763 switch (arg[0])
2764 {
2669 case 0: /* char tab stop set at active position */ 2765 case 0: /* char tab stop set at active position */
2670 rxvt_scr_set_tab(aR_ 1); 2766 scr_set_tab (1);
2671 break; /* = ESC H */ 2767 break; /* = ESC H */
2672 /* case 1: */ /* line tab stop set at active line */ 2768 /* case 1: */ /* line tab stop set at active line */
2673 case 2: /* char tab stop cleared at active position */ 2769 case 2: /* char tab stop cleared at active position */
2674 rxvt_scr_set_tab(aR_ 0); 2770 scr_set_tab (0);
2675 break; /* = ESC [ 0 g */ 2771 break; /* = ESC [ 0 g */
2676 /* case 3: */ /* line tab stop cleared at active line */ 2772 /* case 3: */ /* line tab stop cleared at active line */
2677 /* case 4: */ /* char tab stops cleared at active line */ 2773 /* case 4: */ /* char tab stops cleared at active line */
2678 case 5: /* all char tab stops are cleared */ 2774 case 5: /* all char tab stops are cleared */
2679 rxvt_scr_set_tab(aR_ -1); 2775 scr_set_tab (-1);
2680 break; /* = ESC [ 3 g */ 2776 break; /* = ESC [ 3 g */
2681 /* case 6: */ /* all line tab stops are cleared */ 2777 /* case 6: */ /* all line tab stops are cleared */
2682 } 2778 }
2683 break; 2779 break;
2684 2780
2685 case CSI_RM: /* 8.3.107: RESET MODE */ 2781 case CSI_RM: /* 8.3.107: RESET MODE */
2686 if (arg[0] == 4) 2782 if (arg[0] == 4)
2687 rxvt_scr_insert_mode(aR_ 0); 2783 scr_insert_mode (0);
2688 break; 2784 break;
2689 2785
2690 case CSI_SM: /* 8.3.126: SET MODE */ 2786 case CSI_SM: /* 8.3.126: SET MODE */
2691 if (arg[0] == 4) 2787 if (arg[0] == 4)
2692 rxvt_scr_insert_mode(aR_ 1); 2788 scr_insert_mode (1);
2693 break; 2789 break;
2694 2790
2695/* 2791 /*
2696 * PRIVATE USE beyond this point. All CSI_7? sequences here 2792 * PRIVATE USE beyond this point. All CSI_7? sequences here
2697 */ 2793 */
2698 case CSI_72: /* DECSTBM: set top and bottom margins */ 2794 case CSI_72: /* DECSTBM: set top and bottom margins */
2699 if (nargs == 1) 2795 if (nargs == 1)
2700 rxvt_scr_scroll_region(aR_ arg[0] - 1, MAX_ROWS - 1); 2796 scr_scroll_region (arg[0] - 1, MAX_ROWS - 1);
2701 else if (nargs == 0 || arg[0] >= arg[1]) 2797 else if (nargs == 0 || arg[0] >= arg[1])
2702 rxvt_scr_scroll_region(aR_ 0, MAX_ROWS - 1); 2798 scr_scroll_region (0, MAX_ROWS - 1);
2703 else 2799 else
2704 rxvt_scr_scroll_region(aR_ arg[0] - 1, arg[1] - 1); 2800 scr_scroll_region (arg[0] - 1, arg[1] - 1);
2705 break; 2801 break;
2706 2802
2707 case CSI_73: 2803 case CSI_73:
2708 rxvt_scr_cursor(aR_ SAVE); 2804 scr_cursor (SAVE);
2709 break; 2805 break;
2710 case CSI_75: 2806 case CSI_75:
2711 rxvt_scr_cursor(aR_ RESTORE); 2807 scr_cursor (RESTORE);
2712 break; 2808 break;
2713 2809
2714#ifndef NO_FRILLS 2810#ifndef NO_FRILLS
2715 case CSI_74: 2811 case CSI_74:
2716 rxvt_process_window_ops(aR_ arg, nargs); 2812 process_window_ops (arg, nargs);
2717 break; 2813 break;
2718#endif 2814#endif
2719 2815
2720 case CSI_78: /* DECREQTPARM */ 2816 case CSI_78: /* DECREQTPARM */
2721 if (arg[0] == 0 || arg[0] == 1) 2817 if (arg[0] == 0 || arg[0] == 1)
2722 R->tt_printf("\033[%d;1;1;112;112;1;0x", arg[0] + 2); 2818 tt_printf("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2723 /* FALLTHROUGH */ 2819 /* FALLTHROUGH */
2724 2820
2725 default: 2821 default:
2726 break; 2822 break;
2727 } 2823 }
2728} 2824}
2729/*}}} */ 2825/*}}} */
2730 2826
2731#ifndef NO_FRILLS 2827#ifndef NO_FRILLS
2732/* ARGSUSED */ 2828/* ARGSUSED */
2733/* INTPROTO */
2734void 2829void
2735rxvt_process_window_ops(pR_ const int *args, unsigned int nargs) 2830rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2736{ 2831{
2737 int x, y; 2832 int x, y;
2738#if 0 2833#if 0
2739 char *s; 2834 char *s;
2740#endif 2835#endif
2741 XWindowAttributes wattr; 2836 XWindowAttributes wattr;
2742 Window wdummy; 2837 Window wdummy;
2743 2838
2744 if (nargs == 0) 2839 if (nargs == 0)
2745 return; 2840 return;
2746 switch (args[0]) { 2841 switch (args[0])
2842 {
2747 /* 2843 /*
2748 * commands 2844 * commands
2749 */ 2845 */
2750 case 1: /* deiconify window */ 2846 case 1: /* deiconify window */
2751 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 2847 XMapWindow(display->display, TermWin.parent[0]);
2752 break; 2848 break;
2753 case 2: /* iconify window */ 2849 case 2: /* iconify window */
2754 XIconifyWindow(R->Xdisplay, R->TermWin.parent[0], 2850 XIconifyWindow(display->display, TermWin.parent[0],
2755 DefaultScreen(R->Xdisplay)); 2851 DefaultScreen(display->display));
2756 break; 2852 break;
2757 case 3: /* set position (pixels) */ 2853 case 3: /* set position (pixels) */
2758 XMoveWindow(R->Xdisplay, R->TermWin.parent[0], args[1], args[2]); 2854 XMoveWindow(display->display, TermWin.parent[0], args[1], args[2]);
2759 break; 2855 break;
2760 case 4: /* set size (pixels) */ 2856 case 4: /* set size (pixels) */
2761 rxvt_set_widthheight(aR_ (unsigned int)args[2], (unsigned int)args[1]); 2857 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2762 break; 2858 break;
2763 case 5: /* raise window */ 2859 case 5: /* raise window */
2764 XRaiseWindow(R->Xdisplay, R->TermWin.parent[0]); 2860 XRaiseWindow(display->display, TermWin.parent[0]);
2765 break; 2861 break;
2766 case 6: /* lower window */ 2862 case 6: /* lower window */
2767 XLowerWindow(R->Xdisplay, R->TermWin.parent[0]); 2863 XLowerWindow(display->display, TermWin.parent[0]);
2768 break; 2864 break;
2769 case 7: /* refresh window */ 2865 case 7: /* refresh window */
2770 rxvt_scr_touch(aR_ True); 2866 scr_touch (true);
2771 break; 2867 break;
2772 case 8: /* set size (chars) */ 2868 case 8: /* set size (chars) */
2773 rxvt_set_widthheight(aR_ (unsigned int)(args[2] * R->TermWin.fwidth), 2869 set_widthheight ((unsigned int)(args[2] * TermWin.fwidth),
2774 (unsigned int)(args[1] * R->TermWin.fheight)); 2870 (unsigned int)(args[1] * TermWin.fheight));
2775 break; 2871 break;
2776 default: 2872 default:
2777 if (args[0] >= 24) /* set height (chars) */ 2873 if (args[0] >= 24) /* set height (chars) */
2778 rxvt_set_widthheight(aR_ (unsigned int)R->TermWin.width, 2874 set_widthheight ((unsigned int)TermWin.width,
2779 (unsigned int)(args[1] * R->TermWin.fheight)); 2875 (unsigned int)(args[1] * TermWin.fheight));
2780 break; 2876 break;
2781 /* 2877 /*
2782 * reports - some output format copied from XTerm 2878 * reports - some output format copied from XTerm
2783 */ 2879 */
2784 case 11: /* report window state */ 2880 case 11: /* report window state */
2785 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2881 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2786 R->tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 2882 tt_printf("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2787 break; 2883 break;
2788 case 13: /* report window position */ 2884 case 13: /* report window position */
2789 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2885 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2790 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], wattr.root, 2886 XTranslateCoordinates(display->display, TermWin.parent[0], wattr.root,
2791 -wattr.border_width, -wattr.border_width, 2887 -wattr.border_width, -wattr.border_width,
2792 &x, &y, &wdummy); 2888 &x, &y, &wdummy);
2793 R->tt_printf("\033[3;%d;%dt", x, y); 2889 tt_printf("\033[3;%d;%dt", x, y);
2794 break; 2890 break;
2795 case 14: /* report window size (pixels) */ 2891 case 14: /* report window size (pixels) */
2796 XGetWindowAttributes(R->Xdisplay, R->TermWin.parent[0], &wattr); 2892 XGetWindowAttributes(display->display, TermWin.parent[0], &wattr);
2797 R->tt_printf("\033[4;%d;%dt", wattr.height, wattr.width); 2893 tt_printf("\033[4;%d;%dt", wattr.height, wattr.width);
2798 break; 2894 break;
2799 case 18: /* report window size (chars) */ 2895 case 18: /* report window size (chars) */
2800 R->tt_printf("\033[8;%d;%dt", R->TermWin.nrow, R->TermWin.ncol); 2896 tt_printf("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2801 break; 2897 break;
2802#if 0 /* XXX: currently disabled due to security concerns */ 2898#if 0 /* XXX: currently disabled due to security concerns */
2803 case 20: /* report icon label */ 2899 case 20: /* report icon label */
2804 XGetIconName(R->Xdisplay, R->TermWin.parent[0], &s); 2900 XGetIconName(display->display, TermWin.parent[0], &s);
2805 R->tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 2901 tt_printf("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */
2806 break; 2902 break;
2807 case 21: /* report window title */ 2903 case 21: /* report window title */
2808 XFetchName(R->Xdisplay, R->TermWin.parent[0], &s); 2904 XFetchName(display->display, TermWin.parent[0], &s);
2809 R->tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 2905 tt_printf("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */
2810 break; 2906 break;
2811#endif 2907#endif
2908
2812 } 2909 }
2813} 2910}
2814#endif 2911#endif
2815 2912
2816/*----------------------------------------------------------------------*/ 2913/*----------------------------------------------------------------------*/
2817/* 2914/*
2818 * get input up until STRING TERMINATOR (or BEL) 2915 * get input up until STRING TERMINATOR (or BEL)
2819 * ends_how is terminator used. returned input must be free()d 2916 * ends_how is terminator used. returned input must be free()d
2820 */ 2917 */
2821/* INTPROTO */
2822unsigned char * 2918unsigned char *
2823rxvt_get_to_st(pR_ unsigned char *ends_how) 2919rxvt_term::get_to_st (unsigned char *ends_how)
2824{ 2920{
2825 int seen_esc = 0; /* seen escape? */ 2921 int seen_esc = 0; /* seen escape? */
2826 unsigned int n = 0; 2922 unsigned int n = 0;
2827 unsigned char *s; 2923 unsigned char *s;
2828 unsigned char ch, string[STRING_MAX]; 2924 unsigned char ch, string[STRING_MAX];
2829 2925
2830 for (; (ch = rxvt_cmd_getc(aR));) { 2926 for (; (ch = cmd_getc ());)
2927 {
2831 if (ch == C0_BEL 2928 if (ch == C0_BEL
2832 || ch == CHAR_ST 2929 || ch == CHAR_ST
2833 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 2930 || (ch == 0x5c && seen_esc)) /* 7bit ST */
2834 break; 2931 break;
2835 if (ch == C0_ESC) { 2932 if (ch == C0_ESC)
2933 {
2836 seen_esc = 1; 2934 seen_esc = 1;
2837 continue; 2935 continue;
2936 }
2838 } else if (ch == '\t') 2937 else if (ch == '\t')
2839 ch = ' '; /* translate '\t' to space */ 2938 ch = ' '; /* translate '\t' to space */
2840 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 2939 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20))
2841 return NULL; /* other control character - exit */ 2940 return NULL; /* other control character - exit */
2842 if (n < sizeof(string) - 1) 2941 if (n < sizeof(string) - 1)
2843 string[n++] = ch; 2942 string[n++] = ch;
2844 seen_esc = 0; 2943 seen_esc = 0;
2845 } 2944 }
2846 string[n++] = '\0'; 2945 string[n++] = '\0';
2847 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL) 2946 if ((s = (unsigned char *)rxvt_malloc(n)) == NULL)
2848 return NULL; 2947 return NULL;
2849 *ends_how = (ch == 0x5c ? C0_ESC : ch); 2948 *ends_how = (ch == 0x5c ? C0_ESC : ch);
2850 STRNCPY(s, string, n); 2949 STRNCPY(s, string, n);
2851 return s; 2950 return s;
2852} 2951}
2853 2952
2854/*----------------------------------------------------------------------*/ 2953/*----------------------------------------------------------------------*/
2855/* 2954/*
2856 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 2955 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2857 */ 2956 */
2858/* INTPROTO */
2859void 2957void
2860rxvt_process_dcs_seq(pR) 2958rxvt_term::process_dcs_seq ()
2861{ 2959{
2862 unsigned char eh, *s; 2960 unsigned char eh, *s;
2863/* 2961 /*
2864 * Not handled yet 2962 * Not handled yet
2865 */ 2963 */
2866 s = rxvt_get_to_st(aR_ &eh); 2964 s = get_to_st (&eh);
2867 if (s) 2965 if (s)
2868 free(s); 2966 free(s);
2869 return; 2967 return;
2870} 2968}
2871 2969
2872/*----------------------------------------------------------------------*/ 2970/*----------------------------------------------------------------------*/
2873/* 2971/*
2874 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 2972 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2875 */ 2973 */
2876/* INTPROTO */
2877void 2974void
2878rxvt_process_osc_seq(pR) 2975rxvt_term::process_osc_seq ()
2879{ 2976{
2880 unsigned char ch, eh, *s; 2977 unsigned char ch, eh, *s;
2881 int arg; 2978 int arg;
2882 2979
2883 ch = rxvt_cmd_getc(aR); 2980 ch = cmd_getc ();
2884 for (arg = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 2981 for (arg = 0; isdigit(ch); ch = cmd_getc ())
2885 arg = arg * 10 + (ch - '0'); 2982 arg = arg * 10 + (ch - '0');
2886 2983
2887 if (ch == ';') { 2984 if (ch == ';')
2888 s = rxvt_get_to_st(aR_ &eh); 2985 {
2889 if (s) { 2986 s = get_to_st (&eh);
2890 /* 2987 if (s)
2988 {
2989 /*
2891 * rxvt_menubar_dispatch() violates the constness of the string, 2990 * rxvt_menubar_dispatch() violates the constness of the string,
2892 * so do it here 2991 * so do it here
2893 */ 2992 */
2894 if (arg == XTerm_Menu) 2993 if (arg == XTerm_Menu)
2895#if 0 /* XXX: currently disabled due to security concerns */ 2994#if 0 /* XXX: currently disabled due to security concerns */
2896 rxvt_menubar_dispatch(aR_ (char *)s); 2995 menubar_dispatch ((char *)s);
2897#else 2996#else
2898 0; 2997 (void)0;
2899#endif 2998#endif
2900 else 2999 else
2901 rxvt_xterm_seq(aR_ arg, (char *)s, eh); 3000 xterm_seq (arg, (char *)s, eh);
2902 free(s); 3001 free(s);
2903 } 3002 }
2904 } 3003 }
2905} 3004}
2906/* 3005/*
2907 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3006 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2908 * 0 = change iconName/title 3007 * 0 = change iconName/title
… …
2922 * 20 = bg pixmap 3021 * 20 = bg pixmap
2923 * 39 = change default fg color 3022 * 39 = change default fg color
2924 * 49 = change default bg color 3023 * 49 = change default bg color
2925 * 55 = dump scrollback buffer and all of screen 3024 * 55 = dump scrollback buffer and all of screen
2926 */ 3025 */
2927/* EXTPROTO */
2928void 3026void
2929rxvt_xterm_seq(pR_ int op, const char *str, unsigned char resp __attribute__((unused))) 3027rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__((unused)))
2930{ 3028{
2931 int changed = 0; 3029 int changed = 0;
2932 int color; 3030 int color;
2933 char *buf, *name; 3031 char *buf, *name;
2934 3032
2935 assert(str != NULL); 3033 assert(str != NULL);
2936 switch (op) { 3034 switch (op)
3035 {
2937 case XTerm_name: 3036 case XTerm_name:
2938 rxvt_set_title(aR_ str); 3037 set_title (str);
2939 /* FALLTHROUGH */ 3038 /* FALLTHROUGH */
2940 case XTerm_iconName: 3039 case XTerm_iconName:
2941 rxvt_set_iconName(aR_ str); 3040 set_iconName (str);
2942 break; 3041 break;
2943 case XTerm_title: 3042 case XTerm_title:
2944 rxvt_set_title(aR_ str); 3043 set_title (str);
2945 break; 3044 break;
2946 case XTerm_Color: 3045 case XTerm_Color:
2947 for (buf = (char *)str; buf && *buf;) { 3046 for (buf = (char *)str; buf && *buf;)
3047 {
2948 if ((name = STRCHR(buf, ';')) == NULL) 3048 if ((name = STRCHR(buf, ';')) == NULL)
2949 break; 3049 break;
2950 *name++ = '\0'; 3050 *name++ = '\0';
2951 color = atoi(buf); 3051 color = atoi(buf);
2952 if (color < 0 || color >= TOTAL_COLORS) 3052 if (color < 0 || color >= TOTAL_COLORS)
2953 break; 3053 break;
2954 if ((buf = STRCHR(name, ';')) != NULL) 3054 if ((buf = STRCHR(name, ';')) != NULL)
2955 *buf++ = '\0'; 3055 *buf++ = '\0';
2956 rxvt_set_window_color(aR_ color + minCOLOR, name); 3056 set_window_color (color + minCOLOR, name);
2957 } 3057 }
2958 break; 3058 break;
2959#ifndef NO_CURSORCOLOR 3059#ifndef NO_CURSORCOLOR
2960 case XTerm_Color_cursor: 3060 case XTerm_Color_cursor:
2961 rxvt_set_window_color(aR_ Color_cursor, str); 3061 set_window_color (Color_cursor, str);
2962 break; 3062 break;
2963#endif 3063#endif
2964 case XTerm_Color_pointer: 3064 case XTerm_Color_pointer:
2965 rxvt_set_window_color(aR_ Color_pointer, str); 3065 set_window_color (Color_pointer, str);
2966 break; 3066 break;
2967#ifndef NO_BOLD_UNDERLINE_REVERSE 3067#ifndef NO_BOLD_UNDERLINE_REVERSE
2968 case XTerm_Color_BD: 3068 case XTerm_Color_BD:
2969 rxvt_set_window_color(aR_ Color_BD, str); 3069 set_window_color (Color_BD, str);
2970 break; 3070 break;
2971 case XTerm_Color_UL: 3071 case XTerm_Color_UL:
2972 rxvt_set_window_color(aR_ Color_UL, str); 3072 set_window_color (Color_UL, str);
2973 break; 3073 break;
2974 case XTerm_Color_RV: 3074 case XTerm_Color_RV:
2975 rxvt_set_window_color(aR_ Color_RV, str); 3075 set_window_color (Color_RV, str);
2976 break; 3076 break;
2977#endif 3077#endif
2978 3078
2979 case XTerm_Menu: 3079 case XTerm_Menu:
2980 /* 3080 /*
2981 * rxvt_menubar_dispatch() violates the constness of the string, 3081 * rxvt_menubar_dispatch() violates the constness of the string,
2982 * so DON'T do it here 3082 * so DON'T do it here
2983 */ 3083 */
2984 break; 3084 break;
2985 case XTerm_Pixmap: 3085 case XTerm_Pixmap:
2986 if (*str != ';') { 3086 if (*str != ';')
3087 {
2987#if XPM_BACKGROUND 3088#if XPM_BACKGROUND
2988 rxvt_scale_pixmap(aR_ ""); /* reset to default scaling */ 3089 scale_pixmap (""); /* reset to default scaling */
2989 rxvt_set_bgPixmap(aR_ str); /* change pixmap */ 3090 set_bgPixmap (str); /* change pixmap */
2990#endif 3091#endif
2991 rxvt_scr_touch(aR_ True); 3092 scr_touch (true);
2992 } 3093 }
2993 while ((str = STRCHR(str, ';')) != NULL) { 3094 while ((str = STRCHR(str, ';')) != NULL)
2994 str++; 3095 {
3096 str++;
2995#if XPM_BACKGROUND 3097#if XPM_BACKGROUND
2996 changed += rxvt_scale_pixmap(aR_ str); 3098 changed += scale_pixmap (str);
2997#endif 3099#endif
2998 } 3100
2999 if (changed) { 3101 }
3102 if (changed)
3103 {
3000#ifdef XPM_BACKGROUND 3104#ifdef XPM_BACKGROUND
3001 rxvt_resize_pixmap(aR); 3105 resize_pixmap ();
3002#endif 3106#endif
3003 rxvt_scr_touch(aR_ True); 3107 scr_touch (true);
3004 } 3108 }
3005 break; 3109 break;
3006 3110
3007 case XTerm_restoreFG: 3111 case XTerm_restoreFG:
3008 rxvt_set_window_color(aR_ Color_fg, str); 3112 set_window_color (Color_fg, str);
3009 break; 3113 break;
3010 case XTerm_restoreBG: 3114 case XTerm_restoreBG:
3011 rxvt_set_window_color(aR_ Color_bg, str); 3115 set_window_color (Color_bg, str);
3012 break; 3116 break;
3013 case XTerm_logfile: 3117 case XTerm_logfile:
3014 break; 3118 break;
3015 case XTerm_font: 3119 case XTerm_font:
3016 rxvt_change_font(aR_ 0, str); 3120 change_font (0, str);
3017 break; 3121 break;
3018#if 0 3122#if 0
3019 case XTerm_dumpscreen: /* no error notices */ 3123 case XTerm_dumpscreen: /* no error notices */
3020 { 3124 {
3021 int fd; 3125 int fd;
3022 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) { 3126 if ((fd = open(str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3023 rxvt_scr_dump(aR_ fd); 3127 {
3024 close(fd); 3128 scr_dump (fd);
3025 } 3129 close(fd);
3026 } 3130 }
3027 break; 3131 }
3132 break;
3028#endif 3133#endif
3134
3029 } 3135 }
3030} 3136}
3031/*----------------------------------------------------------------------*/ 3137/*----------------------------------------------------------------------*/
3032 3138
3033/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3139/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3038 * 's' = save 3144 * 's' = save
3039 * 'r' = restore 3145 * 'r' = restore
3040 * 't' = toggle 3146 * 't' = toggle
3041 * so no need for fancy checking 3147 * so no need for fancy checking
3042 */ 3148 */
3043/* INTPROTO */
3044int 3149int
3045rxvt_privcases(pR_ int mode, unsigned long bit) 3150rxvt_term::privcases (int mode, unsigned long bit)
3046{ 3151{
3047 int state; 3152 int state;
3048 3153
3049 if (mode == 's') { 3154 if (mode == 's')
3155 {
3050 R->SavedModes |= (R->PrivateModes & bit); 3156 SavedModes |= (PrivateModes & bit);
3051 return -1; 3157 return -1;
3052 } else { 3158 }
3159 else
3160 {
3053 if (mode == 'r') 3161 if (mode == 'r')
3054 state = (R->SavedModes & bit) ? 1 : 0; /* no overlapping */ 3162 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3055 else 3163 else
3056 state = (mode == 't') ? !(R->PrivateModes & bit) : mode; 3164 state = (mode == 't') ? !(PrivateModes & bit) : mode;
3057 PrivMode(state, bit); 3165 PrivMode(state, bit);
3058 } 3166 }
3059 return state; 3167 return state;
3060} 3168}
3061 3169
3062/* we're not using priv _yet_ */ 3170/* we're not using priv _yet_ */
3063/* INTPROTO */
3064void 3171void
3065rxvt_process_terminal_mode(pR_ int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg) 3172rxvt_term::process_terminal_mode (int mode, int priv __attribute__((unused)), unsigned int nargs, const int *arg)
3066{ 3173{
3067 unsigned int i, j; 3174 unsigned int i, j;
3068 int state; 3175 int state;
3069 static const struct { 3176 static const struct
3177 {
3070 const int argval; 3178 const int argval;
3071 const unsigned long bit; 3179 const unsigned long bit;
3180 }
3072 } argtopriv[] = { 3181 argtopriv[] = {
3073 { 1, PrivMode_aplCUR }, 3182 { 1, PrivMode_aplCUR },
3074 { 2, PrivMode_vt52 }, 3183 { 2, PrivMode_vt52 },
3075 { 3, PrivMode_132 }, 3184 { 3, PrivMode_132 },
3076 { 4, PrivMode_smoothScroll }, 3185 { 4, PrivMode_smoothScroll },
3077 { 5, PrivMode_rVideo }, 3186 { 5, PrivMode_rVideo },
3078 { 6, PrivMode_relOrigin }, 3187 { 6, PrivMode_relOrigin },
3079 { 7, PrivMode_Autowrap }, 3188 { 7, PrivMode_Autowrap },
3080 { 9, PrivMode_MouseX10 }, 3189 { 9, PrivMode_MouseX10 },
3081#ifdef menuBar_esc 3190#ifdef menuBar_esc
3082 { menuBar_esc, PrivMode_menuBar }, 3191 { menuBar_esc, PrivMode_menuBar },
3083#endif 3192#endif
3084#ifdef scrollBar_esc 3193#ifdef scrollBar_esc
3085 { scrollBar_esc, PrivMode_scrollBar }, 3194 { scrollBar_esc, PrivMode_scrollBar },
3086#endif 3195#endif
3087 { 25, PrivMode_VisibleCursor }, 3196 { 25, PrivMode_VisibleCursor },
3088 { 35, PrivMode_ShiftKeys }, 3197 { 35, PrivMode_ShiftKeys },
3089 { 40, PrivMode_132OK }, 3198 { 40, PrivMode_132OK },
3090 { 47, PrivMode_Screen }, 3199 { 47, PrivMode_Screen },
3091 { 66, PrivMode_aplKP }, 3200 { 66, PrivMode_aplKP },
3092#ifndef NO_BACKSPACE_KEY 3201#ifndef NO_BACKSPACE_KEY
3093 { 67, PrivMode_BackSpace }, 3202 { 67, PrivMode_BackSpace },
3094#endif 3203#endif
3095 { 1000, PrivMode_MouseX11 }, 3204 { 1000, PrivMode_MouseX11 },
3096 { 1010, PrivMode_TtyOutputInh }, 3205 { 1010, PrivMode_TtyOutputInh },
3097 { 1011, PrivMode_Keypress }, 3206 { 1011, PrivMode_Keypress },
3098 { 1047, PrivMode_Screen }, 3207 { 1047, PrivMode_Screen },
3099 }; 3208 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */
3209 };
3100 3210
3101 if (nargs == 0) 3211 if (nargs == 0)
3102 return; 3212 return;
3103 3213
3104/* make lo/hi boolean */ 3214 /* make lo/hi boolean */
3105 if (mode == 'l') 3215 if (mode == 'l')
3106 mode = 0; /* reset */ 3216 mode = 0; /* reset */
3107 else if (mode == 'h') 3217 else if (mode == 'h')
3108 mode = 1; /* set */ 3218 mode = 1; /* set */
3109 3219
3110 for (i = 0; i < nargs; i++) { 3220 for (i = 0; i < nargs; i++)
3221 {
3111 state = -1; 3222 state = -1;
3112 3223
3113 /* basic handling */ 3224 /* basic handling */
3114 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++) 3225 for (j = 0; j < (sizeof(argtopriv)/sizeof(argtopriv[0])); j++)
3115 if (argtopriv[j].argval == arg[i]) { 3226 if (argtopriv[j].argval == arg[i])
3227 {
3116 state = rxvt_privcases(aR_ mode, argtopriv[j].bit); 3228 state = privcases (mode, argtopriv[j].bit);
3117 break; 3229 break;
3118 } 3230 }
3119 3231
3120 /* extra handling for values with state unkept */ 3232 /* extra handling for values with state unkept */
3121 if (state == -1) 3233 if (state == -1)
3122 switch (arg[i]) { 3234 switch (arg[i])
3235 {
3123 case 1048: /* alternative cursor save */ 3236 case 1048: /* alternative cursor save */
3124 if (mode == 0) 3237 if (mode == 0)
3125 rxvt_scr_cursor(aR_ RESTORE); 3238 scr_cursor (RESTORE);
3126 else if (mode == 1) 3239 else if (mode == 1)
3127 rxvt_scr_cursor(aR_ SAVE); 3240 scr_cursor (SAVE);
3128 /* FALLTHROUGH */ 3241 /* FALLTHROUGH */
3129 default: 3242 default:
3130 continue; /* for(;i;) */ 3243 continue; /* for(;i;) */
3131 } 3244 }
3132 3245
3133 /* extra handling for values with valid 0 or 1 state */ 3246 /* extra handling for values with valid 0 or 1 state */
3134 switch (arg[i]) { 3247 switch (arg[i])
3248 {
3135 /* case 1: - application cursor keys */ 3249 /* case 1: - application cursor keys */
3136 case 2: /* VT52 mode */ 3250 case 2: /* VT52 mode */
3137 /* oddball mode. should be set regardless of set/reset 3251 /* oddball mode. should be set regardless of set/reset
3138 * parameter. Return from VT52 mode with an ESC < from 3252 * parameter. Return from VT52 mode with an ESC < from
3139 * within VT52 mode 3253 * within VT52 mode
3140 */ 3254 */
3141 PrivMode(1, PrivMode_vt52); 3255 PrivMode(1, PrivMode_vt52);
3142 break; 3256 break;
3143 case 3: /* 80/132 */ 3257 case 3: /* 80/132 */
3144 if (R->PrivateModes & PrivMode_132OK) 3258 if (PrivateModes & PrivMode_132OK)
3145 rxvt_set_widthheight(aR_
3146 (unsigned int)((state ? 132 : 80) * R->TermWin.fwidth), 3259 set_widthheight ( (unsigned int)((state ? 132 : 80) * TermWin.fwidth),
3147 (unsigned int)R->TermWin.height); 3260 (unsigned int)TermWin.height);
3148 break; 3261 break;
3149 case 4: /* smooth scrolling */ 3262 case 4: /* smooth scrolling */
3150 if (state) 3263 if (state)
3151 R->Options &= ~Opt_jumpScroll; 3264 Options &= ~Opt_jumpScroll;
3152 else 3265 else
3153 R->Options |= Opt_jumpScroll; 3266 Options |= Opt_jumpScroll;
3154 break; 3267 break;
3155 case 5: /* reverse video */ 3268 case 5: /* reverse video */
3156 rxvt_scr_rvideo_mode(aR_ state); 3269 scr_rvideo_mode (state);
3157 break; 3270 break;
3158 case 6: /* relative/absolute origins */ 3271 case 6: /* relative/absolute origins */
3159 rxvt_scr_relative_origin(aR_ state); 3272 scr_relative_origin (state);
3160 break; 3273 break;
3161 case 7: /* autowrap */ 3274 case 7: /* autowrap */
3162 rxvt_scr_autowrap(aR_ state); 3275 scr_autowrap (state);
3163 break; 3276 break;
3164 /* case 8: - auto repeat, can't do on a per window basis */ 3277 /* case 8: - auto repeat, can't do on a per window basis */
3165 case 9: /* X10 mouse reporting */ 3278 case 9: /* X10 mouse reporting */
3166 if (state) /* orthogonal */ 3279 if (state) /* orthogonal */
3167 R->PrivateModes &= ~(PrivMode_MouseX11); 3280 PrivateModes &= ~(PrivMode_MouseX11);
3168 break; 3281 break;
3169#ifdef menuBar_esc 3282#ifdef menuBar_esc
3170 case menuBar_esc: 3283 case menuBar_esc:
3171#ifdef MENUBAR 3284#ifdef MENUBAR
3172 rxvt_map_menuBar(aR_ state); 3285 map_menuBar (state);
3173#endif 3286#endif
3174 break; 3287 break;
3175#endif 3288#endif
3176#ifdef scrollBar_esc 3289#ifdef scrollBar_esc
3177 case scrollBar_esc: 3290 case scrollBar_esc:
3178 if (rxvt_scrollbar_mapping(aR_ state)) { 3291 if (scrollbar_mapping (state))
3179 rxvt_resize_all_windows(aR_ 0, 0, 0); 3292 {
3180 rxvt_scr_touch(aR_ True); 3293 resize_all_windows (0, 0, 0);
3181 } 3294 scr_touch (true);
3182 break; 3295 }
3296 break;
3183#endif 3297#endif
3184 case 25: /* visible/invisible cursor */ 3298 case 25: /* visible/invisible cursor */
3185 rxvt_scr_cursor_visible(aR_ state); 3299 scr_cursor_visible (state);
3186 break; 3300 break;
3187 /* case 35: - shift keys */ 3301 /* case 35: - shift keys */
3188 /* case 40: - 80 <--> 132 mode */ 3302 /* case 40: - 80 <--> 132 mode */
3189 case 47: /* secondary screen */ 3303 case 47: /* secondary screen */
3190 rxvt_scr_change_screen(aR_ state); 3304 scr_change_screen (state);
3191 break; 3305 break;
3192 /* case 66: - application key pad */ 3306 /* case 66: - application key pad */
3193 /* case 67: - backspace key */ 3307 /* case 67: - backspace key */
3194 case 1000: /* X11 mouse reporting */ 3308 case 1000: /* X11 mouse reporting */
3195 if (state) /* orthogonal */ 3309 if (state) /* orthogonal */
3196 R->PrivateModes &= ~(PrivMode_MouseX10); 3310 PrivateModes &= ~(PrivMode_MouseX10);
3197 break; 3311 break;
3198#if 0 3312#if 0
3199 case 1001: 3313 case 1001:
3200 break; /* X11 mouse highlighting */ 3314 break; /* X11 mouse highlighting */
3201#endif 3315#endif
3202 case 1010: /* scroll to bottom on TTY output inhibit */ 3316 case 1010: /* scroll to bottom on TTY output inhibit */
3203 if (state) 3317 if (state)
3204 R->Options &= ~Opt_scrollTtyOutput; 3318 Options &= ~Opt_scrollTtyOutput;
3205 else 3319 else
3206 R->Options |= Opt_scrollTtyOutput; 3320 Options |= Opt_scrollTtyOutput;
3207 break; 3321 break;
3208 case 1011: /* scroll to bottom on key press */ 3322 case 1011: /* scroll to bottom on key press */
3209 if (state) 3323 if (state)
3210 R->Options |= Opt_scrollTtyKeypress; 3324 Options |= Opt_scrollTtyKeypress;
3211 else 3325 else
3212 R->Options &= ~Opt_scrollTtyKeypress; 3326 Options &= ~Opt_scrollTtyKeypress;
3213 break; 3327 break;
3214 case 1047: /* secondary screen w/ clearing */ 3328 case 1047: /* secondary screen w/ clearing */
3329 case 1049: /* better secondary screen w/ clearing, but not fully implemented */
3215 if (R->current_screen != PRIMARY) 3330 if (current_screen != PRIMARY)
3216 rxvt_scr_erase_screen(aR_ 2); 3331 scr_erase_screen (2);
3217 rxvt_scr_change_screen(aR_ state); 3332 scr_change_screen (state);
3218 /* FALLTHROUGH */ 3333 /* FALLTHROUGH */
3219 default: 3334 default:
3220 break; 3335 break;
3221 } 3336 }
3222 } 3337 }
3223} 3338}
3224/*}}} */ 3339/*}}} */
3225 3340
3226/*{{{ process sgr sequences */ 3341/*{{{ process sgr sequences */
3227/* INTPROTO */
3228void 3342void
3229rxvt_process_sgr_mode(pR_ unsigned int nargs, const int *arg) 3343rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3230{ 3344{
3231 unsigned int i; 3345 unsigned int i;
3232 short rendset; 3346 short rendset;
3233 int rendstyle; 3347 int rendstyle;
3234 3348
3235 if (nargs == 0) { 3349 if (nargs == 0)
3236 rxvt_scr_rendition(aR_ 0, ~RS_None);
3237 return;
3238 } 3350 {
3351 scr_rendition (0, ~RS_None);
3352 return;
3353 }
3239 for (i = 0; i < nargs; i++) { 3354 for (i = 0; i < nargs; i++)
3355 {
3240 rendset = -1; 3356 rendset = -1;
3241 switch (arg[i]) { 3357 switch (arg[i])
3242 case 0: 3358 {
3359 case 0:
3243 rendset = 0, rendstyle = ~RS_None; 3360 rendset = 0, rendstyle = ~RS_None;
3244 break; 3361 break;
3245 case 1: 3362 case 1:
3246 rendset = 1, rendstyle = RS_Bold; 3363 rendset = 1, rendstyle = RS_Bold;
3247 break; 3364 break;
3248 case 4: 3365 case 4:
3249 rendset = 1, rendstyle = RS_Uline; 3366 rendset = 1, rendstyle = RS_Uline;
3250 break; 3367 break;
3251 case 5: 3368 case 5:
3252 rendset = 1, rendstyle = RS_Blink; 3369 rendset = 1, rendstyle = RS_Blink;
3253 break; 3370 break;
3254 case 7: 3371 case 7:
3255 rendset = 1, rendstyle = RS_RVid; 3372 rendset = 1, rendstyle = RS_RVid;
3256 break; 3373 break;
3257 case 22: 3374 case 22:
3258 rendset = 0, rendstyle = RS_Bold; 3375 rendset = 0, rendstyle = RS_Bold;
3259 break; 3376 break;
3260 case 24: 3377 case 24:
3261 rendset = 0, rendstyle = RS_Uline; 3378 rendset = 0, rendstyle = RS_Uline;
3262 break; 3379 break;
3263 case 25: 3380 case 25:
3264 rendset = 0, rendstyle = RS_Blink; 3381 rendset = 0, rendstyle = RS_Blink;
3265 break; 3382 break;
3266 case 27: 3383 case 27:
3267 rendset = 0, rendstyle = RS_RVid; 3384 rendset = 0, rendstyle = RS_RVid;
3268 break; 3385 break;
3269 } 3386 }
3270 if (rendset != -1) { 3387 if (rendset != -1)
3271 rxvt_scr_rendition(aR_ rendset, rendstyle); 3388 {
3389 scr_rendition (rendset, rendstyle);
3272 continue; /* for(;i;) */ 3390 continue; /* for(;i;) */
3273 } 3391 }
3274 3392
3275 switch (arg[i]) { 3393 switch (arg[i])
3276 case 30: 3394 {
3395 case 30:
3277 case 31: /* set fg color */ 3396 case 31: /* set fg color */
3278 case 32: 3397 case 32:
3279 case 33: 3398 case 33:
3280 case 34: 3399 case 34:
3281 case 35: 3400 case 35:
3282 case 36: 3401 case 36:
3283 case 37: 3402 case 37:
3284 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 30)), 3403 scr_color ((unsigned int)(minCOLOR + (arg[i] - 30)),
3285 Color_fg); 3404 Color_fg);
3286 break; 3405 break;
3287#ifdef TTY_256COLOR 3406#ifdef TTY_256COLOR
3288 case 38: 3407 case 38:
3289 if (nargs > i + 2 && arg[i + 1] == 5) { 3408 if (nargs > i + 2 && arg[i + 1] == 5)
3409 {
3290 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3410 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3291 Color_fg); 3411 Color_fg);
3292 i += 2; 3412 i += 2;
3293 } 3413 }
3294 break; 3414 break;
3295#endif 3415#endif
3296 case 39: /* default fg */ 3416 case 39: /* default fg */
3297 rxvt_scr_color(aR_ Color_fg, Color_fg); 3417 scr_color (Color_fg, Color_fg);
3298 break; 3418 break;
3299 3419
3300 case 40: 3420 case 40:
3301 case 41: /* set bg color */ 3421 case 41: /* set bg color */
3302 case 42: 3422 case 42:
3303 case 43: 3423 case 43:
3304 case 44: 3424 case 44:
3305 case 45: 3425 case 45:
3306 case 46: 3426 case 46:
3307 case 47: 3427 case 47:
3308 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + (arg[i] - 40)), 3428 scr_color ((unsigned int)(minCOLOR + (arg[i] - 40)),
3309 Color_bg); 3429 Color_bg);
3310 break; 3430 break;
3311#ifdef TTY_256COLOR 3431#ifdef TTY_256COLOR
3312 case 48: 3432 case 48:
3313 if (nargs > i + 2 && arg[i + 1] == 5) { 3433 if (nargs > i + 2 && arg[i + 1] == 5)
3434 {
3314 rxvt_scr_color(aR_ (unsigned int)(minCOLOR + arg[i + 2]), 3435 scr_color ((unsigned int)(minCOLOR + arg[i + 2]),
3315 Color_bg); 3436 Color_bg);
3316 i += 2; 3437 i += 2;
3317 } 3438 }
3318 break; 3439 break;
3319#endif 3440#endif
3320 case 49: /* default bg */ 3441 case 49: /* default bg */
3321 rxvt_scr_color(aR_ Color_bg, Color_bg); 3442 scr_color (Color_bg, Color_bg);
3322 break; 3443 break;
3323 3444
3324#ifndef NO_BRIGHTCOLOR 3445#ifndef NO_BRIGHTCOLOR
3325 case 90: 3446 case 90:
3326 case 91: /* set bright fg color */ 3447 case 91: /* set bright fg color */
3327 case 92: 3448 case 92:
3328 case 93: 3449 case 93:
3329 case 94: 3450 case 94:
3330 case 95: 3451 case 95:
3331 case 96: 3452 case 96:
3332 case 97: 3453 case 97:
3333 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 90)), 3454 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 90)),
3334 Color_fg); 3455 Color_fg);
3335 break; 3456 break;
3336 case 100: 3457 case 100:
3337 case 101: /* set bright bg color */ 3458 case 101: /* set bright bg color */
3338 case 102: 3459 case 102:
3339 case 103: 3460 case 103:
3340 case 104: 3461 case 104:
3341 case 105: 3462 case 105:
3342 case 106: 3463 case 106:
3343 case 107: 3464 case 107:
3344 rxvt_scr_color(aR_ (unsigned int)(minBrightCOLOR + (arg[i] - 100)), 3465 scr_color ((unsigned int)(minBrightCOLOR + (arg[i] - 100)),
3345 Color_bg); 3466 Color_bg);
3346 break; 3467 break;
3347#endif 3468#endif
3348 } 3469
3470 }
3349 } 3471 }
3350} 3472}
3351/*}}} */ 3473/*}}} */
3352 3474
3353/*{{{ process Rob Nation's own graphics mode sequences */ 3475/*{{{ process Rob Nation's own graphics mode sequences */
3354/* INTPROTO */
3355void 3476void
3356rxvt_process_graphics(pR) 3477rxvt_term::process_graphics ()
3357{ 3478{
3358 unsigned char ch, cmd = rxvt_cmd_getc(aR); 3479 unsigned char ch, cmd = cmd_getc ();
3359 3480
3360#ifndef RXVT_GRAPHICS 3481#ifndef RXVT_GRAPHICS
3482 if (cmd == 'Q')
3361 if (cmd == 'Q') { /* query graphics */ 3483 { /* query graphics */
3362 R->tt_printf("\033G0\n"); /* no graphics */ 3484 tt_printf("\033G0\n"); /* no graphics */
3363 return; 3485 return;
3364 } 3486 }
3365/* swallow other graphics sequences until terminating ':' */ 3487 /* swallow other graphics sequences until terminating ':' */
3366 do 3488 do
3367 ch = rxvt_cmd_getc(aR); 3489 ch = cmd_getc ();
3368 while (ch != ':'); 3490 while (ch != ':');
3369#else 3491#else
3370 unsigned int nargs; 3492 unsigned int nargs;
3371 int args[NGRX_PTS]; 3493 int args[NGRX_PTS];
3372 unsigned char *text = NULL; 3494 unsigned char *text = NULL;
3373 3495
3496 if (cmd == 'Q')
3374 if (cmd == 'Q') { /* query graphics */ 3497 { /* query graphics */
3375 R->tt_printf("\033G1\n"); /* yes, graphics (color) */ 3498 tt_printf("\033G1\n"); /* yes, graphics (color) */
3376 return; 3499 return;
3377 } 3500 }
3378 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;) { 3501 for (nargs = 0; nargs < (sizeof(args) / sizeof(args[0])) - 1;)
3502 {
3379 int neg; 3503 int neg;
3380 3504
3381 ch = rxvt_cmd_getc(aR); 3505 ch = cmd_getc ();
3382 neg = (ch == '-'); 3506 neg = (ch == '-');
3383 if (neg || ch == '+') 3507 if (neg || ch == '+')
3384 ch = rxvt_cmd_getc(aR); 3508 ch = cmd_getc ();
3385 3509
3386 for (args[nargs] = 0; isdigit(ch); ch = rxvt_cmd_getc(aR)) 3510 for (args[nargs] = 0; isdigit(ch); ch = cmd_getc ())
3387 args[nargs] = args[nargs] * 10 + (ch - '0'); 3511 args[nargs] = args[nargs] * 10 + (ch - '0');
3388 if (neg) 3512 if (neg)
3389 args[nargs] = -args[nargs]; 3513 args[nargs] = -args[nargs];
3390 3514
3391 nargs++; 3515 nargs++;
3392 args[nargs] = 0; 3516 args[nargs] = 0;
3393 if (ch != ';') 3517 if (ch != ';')
3394 break; 3518 break;
3395 } 3519 }
3396 3520
3397 if ((cmd == 'T') && (nargs >= 5)) { 3521 if ((cmd == 'T') && (nargs >= 5))
3522 {
3398 int i, len = args[4]; 3523 int i, len = args[4];
3399 3524
3400 text = rxvt_malloc((len + 1) * sizeof(char)); 3525 text = (unsigned char *)rxvt_malloc((len + 1) * sizeof(char));
3401 3526
3402 if (text != NULL) { 3527 if (text != NULL)
3528 {
3403 for (i = 0; i < len; i++) 3529 for (i = 0; i < len; i++)
3404 text[i] = rxvt_cmd_getc(aR); 3530 text[i] = cmd_getc ();
3405 text[len] = '\0'; 3531 text[len] = '\0';
3406 } 3532 }
3407 } 3533 }
3408 rxvt_Gr_do_graphics(aR_ cmd, nargs, args, text); 3534 Gr_do_graphics (cmd, nargs, args, text);
3409#endif 3535#endif
3410} 3536}
3411/*}}} */ 3537/*}}} */
3412 3538
3413/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
… …
3439 3565
3440 if (len) 3566 if (len)
3441 { 3567 {
3442 if (v_buflen == 0) 3568 if (v_buflen == 0)
3443 { 3569 {
3444 int written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 3570 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3571
3445 if (written == len) 3572 if ((unsigned int)written == len)
3446 return; 3573 return;
3447 3574
3448 data += written; 3575 data += written;
3449 len -= written; 3576 len -= written;
3450 } 3577 }

Diff Legend

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