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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.39 by pcg, Sat Feb 21 22:14:00 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines