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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.48 by pcg, Wed Mar 3 04:07:52 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.9 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>
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && STRNCMP (locale, curlocale, 128))
55 {
56 STRNCPY (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
58{ 72{
59 free (p); 73 free (p);
60} 74}
61 75
62rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
63: pty_ev (this, &rxvt_term::pty_cb), 80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
64#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
89#endif
90#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 92#endif
67#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 95#endif
96#ifdef USE_XIM
70 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
99 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
72 check_ev (this, &rxvt_term::check_cb) 102 incr_ev (this, &rxvt_term::incr_cb)
73{ 103{
74 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
75} 105}
76 106
77rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
78{ 108{
79 rxvt_scr_release (this);
80
81#ifndef NO_SETOWNER_TTYDEV
82 rxvt_privileged_ttydev (this, RESTORE);
83#endif
84#ifdef UTMP_SUPPORT
85 rxvt_privileged_utmp (this, RESTORE);
86#endif
87#ifdef USE_XIM
88 if (Input_Context != NULL)
89 {
90 XDestroyIC (Input_Context);
91 Input_Context = NULL;
92 }
93#endif
94
95 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
96 close (cmd_fd); 110 close (cmd_fd);
97 111
98 if (Xfd >= 0) 112#ifndef NO_SETOWNER_TTYDEV
99 XCloseDisplay (Xdisplay); 113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
100 135
101 delete PixColors; 136 delete PixColors;
137
138 displays.put (display);
139
140 scr_release ();
141
142 free (env_windowid);
143 free (env_display);
144 free (env_term);
145 free (env_colorfgbg);
146 free (locale);
147 free (codeset);
148
149 delete envv;
150 delete argv;
102} 151}
103 152
104void 153void
105rxvt_term::destroy () 154rxvt_term::destroy ()
106{ 155{
156 if (display)
157 {
158 rootwin_ev.stop (display);
159 termwin_ev.stop (display);
160 vt_ev.stop (display);
161#ifdef USE_XIM
162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
171 }
172
107 check_ev.stop (); 173 check_ev.stop ();
108 pty_ev.stop (); 174 pty_ev.stop ();
109 x_ev.stop ();
110#ifdef CURSOR_BLINK 175#ifdef CURSOR_BLINK
176 cursor_blink_ev.stop ();
177#endif
178#ifdef TEXT_BLINK
111 blink_ev.stop (); 179 text_blink_ev.stop ();
112#endif 180#endif
113#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
114 pointer_ev.stop (); 182 pointer_ev.stop ();
115#endif 183#endif
116 184
124 192
125 delete this; 193 delete this;
126} 194}
127 195
128/*----------------------------------------------------------------------*/ 196/*----------------------------------------------------------------------*/
129/* rxvt_init() */ 197/* rxvt_init () */
130/* LIBPROTO */ 198/* LIBPROTO */
131rxvt_t 199rxvt_t
132rxvt_init (int argc, const char *const *argv) 200rxvt_init (int argc, const char *const *argv)
133{ 201{
134 SET_R (new rxvt_term); 202 SET_R (new rxvt_term);
135 dR;
136 203
137 if (!R->init_vars () || !R->init (argc, argv)) 204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
138 { 205 {
139 delete R; 206 delete GET_R;
140 return NULL; 207 SET_R (0);
141 } 208 }
142 209
143 return R; 210 return GET_R;
144} 211}
145 212
146/* EXTPROTO */ 213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
147void 215void
148rxvt_init_signals () 216rxvt_init_signals ()
149{ 217{
150/* install exit handler for cleanup */ 218 /* install exit handler for cleanup */
151#if 0 219#if 0
152#ifdef HAVE_ATEXIT 220#ifdef HAVE_ATEXIT
153 atexit(rxvt_clean_exit); 221 atexit (rxvt_clean_exit);
154#else 222#else
155#endif 223#endif
156#endif 224#endif
157 225
158 struct sigaction sa; 226 struct sigaction sa;
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 236
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */ 238 /* signal (SIGURG, SIG_DFL); */
171 239
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174} 242}
175 243
176bool 244bool
177rxvt_term::init (int argc, const char *const *argv) 245rxvt_term::init (int argc, const char *const *argv)
178{ 246{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 247 /*
182 * Save and then give up any super-user privileges 248 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 249 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 250 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 251 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 252 * 2. chown tty on some systems
187 */ 253 */
188 rxvt_privileges (this, SAVE); 254 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 255 privileges (IGNORE);
190 256
191 rxvt_init_secondary (this); 257 init_secondary ();
192 258
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
194 260
261 set_locale ("");
262
195#if (MENUBAR_MAX) 263#if MENUBAR_MAX
196 rxvt_menubar_read (this, rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
197#endif 265#endif
198#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 269#endif
202 270
203 rxvt_Create_Windows (this, argc, argv); 271 create_windows (argc, argv);
204 272
205 rxvt_init_xlocale (this); 273 init_xlocale ();
206 274
207 rxvt_scr_reset (this); /* initialize screen */ 275 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */
210#endif
211 276
212#if 0 277#if 0
213#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 278 XSynchronize (display->display, True);
215#endif
216#endif 279#endif
217 280
218#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
221#endif 284#endif
222#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 286 if (menubar_visible ())
224 XMapWindow (Xdisplay, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
225#endif 288#endif
226#ifdef TRANSPARENT 289#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
228 { 291 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 292 XSelectInput (display->display, display->root, PropertyChangeMask);
230 rxvt_check_our_parents (this); 293 check_our_parents ();
231 } 294 }
232#endif 295#endif
296
297 rootwin_ev.start (display, display->root);
298
233 XMapWindow (Xdisplay, TermWin.vt); 299 XMapWindow (display->display, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 300 XMapWindow (display->display, TermWin.parent[0]);
235 301
236 rxvt_init_env (this);
237 rxvt_init_command (this, cmd_argv); 302 init_command (cmd_argv);
238 303
239 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 304 pty_ev.start (cmd_fd, EVENT_READ);
241 305
242 check_ev.start (); 306 check_ev.start ();
243 307
244 return true; 308 return true;
251 * Catch a SIGCHLD signal and exit if the direct child has died 315 * Catch a SIGCHLD signal and exit if the direct child has died
252 */ 316 */
253/* ARGSUSED */ 317/* ARGSUSED */
254/* EXTPROTO */ 318/* EXTPROTO */
255RETSIGTYPE 319RETSIGTYPE
256rxvt_Child_signal(int sig __attribute__ ((unused))) 320rxvt_Child_signal (int sig __attribute__ ((unused)))
257{ 321{
258 int pid, save_errno = errno; 322 int pid, save_errno = errno;
259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ; 324 ;
261 errno = save_errno; 325 errno = save_errno;
262 326
263#if 0 327#if 0
264 if (pid == R->cmd_pid) 328 if (pid == cmd_pid)
265 exit (EXIT_SUCCESS); 329 exit (EXIT_SUCCESS);
266#endif 330#endif
267} 331}
268 332
269/* 333/*
270 * Catch a fatal signal and tidy up before quitting 334 * Catch a fatal signal and tidy up before quitting
271 */ 335 */
272/* EXTPROTO */ 336/* EXTPROTO */
273RETSIGTYPE 337RETSIGTYPE
274rxvt_Exit_signal(int sig) 338rxvt_Exit_signal (int sig)
275{ 339{
276 signal(sig, SIG_DFL); 340 signal (sig, SIG_DFL);
277#ifdef DEBUG_CMD 341#ifdef DEBUG_CMD
278 rxvt_print_error("signal %d", sig); 342 rxvt_print_error ("signal %d", sig);
279#endif 343#endif
280 rxvt_clean_exit(); 344 rxvt_clean_exit ();
281 kill(getpid(), sig); 345 kill (getpid (), sig);
282} 346}
283 347
284/* ARGSUSED */
285/* INTPROTO */ 348/* INTPROTO */
286int 349int
287rxvt_xerror_handler(const Display * display 350rxvt_xerror_handler (Display *display, XErrorEvent *event)
288 __attribute__ ((unused)), const XErrorEvent * event)
289{ 351{
290 dR;
291
292 if (R->allowedxerror == -1) 352 if (GET_R->allowedxerror == -1)
293 R->allowedxerror = event->error_code; 353 GET_R->allowedxerror = event->error_code;
294 else 354 else
295 { 355 {
296 rxvt_print_error("XError: Request: %d . %d, Error: %d", 356 old_xerror_handler (display, event);
297 event->request_code, event->minor_code,
298 event->error_code);
299
300 R->destroy (); 357 GET_R->destroy ();
301 } 358 }
302 359
303 return 0; 360 return 0;
304} 361}
305 362
310 */ 367 */
311/* EXTPROTO */ 368/* EXTPROTO */
312void 369void
313rxvt_clean_exit () 370rxvt_clean_exit ()
314{ 371{
315 dR; 372 // TODO: rxvtd should clean up all ressources
316 373 if (GET_R)
317 R->destroy (); 374 GET_R->destroy ();
318} 375}
319 376
320/* ------------------------------------------------------------------------- * 377/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 378 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 379 * ------------------------------------------------------------------------- */
323/* EXTPROTO */ 380/* EXTPROTO */
324void * 381void *
325rxvt_malloc(size_t size) 382rxvt_malloc (size_t size)
326{ 383{
327 void *p; 384 void *p;
328 385
329 p = malloc(size); 386 p = malloc (size);
330 if (p) 387 if (p)
331 return p; 388 return p;
332 389
333 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 390 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
334 rxvt_clean_exit(); 391 rxvt_clean_exit ();
335 exit(EXIT_FAILURE); 392 exit (EXIT_FAILURE);
336/* NOTREACHED */ 393 /* NOTREACHED */
337} 394}
338 395
339/* EXTPROTO */ 396/* EXTPROTO */
340void * 397void *
341rxvt_calloc(size_t number, size_t size) 398rxvt_calloc (size_t number, size_t size)
342{ 399{
343 void *p; 400 void *p;
344 401
345 p = calloc(number, size); 402 p = calloc (number, size);
346 if (p) 403 if (p)
347 return p; 404 return p;
348 405
349 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 406 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
350 rxvt_clean_exit(); 407 rxvt_clean_exit ();
351 exit(EXIT_FAILURE); 408 exit (EXIT_FAILURE);
352/* NOTREACHED */ 409 /* NOTREACHED */
353} 410}
354 411
355/* EXTPROTO */ 412/* EXTPROTO */
356void * 413void *
357rxvt_realloc(void *ptr, size_t size) 414rxvt_realloc (void *ptr, size_t size)
358{ 415{
359 void *p; 416 void *p;
360 417
361 if (ptr) 418 if (ptr)
362 p = realloc(ptr, size); 419 p = realloc (ptr, size);
363 else 420 else
364 p = malloc(size); 421 p = malloc (size);
365 if (p) 422 if (p)
366 return p; 423 return p;
367 424
368 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 425 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
369 rxvt_clean_exit(); 426 rxvt_clean_exit ();
370 exit(EXIT_FAILURE); 427 exit (EXIT_FAILURE);
371/* NOTREACHED */ 428 /* NOTREACHED */
372} 429}
373 430
374/* ------------------------------------------------------------------------- * 431/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 432 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 433 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 434/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 435void
380rxvt_privileges(pR_ int mode) 436rxvt_term::privileges (int mode)
381{ 437{
382#if ! defined(__CYGWIN32__) 438#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 440 /* setreuid () is the poor man's setuid (), seteuid () */
385# define seteuid(a) setreuid(-1, (a)) 441# define seteuid(a) setreuid(-1, (a))
386# define setegid(a) setregid(-1, (a)) 442# define setegid(a) setregid(-1, (a))
387# define HAVE_SETEUID 443# define HAVE_SETEUID
388# endif 444# endif
389# ifdef HAVE_SETEUID 445# ifdef HAVE_SETEUID
390 switch (mode) { 446 switch (mode)
447 {
391 case IGNORE: 448 case IGNORE:
392 /* 449 /*
393 * change effective uid/gid - not real uid/gid - so we can switch 450 * change effective uid/gid - not real uid/gid - so we can switch
394 * back to root later, as required 451 * back to root later, as required
395 */ 452 */
396 seteuid(getuid()); 453 seteuid (getuid ());
397 setegid(getgid()); 454 setegid (getgid ());
398 break; 455 break;
399 case SAVE: 456 case SAVE:
400 R->euid = geteuid(); 457 euid = geteuid ();
401 R->egid = getegid(); 458 egid = getegid ();
402 break; 459 break;
403 case RESTORE: 460 case RESTORE:
404 seteuid(R->euid); 461 seteuid (euid);
405 setegid(R->egid); 462 setegid (egid);
406 break; 463 break;
407 } 464 }
408# else 465# else
409 switch (mode) { 466 switch (mode)
467 {
410 case IGNORE: 468 case IGNORE:
411 setuid(getuid()); 469 setuid (getuid ());
412 setgid(getgid()); 470 setgid (getgid ());
413 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
414 case SAVE: 472 case SAVE:
415 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
416 case RESTORE: 474 case RESTORE:
417 break; 475 break;
418 } 476 }
419# endif 477# endif
420#endif 478#endif
421} 479}
422 480
423#ifdef UTMP_SUPPORT 481#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 482void
426rxvt_privileged_utmp(pR_ char action) 483rxvt_term::privileged_utmp (char action)
427{ 484{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
429 action, R->next_utmp_action, getpid())); 486 action, next_utmp_action, getpid ()));
430 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
431 || (R->Options & Opt_utmpInhibit) 488 || (Options & Opt_utmpInhibit)
432 || R->ttydev == NULL || *R->ttydev == '\0') 489 || ttydev == NULL || *ttydev == '\0')
433 return; 490 return;
434 491
435 rxvt_privileges(aR_ RESTORE); 492 privileges (RESTORE);
436 if (action == SAVE) { 493 if (action == SAVE)
494 {
437 R->next_utmp_action = RESTORE; 495 next_utmp_action = RESTORE;
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 496 makeutent (ttydev, rs[Rs_display_name]);
497 }
498 else
439 } else { /* action == RESTORE */ 499 { /* action == RESTORE */
440 R->next_utmp_action = IGNORE; 500 next_utmp_action = IGNORE;
441 rxvt_cleanutent(aR); 501 cleanutent ();
442 } 502 }
443 rxvt_privileges(aR_ IGNORE); 503 privileges (IGNORE);
444} 504}
445#endif 505#endif
446 506
447#ifndef NO_SETOWNER_TTYDEV 507#ifndef NO_SETOWNER_TTYDEV
448/* EXTPROTO */
449void 508void
450rxvt_privileged_ttydev(pR_ char action) 509rxvt_term::privileged_ttydev (char action)
451{ 510{
452 D_MAIN((stderr, 511 D_MAIN ((stderr,
453 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
454 action, R->next_tty_action, getpid())); 513 action, next_tty_action, getpid ()));
455 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
456 || R->ttydev == NULL || *R->ttydev == '\0') 515 || ttydev == NULL || *ttydev == '\0')
457 return; 516 return;
458 517
459 rxvt_privileges(aR_ RESTORE); 518 privileges (RESTORE);
460 519
461 if (action == SAVE) { 520 if (action == SAVE)
521 {
462 R->next_tty_action = RESTORE; 522 next_tty_action = RESTORE;
463# ifndef RESET_TTY_TO_COMMON_DEFAULTS 523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
464/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
465 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
466 R->next_tty_action = IGNORE; 526 next_tty_action = IGNORE;
467 else 527 else
468# endif 528# endif
529
469 { 530 {
470 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 531 chown (ttydev, getuid (), ttygid); /* fail silently */
471 chmod(R->ttydev, R->ttymode); 532 chmod (ttydev, ttymode);
472# ifdef HAVE_REVOKE 533# ifdef HAVE_REVOKE
473 revoke(R->ttydev); 534 revoke (ttydev);
474# endif 535# endif
536
475 } 537 }
538 }
539 else
476 } else { /* action == RESTORE */ 540 { /* action == RESTORE */
477 R->next_tty_action = IGNORE; 541 next_tty_action = IGNORE;
478# ifndef RESET_TTY_TO_COMMON_DEFAULTS 542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
479 chmod(R->ttydev, R->ttyfd_stat.st_mode); 543 chmod (ttydev, ttyfd_stat.st_mode);
480 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
481# else 545# else
482 chmod(R->ttydev, 546 chmod (ttydev,
483 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
484 chown(R->ttydev, 0, 0); 548 chown (ttydev, 0, 0);
485# endif 549# endif
486 }
487 550
551 }
552
488 rxvt_privileges(aR_ IGNORE); 553 privileges (IGNORE);
489 554
490# ifndef RESET_TTY_TO_COMMON_DEFAULTS 555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
491 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
492 action == RESTORE ? "Restoring" : (action == 557 action == RESTORE ? "Restoring" : (action ==
493 SAVE ? "Saving" : 558 SAVE ? "Saving" :
494 "UNKNOWN ERROR for"), R->ttydev, 559 "UNKNOWN ERROR for"), ttydev,
495 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
496 R->ttyfd_stat.st_gid)); 561 ttyfd_stat.st_gid));
497# endif 562# endif
498} 563}
499#endif 564#endif
500 565
501/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
502/* 567/*
503 * window size/position calculcations for XSizeHint and other storage. 568 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 569 * if width/height are non-zero then override calculated width/height
505 */ 570 */
506/* EXTPROTO */
507void 571void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 572rxvt_term::window_calc (unsigned int width, unsigned int height)
509{ 573{
510 short recalc_x, recalc_y; 574 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 575 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 576 unsigned int w, h;
513 unsigned int max_width, max_height; 577 unsigned int max_width, max_height;
514 578
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 579 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 580 TermWin.ncol, TermWin.nrow, szHint.width,
517 R->szHint.height)); 581 szHint.height));
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 583 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 585
522 recalc_x = recalc_y = 0; 586 recalc_x = recalc_y = 0;
523 flags = 0; 587 flags = 0;
524 if (!R->parsed_geometry) { 588 if (!parsed_geometry)
589 {
525 R->parsed_geometry = 1; 590 parsed_geometry = 1;
526 if (R->rs[Rs_geometry]) 591 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
528 if (flags & WidthValue) { 593 if (flags & WidthValue)
594 {
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 595 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
530 R->szHint.flags |= USSize; 596 szHint.flags |= USSize;
531 } 597 }
532 if (flags & HeightValue) { 598 if (flags & HeightValue)
599 {
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 600 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
534 R->szHint.flags |= USSize; 601 szHint.flags |= USSize;
535 } 602 }
536 if (flags & XValue) { 603 if (flags & XValue)
604 {
537 R->szHint.x = x; 605 szHint.x = x;
538 R->szHint.flags |= USPosition; 606 szHint.flags |= USPosition;
539 if (flags & XNegative) { 607 if (flags & XNegative)
608 {
540 recalc_x = 1; 609 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 610 szHint.win_gravity = NorthEastGravity;
542 } 611 }
543 } 612 }
544 if (flags & YValue) { 613 if (flags & YValue)
614 {
545 R->szHint.y = y; 615 szHint.y = y;
546 R->szHint.flags |= USPosition; 616 szHint.flags |= USPosition;
547 if (flags & YNegative) { 617 if (flags & YNegative)
618 {
548 recalc_y = 1; 619 recalc_y = 1;
549 if (R->szHint.win_gravity == NorthEastGravity) 620 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 621 szHint.win_gravity = SouthEastGravity;
551 else 622 else
552 R->szHint.win_gravity = SouthWestGravity; 623 szHint.win_gravity = SouthWestGravity;
553 } 624 }
554 } 625 }
555 } 626 }
556/* TODO: BOUNDS */ 627 /* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 628 TermWin.width = TermWin.ncol * TermWin.fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 629 TermWin.height = TermWin.nrow * TermWin.fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 630 max_width = MAX_COLS * TermWin.fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 631 max_height = MAX_ROWS * TermWin.fheight;
561 632
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
563 634
564 sb_w = mb_h = 0; 635 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 636 window_vt_x = window_vt_y = 0;
566 if (scrollbar_visible(R)) { 637 if (scrollbar_visible ())
638 {
567 sb_w = scrollbar_TotalWidth(); 639 sb_w = scrollbar_TotalWidth ();
568 R->szHint.base_width += sb_w; 640 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 641 if (! (Options & Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 642 window_vt_x = sb_w;
571 } 643 }
572 if (menubar_visible(R)) { 644 if (menubar_visible ())
645 {
573 mb_h = menuBar_TotalHeight(); 646 mb_h = menuBar_TotalHeight ();
574 R->szHint.base_height += mb_h; 647 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 648 window_vt_y = mb_h;
576 } 649 }
577 R->szHint.width_inc = R->TermWin.fwidth; 650 szHint.width_inc = TermWin.fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 651 szHint.height_inc = TermWin.fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 652 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 653 szHint.min_height = szHint.base_height + szHint.height_inc;
581 654
582 if (width && width - R->szHint.base_width < max_width) { 655 if (width && width - szHint.base_width < max_width)
656 {
583 R->szHint.width = width; 657 szHint.width = width;
584 R->TermWin.width = width - R->szHint.base_width; 658 TermWin.width = width - szHint.base_width;
585 } else { 659 }
660 else
661 {
586 MIN_IT(R->TermWin.width, max_width); 662 MIN_IT (TermWin.width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 663 szHint.width = szHint.base_width + TermWin.width;
588 } 664 }
589 if (height && height - R->szHint.base_height < max_height) { 665 if (height && height - szHint.base_height < max_height)
666 {
590 R->szHint.height = height; 667 szHint.height = height;
591 R->TermWin.height = height - R->szHint.base_height; 668 TermWin.height = height - szHint.base_height;
592 } else { 669 }
670 else
671 {
593 MIN_IT(R->TermWin.height, max_height); 672 MIN_IT (TermWin.height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 673 szHint.height = szHint.base_height + TermWin.height;
595 } 674 }
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 676 window_sb_x = szHint.width - sb_w;
598 677
599 if (recalc_x) 678 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 680 - szHint.width - 2 * TermWin.ext_bwidth);
602 if (recalc_y) 681 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 683 - szHint.height - 2 * TermWin.ext_bwidth);
605 684
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 685 TermWin.ncol = TermWin.width / TermWin.fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 686 TermWin.nrow = TermWin.height / TermWin.fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
610 R->szHint.height)); 689 szHint.height));
611 return; 690 return;
612} 691}
613 692
614/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
615/* 694/*
616 * Tell the teletype handler what size the window is. 695 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 696 * Called after a window size change.
618 */ 697 */
619void 698void
620rxvt_term::tt_winch () 699rxvt_term::tt_winch ()
621{ 700{
622 struct winsize ws; 701 struct winsize ws;
623 702
624 if (cmd_fd < 0) 703 if (cmd_fd < 0)
625 return; 704 return;
626 705
627 ws.ws_col = TermWin.ncol; 706 ws.ws_col = TermWin.ncol;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 708 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 709#ifndef DEBUG_SIZE
631 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 711#else
633 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635# ifdef SIGWINCH 714# ifdef SIGWINCH
636 else if (cmd_pid) /* force through to the command */ 715 else if (cmd_pid) /* force through to the command */
637 kill (cmd_pid, SIGWINCH); 716 kill (cmd_pid, SIGWINCH);
638# endif 717# endif
639#endif 718#endif
640} 719}
641 720
642/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
643/* rxvt_change_font() - Switch to a new font */ 722/* rxvt_change_font () - Switch to a new font */
644/* 723/*
645 * init = 1 - initialize 724 * init = 1 - initialize
646 * 725 *
647 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
648 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
649 */ 728 */
650/* EXTPROTO */ 729bool
651void
652rxvt_change_font(pR_ int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
653{ 731{
654} 732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
655 743
656/* INTPROTO */ 744 if (fs && fs->populate (fontname ? fontname : "fixed"))
657void 745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
658rxvt_font_up_down(pR_ int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
659{ 768{
769 return false;
660} 770}
661 771
662/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
663/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
664/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
665/* EXTPROTO */
666void 775void
667rxvt_set_title(pR_ const char *str) 776rxvt_term::set_title (const char *str)
668{ 777{
669#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
670 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
671#else 780#else
672 char *name; 781 char *name;
673 782
674 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
675 name = NULL; 784 name = NULL;
676 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
677 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
678 if (name) 787 if (name)
679 XFree(name); 788 XFree (name);
680#endif 789#endif
681} 790}
682 791
683/* EXTPROTO */
684void 792void
685rxvt_set_iconName(pR_ const char *str) 793rxvt_term::set_iconName (const char *str)
686{ 794{
687#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
688 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
689#else 797#else
690 char *name; 798 char *name;
691 799
692 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
693 name = NULL; 801 name = NULL;
694 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
695 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
696 if (name) 804 if (name)
697 XFree(name); 805 XFree (name);
698#endif 806#endif
699} 807}
700 808
701#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
702/* EXTPROTO */
703void 810void
704rxvt_set_window_color(pR_ int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
705{ 812{
706 rxvt_color xcol; 813 rxvt_color xcol;
707 int i; 814 int i;
708 815
709 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
710 return; 817 return;
711 818
712/* handle color aliases */ 819 /* handle color aliases */
713 if (isdigit(*color)) { 820 if (isdigit (*color))
821 {
714 i = atoi(color); 822 i = atoi (color);
823 if (i >= 8 && i <= 15)
715 if (i >= 8 && i <= 15) { /* bright colors */ 824 { /* bright colors */
716 i -= 8; 825 i -= 8;
717# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
718 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
719 SET_PIXCOLOR(R, idx); 828 SET_PIXCOLOR (idx);
720 goto Done; 829 goto Done;
721# endif 830# endif
831
722 } 832 }
723 if (i >= 0 && i <= 7) { /* normal colors */ 833 if (i >= 0 && i <= 7)
834 { /* normal colors */
724 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
725 SET_PIXCOLOR(R, idx); 836 SET_PIXCOLOR (idx);
726 goto Done; 837 goto Done;
727 } 838 }
728 } 839 }
729 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
730 return; 841 return;
731/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 842 /* XStoreColor (display->display, XCMAP, XColor*); */
732 843
733/* 844 /*
734 * FIXME: should free colors here, but no idea how to do it so instead, 845 * FIXME: should free colors here, but no idea how to do it so instead,
735 * so just keep gobbling up the colormap 846 * so just keep gobbling up the colormap
736 */ 847 */
737# if 0 848# if 0
738 for (i = Color_Black; i <= Color_White; i++) 849 for (i = Color_Black; i <= Color_White; i++)
739 if (R->PixColors[idx] == R->PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
740 break; 851 break;
741 if (i > Color_White) { 852 if (i > Color_White)
853 {
742 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
743 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
744 DisplayPlanes(R->Xdisplay, Xscreen)); 856 DisplayPlanes (display->display, display->screen));
745 } 857 }
746# endif 858# endif
747 859
748 R->PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
749 SET_PIXCOLOR(R, idx); 861 SET_PIXCOLOR (idx);
750 862
751/* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
752/* Cursor cursor; */ 864 /* Cursor cursor; */
753 Done: 865Done:
754 if (idx == Color_bg && !(R->Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
755 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
756 R->PixColors[Color_bg]); 868 PixColors[Color_bg]);
757 869
758/* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
759 871
760 rxvt_set_colorfgbg(aR); 872 set_colorfgbg ();
761 rxvt_recolour_cursor(aR); 873 recolour_cursor ();
762/* the only reasonable way to enforce a clean update */ 874 /* the only reasonable way to enforce a clean update */
763 rxvt_scr_poweron(aR); 875 scr_poweron ();
764} 876}
765 877
766#else 878#else
767# define rxvt_set_window_color(aR_ idx,color) ((void)0) 879# define set_window_color (idx,color) ((void)0)
768#endif /* XTERM_COLOR_CHANGE */ 880#endif /* XTERM_COLOR_CHANGE */
769 881
770/* EXTPROTO */
771void 882void
772rxvt_recolour_cursor(pR) 883rxvt_term::recolour_cursor ()
773{ 884{
774 rxvt_color xcol[2];
775
776#if TODO 885#if TODO
886 rxvt_color xcol[2];
887
777 xcol[0] = R->PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
778 xcol[1] = R->PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
779 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
780 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
781#endif 892#endif
782} 893}
783 894
784/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
785/* 896/*
786 * find if fg/bg matches any of the normal (low-intensity) colors 897 * find if fg/bg matches any of the normal (low-intensity) colors
787 */ 898 */
788/* INTPROTO */
789void 899void
790rxvt_set_colorfgbg(pR) 900rxvt_term::set_colorfgbg ()
791{ 901{
792 unsigned int i; 902 unsigned int i;
793 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
794 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
795 905
796 R->env_colorfgbg = 906 env_colorfgbg =
797 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
798 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
799 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
800 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
801 if (R->PixColors[Color_fg] == R->PixColors[i]) { 911 if (PixColors[Color_fg] == PixColors[i])
912 {
802 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
803 break; 914 break;
804 } 915 }
805 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
806 if (R->PixColors[Color_bg] == R->PixColors[i]) { 917 if (PixColors[Color_bg] == PixColors[i])
918 {
807 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
808#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
809 xpmb = "default;"; 921 xpmb = "default;";
810#endif 922#endif
811 break; 923 break;
812 } 924 }
925
813 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
814 putenv(R->env_colorfgbg);
815 927
816#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
817 R->colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
818 for (i = minCOLOR; i <= maxCOLOR; i++) { 930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
819 if (R->PixColors[Color_fg] == R->PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
820 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
821 if (R->PixColors[Color_bg] == R->PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
822 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
823 } 936 }
824#endif 937#endif
825} 938}
826 939
827/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
828/* 941/*
829 * Colour determination for low colour displays, routine from 942 * Colour determination for low colour displays, routine from
830 * Hans de Goede <hans@highrise.nl> 943 * Hans de Goede <hans@highrise.nl>
831 */ 944 */
832 945
833/* EXTPROTO */
834int 946int
835rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
836{ 948{
837 screen_in_out->set(aR_ colour);
838
839 if (!screen_in_out->set(aR_ colour)) { 949 if (!screen_in_out->set (display, colour))
950 {
840 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
841 return false; 952 return false;
842 } 953 }
843 954
844 return true; 955 return true;
845} 956}
846 957
847/* -------------------------------------------------------------------- * 958/* -------------------------------------------------------------------- *
848 * - WINDOW RESIZING - * 959 * - WINDOW RESIZING - *
849 * -------------------------------------------------------------------- */ 960 * -------------------------------------------------------------------- */
850/* EXTPROTO */
851void 961void
852rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 962rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
853 int ignoreparent)
854{ 963{
855 int fix_screen; 964 int fix_screen;
856 965
857#ifdef SMART_RESIZE 966#ifdef SMART_RESIZE
858 int old_width = R->szHint.width, old_height = R->szHint.height; 967 int old_width = szHint.width, old_height = szHint.height;
859#endif 968#endif
860 969
861 rxvt_window_calc(aR_ width, height); 970 window_calc (width, height);
862 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
863 if (!ignoreparent) { 972 if (!ignoreparent)
973 {
864#ifdef SMART_RESIZE 974#ifdef SMART_RESIZE
865/* 975 /*
866 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
867 * reposition window on resize depending on placement on screen 977 * reposition window on resize depending on placement on screen
868 */ 978 */
869 int x, y, x1, y1; 979 int x, y, x1, y1;
870 int dx, dy; 980 int dx, dy;
871 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
872 Window unused_cr; 982 Window unused_cr;
873 983
874 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
875 0, 0, &x, &y, &unused_cr); 985 0, 0, &x, &y, &unused_cr);
876 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
877 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 987 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
878 /* 988 /*
879 * if Xroot isn't the parent window, a WM will probably have offset 989 * if display->root isn't the parent window, a WM will probably have offset
880 * our position for handles and decorations. Counter it 990 * our position for handles and decorations. Counter it
881 */ 991 */
882 if (x1 != x || y1 != y) { 992 if (x1 != x || y1 != y)
993 {
883 x -= x1; 994 x -= x1;
884 y -= y1; 995 y -= y1;
885 } 996 }
886 997
887 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
888 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
889 dx = old_width - R->szHint.width; 1000 dx = old_width - szHint.width;
890 dy = old_height - R->szHint.height; 1001 dy = old_height - szHint.height;
891 1002
892 /* Check position of the center of the window */ 1003 /* Check position of the center of the window */
893 if (x < x1) /* left half */ 1004 if (x < x1) /* left half */
894 dx = 0; 1005 dx = 0;
895 else if (x == x1) /* exact center */ 1006 else if (x == x1) /* exact center */
896 dx /= 2; 1007 dx /= 2;
897 if (y < y1) /* top half */ 1008 if (y < y1) /* top half */
898 dy = 0; 1009 dy = 0;
899 else if (y == y1) /* exact center */ 1010 else if (y == y1) /* exact center */
900 dy /= 2; 1011 dy /= 2;
901 1012
902 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
903 R->szHint.width, R->szHint.height); 1014 szHint.width, szHint.height);
904#else 1015#else
905 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
906 R->szHint.height); 1017 szHint.height);
907#endif 1018#endif
908 }
909 1019
1020 }
1021
910 fix_screen = (R->TermWin.ncol != R->prev_ncol 1022 fix_screen = (TermWin.ncol != prev_ncol
911 || R->TermWin.nrow != R->prev_nrow); 1023 || TermWin.nrow != prev_nrow);
1024
912 if (fix_screen || width != R->old_width || height != R->old_height) { 1025 if (fix_screen || width != old_width || height != old_height)
1026 {
913 if (scrollbar_visible(R)) { 1027 if (scrollbar_visible ())
1028 {
914 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
915 0, scrollbar_TotalWidth(), R->szHint.height); 1030 0, scrollbar_TotalWidth (), szHint.height);
916 rxvt_Resize_scrollBar(aR); 1031 resize_scrollbar ();
917 } 1032 }
1033
918 if (menubar_visible(R)) 1034 if (menubar_visible ())
919 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
920 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1037
921 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
922 R->window_vt_y, TermWin_TotalWidth(), 1039 window_vt_y, TermWin_TotalWidth (),
923 TermWin_TotalHeight()); 1040 TermWin_TotalHeight ());
924#ifdef RXVT_GRAPHICS 1041 scr_clear (height != old_height);
925 if (R->old_height)
926 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
927 R->old_height - R->szHint.base_height);
928#endif
929 rxvt_scr_clear(aR);
930#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
931 rxvt_resize_pixmap(aR); 1043 resize_pixmap ();
932#endif 1044#endif
933 }
934 1045
1046 }
1047
935 if (fix_screen || R->old_height == 0) { 1048 if (fix_screen || old_height == 0)
1049 {
936 int curr_screen = -1; 1050 int curr_screen = -1;
937 uint16_t old_ncol = R->prev_ncol; 1051 int old_ncol = prev_ncol;
938 1052
939 /* scr_reset only works on the primary screen */ 1053 /* scr_reset only works on the primary screen */
940 if (R->old_height) /* this is not the first time through */ 1054 if (old_height) /* this is not the first time through */
1055 {
1056 unsigned int ncol = TermWin.ncol;
1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
941 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
942 rxvt_scr_reset(aR); 1059 TermWin.ncol = ncol;
943 if (curr_screen >= 0) { /* this is not the first time through */
944 rxvt_scr_change_screen(aR_ curr_screen);
945 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
946 } 1060 }
947 }
948 1061
1062 scr_reset ();
1063
1064 if (curr_screen >= 0) /* this is not the first time through */
1065 {
1066 scr_change_screen (curr_screen);
1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1068 }
1069 }
1070
949 R->old_width = R->szHint.width; 1071 old_width = szHint.width;
950 R->old_height = R->szHint.height; 1072 old_height = szHint.height;
951 1073
952#ifdef USE_XIM 1074#ifdef USE_XIM
953 rxvt_IMSetStatusPosition(aR); 1075 IMSetStatusPosition ();
954#endif 1076#endif
955} 1077}
956 1078
957/* 1079/*
958 * Set the width/height of the vt window in characters. Units are pixels. 1080 * Set the width/height of the vt window in characters. Units are pixels.
959 * good for toggling 80/132 columns 1081 * good for toggling 80/132 columns
960 */ 1082 */
961/* EXTPROTO */
962void 1083void
963rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1084rxvt_term::set_widthheight (unsigned int width, unsigned int height)
964{ 1085{
965 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
966 1087
967 if (width == 0 || height == 0) { 1088 if (width == 0 || height == 0)
1089 {
968 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
969 if (width == 0) 1091 if (width == 0)
970 width = wattr.width - R->szHint.base_width; 1092 width = wattr.width - szHint.base_width;
971 if (height == 0) 1093 if (height == 0)
972 height = wattr.height - R->szHint.base_height; 1094 height = wattr.height - szHint.base_height;
973 } 1095 }
974 if (width != R->TermWin.width || height != R->TermWin.height) { 1096 if (width != TermWin.width || height != TermWin.height)
1097 {
975 width += R->szHint.base_width; 1098 width += szHint.base_width;
976 height += R->szHint.base_height; 1099 height += szHint.base_height;
977 rxvt_resize_all_windows(aR_ width, height, 0); 1100 resize_all_windows (width, height, 0);
978 } 1101 }
979} 1102}
980 1103
981/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
982 * - X INPUT METHOD ROUTINES - * 1105 * - X INPUT METHOD ROUTINES - *
983 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
984#ifdef USE_XIM 1107#ifdef USE_XIM
985/* INTPROTO */ 1108
986void 1109void
987rxvt_setSize(pR_ XRectangle * size) 1110rxvt_term::im_set_size (XRectangle *size)
988{ 1111{
989 size->x = R->TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
990 size->y = R->TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
991 size->width = Width2Pixel(R->TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
992 size->height = Height2Pixel(R->TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
993} 1116}
994 1117
995/* INTPROTO */
996void 1118void
997rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
998{ 1120{
999 *fg = R->PixColors[Color_fg]; 1121 *fg = PixColors[Color_fg];
1000 *bg = R->PixColors[Color_bg]; 1122 *bg = PixColors[Color_bg];
1001} 1123}
1002 1124
1003/* Checking whether input method is running. */ 1125/* Checking whether input method is running. */
1004/* INTPROTO */
1005Bool 1126bool
1006rxvt_IMisRunning(pR) 1127rxvt_term::IMisRunning ()
1007{ 1128{
1008 char *p; 1129 char *p;
1009 Atom atom; 1130 Atom atom;
1010 Window win; 1131 Window win;
1011 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1012 1133
1013/* get current locale modifier */ 1134 /* get current locale modifier */
1014 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 {
1015 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1016 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1017 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1018 *p = '\0'; 1140 *p = '\0';
1019 1141
1020 atom = XInternAtom(R->Xdisplay, server, False); 1142 atom = XInternAtom (display->display, server, False);
1021 win = XGetSelectionOwner(R->Xdisplay, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1022 if (win != None) 1144 if (win != None)
1023 return True; 1145 return True;
1024 } 1146 }
1025 return False; 1147 return False;
1026} 1148}
1027 1149
1028/* EXTPROTO */
1029void 1150void
1030rxvt_IMSendSpot(pR) 1151rxvt_term::IMSendSpot ()
1031{ 1152{
1032 XPoint spot; 1153 XPoint spot;
1033 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1034 1155
1035 if (R->Input_Context == NULL 1156 if (Input_Context == NULL
1036 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1037 || !(R->event_type == KeyPress 1158 || ! (event_type == KeyPress
1038 || R->event_type == Expose 1159 || event_type == Expose
1039 || R->event_type == NoExpose 1160 || event_type == NoExpose
1040 || R->event_type == SelectionNotify 1161 || event_type == SelectionNotify
1041 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1042 || !rxvt_IMisRunning(aR)) 1163 || !IMisRunning ())
1043 return; 1164 return;
1044 1165
1045 rxvt_setPosition(aR_ & spot); 1166 im_set_position (&spot);
1046 1167
1047 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1048 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1049 XFree(preedit_attr); 1170 XFree (preedit_attr);
1050} 1171}
1051 1172
1052/* EXTPROTO */
1053void 1173void
1054rxvt_setTermFontSet(pR_ int idx)
1055{
1056 char *string;
1057 long length;
1058 int success = 0;
1059
1060 if (idx < 0 || idx >= MAX_NFONTS)
1061 return;
1062}
1063
1064/* INTPROTO */
1065void
1066rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1067 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1068{ 1176{
1069 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1070 1178
1071 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1072 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1181
1073 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1074 mbh -= R->TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1075 1184
1076 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1077 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1078 1187
1079 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1080 + vtx;
1081 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1082 1190
1083 status_rect->x = vtx; 1191 status_rect->x = vtx;
1084 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1085 1193
1086 status_rect->width = needed_rect->width ? needed_rect->width 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1087 : Width2Pixel(R->TermWin.ncol + 1);
1088 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1089} 1196}
1090 1197
1091/* ARGSUSED */
1092/* INTPROTO */
1093void 1198void
1094rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1199rxvt_term::im_destroy ()
1095 __attribute__ ((unused)), XPointer call_data
1096 __attribute__ ((unused)))
1097{ 1200{
1098 dR; 1201 if (Input_Context)
1099 1202 {
1203 XDestroyIC (Input_Context);
1100 R->Input_Context = NULL; 1204 Input_Context = NULL;
1101/* To avoid Segmentation Fault in C locale: Solaris only? */ 1205 }
1102 if (STRCMP(R->locale, "C"))
1103 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1104 rxvt_IMInstantiateCallback, NULL);
1105}
1106 1206
1107/* 1207 if (input_method)
1108 * X manual pages and include files don't match on some systems:
1109 * some think this is an XIDProc and others an XIMProc so we can't
1110 * use the first argument - need to update this to be nice for
1111 * both types via some sort of configure detection
1112 */
1113/* ARGSUSED */
1114/* EXTPROTO */
1115void
1116rxvt_IMInstantiateCallback(Display * unused
1117 __attribute__ ((unused)), XPointer client_data
1118 __attribute__ ((unused)), XPointer call_data
1119 __attribute__ ((unused)))
1120{
1121 dR;
1122 int i, found, had_im;
1123 const char *p;
1124 char **s;
1125 char buf[IMBUFSIZ];
1126
1127 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1128 if (R->Input_Context)
1129 return;
1130
1131 found = had_im = 0;
1132 p = R->rs[Rs_inputMethod];
1133 if (p && *p) {
1134 had_im = 1;
1135 s = rxvt_splitcommastring(p);
1136 for (i = 0; s[i]; i++) {
1137 if (*s[i]) {
1138 STRCPY(buf, "@im=");
1139 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1140 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1141 && (rxvt_IM_get_IC(aR) == True)) {
1142 found = 1;
1143 break;
1144 }
1145 }
1146 }
1147 for (i = 0; s[i]; i++)
1148 free(s[i]);
1149 free(s);
1150 } 1208 {
1151 if (found) 1209 display->put_xim (input_method);
1152 return; 1210 input_method = 0;
1153
1154/* try with XMODIFIERS env. var. */
1155 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1156 rxvt_IM_get_IC(aR);
1157 return;
1158 } 1211 }
1159
1160/* try with no modifiers base IF the user didn't specify an IM */
1161 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1162 && rxvt_IM_get_IC(aR) == True)
1163 return;
1164} 1212}
1165 1213
1166/* 1214/*
1167 * Try to open a XIM with the current modifiers, then see if we can 1215 * Try to open a XIM with the current modifiers, then see if we can
1168 * open a suitable preedit type 1216 * open a suitable preedit type
1169 */ 1217 */
1170/* INTPROTO */
1171Bool 1218bool
1172rxvt_IM_get_IC(pR) 1219rxvt_term::IM_get_IC (const char *modifiers)
1173{ 1220{
1174 int i, j, found; 1221 int i, j, found;
1175 XIM xim; 1222 XIM xim;
1176 XPoint spot; 1223 XPoint spot;
1177 XRectangle rect, status_rect, needed_rect; 1224 XRectangle rect, status_rect, needed_rect;
1178 unsigned long fg, bg; 1225 unsigned long fg, bg;
1179 const char *p; 1226 const char *p;
1180 char **s; 1227 char **s;
1181 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1182 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1183 XIMCallback ximcallback;
1184 1230
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false;
1233
1185 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1186 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1235 input_method = display->get_xim (locale, modifiers);
1187 if (xim == NULL) 1236 if (input_method == NULL)
1188 return False; 1237 return false;
1189 1238
1239 xim = input_method->xim;
1240
1190 xim_styles = NULL; 1241 xim_styles = NULL;
1191 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1192 || !xim_styles || !xim_styles->count_styles) { 1243 || !xim_styles || !xim_styles->count_styles)
1193 XCloseIM(xim); 1244 {
1245 display->put_xim (input_method);
1194 return False; 1246 return false;
1195 } 1247 }
1196 1248
1197 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1198 : "OverTheSpot,OffTheSpot,Root";
1199 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1200 for (i = found = 0; !found && s[i]; i++) { 1251 for (i = found = 0; !found && s[i]; i++)
1252 {
1201 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1202 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1203 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1204 R->input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1205 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1206 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1207 1259
1208 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1209 if (R->input_style == xim_styles->supported_styles[j]) { 1261 if (input_style == xim_styles->supported_styles[j])
1262 {
1210 found = 1; 1263 found = 1;
1264 break;
1265 }
1266 }
1267
1268 for (i = 0; s[i]; i++)
1269 free (s[i]);
1270
1271 free (s);
1272 XFree (xim_styles);
1273
1274 if (!found)
1275 {
1276 display->put_xim (input_method);
1277 return false;
1278 }
1279
1280 preedit_attr = status_attr = NULL;
1281
1282 if (input_style & XIMPreeditPosition)
1283 {
1284 im_set_size (&rect);
1285 im_set_position (&spot);
1286 im_set_color (&fg, &bg);
1287
1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1289 XNSpotLocation, &spot,
1290 XNForeground, fg, XNBackground, bg,
1291 //XNFontSet, TermWin.fontset,
1292 NULL);
1293 }
1294 else if (input_style & XIMPreeditArea)
1295 {
1296 im_set_color (&fg, &bg);
1297
1298 /*
1299 * The necessary width of preedit area is unknown
1300 * until create input context.
1301 */
1302 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1305
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1307 XNForeground, fg, XNBackground, bg,
1308 //XNFontSet, TermWin.fontset,
1309 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 }
1315
1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1317 XNClientWindow, TermWin.parent[0],
1318 XNFocusWindow, TermWin.parent[0],
1319 preedit_attr ? XNPreeditAttributes : NULL,
1320 preedit_attr,
1321 status_attr ? XNStatusAttributes : NULL,
1322 status_attr, NULL);
1323 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr);
1325
1326 if (Input_Context == NULL)
1327 {
1328 rxvt_print_error ("failed to create input context");
1329 display->put_xim (input_method);
1330 return false;
1331 }
1332
1333 if (input_style & XIMPreeditArea)
1334 IMSetStatusPosition ();
1335
1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1337 return true;
1338}
1339
1340void
1341rxvt_term::im_cb ()
1342{
1343 int i, found, had_im;
1344 const char *p;
1345 char **s;
1346 char buf[IMBUFSIZ];
1347
1348 im_destroy ();
1349
1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1351 if (Input_Context)
1352 return;
1353
1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1355 if (rs[Rs_imLocale])
1356 SET_LOCALE (rs[Rs_imLocale]);
1357#endif
1358
1359 p = rs[Rs_inputMethod];
1360 if (p && *p)
1361 {
1362 bool found = false;
1363
1364 s = rxvt_splitcommastring (p);
1365 for (i = 0; s[i]; i++)
1366 {
1367 if (*s[i])
1368 {
1369 STRCPY (buf, "@im=");
1370 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1371 if (IM_get_IC (buf))
1372 {
1373 found = true;
1211 break; 1374 break;
1375 }
1212 } 1376 }
1213 } 1377 }
1214 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1215 free(s[i]); 1379 free (s[i]);
1216 free(s); 1380 free (s);
1217 XFree(xim_styles);
1218 1381
1219 if (!found) { 1382 if (found)
1220 XCloseIM(xim); 1383 goto done;
1221 return False;
1222 } 1384 }
1223 1385
1224 ximcallback.callback = rxvt_IMDestroyCallback; 1386 /* try with XMODIFIERS env. var. */
1387 if (IM_get_IC (""))
1388 goto done;
1225 1389
1226/* XXX: not sure why we need this (as well as IC one below) */ 1390 /* try with no modifiers base IF the user didn't specify an IM */
1227 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1391 if (IM_get_IC ("@im=none"))
1392 goto done;
1228 1393
1229 preedit_attr = status_attr = NULL; 1394done:
1230 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1231 if (R->input_style & XIMPreeditPosition) { 1396 if (rs[Rs_imLocale])
1232 rxvt_setSize(aR_ & rect); 1397 SET_LOCALE (locale);
1233 rxvt_setPosition(aR_ & spot); 1398#endif
1234 rxvt_setColor(aR_ & fg, &bg);
1235
1236 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1237 XNSpotLocation, &spot,
1238 XNForeground, fg, XNBackground, bg,
1239 //XNFontSet, R->TermWin.fontset,
1240 NULL);
1241 } else if (R->input_style & XIMPreeditArea) {
1242 rxvt_setColor(aR_ & fg, &bg);
1243
1244 /*
1245 * The necessary width of preedit area is unknown
1246 * until create input context.
1247 */
1248 needed_rect.width = 0;
1249
1250 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1251
1252 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1253 XNForeground, fg, XNBackground, bg,
1254 //XNFontSet, R->TermWin.fontset,
1255 NULL);
1256 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1257 XNForeground, fg, XNBackground, bg,
1258 //XNFontSet, R->TermWin.fontset,
1259 NULL);
1260 }
1261 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1262 XNClientWindow, R->TermWin.parent[0],
1263 XNFocusWindow, R->TermWin.parent[0],
1264 XNDestroyCallback, &ximcallback,
1265 preedit_attr ? XNPreeditAttributes : NULL,
1266 preedit_attr,
1267 status_attr ? XNStatusAttributes : NULL,
1268 status_attr, NULL);
1269 if (preedit_attr)
1270 XFree(preedit_attr);
1271 if (status_attr)
1272 XFree(status_attr);
1273 if (R->Input_Context == NULL) {
1274 rxvt_print_error("failed to create input context");
1275 XCloseIM(xim);
1276 return False;
1277 }
1278 if (R->input_style & XIMPreeditArea)
1279 rxvt_IMSetStatusPosition(aR);
1280 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1281 return True;
1282} 1399}
1283 1400
1284/* EXTPROTO */
1285void 1401void
1286rxvt_IMSetStatusPosition(pR) 1402rxvt_term::IMSetStatusPosition ()
1287{ 1403{
1288 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1289 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1290 1406
1291 if (R->Input_Context == NULL 1407 if (Input_Context == NULL
1292 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1293 || !rxvt_IMisRunning(aR)) 1409 || !IMisRunning ())
1294 return; 1410 return;
1295 1411
1296/* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1297 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1298 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1299 XFree(status_attr); 1415 XFree (status_attr);
1300 1416
1301 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1302 1418
1303 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1304 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1305 1421
1306 XSetICValues(R->Input_Context, 1422 XSetICValues (Input_Context,
1307 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1308 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1309 1425
1310 XFree(preedit_attr); 1426 XFree (preedit_attr);
1311 XFree(status_attr); 1427 XFree (status_attr);
1312} 1428}
1313#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1314 1430
1315/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1316rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines