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

Diff Legend

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