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.13 by pcg, Fri Dec 5 04:27:20 2003 UTC vs.
Revision 1.54 by pcg, Sun Feb 22 12:58:02 2004 UTC

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

Diff Legend

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