[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.338 by root, Tue Dec 7 19:47:02 2010 UTC vs.
Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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.
…		…
36	#include "keyboard.h"	36	#include "keyboard.h"
37	#include "rxvtperl.h"	37	#include "rxvtperl.h"
38		38
39	#include <limits>	39	#include <limits>
40		40
41	#include <cassert>	41	#include <assert.h>
42	#include <csignal>	42	#include <signal.h>
43	#include <cstring>	43	#include <string.h>
44		44
45	#include <termios.h>	45	#include <termios.h>
46		46
47	#ifdef HAVE_XSETLOCALE	47	#ifdef HAVE_XSETLOCALE
48	# define X_LOCALE	48	# define X_LOCALE
49	# include <X11/Xlocale.h>	49	# include <X11/Xlocale.h>
50	#else	50	#else
51	# ifdef HAVE_SETLOCALE
52	# include <clocale>	51	# include <locale.h>
53	# endif
54	#endif	52	#endif
55		53
56	struct termios rxvt_term::def_tio;	54	struct termios rxvt_term::def_tio;
57	vector<rxvt_term *> rxvt_term::termlist;	55	vector<rxvt_term *> rxvt_term::termlist;
58		56
…		…
96	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	94	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97	{	95	{
98	compose_char *cc;	96	compose_char *cc;
99		97
100	// break compose chains, as stupid readline really likes to duplicate	98	// break compose chains, as stupid readline really likes to duplicate
101	// composing characters for some reason near the end of a line.	99	// composing characters for some reason, near the end of a line.
102	cc = (*this)[c1];	100	cc = (*this)[c1];
103	while (cc)	101	while (cc)
104	{	102	{
105	if (cc->c2 == c2) return c1;	103	if (cc->c2 == c2) return c1;
106	cc = (*this)[cc->c1];	104	cc = (*this)[cc->c1];
107	}	105	}
108		106
109	// check to see whether this combination already exists otherwise	107	// check to see whether this combination already exists otherwise
110	for (cc = v.end (); cc-- > v.begin (); )	108	for (cc = v.begin (); cc < v.end (); cc++)
111	{
112	if (cc->c1 == c1 && cc->c2 == c2)	109	if (cc->c1 == c1 && cc->c2 == c2)
113	return COMPOSE_LO + (cc - v.begin ());	110	return COMPOSE_LO + (cc - v.begin ());
114	}
115		111
116	// allocate a new combination	112	// allocate a new combination
117	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)	113	if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118	{	114	{
119	static int seen;	115	static int seen;
120		116
121	if (!seen++)	117	if (!seen++)
122	fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n");	118	rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123		119
124	return REPLACEMENT_CHAR;	120	return REPLACEMENT_CHAR;
125	}	121	}
126		122
127	v.push_back (compose_char (c1, c2));	123	v.push_back (compose_char (c1, c2));
…		…
176	#endif	172	#endif
177	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	173	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
178	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),	174	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179	#endif	175	#endif
180	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),	176	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181	#ifdef USE_XIM	177	#if USE_XIM
182	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),	178	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
183	#endif	179	#endif
184	#ifdef POINTER_BLANK	180	#ifdef POINTER_BLANK
185	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);	181	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
186	#endif	182	#endif
…		…
189	#endif	185	#endif
190	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);	186	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);	187	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);	188	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);	189	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	190	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);	191	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197		192
198	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	193	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199		194
…		…
228	delete fontset[i];	223	delete fontset[i];
229	#endif	224	#endif
230	delete fontset[0];	225	delete fontset[0];
231		226
232	#ifdef HAVE_BG_PIXMAP	227	#ifdef HAVE_BG_PIXMAP
233	bgPixmap.destroy ();	228	bg_destroy ();
234	#endif
235	#ifdef HAVE_AFTERIMAGE
236	if (asv)
237	destroy_asvisual (asv, 0);
238	if (asimman)
239	destroy_image_manager (asimman, 0);
240	#endif	229	#endif
241		230
242	if (display)	231	if (display)
243	{	232	{
244	selection_clear ();	233	selection_clear ();
245	selection_clear (true);	234	selection_clear (true);
246		235
247	#ifdef USE_XIM	236	#if USE_XIM
248	im_destroy ();	237	im_destroy ();
249	#endif	238	#endif
250	scrollBar.destroy ();	239	scrollBar.destroy ();
251	if (gc) XFreeGC (dpy, gc);	240	if (gc) XFreeGC (dpy, gc);
252		241
253	delete drawable;	242	delete drawable;
254	// destroy all windows	243	// destroy all windows
255	if (parent[0])	244	if (parent)
256	XDestroyWindow (dpy, parent[0]);	245	XDestroyWindow (dpy, parent);
257		246
258	for (int i = 0; i < TOTAL_COLORS; i++)	247	for (int i = 0; i < TOTAL_COLORS; i++)
259	if (ISSET_PIXCOLOR (i))	248	if (ISSET_PIXCOLOR (i))
260	{	249	{
261	pix_colors_focused [i].free (this);	250	pix_colors_focused [i].free (this);
…		…
276	for (int i = 0; i < allocated.size (); i++)	265	for (int i = 0; i < allocated.size (); i++)
277	free (allocated [i]);	266	free (allocated [i]);
278		267
279	free (selection.text);	268	free (selection.text);
280	free (selection.clip_text);	269	free (selection.clip_text);
281	// TODO: manage env vars in child only(!)
282	free (env_display);
283	free (env_term);
284	free (locale);	270	free (locale);
285	free (v_buffer);	271	free (v_buffer);
286	free (incr_buf);	272
		273	delete selection_req;
287		274
288	delete envv;	275	delete envv;
289	delete argv;	276	delete argv;
290		277
291	#ifdef KEYSYM_RESOURCE	278	#ifdef KEYSYM_RESOURCE
…		…
327	#endif	314	#endif
328	scrollbar_ev.stop (display);	315	scrollbar_ev.stop (display);
329	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	316	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
330	rootwin_ev.stop (display);	317	rootwin_ev.stop (display);
331	#endif	318	#endif
332	incr_ev.stop ();
333	termwin_ev.stop (display);	319	termwin_ev.stop (display);
334	vt_ev.stop (display);	320	vt_ev.stop (display);
335	}	321	}
336		322
337	flush_ev.stop ();	323	flush_ev.stop ();
…		…
362		348
363	delete this;	349	delete this;
364	}	350	}
365		351
366	void	352	void
367	rxvt_term::set_option (uint8_t opt, bool set)	353	rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368	{	354	{
369	if (!opt)	355	if (!opt)
370	return;	356	return;
371		357
372	uint8_t mask = 1 << (opt & 7);	358	uint8_t mask = 1 << (opt & 7);
…		…
388	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	374	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
389	(*t)->emergency_cleanup ();	375	(*t)->emergency_cleanup ();
390	}	376	}
391		377
392	#if !ENABLE_MINIMAL	378	#if !ENABLE_MINIMAL
393	static void	379	static void ecb_cold
394	print_x_error (Display dpy, XErrorEvent event)	380	print_x_error (Display dpy, XErrorEvent event)
395	{	381	{
396	char buffer[BUFSIZ];	382	char buffer[BUFSIZ];
397	char mesg[BUFSIZ];	383	char mesg[BUFSIZ];
398	char number[32];	384	char number[32];
399	char *mtype = "XlibMessage";	385	const char mtype[] = "XlibMessage";
		386
400	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);	387	XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
401	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);	388	XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402	rxvt_warn ("An X Error occurred, trying to continue after report.\n");	389	rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403	rxvt_warn ("%s: %s\n", mesg, buffer);	390	rxvt_warn ("%s: %s\n", mesg, buffer);
404	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);	391	XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);	392	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
406	sprintf(number, "%d", event->request_code);	393	sprintf (number, "%d", event->request_code);
407	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);	394	XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
408	rxvt_warn ("(which is %s)\n", buffer);	395	rxvt_warn ("(which is %s)\n", buffer);
		396
409	if (event->request_code >= 128) {	397	if (event->request_code >= 128)
		398	{
410	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",	399	XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
411	mesg, BUFSIZ);
412	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);	400	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413	}	401	}
		402
414	if ((event->error_code == BadWindow) \|\|	403	if (event->error_code == BadWindow
415	(event->error_code == BadPixmap) \|\|	404	\|\| event->error_code == BadPixmap
416	(event->error_code == BadCursor) \|\|	405	\|\| event->error_code == BadCursor
417	(event->error_code == BadFont) \|\|	406	\|\| event->error_code == BadFont
418	(event->error_code == BadDrawable) \|\|	407	\|\| event->error_code == BadDrawable
419	(event->error_code == BadColor) \|\|	408	\|\| event->error_code == BadColor
420	(event->error_code == BadGC) \|\|	409	\|\| event->error_code == BadGC
421	(event->error_code == BadIDChoice) \|\|	410	\|\| event->error_code == BadIDChoice
422	(event->error_code == BadValue) \|\|	411	\|\| event->error_code == BadValue
423	(event->error_code == BadAtom)) {	412	\|\| event->error_code == BadAtom)
		413	{
424	if (event->error_code == BadValue)	414	if (event->error_code == BadValue)
425	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",	415	XGetErrorDatabaseText (dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
426	mesg, BUFSIZ);
427	else if (event->error_code == BadAtom)	416	else if (event->error_code == BadAtom)
428	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",	417	XGetErrorDatabaseText (dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429	mesg, BUFSIZ);
430	else	418	else
431	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	419	XGetErrorDatabaseText (dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
432	mesg, BUFSIZ);	420
433	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	421	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434	}	422	}
		423
435	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	424	XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
436	mesg, BUFSIZ);
437	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	425	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438	}	426	}
439	#endif	427	#endif
440		428
441	int	429	int ecb_cold
442	rxvt_xerror_handler (Display display, XErrorEvent event)	430	rxvt_xerror_handler (Display display, XErrorEvent event)
443	{	431	{
444	if (GET_R->allowedxerror == -1)	432	if (GET_R->allowedxerror == -1)
445	GET_R->allowedxerror = event->error_code;	433	GET_R->allowedxerror = event->error_code;
446	else	434	else
…		…
455	}	443	}
456		444
457	return 0;	445	return 0;
458	}	446	}
459		447
460	int	448	int ecb_cold
461	rxvt_xioerror_handler (Display *display)	449	rxvt_xioerror_handler (Display *display)
462	{	450	{
463	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",	451	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464	DisplayString (display));	452	DisplayString (display));
465	rxvt_emergency_cleanup ();	453	rxvt_emergency_cleanup ();
…		…
585	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	573	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
586	// TODO: handle this with exceptions and tolerate the memory loss	574	// TODO: handle this with exceptions and tolerate the memory loss
587	XSetIOErrorHandler (rxvt_xioerror_handler);	575	XSetIOErrorHandler (rxvt_xioerror_handler);
588		576
589	XrmInitialize ();	577	XrmInitialize ();
		578
		579	#if HAVE_PIXBUF
		580	g_type_init ();
		581	#endif
590	}	582	}
591		583
592	/----------------------------------------------------------------------/	584	/----------------------------------------------------------------------/
593	/*	585	/*
594	* window size/position calculations for XSizeHint and other storage.	586	* window size/position calculations for XSizeHint and other storage.
…		…
715	if (recalc_y)	707	if (recalc_y)
716	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	708	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
717		709
718	ncol = width / fwidth;	710	ncol = width / fwidth;
719	nrow = height / fheight;	711	nrow = height / fheight;
		712
		713	// When the size of the vt window is not a multiple of the cell
		714	// size, i.e., when the wm does not honour our size hints, there are
		715	// extra areas not covered by the terminal screen. Such gaps, when a
		716	// bg pixmap is set, would have to be cleared manually to properly
		717	// refresh the background. We take the simpler route and shrink the
		718	// vt window so as to avoid creating gaps.
		719	vt_width = ncol * fwidth;
		720	vt_height = nrow * fheight;
720	}	721	}
721		722
722	/----------------------------------------------------------------------/	723	/----------------------------------------------------------------------/
723	/*	724	/*
724	* Tell the teletype handler what size the window is.	725	* Tell the teletype handler what size the window is.
…		…
732		733
733	struct winsize ws;	734	struct winsize ws;
734		735
735	ws.ws_col = ncol;	736	ws.ws_col = ncol;
736	ws.ws_row = nrow;	737	ws.ws_row = nrow;
737	ws.ws_xpixel = width;	738	ws.ws_xpixel = vt_width;
738	ws.ws_ypixel = height;	739	ws.ws_ypixel = vt_height;
739	ioctl (pty->pty, TIOCSWINSZ, &ws);	740	ioctl (pty->pty, TIOCSWINSZ, &ws);
740		741
741	#if 0	742	#if 0
742	// TIOCSWINSZ is supposed to do this automatically and correctly	743	// TIOCSWINSZ is supposed to do this automatically and correctly
743	if (cmd_pid) /* force through to the command */	744	if (cmd_pid) /* force through to the command */
744	kill (-cmd_pid, SIGWINCH);	745	kill (-cmd_pid, SIGWINCH);
745	#endif	746	#endif
746	}	747	}
747		748
748	/----------------------------------------------------------------------/	749	/----------------------------------------------------------------------/
749	/* set_fonts () - load and set the various fonts	750	/* load and set the various fonts */
750	*
751	* init = 1 - initialize
752	*
753	* fontname == FONT_UP - switch to bigger font
754	* fontname == FONT_DN - switch to smaller font
755	*/
756	bool	751	bool
757	rxvt_term::set_fonts ()	752	rxvt_term::set_fonts ()
758	{	753	{
759	rxvt_fontset *fs = new rxvt_fontset (this);	754	rxvt_fontset *fs = new rxvt_fontset (this);
760	rxvt_fontprop prop;	755	rxvt_fontprop prop;
…		…
775		770
776	delete fontset[0];	771	delete fontset[0];
777	fontset[0] = fs;	772	fontset[0] = fs;
778		773
779	prop = (*fs)[rxvt_fontset::firstFont]->properties ();	774	prop = (*fs)[rxvt_fontset::firstFont]->properties ();
780	prop.height += lineSpace;
781	prop.width += letterSpace;	775	prop.width += letterSpace;
782		776
783	fs->set_prop (prop, false);	777	fs->set_prop (prop, false);
784		778
785	fwidth = prop.width;	779	fwidth = prop.width;
786	fheight = prop.height;	780	fheight = prop.height + lineSpace;
787	fbase = prop.ascent;	781	fbase = prop.ascent;
788		782
789	for (int style = 1; style < 4; style++)	783	for (int style = 1; style < 4; style++)
790	{	784	{
791	#if ENABLE_STYLES	785	#if ENABLE_STYLES
…		…
817	#else	811	#else
818	fontset[style] = fontset[0];	812	fontset[style] = fontset[0];
819	#endif	813	#endif
820	}	814	}
821		815
822	if (parent[0])	816	if (parent)
823	{	817	{
824	resize_all_windows (0, 0, 0);	818	resize_all_windows (0, 0, 0);
825	scr_remap_chars ();	819	scr_remap_chars ();
826	scr_touch (true);	820	scr_touch (true);
827	}	821	}
…		…
830	}	824	}
831		825
832	void	826	void
833	rxvt_term::set_string_property (Atom prop, const char *str, int len)	827	rxvt_term::set_string_property (Atom prop, const char *str, int len)
834	{	828	{
835	XChangeProperty (dpy, parent[0],	829	XChangeProperty (dpy, parent,
836	prop, XA_STRING, 8, PropModeReplace,	830	prop, XA_STRING, 8, PropModeReplace,
837	(const unsigned char *)str, len >= 0 ? len : strlen (str));	831	(const unsigned char *)str, len >= 0 ? len : strlen (str));
838	}	832	}
839		833
840	void	834	void
…		…
842	{	836	{
843	XTextProperty ct;	837	XTextProperty ct;
844		838
845	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)	839	if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846	{	840	{
847	XSetTextProperty (dpy, parent[0], &ct, prop);	841	XSetTextProperty (dpy, parent, &ct, prop);
848	XFree (ct.value);	842	XFree (ct.value);
849	}	843	}
850	}	844	}
851		845
852	void	846	void
853	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	847	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
854	{	848	{
855	wchar_t *ws = rxvt_mbstowcs (str, len);	849	wchar_t *ws = rxvt_mbstowcs (str, len);
856	char *s = rxvt_wcstoutf8 (ws);	850	char *s = rxvt_wcstoutf8 (ws);
857		851
858	XChangeProperty (dpy, parent[0],	852	XChangeProperty (dpy, parent,
859	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	853	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
860	(const unsigned char *)s, strlen (s));	854	(const unsigned char *)s, strlen (s));
861		855
862	free (s);	856	free (s);
863	free (ws);	857	free (ws);
…		…
953		947
954	/----------------------------------------------------------------------/	948	/----------------------------------------------------------------------/
955	/*	949	/*
956	* find if fg/bg matches any of the normal (low-intensity) colors	950	* find if fg/bg matches any of the normal (low-intensity) colors
957	*/	951	*/
958	void	952	char *
959	rxvt_term::set_colorfgbg ()	953	rxvt_term::get_colorfgbg ()
960	{	954	{
961	unsigned int i;	955	unsigned int i;
962	const char *xpmb = "";	956	const char *xpmb = "";
963	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	957	char fstr[] = "default";
		958	char bstr[] = "default";
		959	char *env_colorfgbg;
964		960
965	strcpy (fstr, "default");
966	strcpy (bstr, "default");
967	for (i = Color_Black; i <= Color_White; i++)	961	for (i = Color_Black; i <= Color_White; i++)
968	if (pix_colors[Color_fg] == pix_colors[i])	962	if (pix_colors[Color_fg] == pix_colors[i])
969	{	963	{
970	sprintf (fstr, "%d", (i - Color_Black));	964	sprintf (fstr, "%d", i - Color_Black);
971	break;	965	break;
972	}	966	}
973		967
974	for (i = Color_Black; i <= Color_White; i++)	968	for (i = Color_Black; i <= Color_White; i++)
975	if (pix_colors[Color_bg] == pix_colors[i])	969	if (pix_colors[Color_bg] == pix_colors[i])
976	{	970	{
977	sprintf (bstr, "%d", (i - Color_Black));	971	sprintf (bstr, "%d", i - Color_Black);
978	#ifdef BG_IMAGE_FROM_FILE	972	#if BG_IMAGE_FROM_FILE
979	xpmb = "default;";	973	xpmb = "default;";
980	#endif	974	#endif
981	break;	975	break;
982	}	976	}
983		977
		978	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
984	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	979	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
		980	return env_colorfgbg;
985	}	981	}
986		982
987	/----------------------------------------------------------------------/	983	/----------------------------------------------------------------------/
988		984
989	bool	985	bool
…		…
1018		1014
1019	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow	1015	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020	if (set_hint)	1016	if (set_hint)
1021	{	1017	{
1022	szHint.flags &= ~(PBaseSize \| PResizeInc);	1018	szHint.flags &= ~(PBaseSize \| PResizeInc);
1023	XSetWMNormalHints (dpy, parent[0], &szHint);	1019	XSetWMNormalHints (dpy, parent, &szHint);
1024	szHint.flags \|= PBaseSize \| PResizeInc;	1020	szHint.flags \|= PBaseSize \| PResizeInc;
1025	}	1021	}
1026		1022
1027	if (!ignoreparent)	1023	if (!ignoreparent)
1028	{	1024	{
…		…
1034	int x, y, x1, y1;	1030	int x, y, x1, y1;
1035	int dx, dy;	1031	int dx, dy;
1036	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1032	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1037	Window unused_cr;	1033	Window unused_cr;
1038		1034
1039	XTranslateCoordinates (dpy, parent[0], display->root,	1035	XTranslateCoordinates (dpy, parent, display->root,
1040	0, 0, &x, &y, &unused_cr);	1036	0, 0, &x, &y, &unused_cr);
1041	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,	1037	XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1042	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1038	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1043	/*	1039	/*
1044	* if display->root isn't the parent window, a WM will probably have offset	1040	* if display->root isn't the parent window, a WM will probably have offset
1045	* our position for handles and decorations. Counter it	1041	* our position for handles and decorations. Counter it
1046	*/	1042	*/
…		…
1063	if (y < y1) /* top half */	1059	if (y < y1) /* top half */
1064	dy = 0;	1060	dy = 0;
1065	else if (y == y1) /* exact center */	1061	else if (y == y1) /* exact center */
1066	dy /= 2;	1062	dy /= 2;
1067		1063
1068	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,	1064	XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1069	szHint.width, szHint.height);	1065	szHint.width, szHint.height);
1070	#else	1066	#else
1071	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	1067	XResizeWindow (dpy, parent, szHint.width, szHint.height);
1072	#endif	1068	#endif
1073	}	1069	}
1074		1070
1075	if (set_hint)	1071	if (set_hint)
1076	XSetWMNormalHints (dpy, parent[0], &szHint);	1072	XSetWMNormalHints (dpy, parent, &szHint);
1077		1073
1078	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1074	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1079		1075
1080	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1076	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1081	{	1077	{
1082	if (scrollBar.state)	1078	if (scrollBar.state)
1083	scrollBar.resize ();	1079	scrollBar.resize ();
1084		1080
1085	XMoveResizeWindow (dpy, vt,	1081	XMoveResizeWindow (dpy, vt,
1086	window_vt_x, window_vt_y,	1082	window_vt_x, window_vt_y,
1087	width, height);	1083	vt_width, vt_height);
		1084
		1085	HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1088		1086
1089	#ifdef HAVE_BG_PIXMAP	1087	#ifdef HAVE_BG_PIXMAP
1090	if (bgPixmap.window_size_sensitive ())	1088	if (bg_window_size_sensitive ())
1091	update_background ();	1089	update_background ();
1092	#endif	1090	#endif
1093	}	1091	}
1094		1092
1095	if (fix_screen \|\| old_height == 0)	1093	if (fix_screen \|\| old_height == 0)
1096	scr_reset ();	1094	scr_reset ();
1097		1095
1098	#ifdef HAVE_BG_PIXMAP
1099	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100	// if (bgPixmap.pixmap)
1101	// scr_touch (false);
1102	#endif
1103
1104	#ifdef USE_XIM	1096	#if USE_XIM
1105	IMSetPosition ();	1097	im_set_position ();
1106	#endif	1098	#endif
1107	}	1099	}
1108		1100
1109	/*	1101	/*
1110	* Set the width/height of the vt window in characters. Units are pixels.	1102	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1123	newwidth = wattr.width - szHint.base_width;	1115	newwidth = wattr.width - szHint.base_width;
1124	if (newheight == 0)	1116	if (newheight == 0)
1125	newheight = wattr.height - szHint.base_height;	1117	newheight = wattr.height - szHint.base_height;
1126	}	1118	}
1127		1119
1128	if (newwidth != width \|\| newheight != height)	1120	if (newwidth != vt_width \|\| newheight != vt_height)
1129	{	1121	{
1130	newwidth += szHint.base_width;	1122	newwidth += szHint.base_width;
1131	newheight += szHint.base_height;	1123	newheight += szHint.base_height;
1132	resize_all_windows (newwidth, newheight, 0);	1124	resize_all_windows (newwidth, newheight, 0);
1133	}	1125	}
1134	}	1126	}
1135		1127
1136	/* -------------------------------------------------------------------- *	1128	/* -------------------------------------------------------------------- *
1137	* - X INPUT METHOD ROUTINES - *	1129	* - X INPUT METHOD ROUTINES - *
1138	* -------------------------------------------------------------------- */	1130	* -------------------------------------------------------------------- */
1139	#ifdef USE_XIM	1131	#if USE_XIM
1140		1132
1141	void	1133	void
1142	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1134	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1143	{	1135	{
1144	fg = pix_colors [Color_fg];	1136	fg = pix_colors [Color_fg];
…		…
1171	status_rect.height = fheight;	1163	status_rect.height = fheight;
1172	}	1164	}
1173		1165
1174	/* Checking whether input method is running. */	1166	/* Checking whether input method is running. */
1175	bool	1167	bool
1176	rxvt_term::IMisRunning ()	1168	rxvt_term::im_is_running ()
1177	{	1169	{
1178	Atom atom;	1170	Atom atom;
1179	Window win;	1171	Window win;
1180	char server[IMBUFSIZ];	1172	char server[IMBUFSIZ];
1181		1173
…		…
1190		1182
1191	atom = XInternAtom (dpy, server, False);	1183	atom = XInternAtom (dpy, server, False);
1192	win = XGetSelectionOwner (dpy, atom);	1184	win = XGetSelectionOwner (dpy, atom);
1193		1185
1194	if (win != None)	1186	if (win != None)
1195	return True;	1187	return true;
1196	}	1188	}
1197		1189
1198	return False;	1190	return false;
1199	}	1191	}
1200		1192
1201	void	1193	void
1202	rxvt_term::IMSendSpot ()	1194	rxvt_term::im_send_spot ()
1203	{	1195	{
1204	XPoint nspot;	1196	XPoint nspot;
1205	XVaNestedList preedit_attr;	1197	XVaNestedList preedit_attr;
1206		1198
1207	if (!Input_Context	1199	if (!Input_Context
…		…
1313	/*	1305	/*
1314	* Try to open a XIM with the current modifiers, then see if we can	1306	* Try to open a XIM with the current modifiers, then see if we can
1315	* open a suitable preedit type	1307	* open a suitable preedit type
1316	*/	1308	*/
1317	bool	1309	bool
1318	rxvt_term::IM_get_IC (const char *modifiers)	1310	rxvt_term::im_get_ic (const char *modifiers)
1319	{	1311	{
1320	int i, j, found;	1312	int i, j, found;
1321	XIM xim;	1313	XIM xim;
1322	XPoint spot;	1314	XPoint spot;
1323	XRectangle rect, status_rect, needed_rect;	1315	XRectangle rect, status_rect, needed_rect;
1324	unsigned long fg, bg;	1316	unsigned long fg, bg;
1325	const char *p;	1317	const char *p;
1326	char **s;	1318	char **s;
1327	XIMStyles *xim_styles;	1319	XIMStyles *xim_styles;
1328	#ifdef ENABLE_XIM_ONTHESPOT
1329	XIMCallback xcb[4];
1330	#endif
1331		1320
1332	set_environ (envv);	1321	set_environ (envv);
1333		1322
1334	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1323	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1335	return false;	1324	return false;
…		…
1356	p = pet[pi];	1345	p = pet[pi];
1357		1346
1358	if (!p)	1347	if (!p)
1359	continue;	1348	continue;
1360		1349
1361	s = rxvt_splitcommastring (p);	1350	s = rxvt_strsplit (',', p);
1362		1351
1363	for (i = found = 0; !found && s[i]; i++)	1352	for (i = found = 0; !found && s[i]; i++)
1364	{	1353	{
1365	if (!strcmp (s[i], "OverTheSpot"))	1354	if (!strcmp (s[i], "OverTheSpot"))
1366	input_style = XIMPreeditPosition \| XIMStatusNothing;	1355	input_style = XIMPreeditPosition \| XIMStatusNothing;
…		…
1378	input_style = XIMPreeditNothing \| XIMStatusNothing;	1367	input_style = XIMPreeditNothing \| XIMStatusNothing;
1379		1368
1380	for (j = 0; j < xim_styles->count_styles; j++)	1369	for (j = 0; j < xim_styles->count_styles; j++)
1381	if (input_style == xim_styles->supported_styles[j])	1370	if (input_style == xim_styles->supported_styles[j])
1382	{	1371	{
1383	rxvt_freecommastring (s);	1372	rxvt_free_strsplit (s);
1384		1373
1385	found = 1;	1374	found = 1;
1386	goto foundpet;	1375	goto foundpet;
1387	}	1376	}
1388		1377
1389	}	1378	}
1390		1379
1391	rxvt_freecommastring (s);	1380	rxvt_free_strsplit (s);
1392	}	1381	}
1393		1382
1394	foundpet:	1383	foundpet:
1395		1384
1396	XFree (xim_styles);	1385	XFree (xim_styles);
…		…
1475	NULL);	1464	NULL);
1476	}	1465	}
1477	#if ENABLE_XIM_ONTHESPOT	1466	#if ENABLE_XIM_ONTHESPOT
1478	else if (input_style & XIMPreeditCallbacks)	1467	else if (input_style & XIMPreeditCallbacks)
1479	{	1468	{
		1469	XIMCallback xcb[4];
		1470
1480	im_set_position (spot);	1471	im_set_position (spot);
1481		1472
1482	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;	1473	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1483	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;	1474	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1484	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;	1475	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
…		…
1499	#endif	1490	#endif
1500		1491
1501	Input_Context = XCreateIC (xim,	1492	Input_Context = XCreateIC (xim,
1502	XNInputStyle, input_style,	1493	XNInputStyle, input_style,
1503	XNClientWindow, vt,	1494	XNClientWindow, vt,
1504	XNFocusWindow, parent[0],	1495	XNFocusWindow, parent,
1505	preedit_attr ? XNPreeditAttributes : NULL,	1496	preedit_attr ? XNPreeditAttributes : NULL,
1506	preedit_attr,	1497	preedit_attr,
1507	status_attr ? XNStatusAttributes : NULL,	1498	status_attr ? XNStatusAttributes : NULL,
1508	status_attr, NULL);	1499	status_attr, NULL);
1509		1500
…		…
1522	// unfortunately, only the focus window is used by XIM, hard to fix	1513	// unfortunately, only the focus window is used by XIM, hard to fix
1523	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))	1514	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1524	vt_select_input ();	1515	vt_select_input ();
1525	#endif	1516	#endif
1526		1517
1527	IMSetPosition ();	1518	im_set_position ();
1528		1519
1529	return true;	1520	return true;
1530	}	1521	}
1531		1522
1532	void	1523	void
…		…
1542	im_destroy ();	1533	im_destroy ();
1543		1534
1544	if (Input_Context)	1535	if (Input_Context)
1545	return;	1536	return;
1546		1537
1547	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1548	if (rs[Rs_imLocale])	1538	if (rs[Rs_imLocale])
1549	SET_LOCALE (rs[Rs_imLocale]);	1539	SET_LOCALE (rs[Rs_imLocale]);
1550	#endif
1551		1540
1552	p = rs[Rs_inputMethod];	1541	p = rs[Rs_inputMethod];
1553	if (p && *p)	1542	if (p && *p)
1554	{	1543	{
1555	bool found = false;	1544	bool found = false;
1556		1545
1557	s = rxvt_splitcommastring (p);	1546	s = rxvt_strsplit (',', p);
1558		1547
1559	for (i = 0; s[i]; i++)	1548	for (i = 0; s[i]; i++)
1560	{	1549	{
1561	if (*s[i])	1550	if (*s[i])
1562	{	1551	{
1563	strcpy (buf, "@im=");	1552	strcpy (buf, "@im=");
1564	strncat (buf, s[i], IMBUFSIZ - 5);	1553	strncat (buf, s[i], IMBUFSIZ - 5);
1565	if (IM_get_IC (buf))	1554	if (im_get_ic (buf))
1566	{	1555	{
1567	found = true;	1556	found = true;
1568	break;	1557	break;
1569	}	1558	}
1570	}	1559	}
1571	}	1560	}
1572		1561
1573	rxvt_freecommastring (s);	1562	rxvt_free_strsplit (s);
1574		1563
1575	if (found)	1564	if (found)
1576	goto done;	1565	goto done;
1577	}	1566	}
1578		1567
1579	/* try with XMODIFIERS env. var. */	1568	/* try with XMODIFIERS env. var. */
1580	if (IM_get_IC (""))	1569	if (im_get_ic (""))
1581	goto done;	1570	goto done;
1582		1571
1583	/* try with no modifiers base IF the user didn't specify an IM */	1572	/* try with no modifiers base IF the user didn't specify an IM */
1584	if (IM_get_IC ("@im=none"))	1573	if (im_get_ic ("@im=none"))
1585	goto done;	1574	goto done;
1586		1575
1587	done:	1576	done:
1588	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1589	if (rs[Rs_imLocale])	1577	if (rs[Rs_imLocale])
1590	SET_LOCALE (locale);	1578	SET_LOCALE (locale);
1591	#endif
1592	}	1579	}
1593		1580
1594	void	1581	void
1595	rxvt_term::IMSetPosition ()	1582	rxvt_term::im_set_position ()
1596	{	1583	{
1597	XRectangle preedit_rect, status_rect, *needed_rect;	1584	XRectangle preedit_rect, status_rect, *needed_rect;
1598	XVaNestedList preedit_attr, status_attr;	1585	XVaNestedList preedit_attr, status_attr;
1599		1586
1600	if (!Input_Context	1587	if (!Input_Context
1601	\|\| !focus	1588	\|\| !focus
1602	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))	1589	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1603	\|\| !IMisRunning ())	1590	\|\| !im_is_running ())
1604	return;	1591	return;
1605		1592
1606	if (input_style & XIMPreeditPosition)	1593	if (input_style & XIMPreeditPosition)
1607	{	1594	{
1608	im_set_size (preedit_rect);	1595	im_set_size (preedit_rect);
…		…
1638		1625
1639	void	1626	void
1640	rxvt_term::get_window_origin (int &x, int &y)	1627	rxvt_term::get_window_origin (int &x, int &y)
1641	{	1628	{
1642	Window cr;	1629	Window cr;
1643	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);	1630	XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1644	}
1645
1646	Pixmap
1647	rxvt_term::get_pixmap_property (int prop_id)
1648	{
1649	if (prop_id > 0 && prop_id < NUM_XA)
1650	if (xa[prop_id])
1651	{
1652	int aformat;
1653	unsigned long nitems, bytes_after;
1654	Atom atype;
1655	unsigned char *prop = NULL;
1656	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1657	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658	&nitems, &bytes_after, &prop);
1659	if (result == Success && prop && atype == XA_PIXMAP)
1660	return (Pixmap )prop;
1661	}
1662
1663	return None;
1664	}	1631	}
1665		1632
1666	#ifdef HAVE_BG_PIXMAP	1633	#ifdef HAVE_BG_PIXMAP
1667		1634
1668	void	1635	void
1669	rxvt_term::update_background ()	1636	rxvt_term::update_background ()
1670	{	1637	{
1671	if (update_background_ev.is_active ())	1638	if (update_background_ev.is_active ())
1672	return;	1639	return;
1673		1640
1674	bgPixmap.invalidate ();	1641	bg_invalidate ();
1675		1642
		1643	if (!mapped)
		1644	return;
		1645
1676	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);	1646	ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677		1647
1678	if (to_wait <= 0.)	1648	if (to_wait <= 0.)
1679	bgPixmap.render ();	1649	bg_render ();
1680	else	1650	else
1681	update_background_ev.start (to_wait);	1651	update_background_ev.start (to_wait);
1682	}	1652	}
1683		1653
1684	void	1654	void
1685	rxvt_term::update_background_cb (ev::timer &w, int revents)	1655	rxvt_term::update_background_cb (ev::timer &w, int revents)
1686	{	1656	{
1687	make_current ();	1657	make_current ();
1688		1658
1689	update_background_ev.stop ();	1659	update_background_ev.stop ();
1690	bgPixmap.render ();	1660	bg_render ();
1691	refresh_check ();	1661	refresh_check ();
1692	}	1662	}
1693		1663
1694	#endif /* HAVE_BG_PIXMAP */	1664	#endif /* HAVE_BG_PIXMAP */
1695		1665

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.338 by root, Tue Dec 7 19:47:02 2010 UTC vs. Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.338 by root, Tue Dec 7 19:47:02 2010 UTC vs.
Revision 1.379 by root, Tue Jun 5 11:10:58 2012 UTC