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.17 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.39 by pcg, Mon Feb 9 07:15:46 2004 UTC

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

Diff Legend

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