ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.11 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.55 by pcg, Sun Feb 22 20:08:18 2004 UTC

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

Diff Legend

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