ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.65 by pcg, Fri Apr 2 15:15:26 2004 UTC vs.
Revision 1.118 by root, Thu Dec 9 06:20:41 2004 UTC

1	/*--------------------------------*-C-*---------------------------------*;	1	/*--------------------------------*-C-*---------------------------------*
2	* File: main.c	2	* File: main.C
3	*----------------------------------------------------------------------*	3	*----------------------------------------------------------------------*
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
7	* - original version	7	* - original version
…		…
51	static char curlocale[128];	51	static char curlocale[128];
52		52
53	bool	53	bool
54	rxvt_set_locale (const char *locale)	54	rxvt_set_locale (const char *locale)
55	{	55	{
56	if (!locale || !STRNCMP (locale, curlocale, 128))	56	if (!locale || !strncmp (locale, curlocale, 128))
57	return false;	57	return false;
58		58
59	STRNCPY (curlocale, locale, 128);	59	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	60	setlocale (LC_CTYPE, curlocale);
61	return true;	61	return true;
62	}	62	}
63		63
64	#if ENABLE_COMBINING	64	#if ENABLE_COMBINING
…		…
123	return len;	123	return len;
124		124
125	}	125	}
126	#endif	126	#endif
127		127
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	MEMSET (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	128	rxvt_term::rxvt_term ()
144	:	129	:
		130	#if TRANSPARENT
145	rootwin_ev (this, &rxvt_term::rootwin_cb),	131	rootwin_ev (this, &rxvt_term::rootwin_cb),
		132	#endif
		133	#ifdef HAVE_SCROLLBARS
		134	scrollbar_ev (this, &rxvt_term::x_cb),
		135	#endif
		136	#ifdef MENUBAR
		137	menubar_ev (this, &rxvt_term::x_cb),
		138	#endif
		139	#ifdef CURSOR_BLINK
		140	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		141	#endif
		142	#ifdef TEXT_BLINK
		143	text_blink_ev (this, &rxvt_term::text_blink_cb),
		144	#endif
		145	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		146	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		147	#endif
		148	#ifdef SELECTION_SCROLLING
		149	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		150	#endif
		151	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		152	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		153	#endif
		154	#ifdef POINTER_BLANK
		155	pointer_ev (this, &rxvt_term::pointer_cb),
		156	#endif
		157	#ifdef USE_XIM
		158	im_ev (this, &rxvt_term::im_cb),
		159	#endif
		160	sw_term (this, &rxvt_term::sig_term),
		161	sw_chld (this, &rxvt_term::sig_chld),
146	termwin_ev (this, &rxvt_term::x_cb),	162	termwin_ev (this, &rxvt_term::x_cb),
147	vt_ev (this, &rxvt_term::x_cb),	163	vt_ev (this, &rxvt_term::x_cb),
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifdef POINTER_BLANK
161	pointer_ev (this, &rxvt_term::pointer_cb),
162	#endif
163	#ifdef USE_XIM
164	im_ev (this, &rxvt_term::im_cb),
165	#endif
166	check_ev (this, &rxvt_term::check_cb),	164	check_ev (this, &rxvt_term::check_cb),
		165	flush_ev (this, &rxvt_term::flush_cb),
167	destroy_ev (this, &rxvt_term::destroy_cb),	166	destroy_ev (this, &rxvt_term::destroy_cb),
168	pty_ev (this, &rxvt_term::pty_cb),	167	pty_ev (this, &rxvt_term::pty_cb),
169	incr_ev (this, &rxvt_term::incr_cb)	168	incr_ev (this, &rxvt_term::incr_cb)
170	{	169	{
171	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	170	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
…		…
175		174
176	rxvt_term::~rxvt_term ()	175	rxvt_term::~rxvt_term ()
177	{	176	{
178	termlist.erase (find (termlist.begin (), termlist.end(), this));	177	termlist.erase (find (termlist.begin (), termlist.end(), this));
179		178
180	if (cmd_fd >= 0)	179	if (cmd_pid)
181	close (cmd_fd);	180	kill (-cmd_pid, SIGHUP);
182		181
183	#ifndef NO_SETOWNER_TTYDEV	182	pty.put ();
184	privileged_ttydev (RESTORE);	183
185	#endif
186	#ifdef UTMP_SUPPORT	184	#ifdef UTMP_SUPPORT
187	privileged_utmp (RESTORE);	185	privileged_utmp (RESTORE);
188	#endif	186	#endif
189		187
		188	#if ENABLE_STYLES
		189	for (int i = RS_styleCount; --i; )
		190	if (TermWin.fontset[i] != TermWin.fontset[0])
		191	delete TermWin.fontset[i];
		192	#endif
190	delete TermWin.fontset;	193	delete TermWin.fontset[0];
191		194
192	if (display)	195	if (display)
193	{	196	{
194	selection_clear ();	197	selection_clear ();
195		198
		199	#ifdef USE_XIM
		200	im_destroy ();
		201	#endif
196	#ifdef MENUBAR	202	#ifdef MENUBAR
197	if (menubarGC) XFreeGC (display->display, menubarGC);	203	if (menubarGC) XFreeGC (display->display, menubarGC);
198	#endif	204	#endif
199	#ifdef XTERM_SCROLLBAR	205	#ifdef XTERM_SCROLLBAR
200	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	206	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201	if (ShadowGC) XFreeGC (display->display, ShadowGC);	207	if (ShadowGC) XFreeGC (display->display, ShadowGC);
202	#endif	208	#endif
…		…
233	XDestroyWindow (display->display, TermWin.parent[0]);	239	XDestroyWindow (display->display, TermWin.parent[0]);
234	}	240	}
235		241
236	// TODO: free pixcolours, colours should become part of rxvt_display	242	// TODO: free pixcolours, colours should become part of rxvt_display
237		243
238	delete PixColors;	244	delete pix_colors_focused;
		245	#ifdef OFF_FOCUS_FADING
		246	delete pix_colors_unfocused;
		247	#endif
239		248
240	displays.put (display);	249	displays.put (display);
241		250
242	scr_release ();	251	scr_release ();
243		252
…		…
261	}	270	}
262		271
263	void	272	void
264	rxvt_term::destroy ()	273	rxvt_term::destroy ()
265	{	274	{
		275	if (destroy_ev.active)
		276	return;
		277
		278	#if ENABLE_OVERLAY
		279	scr_overlay_off ();
		280	#endif
		281
266	if (display)	282	if (display)
267	{	283	{
		284	#if USE_XIM
		285	im_ev.stop (display);
		286	#endif
		287	#if HAVE_SCROLLBARS
		288	scrollbar_ev.stop (display);
		289	#endif
		290	#if MENUBAR
		291	menubar_ev.stop (display);
		292	#endif
		293	#if TRANSPARENT
268	rootwin_ev.stop (display);	294	rootwin_ev.stop (display);
		295	#endif
		296	incr_ev.stop ();
269	termwin_ev.stop (display);	297	termwin_ev.stop (display);
270	vt_ev.stop (display);	298	vt_ev.stop (display);
271	#ifdef USE_XIM
272	im_destroy ();
273	im_ev.stop (display);
274	#endif
275	#ifdef HAVE_SCROLLBARS
276	scrollbar_ev.stop (display);
277	#endif
278	#ifdef MENUBAR
279	menubar_ev.stop (display);
280	#endif
281	}	299	}
282		300
283	check_ev.stop ();	301	check_ev.stop ();
284	pty_ev.stop ();	302	pty_ev.stop ();
285	#ifdef CURSOR_BLINK	303	#ifdef CURSOR_BLINK
286	cursor_blink_ev.stop ();	304	cursor_blink_ev.stop ();
287	#endif	305	#endif
288	#ifdef TEXT_BLINK	306	#ifdef TEXT_BLINK
289	text_blink_ev.stop ();	307	text_blink_ev.stop ();
290	#endif	308	#endif
		309	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		310	cont_scroll_ev.stop ();
		311	#endif
		312	#ifdef SELECTION_SCROLLING
		313	sel_scroll_ev.stop ();
		314	#endif
291	#ifdef POINTER_BLANK	315	#ifdef POINTER_BLANK
292	pointer_ev.stop ();	316	pointer_ev.stop ();
293	#endif	317	#endif
294		318
295	destroy_ev.start (0);	319	destroy_ev.start (0);
…		…
311	SET_R (this);	335	SET_R (this);
312		336
313	if (!init_vars ())	337	if (!init_vars ())
314	return false;	338	return false;
315		339
		340	init_secondary ();
		341
		342	const char **cmd_argv = init_resources (argc, argv);
		343
		344	set_locale ("");
		345
		346	#if MENUBAR_MAX
		347	menubar_read (rs[Rs_menu]);
		348	#endif
		349	#ifdef HAVE_SCROLLBARS
		350	if (options & Opt_scrollBar)
		351	scrollBar.setIdle (); /* set existence for size calculations */
		352	#endif
		353
		354	create_windows (argc, argv);
		355
		356	init_xlocale ();
		357
		358	scr_reset (); /* initialize screen */
		359
		360	#if 0
		361	XSynchronize (display->display, True);
		362	#endif
		363
		364	#ifdef HAVE_SCROLLBARS
		365	if (options & Opt_scrollBar)
		366	resize_scrollbar (); /* create and map scrollbar */
		367	#endif
		368	#if (MENUBAR_MAX)
		369	if (menubar_visible ())
		370	XMapWindow (display->display, menuBar.win);
		371	#endif
		372	#ifdef TRANSPARENT
		373	if (options & Opt_transparent)
		374	{
		375	XSelectInput (display->display, display->root, PropertyChangeMask);
		376	check_our_parents ();
		377	rootwin_ev.start (display, display->root);
		378	}
		379	#endif
		380
		381	XMapWindow (display->display, TermWin.vt);
		382	XMapWindow (display->display, TermWin.parent[0]);
		383
		384	set_colorfgbg ();
		385
		386	init_command (cmd_argv);
		387
		388	pty_ev.start (pty.pty, EVENT_READ);
		389
		390	check_ev.start ();
		391
		392	return true;
		393	}
		394
		395	static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
		396
		397	void
		398	rxvt_init ()
		399	{
316	/*	400	/*
317	* Save and then give up any super-user privileges	401	* Save and then give up any super-user privileges
318	* If we need privileges in any area then we must specifically request it.	402	* If we need privileges in any area then we must specifically request it.
319	* We should only need to be root in these cases:	403	* We should only need to be root in these cases:
320	* 1. write utmp entries on some systems	404	* 1. write utmp entries on some systems
321	* 2. chown tty on some systems	405	* 2. chown tty on some systems
322	*/	406	*/
323	privileges (SAVE);	407	rxvt_privileges (SAVE);
324	privileges (IGNORE);	408	rxvt_privileges (IGNORE);
325		409
326	init_secondary ();	410	signal (SIGHUP, SIG_IGN);
327		411	signal (SIGPIPE, SIG_IGN);
328	const char **cmd_argv = init_resources (argc, argv);
329
330	set_locale ("");
331
332	#if MENUBAR_MAX
333	menubar_read (rs[Rs_menu]);
334	#endif
335	#ifdef HAVE_SCROLLBARS
336	if (Options & Opt_scrollBar)
337	scrollBar.setIdle (); /* set existence for size calculations */
338	#endif
339
340	create_windows (argc, argv);
341
342	init_xlocale ();
343
344	scr_reset (); /* initialize screen */
345
346	#if 0
347	XSynchronize (display->display, True);
348	#endif
349
350	#ifdef HAVE_SCROLLBARS
351	if (Options & Opt_scrollBar)
352	resize_scrollbar (); /* create and map scrollbar */
353	#endif
354	#if (MENUBAR_MAX)
355	if (menubar_visible ())
356	XMapWindow (display->display, menuBar.win);
357	#endif
358	#ifdef TRANSPARENT
359	if (Options & Opt_transparent)
360	{
361	XSelectInput (display->display, display->root, PropertyChangeMask);
362	check_our_parents ();
363	}
364	#endif
365
366	rootwin_ev.start (display, display->root);
367
368	XMapWindow (display->display, TermWin.vt);
369	XMapWindow (display->display, TermWin.parent[0]);
370
371	init_command (cmd_argv);
372
373	pty_ev.start (cmd_fd, EVENT_READ);
374
375	check_ev.start ();
376
377	return true;
378	}
379
380	static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382	void
383	rxvt_init_signals ()
384	{
385	/* install exit handler for cleanup */
386	#if 0
387	#ifdef HAVE_ATEXIT
388	atexit (rxvt_clean_exit);
389	#else
390	#endif
391	#endif
392
393	struct sigaction sa;
394
395	sigfillset (&sa.sa_mask);
396	sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
397	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
398	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
399	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
400	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
401	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
402	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
403		412
404	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	413	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
405	/* signal (SIGURG, SIG_DFL); */	414	/* signal (SIGURG, SIG_DFL); */
406		415
407	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	416	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
		417	// TODO: handle this with exceptions and tolerate the memory loss
408	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);	418	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
409	}	419	}
410		420
411	/* ------------------------------------------------------------------------- *	421	/* ------------------------------------------------------------------------- *
412	* SIGNAL HANDLING & EXIT HANDLER *	422	* SIGNAL HANDLING & EXIT HANDLER *
413	* ------------------------------------------------------------------------- */	423	* ------------------------------------------------------------------------- */
414	/*	424	/*
415	* Catch a SIGCHLD signal and exit if the direct child has died	425	* Catch a SIGCHLD signal and exit if the direct child has died
416	*/	426	*/
417		427
418	void rxvt_term::child_exited (int pid)	428	void
		429	rxvt_term::sig_chld (sig_watcher &w)
419	{	430	{
420	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	431	// we are being called for every SIGCHLD, not just ours
421	if (pid == (*t)->cmd_pid)	432	int pid;
422	{
423	(*t)->destroy ();
424	break;
425	}
426	}
427
428	/* ARGSUSED */
429	/* EXTPROTO */
430	RETSIGTYPE
431	rxvt_Child_signal (int sig __attribute__ ((unused)))
432	{
433	int pid, save_errno = errno;
434		433
435	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	434	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
436	rxvt_term::child_exited (pid);	435	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
437		436	if (pid == (*t)->cmd_pid)
438	errno = save_errno;	437	{
439	}	438	(*t)->destroy ();
440		439	break;
441	/*	440	}
442	* Catch a fatal signal and tidy up before quitting
443	*/
444	/* EXTPROTO */
445	RETSIGTYPE
446	rxvt_Exit_signal (int sig)
447	{
448	signal (sig, SIG_DFL);
449	#ifdef DEBUG_CMD
450	rxvt_warn ("caught signal %d, exiting.\n", sig);
451	#endif
452	rxvt_clean_exit ();
453	kill (getpid (), sig);
454	}
455
456	/* INTPROTO */
457	int
458	rxvt_xerror_handler (Display *display, XErrorEvent *event)
459	{
460	if (GET_R->allowedxerror == -1)
461	GET_R->allowedxerror = event->error_code;
462	else
463	{
464	old_xerror_handler (display, event);
465	GET_R->destroy ();
466	}
467
468	return 0;
469	}	441	}
470		442
471	/*----------------------------------------------------------------------*/	443	/*----------------------------------------------------------------------*/
472	/*	444	/*
473	* Exit gracefully, clearing the utmp entry and restoring tty attributes	445	* Exit gracefully, clearing the utmp entry and restoring tty attributes
474	* TODO: if debugging, this should free up any known resources if we can	446	* TODO: if debugging, this should free up any known resources if we can
475	*/	447	*/
476	/* EXTPROTO */
477	void	448	void
478	rxvt_clean_exit ()	449	rxvt_destroy_all ()
479	{	450	{
480	// TODO: rxvtd should clean up all ressources	451	// TODO: rxvtd should clean up all ressources
481	if (GET_R)	452	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		453	(*t)->destroy ();
		454	}
		455
		456	/*
		457	* Catch a fatal signal and tidy up before quitting
		458	*/
		459	void
		460	rxvt_term::sig_term (sig_watcher &w)
		461	{
		462	#ifdef DEBUG_CMD
		463	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		464	#endif
		465	rxvt_destroy_all ();
		466	signal (w.signum, SIG_DFL);
		467	kill (getpid (), w.signum);
		468	}
		469
		470	/* INTPROTO */
		471	int
		472	rxvt_xerror_handler (Display *display, XErrorEvent *event)
		473	{
		474	if (GET_R->allowedxerror == -1)
		475	GET_R->allowedxerror = event->error_code;
		476	else
		477	{
		478	old_xerror_handler (display, event);
482	GET_R->destroy ();	479	GET_R->destroy ();
		480	}
		481
		482	return 0;
483	}	483	}
484		484
485	/* ------------------------------------------------------------------------- *	485	/* ------------------------------------------------------------------------- *
486	* MEMORY ALLOCATION WRAPPERS *	486	* MEMORY ALLOCATION WRAPPERS *
487	* ------------------------------------------------------------------------- */	487	* ------------------------------------------------------------------------- */
488	/* EXTPROTO */	488	void *
489	void *
490	rxvt_malloc (size_t size)	489	rxvt_malloc (size_t size)
491	{	490	{
492	void *p;
493
494	p = malloc (size);	491	void *p = malloc (size);
		492
495	if (p)	493	if (!p)
		494	rxvt_fatal ("memory allocation failure. aborting.\n");
		495
496	return p;	496	return p;
497
498	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
499	rxvt_clean_exit ();
500	exit (EXIT_FAILURE);
501	/* NOTREACHED */
502	}	497	}
503		498
504	/* EXTPROTO */	499	/* INTPROTO */
505	void *	500	void *
506	rxvt_calloc (size_t number, size_t size)	501	rxvt_calloc (size_t number, size_t size)
507	{	502	{
508	void *p;
509
510	p = calloc (number, size);	503	void *p = calloc (number, size);
		504
511	if (p)	505	if (!p)
		506	rxvt_fatal ("memory allocation failure. aborting.\n");
		507
512	return p;	508	return p;
513
514	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
515	rxvt_clean_exit ();
516	exit (EXIT_FAILURE);
517	/* NOTREACHED */
518	}	509	}
519		510
520	/* EXTPROTO */	511	/* INTPROTO */
521	void *	512	void *
522	rxvt_realloc (void *ptr, size_t size)	513	rxvt_realloc (void *ptr, size_t size)
523	{	514	{
524	void *p;
525
526	if (ptr)
527	p = realloc (ptr, size);	515	void *p = realloc (ptr, size);
528	else	516
529	p = malloc (size);
530	if (p)	517	if (!p)
		518	rxvt_fatal ("memory allocation failure. aborting.\n");
		519
531	return p;	520	return p;
532
533	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
534	rxvt_clean_exit ();
535	exit (EXIT_FAILURE);
536	/* NOTREACHED */
537	}	521	}
538		522
539	/* ------------------------------------------------------------------------- *	523	/* ------------------------------------------------------------------------- *
540	* PRIVILEGED OPERATIONS *	524	* PRIVILEGED OPERATIONS *
541	* ------------------------------------------------------------------------- */	525	* ------------------------------------------------------------------------- */
542	/* take care of suid/sgid super-user (root) privileges */	526	/* take care of suid/sgid super-user (root) privileges */
543	void	527	void
544	rxvt_term::privileges (int mode)	528	rxvt_privileges (rxvt_privaction action)
545	{	529	{
		530	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		531	static uid_t euid;
		532	static gid_t egid;
		533	#endif
		534
546	#if ! defined(__CYGWIN32__)	535	#if ! defined(__CYGWIN32__)
547	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	536	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
548	/* setreuid () is the poor man's setuid (), seteuid () */	537	/* setreuid () is the poor man's setuid (), seteuid () */
549	# define seteuid(a) setreuid(-1, (a))	538	# define seteuid(a) setreuid(-1, (a))
550	# define setegid(a) setregid(-1, (a))	539	# define setegid(a) setregid(-1, (a))
551	# define HAVE_SETEUID	540	# define HAVE_SETEUID
552	# endif	541	# endif
553	# ifdef HAVE_SETEUID	542	# ifdef HAVE_SETEUID
554	switch (mode)	543	switch (action)
555	{	544	{
556	case IGNORE:	545	case IGNORE:
557	/*	546	/*
558	* change effective uid/gid - not real uid/gid - so we can switch	547	* change effective uid/gid - not real uid/gid - so we can switch
559	* back to root later, as required	548	* back to root later, as required
…		…
569	seteuid (euid);	558	seteuid (euid);
570	setegid (egid);	559	setegid (egid);
571	break;	560	break;
572	}	561	}
573	# else	562	# else
574	switch (mode)	563	switch (action)
575	{	564	{
576	case IGNORE:	565	case IGNORE:
577	setuid (getuid ());	566	setuid (getuid ());
578	setgid (getgid ());	567	setgid (getgid ());
579	/* FALLTHROUGH */	568	/* FALLTHROUGH */
…		…
586	#endif	575	#endif
587	}	576	}
588		577
589	#ifdef UTMP_SUPPORT	578	#ifdef UTMP_SUPPORT
590	void	579	void
591	rxvt_term::privileged_utmp (char action)	580	rxvt_term::privileged_utmp (rxvt_privaction action)
592	{	581	{
593	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
594	action, next_utmp_action, getpid ()));
595	if (next_utmp_action != action || (action != SAVE && action != RESTORE)
596	|| (Options & Opt_utmpInhibit)	582	if ((options & Opt_utmpInhibit)
597	|| ttydev == NULL || *ttydev == '\0')	583	|| !pty.name || !*pty.name)
598	return;	584	return;
599		585
600	privileges (RESTORE);	586	rxvt_privileges (RESTORE);
		587
601	if (action == SAVE)	588	if (action == SAVE)
602	{
603	next_utmp_action = RESTORE;
604	makeutent (ttydev, rs[Rs_display_name]);	589	makeutent (pty.name, rs[Rs_display_name]);
605	}
606	else	590	else
607	{ /* action == RESTORE */
608	next_utmp_action = IGNORE;
609	cleanutent ();	591	cleanutent ();
610	}	592
611	privileges (IGNORE);	593	rxvt_privileges (IGNORE);
612	}
613	#endif
614
615	#ifndef NO_SETOWNER_TTYDEV
616	void
617	rxvt_term::privileged_ttydev (char action)
618	{
619	D_MAIN ((stderr,
620	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
621	action, next_tty_action, getpid ()));
622	if (next_tty_action != action || (action != SAVE && action != RESTORE)
623	|| ttydev == NULL || *ttydev == '\0')
624	return;
625
626	privileges (RESTORE);
627
628	if (action == SAVE)
629	{
630	next_tty_action = RESTORE;
631	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
632	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
633	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
634	next_tty_action = IGNORE;
635	else
636	# endif
637
638	{
639	chown (ttydev, getuid (), ttygid); /* fail silently */
640	chmod (ttydev, ttymode);
641	# ifdef HAVE_REVOKE
642	revoke (ttydev);
643	# endif
644
645	}
646	}
647	else
648	{ /* action == RESTORE */
649	next_tty_action = IGNORE;
650	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651	chmod (ttydev, ttyfd_stat.st_mode);
652	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
653	# else
654	chmod (ttydev,
655	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
656	chown (ttydev, 0, 0);
657	# endif
658
659	}
660
661	privileges (IGNORE);
662
663	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
664	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
665	action == RESTORE ? "Restoring" : (action ==
666	SAVE ? "Saving" :
667	"UNKNOWN ERROR for"), ttydev,
668	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
669	ttyfd_stat.st_gid));
670	# endif
671	}	594	}
672	#endif	595	#endif
673		596
674	/*----------------------------------------------------------------------*/	597	/*----------------------------------------------------------------------*/
675	/*	598	/*
…		…
740	max_height = MAX_ROWS * TermWin.fheight;	663	max_height = MAX_ROWS * TermWin.fheight;
741		664
742	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	665	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
743		666
744	sb_w = mb_h = 0;	667	sb_w = mb_h = 0;
745	window_vt_x = window_vt_y = 0;	668	window_vt_x = window_vt_y = TermWin.int_bwidth;
		669
746	if (scrollbar_visible ())	670	if (scrollbar_visible ())
747	{	671	{
748	sb_w = scrollbar_TotalWidth ();	672	sb_w = scrollbar_TotalWidth ();
749	szHint.base_width += sb_w;	673	szHint.base_width += sb_w;
750	if (! (Options & Opt_scrollBar_right))	674	if (!(options & Opt_scrollBar_right))
751	window_vt_x = sb_w;	675	window_vt_x += sb_w;
752	}	676	}
		677
753	if (menubar_visible ())	678	if (menubar_visible ())
754	{	679	{
755	mb_h = menuBar_TotalHeight ();	680	mb_h = menuBar_TotalHeight ();
756	szHint.base_height += mb_h;	681	szHint.base_height += mb_h;
757	window_vt_y = mb_h;	682	window_vt_y += mb_h;
758	}	683	}
		684
759	szHint.width_inc = TermWin.fwidth;	685	szHint.width_inc = TermWin.fwidth;
760	szHint.height_inc = TermWin.fheight;	686	szHint.height_inc = TermWin.fheight;
761	szHint.min_width = szHint.base_width + szHint.width_inc;	687	szHint.min_width = szHint.base_width + szHint.width_inc;
762	szHint.min_height = szHint.base_height + szHint.height_inc;	688	szHint.min_height = szHint.base_height + szHint.height_inc;
763		689
…		…
769	else	695	else
770	{	696	{
771	MIN_IT (TermWin.width, max_width);	697	MIN_IT (TermWin.width, max_width);
772	szHint.width = szHint.base_width + TermWin.width;	698	szHint.width = szHint.base_width + TermWin.width;
773	}	699	}
		700
774	if (height && height - szHint.base_height < max_height)	701	if (height && height - szHint.base_height < max_height)
775	{	702	{
776	szHint.height = height;	703	szHint.height = height;
777	TermWin.height = height - szHint.base_height;	704	TermWin.height = height - szHint.base_height;
778	}	705	}
779	else	706	else
780	{	707	{
781	MIN_IT (TermWin.height, max_height);	708	MIN_IT (TermWin.height, max_height);
782	szHint.height = szHint.base_height + TermWin.height;	709	szHint.height = szHint.base_height + TermWin.height;
783	}	710	}
		711
784	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	712	if (scrollbar_visible () && (options & Opt_scrollBar_right))
785	window_sb_x = szHint.width - sb_w;	713	window_sb_x = szHint.width - sb_w;
786		714
787	if (recalc_x)	715	if (recalc_x)
788	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	716	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
789	- szHint.width - 2 * TermWin.ext_bwidth);	717	- szHint.width - 2 * TermWin.ext_bwidth);
…		…
805	* Called after a window size change.	733	* Called after a window size change.
806	*/	734	*/
807	void	735	void
808	rxvt_term::tt_winch ()	736	rxvt_term::tt_winch ()
809	{	737	{
		738	if (pty.pty < 0)
		739	return;
		740
810	struct winsize ws;	741	struct winsize ws;
811
812	if (cmd_fd < 0)
813	return;
814		742
815	ws.ws_col = TermWin.ncol;	743	ws.ws_col = TermWin.ncol;
816	ws.ws_row = TermWin.nrow;	744	ws.ws_row = TermWin.nrow;
817	ws.ws_xpixel = ws.ws_ypixel = 0;	745	ws.ws_xpixel = TermWin.width;
818	#ifndef DEBUG_SIZE	746	ws.ws_ypixel = TermWin.height;
819	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	747	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
820	#else	748
821	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	749	#if 0
822	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	750	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
823	# ifdef SIGWINCH
824	else if (cmd_pid) /* force through to the command */	751	if (cmd_pid) /* force through to the command */
825	kill (cmd_pid, SIGWINCH);	752	kill (cmd_pid, SIGWINCH);
826	# endif
827	#endif	753	#endif
828	}	754	}
829		755
830	/*----------------------------------------------------------------------*/	756	/*----------------------------------------------------------------------*/
831	/* rxvt_change_font () - Switch to a new font */	757	/* set_fonts () - load and set the various fonts
832	/*	758	/*
833	* init = 1 - initialize	759	* init = 1 - initialize
834	*	760	*
835	* fontname == FONT_UP - switch to bigger font	761	* fontname == FONT_UP - switch to bigger font
836	* fontname == FONT_DN - switch to smaller font	762	* fontname == FONT_DN - switch to smaller font
837	*/	763	*/
838	bool	764	bool
839	rxvt_term::change_font (const char *fontname)	765	rxvt_term::set_fonts ()
840	{	766	{
841	if (fontname == FONT_UP)
842	{
843	// TODO
844	}
845	else if (fontname == FONT_DN)
846	{
847	// TODO
848	}
849	else
850	{
851	rxvt_fontset *fs = new rxvt_fontset (this);	767	rxvt_fontset *fs = new rxvt_fontset (this);
		768	rxvt_fontprop prop;
852		769
853	if (fs && fs->populate (fontname ? fontname : "fixed"))	770	if (!fs
		771	|| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
		772	|| !fs->realize_font (1))
		773	{
		774	delete fs;
		775	return false;
		776	}
		777
		778	#if ENABLE_STYLES
		779	for (int i = RS_styleCount; --i; )
		780	if (TermWin.fontset[i] != TermWin.fontset[0])
		781	delete TermWin.fontset[i];
		782	#endif
		783
		784	delete TermWin.fontset[0];
		785	TermWin.fontset[0] = fs;
		786
		787	prop = (*fs)[1]->properties ();
		788	fs->set_prop (prop);
		789
		790	TermWin.fwidth = prop.width;
		791	TermWin.fheight = prop.height;
		792	TermWin.fweight = prop.weight;
		793	TermWin.fslant = prop.slant;
		794	TermWin.fbase = (*fs)[1]->ascent;
		795
		796	for (int style = 1; style < 4; style++)
		797	{
		798	#if ENABLE_STYLES
		799	const char *res = rs[Rs_font + style];
		800
		801	if (res && !*res)
		802	TermWin.fontset[style] = TermWin.fontset[0];
		803	else
854	{	804	{
855	delete TermWin.fontset;	805	TermWin.fontset[style] = fs = new rxvt_fontset (this);
856	TermWin.fontset = fs;	806	rxvt_fontprop prop2 = prop;
857	TermWin.fwidth = fs->base_font ()->width;
858	TermWin.fheight = fs->base_font ()->height;
859	TermWin.fbase = fs->base_font ()->ascent;
860		807
861	if (TermWin.parent[0])	808	if (res)
		809	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		810	else
862	{	811	{
863	resize_all_windows (0, 0, 0);	812	res = TermWin.fontset[0]->fontdesc;
864	scr_remap_chars ();	813
865	scr_touch (true);	814	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		815	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
866	}	816	}
867		817
868	return true;	818	fs->populate (res);
		819	fs->set_prop (prop2);
869	}	820	}
		821	#else
		822	TermWin.fontset[style] = TermWin.fontset[0];
		823	#endif
		824	}
		825
		826	if (TermWin.parent[0])
870	}	827	{
		828	resize_all_windows (0, 0, 0);
		829	scr_remap_chars ();
		830	scr_touch (true);
		831	}
871		832
872	return false;	833	return true;
873	}	834	}
874		835
875	bool	836	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
876	rxvt_term::font_up_down (int n, int direction)
877	{	837	{
878	return false;	838	// TODO: SMART_WINDOW_TITLE
		839	XChangeProperty (display->display, TermWin.parent[0],
		840	prop, XA_STRING, 8, PropModeReplace,
		841	(const unsigned char *)str, len >= 0 ? len : strlen (str));
		842	}
		843
		844	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
		845	{
		846	// TODO: SMART_WINDOW_TITLE
		847	wchar_t *ws = rxvt_mbstowcs (str, len);
		848	char *s = rxvt_wcstoutf8 (ws);
		849
		850	XChangeProperty (display->display, TermWin.parent[0],
		851	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
		852	(const unsigned char *)s, strlen (s));
		853
		854	free (s);
		855	free (ws);
879	}	856	}
880		857
881	/*----------------------------------------------------------------------*/	858	/*----------------------------------------------------------------------*/
882	/*----------------------------------------------------------------------*/	859	/*----------------------------------------------------------------------*/
883	/* xterm sequences - title, iconName, color (exptl) */	860	/* xterm sequences - title, iconName, color (exptl) */
884	void	861	void
885	rxvt_term::set_title (const char *str)	862	rxvt_term::set_title (const char *str)
886	{	863	{
887	#ifdef SMART_WINDOW_TITLE	864	set_string_property (XA_WM_NAME, str);
888	char *name;	865	#if ENABLE_FRILLS
889		866	set_utf8_property (display->atom ("_NET_WM_NAME"), str);
890	if (!XFetchName (display->display, TermWin.parent[0], &name))
891	name = NULL;
892
893	if (name == NULL || STRCMP (name, str))
894	#endif
895	XStoreName (display->display, TermWin.parent[0], str);
896
897	#ifdef SMART_WINDOW_TITLE
898	if (name)
899	XFree (name);
900	#endif	867	#endif
901	}	868	}
902		869
903	void	870	void
904	rxvt_term::set_icon_name (const char *str)	871	rxvt_term::set_icon_name (const char *str)
905	{	872	{
906	#ifdef SMART_WINDOW_TITLE	873	set_string_property (XA_WM_ICON_NAME, str);
907	char *name;	874	#if ENABLE_FRILLS
908		875	set_utf8_property (display->atom ("_NET_WM_ICON_NAME"), str);
909	if (!XGetIconName (display->display, TermWin.parent[0], &name))
910	name = NULL;
911
912	if (name == NULL || STRCMP (name, str))
913	#endif
914	XSetIconName (display->display, TermWin.parent[0], str);
915
916	#ifdef SMART_WINDOW_TITLE
917	if (name)
918	XFree (name);
919	#endif	876	#endif
920	}	877	}
921		878
922	#ifdef XTERM_COLOR_CHANGE	879	#ifdef XTERM_COLOR_CHANGE
923	void	880	void
…		…
935	i = atoi (color);	892	i = atoi (color);
936	if (i >= 8 && i <= 15)	893	if (i >= 8 && i <= 15)
937	{ /* bright colors */	894	{ /* bright colors */
938	i -= 8;	895	i -= 8;
939	# ifndef NO_BRIGHTCOLOR	896	# ifndef NO_BRIGHTCOLOR
940	PixColors[idx] = PixColors[minBrightCOLOR + i];	897	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
941	SET_PIXCOLOR (idx);	898	SET_PIXCOLOR (idx);
942	goto Done;	899	goto Done;
943	# endif	900	# endif
944		901
945	}	902	}
946	if (i >= 0 && i <= 7)	903	if (i >= 0 && i <= 7)
947	{ /* normal colors */	904	{ /* normal colors */
948	PixColors[idx] = PixColors[minCOLOR + i];	905	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
949	SET_PIXCOLOR (idx);	906	SET_PIXCOLOR (idx);
950	goto Done;	907	goto Done;
951	}	908	}
952	}	909	}
953		910
954	if (!rXParseAllocColor (& xcol, color))	911	if (!rXParseAllocColor (& xcol, color))
955	return;	912	return;
956		913
957	/* XStoreColor (display->display, XCMAP, XColor*); */	914	/* XStoreColor (display->display, display->cmap, XColor*); */
958		915
959	/*	916	/*
960	* FIXME: should free colors here, but no idea how to do it so instead,	917	* FIXME: should free colors here, but no idea how to do it so instead,
961	* so just keep gobbling up the colormap	918	* so just keep gobbling up the colormap
962	*/	919	*/
963	# if 0	920	# if 0
964	for (i = Color_Black; i <= Color_White; i++)	921	for (i = Color_Black; i <= Color_White; i++)
965	if (PixColors[idx] == PixColors[i])	922	if (pix_colors[idx] == pix_colors[i])
966	break;	923	break;
967	if (i > Color_White)	924	if (i > Color_White)
968	{	925	{
969	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	926	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
970	XFreeColors (display->display, XCMAP, (PixColors + idx), 1,	927	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
971	DisplayPlanes (display->display, display->screen));	928	DisplayPlanes (display->display, display->screen));
972	}	929	}
973	# endif	930	# endif
974		931
975	PixColors[idx] = xcol;	932	pix_colors_focused[idx] = xcol;
976	SET_PIXCOLOR (idx);	933	SET_PIXCOLOR (idx);
977		934
978	/* XSetWindowAttributes attr; */	935	/* XSetWindowAttributes attr; */
979	/* Cursor cursor; */	936	/* Cursor cursor; */
980	Done:	937	Done:
981	if (idx == Color_bg && ! (Options & Opt_transparent))	938	#ifdef OFF_FOCUS_FADING
982	XSetWindowBackground (display->display, TermWin.vt,	939	if (rs[Rs_fade])
983	PixColors[Color_bg]);	940	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
		941	#endif
984		942
985	/* handle Color_BD, scrollbar background, etc. */	943	/*TODO: handle Color_BD, scrollbar background, etc. */
986		944
987	set_colorfgbg ();
988	recolour_cursor ();	945	recolour_cursor ();
989	scr_touch (true);	946	scr_recolour ();
990	}	947	}
991		948
992	#else	949	#else
993	# define set_window_color (idx,color) ((void)0)	950	# define set_window_color (idx,color) ((void)0)
994	#endif /* XTERM_COLOR_CHANGE */	951	#endif /* XTERM_COLOR_CHANGE */
…		…
996	void	953	void
997	rxvt_term::recolour_cursor ()	954	rxvt_term::recolour_cursor ()
998	{	955	{
999	XColor xcol[2];	956	XColor xcol[2];
1000		957
1001	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];	958	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1002	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];	959	? pix_colors_focused[Color_pointer_fg]
		960	: pix_colors_focused[Color_fg];
		961	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		962	? pix_colors_focused[Color_pointer_bg]
		963	: pix_colors_focused[Color_bg];
		964
1003	XQueryColors (display->display, XCMAP, xcol, 2);	965	XQueryColors (display->display, display->cmap, xcol, 2);
1004	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	966	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1005	}	967	}
1006		968
1007	/*----------------------------------------------------------------------*/	969	/*----------------------------------------------------------------------*/
1008	/*	970	/*
1009	* find if fg/bg matches any of the normal (low-intensity) colors	971	* find if fg/bg matches any of the normal (low-intensity) colors
1010	*/	972	*/
1011	void	973	void
1012	rxvt_term::set_colorfgbg ()	974	rxvt_term::set_colorfgbg ()
1013	{	975	{
1014	unsigned int i;	976	unsigned int i;
1015	const char *xpmb = "\0";	977	const char *xpmb = "\0";
1016	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	978	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1017		979
1018	env_colorfgbg =
1019	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	980	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020	STRCPY (fstr, "default");	981	strcpy (fstr, "default");
1021	STRCPY (bstr, "default");	982	strcpy (bstr, "default");
1022	for (i = Color_Black; i <= Color_White; i++)	983	for (i = Color_Black; i <= Color_White; i++)
1023	if (PixColors[Color_fg] == PixColors[i])	984	if (pix_colors[Color_fg] == pix_colors[i])
1024	{	985	{
1025	sprintf (fstr, "%d", (i - Color_Black));	986	sprintf (fstr, "%d", (i - Color_Black));
1026	break;	987	break;
1027	}	988	}
		989
1028	for (i = Color_Black; i <= Color_White; i++)	990	for (i = Color_Black; i <= Color_White; i++)
1029	if (PixColors[Color_bg] == PixColors[i])	991	if (pix_colors[Color_bg] == pix_colors[i])
1030	{	992	{
1031	sprintf (bstr, "%d", (i - Color_Black));	993	sprintf (bstr, "%d", (i - Color_Black));
1032	#ifdef XPM_BACKGROUND	994	#ifdef XPM_BACKGROUND
1033	xpmb = "default;";	995	xpmb = "default;";
1034	#endif	996	#endif
1035	break;	997	break;
1036	}	998	}
1037		999
1038	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1000	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039
1040	#ifndef NO_BRIGHTCOLOR
1041	colorfgbg = DEFAULT_RSTYLE;
1042	for (i = minCOLOR; i <= maxCOLOR; i++)
1043	{
1044	if (PixColors[Color_fg] == PixColors[i])
1045	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1046	if (PixColors[Color_bg] == PixColors[i])
1047	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1048	}
1049	#endif
1050	}	1001	}
1051		1002
1052	/*----------------------------------------------------------------------*/	1003	/*----------------------------------------------------------------------*/
1053	/*	1004	/*
1054	* Colour determination for low colour displays, routine from	1005	* Colour determination for low colour displays, routine from
…		…
1079	int old_width = szHint.width, old_height = szHint.height;	1030	int old_width = szHint.width, old_height = szHint.height;
1080	#endif	1031	#endif
1081		1032
1082	window_calc (width, height);	1033	window_calc (width, height);
1083	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);	1034	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
		1035
1084	if (!ignoreparent)	1036	if (!ignoreparent)
1085	{	1037	{
1086	#ifdef SMART_RESIZE	1038	#ifdef SMART_RESIZE
1087	/*	1039	/*
1088	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>	1040	* resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
…		…
1123	dy /= 2;	1075	dy /= 2;
1124		1076
1125	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,	1077	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
1126	szHint.width, szHint.height);	1078	szHint.width, szHint.height);
1127	#else	1079	#else
1128	XResizeWindow (display->display, TermWin.parent[0], szHint.width,	1080	XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);
1129	szHint.height);
1130	#endif	1081	#endif
1131
1132	}	1082	}
1133		1083
1134	fix_screen = (TermWin.ncol != prev_ncol	1084	fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1135	|| TermWin.nrow != prev_nrow);
1136		1085
1137	if (fix_screen || width != old_width || height != old_height)	1086	if (fix_screen || width != old_width || height != old_height)
1138	{	1087	{
1139	if (scrollbar_visible ())	1088	if (scrollbar_visible ())
1140	{	1089	{
1141	XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,	1090	XMoveResizeWindow (display->display, scrollBar.win,
		1091	window_sb_x, 0,
1142	0, scrollbar_TotalWidth (), szHint.height);	1092	scrollbar_TotalWidth (), szHint.height);
1143	resize_scrollbar ();	1093	resize_scrollbar ();
1144	}	1094	}
1145		1095
1146	if (menubar_visible ())	1096	if (menubar_visible ())
1147	XMoveResizeWindow (display->display, menuBar.win, window_vt_x,	1097	XMoveResizeWindow (display->display, menuBar.win,
		1098	window_vt_x, 0,
1148	0, TermWin_TotalWidth (), menuBar_TotalHeight ());	1099	TermWin_TotalWidth (), menuBar_TotalHeight ());
1149		1100
1150	XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,	1101	XMoveResizeWindow (display->display, TermWin.vt,
1151	window_vt_y, TermWin_TotalWidth (),	1102	window_vt_x, window_vt_y,
1152	TermWin_TotalHeight ());	1103	TermWin_TotalWidth (), TermWin_TotalHeight ());
1153	scr_clear (height != old_height);	1104	scr_clear ();
1154	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1155	resize_pixmap ();	1106	resize_pixmap ();
1156	#endif	1107	#endif
1157
1158	}	1108	}
1159		1109
1160	if (fix_screen || old_height == 0)	1110	if (fix_screen || old_height == 0)
1161	{	1111	{
1162	int curr_screen = -1;	1112	int curr_screen = -1;
…		…
1203	if (width == 0)	1153	if (width == 0)
1204	width = wattr.width - szHint.base_width;	1154	width = wattr.width - szHint.base_width;
1205	if (height == 0)	1155	if (height == 0)
1206	height = wattr.height - szHint.base_height;	1156	height = wattr.height - szHint.base_height;
1207	}	1157	}
		1158
1208	if (width != TermWin.width || height != TermWin.height)	1159	if (width != TermWin.width || height != TermWin.height)
1209	{	1160	{
1210	width += szHint.base_width;	1161	width += szHint.base_width;
1211	height += szHint.base_height;	1162	height += szHint.base_height;
1212	resize_all_windows (width, height, 0);	1163	resize_all_windows (width, height, 0);
…		…
1217	* - X INPUT METHOD ROUTINES - *	1168	* - X INPUT METHOD ROUTINES - *
1218	* -------------------------------------------------------------------- */	1169	* -------------------------------------------------------------------- */
1219	#ifdef USE_XIM	1170	#ifdef USE_XIM
1220		1171
1221	void	1172	void
		1173	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1174	{
		1175	fg = pix_colors[Color_fg];
		1176	bg = pix_colors[Color_bg];
		1177	}
		1178
		1179	void
1222	rxvt_term::im_set_size (XRectangle *size)	1180	rxvt_term::im_set_size (XRectangle &size)
1223	{	1181	{
		1182	// the int_bwidth terms make no sense to me
1224	size->x = TermWin.int_bwidth;	1183	size.x = TermWin.int_bwidth;
1225	size->y = TermWin.int_bwidth;	1184	size.y = TermWin.int_bwidth;
1226	size->width = Width2Pixel (TermWin.ncol);	1185	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1227	size->height = Height2Pixel (TermWin.nrow);	1186	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1228	}	1187	}
1229		1188
1230	void	1189	void
1231	rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)	1190	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1191	XRectangle &status_rect,
		1192	const XRectangle &needed_rect)
1232	{	1193	{
1233	*fg = PixColors[Color_fg];	1194	preedit_rect.x = needed_rect.width;
1234	*bg = PixColors[Color_bg];	1195	preedit_rect.y = 0;
		1196	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1197	preedit_rect.height = TermWin.fheight;
		1198
		1199	status_rect.x = 0;
		1200	status_rect.y = 0;
		1201	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1202	status_rect.height = TermWin.fheight;
1235	}	1203	}
1236		1204
1237	/* Checking whether input method is running. */	1205	/* Checking whether input method is running. */
1238	bool	1206	bool
1239	rxvt_term::IMisRunning ()	1207	rxvt_term::IMisRunning ()
1240	{	1208	{
1241	char *p;	1209	char *p;
1242	Atom atom;	1210	Atom atom;
1243	Window win;	1211	Window win;
1244	char server[IMBUFSIZ];	1212	char server[IMBUFSIZ];
1245		1213
1246	/* get current locale modifier */	1214	/* get current locale modifier */
1247	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1215	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1248	{	1216	{
1249	STRCPY (server, "@server=");	1217	strcpy (server, "@server=");
1250	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1218	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1219
1251	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1220	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1252	*p = '\0';	1221	*p = '\0';
1253		1222
1254	atom = XInternAtom (display->display, server, False);	1223	atom = XInternAtom (display->display, server, False);
1255	win = XGetSelectionOwner (display->display, atom);	1224	win = XGetSelectionOwner (display->display, atom);
		1225
1256	if (win != None)	1226	if (win != None)
1257	return True;	1227	return True;
1258	}	1228	}
		1229
1259	return False;	1230	return False;
1260	}	1231	}
1261		1232
1262	void	1233	void
1263	rxvt_term::IMSendSpot ()	1234	rxvt_term::IMSendSpot ()
1264	{	1235	{
1265	XPoint spot;	1236	XPoint nspot;
1266	XVaNestedList preedit_attr;	1237	XVaNestedList preedit_attr;
1267		1238
1268	if (Input_Context == NULL	1239	if (!Input_Context
		1240	|| !TermWin.focus
1269	|| !TermWin.focus || ! (input_style & XIMPreeditPosition)	1241	|| !(input_style & XIMPreeditPosition))
1270	|| ! (event_type == KeyPress
1271	|| event_type == Expose
1272	|| event_type == NoExpose
1273	|| event_type == SelectionNotify
1274	|| event_type == ButtonRelease || event_type == FocusIn)
1275	|| !IMisRunning ())
1276	return;	1242	return;
1277		1243
1278	im_set_position (&spot);	1244	im_set_position (nspot);
		1245
		1246	if (nspot.x == spot.x && nspot.y == spot.y)
		1247	return;
		1248
		1249	spot = nspot;
1279		1250
1280	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1251	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1281	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1252	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1282	XFree (preedit_attr);	1253	XFree (preedit_attr);
1283	}	1254	}
1284		1255
1285	void	1256	void
1286	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1287	XRectangle * needed_rect)
1288	{
1289	int mbh, vtx = 0;
1290
1291	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1292	vtx = scrollbar_TotalWidth ();
1293
1294	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1295	mbh -= TermWin.lineSpace;
1296
1297	preedit_rect->x = needed_rect->width + vtx;
1298	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1299
1300	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1301	preedit_rect->height = Height2Pixel (1);
1302
1303	status_rect->x = vtx;
1304	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1305
1306	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1307	status_rect->height = Height2Pixel (1);
1308	}
1309
1310	void
1311	rxvt_term::im_destroy ()	1257	rxvt_term::im_destroy ()
1312	{	1258	{
1313	if (Input_Context)
1314	{
1315	XDestroyIC (Input_Context);
1316	Input_Context = NULL;
1317	}
1318
1319	if (input_method)	1259	if (input_method)
1320	{	1260	{
		1261	if (Input_Context && input_method->xim)
		1262	XDestroyIC (Input_Context);
		1263
1321	display->put_xim (input_method);	1264	display->put_xim (input_method);
1322	input_method = 0;	1265	input_method = 0;
1323	}	1266	}
		1267
		1268	Input_Context = 0;
1324	}	1269	}
1325		1270
1326	/*	1271	/*
1327	* Try to open a XIM with the current modifiers, then see if we can	1272	* Try to open a XIM with the current modifiers, then see if we can
1328	* open a suitable preedit type	1273	* open a suitable preedit type
1329	*/	1274	*/
1330	bool	1275	bool
1331	rxvt_term::IM_get_IC (const char *modifiers)	1276	rxvt_term::IM_get_IC (const char *modifiers)
1332	{	1277	{
1333	int i, j, found;	1278	int i, j, found;
1334	XIM xim;	1279	XIM xim;
1335	XPoint spot;	1280	XPoint spot;
1336	XRectangle rect, status_rect, needed_rect;	1281	XRectangle rect, status_rect, needed_rect;
1337	unsigned long fg, bg;	1282	unsigned long fg, bg;
1338	const char *p;	1283	const char *p;
1339	char **s;	1284	char **s;
1340	XIMStyles *xim_styles;	1285	XIMStyles *xim_styles;
1341	XVaNestedList preedit_attr, status_attr;
1342		1286
1343	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1287	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1344	return false;	1288	return false;
1345		1289
1346	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1290	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1347	input_method = display->get_xim (locale, modifiers);	1291	input_method = display->get_xim (locale, modifiers);
1348	if (input_method == NULL)	1292	if (input_method == NULL)
1349	return false;	1293	return false;
1350		1294
1351	xim = input_method->xim;	1295	xim = input_method->xim;
		1296	spot.x = spot.y = -1;
1352		1297
1353	xim_styles = NULL;	1298	xim_styles = NULL;
1354	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1299	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1355	|| !xim_styles || !xim_styles->count_styles)	1300	|| !xim_styles || !xim_styles->count_styles)
1356	{	1301	{
1357	display->put_xim (input_method);	1302	im_destroy ();
1358	return false;	1303	return false;
1359	}	1304	}
1360		1305
1361	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1306	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1307
		1308	for (int pi = 0; pi < 2; pi++)
		1309	{
		1310	p = pet[pi];
		1311
		1312	if (!p)
		1313	continue;
		1314
1362	s = rxvt_splitcommastring (p);	1315	s = rxvt_splitcommastring (p);
		1316
1363	for (i = found = 0; !found && s[i]; i++)	1317	for (i = found = 0; !found && s[i]; i++)
1364	{	1318	{
1365	if (!STRCMP (s[i], "OverTheSpot"))	1319	if (!strcmp (s[i], "OverTheSpot"))
1366	input_style = (XIMPreeditPosition | XIMStatusNothing);	1320	input_style = (XIMPreeditPosition | XIMStatusNothing);
1367	else if (!STRCMP (s[i], "OffTheSpot"))	1321	else if (!strcmp (s[i], "OffTheSpot"))
1368	input_style = (XIMPreeditArea | XIMStatusArea);	1322	input_style = (XIMPreeditArea | XIMStatusArea);
1369	else if (!STRCMP (s[i], "Root"))	1323	else if (!strcmp (s[i], "Root"))
1370	input_style = (XIMPreeditNothing | XIMStatusNothing);	1324	input_style = (XIMPreeditNothing | XIMStatusNothing);
		1325	else if (!strcmp (s[i], "None"))
		1326	input_style = (XIMPreeditNone | XIMStatusNone);
1371		1327
1372	for (j = 0; j < xim_styles->count_styles; j++)	1328	for (j = 0; j < xim_styles->count_styles; j++)
1373	if (input_style == xim_styles->supported_styles[j])	1329	if (input_style == xim_styles->supported_styles[j])
1374	{	1330	{
		1331	rxvt_freecommastring (s);
		1332
1375	found = 1;	1333	found = 1;
1376	break;	1334	goto foundpet;
		1335	}
		1336
1377	}	1337	}
1378	}
1379		1338
1380	for (i = 0; s[i]; i++)	1339	rxvt_freecommastring (s);
1381	free (s[i]);	1340	}
1382		1341
1383	free (s);	1342	foundpet:
		1343
1384	XFree (xim_styles);	1344	XFree (xim_styles);
1385		1345
1386	if (!found)	1346	if (!found)
1387	{	1347	{
1388	display->put_xim (input_method);	1348	im_destroy ();
1389	return false;	1349	return false;
1390	}	1350	}
1391		1351
1392	preedit_attr = status_attr = NULL;	1352	XFontSet fs = 0;
		1353	XVaNestedList preedit_attr = 0, status_attr = 0;
		1354
		1355	if (input_style & (XIMPreeditPosition | XIMPreeditArea))
		1356	{
		1357	// fake us a font-set, please
		1358	char **missing_charset_list;
		1359	int missing_charset_count;
		1360	char *def_string;
		1361	char pat[512];
		1362
		1363	sprintf (pat,
		1364	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1365	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1366	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1367	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1368	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1369	"*",
		1370	TermWin.fheight,
		1371	TermWin.fheight + 1, TermWin.fheight - 1,
		1372	TermWin.fheight - 2, TermWin.fheight + 2);
		1373
		1374	fs = XCreateFontSet (display->display, pat,
		1375	&missing_charset_list, &missing_charset_count, &def_string);
		1376
		1377	if (missing_charset_list)
		1378	XFreeStringList (missing_charset_list);
		1379
		1380	if (!fs)
		1381	{
		1382	input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
		1383	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1384	}
		1385	}
1393		1386
1394	if (input_style & XIMPreeditPosition)	1387	if (input_style & XIMPreeditPosition)
1395	{	1388	{
1396	im_set_size (&rect);	1389	im_set_size (rect);
1397	im_set_position (&spot);	1390	im_set_position (spot);
1398	im_set_color (&fg, &bg);	1391	im_set_color (fg, bg);
1399		1392
1400	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1393	preedit_attr = XVaCreateNestedList (0,
		1394	XNForeground, fg,
		1395	XNBackground, bg,
		1396	XNArea, &rect,
1401	XNSpotLocation, &spot,	1397	XNSpotLocation, &spot,
1402	XNForeground, fg, XNBackground, bg,
1403	//XNFontSet, TermWin.fontset,	1398	XNFontSet, fs,
1404	NULL);	1399	NULL);
1405	}	1400	}
1406	else if (input_style & XIMPreeditArea)	1401	else if (input_style & XIMPreeditArea)
1407	{	1402	{
1408	im_set_color (&fg, &bg);	1403	im_set_color (fg, bg);
1409		1404
1410	/*	1405	/*
1411	* The necessary width of preedit area is unknown	1406	* The necessary width of preedit area is unknown
1412	* until create input context.	1407	* until create input context.
1413	*/	1408	*/
1414	needed_rect.width = 0;	1409	needed_rect.width = 0;
1415
1416	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1410	im_set_preedit_area (rect, status_rect, needed_rect);
1417		1411
1418	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1412	preedit_attr = XVaCreateNestedList (0,
		1413	XNForeground, fg,
1419	XNForeground, fg, XNBackground, bg,	1414	XNBackground, bg,
		1415	XNArea, &rect,
		1416	XNFontSet, fs,
		1417	NULL);
		1418	status_attr = XVaCreateNestedList (0,
		1419	XNForeground, fg,
		1420	XNBackground, bg,
		1421	XNArea, &status_rect,
1420	//XNFontSet, TermWin.fontset,	1422	XNFontSet, fs,
1421	NULL);	1423	NULL);
1422	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1423	XNForeground, fg, XNBackground, bg,
1424	//XNFontSet, TermWin.fontset,
1425	NULL);
1426	}	1424	}
1427		1425
1428	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1426	Input_Context = XCreateIC (xim,
		1427	XNInputStyle, input_style,
1429	XNClientWindow, TermWin.parent[0],	1428	XNClientWindow, TermWin.vt,
1430	XNFocusWindow, TermWin.parent[0],	1429	XNFocusWindow, TermWin.parent[0],
1431	preedit_attr ? XNPreeditAttributes : NULL,	1430	preedit_attr ? XNPreeditAttributes : NULL,
1432	preedit_attr,	1431	preedit_attr,
1433	status_attr ? XNStatusAttributes : NULL,	1432	status_attr ? XNStatusAttributes : NULL,
1434	status_attr, NULL);	1433	status_attr, NULL);
		1434
1435	if (preedit_attr) XFree (preedit_attr);	1435	if (preedit_attr) XFree (preedit_attr);
1436	if (status_attr) XFree (status_attr);	1436	if (status_attr) XFree (status_attr);
		1437	if (fs) XFreeFontSet (display->display, fs);
1437		1438
1438	if (Input_Context == NULL)	1439	if (Input_Context == NULL)
1439	{	1440	{
1440	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1441	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1441	display->put_xim (input_method);	1442	im_destroy ();
1442	return false;	1443	return false;
1443	}	1444	}
1444		1445
1445	if (input_style & XIMPreeditArea)	1446	if (input_style & XIMPreeditArea)
1446	IMSetStatusPosition ();	1447	IMSetStatusPosition ();
…		…
1472	if (p && *p)	1473	if (p && *p)
1473	{	1474	{
1474	bool found = false;	1475	bool found = false;
1475		1476
1476	s = rxvt_splitcommastring (p);	1477	s = rxvt_splitcommastring (p);
		1478
1477	for (i = 0; s[i]; i++)	1479	for (i = 0; s[i]; i++)
1478	{	1480	{
1479	if (*s[i])	1481	if (*s[i])
1480	{	1482	{
1481	STRCPY (buf, "@im=");	1483	strcpy (buf, "@im=");
1482	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1484	strncat (buf, s[i], IMBUFSIZ - 5);
1483	if (IM_get_IC (buf))	1485	if (IM_get_IC (buf))
1484	{	1486	{
1485	found = true;	1487	found = true;
1486	break;	1488	break;
1487	}	1489	}
1488	}	1490	}
1489	}	1491	}
1490	for (i = 0; s[i]; i++)	1492
1491	free (s[i]);	1493	rxvt_freecommastring (s);
1492	free (s);
1493		1494
1494	if (found)	1495	if (found)
1495	goto done;	1496	goto done;
1496	}	1497	}
1497		1498
…		…
1511	}	1512	}
1512		1513
1513	void	1514	void
1514	rxvt_term::IMSetStatusPosition ()	1515	rxvt_term::IMSetStatusPosition ()
1515	{	1516	{
1516	XRectangle preedit_rect, status_rect, *needed_rect;	1517	XRectangle preedit_rect, status_rect, *needed_rect;
1517	XVaNestedList preedit_attr, status_attr;	1518	XVaNestedList preedit_attr, status_attr;
1518		1519
1519	if (Input_Context == NULL	1520	if (!Input_Context
		1521	|| !TermWin.focus
1520	|| !TermWin.focus || ! (input_style & XIMPreeditArea)	1522	|| !(input_style & XIMPreeditArea)
1521	|| !IMisRunning ())	1523	|| !IMisRunning ())
1522	return;	1524	return;
1523		1525
1524	/* Getting the necessary width of preedit area */	1526	/* Getting the necessary width of preedit area */
1525	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1527	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1526	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1528	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1527	XFree (status_attr);	1529	XFree (status_attr);
1528		1530
1529	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1531	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1532	XFree (needed_rect);
1530		1533
1531	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1534	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1532	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1535	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1533		1536
1534	XSetICValues (Input_Context,	1537	XSetICValues (Input_Context,
1535	XNPreeditAttributes, preedit_attr,	1538	XNPreeditAttributes, preedit_attr,
1536	XNStatusAttributes, status_attr, NULL);	1539	XNStatusAttributes, status_attr, NULL);
1537		1540
1538	XFree (preedit_attr);	1541	XFree (preedit_attr);
1539	XFree (status_attr);	1542	XFree (status_attr);
1540	}	1543	}
1541	#endif /* USE_XIM */	1544	#endif /* USE_XIM */

Diff Legend

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