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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.218 by root, Thu Feb 2 18:04:46 2006 UTC

…		…
222		222
223	#ifdef USE_XIM	223	#ifdef USE_XIM
224	im_destroy ();	224	im_destroy ();
225	#endif	225	#endif
226	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
227	if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228	if (ShadowGC) XFreeGC (xdisp, ShadowGC);	228	if (ShadowGC) XFreeGC (dpy, ShadowGC);
229	#endif	229	#endif
230	#ifdef PLAIN_SCROLLBAR	230	#ifdef PLAIN_SCROLLBAR
231	if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);	231	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232	#endif	232	#endif
233	#ifdef NEXT_SCROLLBAR	233	#ifdef NEXT_SCROLLBAR
234	if (blackGC) XFreeGC (xdisp, blackGC);	234	if (blackGC) XFreeGC (dpy, blackGC);
235	if (whiteGC) XFreeGC (xdisp, whiteGC);	235	if (whiteGC) XFreeGC (dpy, whiteGC);
236	if (grayGC) XFreeGC (xdisp, grayGC);	236	if (grayGC) XFreeGC (dpy, grayGC);
237	if (darkGC) XFreeGC (xdisp, darkGC);	237	if (darkGC) XFreeGC (dpy, darkGC);
238	if (stippleGC) XFreeGC (xdisp, stippleGC);	238	if (stippleGC) XFreeGC (dpy, stippleGC);
239	if (dimple) XFreePixmap (xdisp, dimple);	239	if (dimple) XFreePixmap (dpy, dimple);
240	if (upArrow) XFreePixmap (xdisp, upArrow);	240	if (upArrow) XFreePixmap (dpy, upArrow);
241	if (downArrow) XFreePixmap (xdisp, downArrow);	241	if (downArrow) XFreePixmap (dpy, downArrow);
242	if (upArrowHi) XFreePixmap (xdisp, upArrowHi);	242	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243	if (downArrowHi) XFreePixmap (xdisp, downArrowHi);	243	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244	#endif	244	#endif
245	#ifdef RXVT_SCROLLBAR	245	#ifdef RXVT_SCROLLBAR
246	if (topShadowGC) XFreeGC (xdisp, topShadowGC);	246	if (topShadowGC) XFreeGC (dpy, topShadowGC);
247	if (botShadowGC) XFreeGC (xdisp, botShadowGC);	247	if (botShadowGC) XFreeGC (dpy, botShadowGC);
248	if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249	#endif	249	#endif
250	if (gc) XFreeGC (xdisp, gc);	250	if (gc) XFreeGC (dpy, gc);
251		251
252	delete drawable;	252	delete drawable;
253	// destroy all windows	253	// destroy all windows
254	if (parent[0])	254	if (parent[0])
255	XDestroyWindow (xdisp, parent[0]);	255	XDestroyWindow (dpy, parent[0]);
256		256
257	for (int i = 0; i < TOTAL_COLORS; i++)	257	for (int i = 0; i < TOTAL_COLORS; i++)
258	if (ISSET_PIXCOLOR (i))	258	if (ISSET_PIXCOLOR (i))
259	{	259	{
260	pix_colors_focused [i].free (this);	260	pix_colors_focused [i].free (this);
…		…
488	init_xlocale ();	488	init_xlocale ();
489		489
490	scr_reset (); // initialize screen	490	scr_reset (); // initialize screen
491		491
492	#if 0	492	#if 0
493	XSynchronize (xdisp, True);	493	XSynchronize (dpy, True);
494	#endif	494	#endif
495		495
496	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
497	if (OPTION (Opt_scrollBar))	497	if (OPTION (Opt_scrollBar))
498	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
499	#endif	499	#endif
500	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
501	if (OPTION (Opt_transparent))	501	if (OPTION (Opt_transparent))
502	{	502	{
503	XSelectInput (xdisp, display->root, PropertyChangeMask);	503	XSelectInput (dpy, display->root, PropertyChangeMask);
504	check_our_parents ();	504	check_our_parents ();
505	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
506	}	506	}
507	#endif	507	#endif
508		508
…		…
522	#if ENABLE_XEMBED	522	#if ENABLE_XEMBED
523	if (rs[Rs_embed])	523	if (rs[Rs_embed])
524	{	524	{
525	long info[2] = { 0, XEMBED_MAPPED };	525	long info[2] = { 0, XEMBED_MAPPED };
526		526
527	XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],	527	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528	32, PropModeReplace, (unsigned char *)&info, 2);	528	32, PropModeReplace, (unsigned char *)&info, 2);
529	}	529	}
530	#endif	530	#endif
531		531
532	XMapWindow (xdisp, vt);	532	XMapWindow (dpy, vt);
533	XMapWindow (xdisp, parent[0]);	533	XMapWindow (dpy, parent[0]);
534		534
535	return true;	535	return true;
536	}	536	}
537		537
538	static struct sig_handlers	538	static struct sig_handlers
…		…
735		735
736	if (scrollBar.state && OPTION (Opt_scrollBar_right))	736	if (scrollBar.state && OPTION (Opt_scrollBar_right))
737	window_sb_x = szHint.width - sb_w;	737	window_sb_x = szHint.width - sb_w;
738		738
739	if (recalc_x)	739	if (recalc_x)
740	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;	740	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741		741
742	if (recalc_y)	742	if (recalc_y)
743	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;	743	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744		744
745	ncol = width / fwidth;	745	ncol = width / fwidth;
746	nrow = height / fheight;	746	nrow = height / fheight;
747	}	747	}
748		748
…		…
851	return true;	851	return true;
852	}	852	}
853		853
854	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	854	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
855	{	855	{
856	XChangeProperty (xdisp, parent[0],	856	XChangeProperty (dpy, parent[0],
857	prop, XA_STRING, 8, PropModeReplace,	857	prop, XA_STRING, 8, PropModeReplace,
858	(const unsigned char *)str, len >= 0 ? len : strlen (str));	858	(const unsigned char *)str, len >= 0 ? len : strlen (str));
859	}	859	}
860		860
861	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	861	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862	{	862	{
863	wchar_t *ws = rxvt_mbstowcs (str, len);	863	wchar_t *ws = rxvt_mbstowcs (str, len);
864	char *s = rxvt_wcstoutf8 (ws);	864	char *s = rxvt_wcstoutf8 (ws);
865		865
866	XChangeProperty (xdisp, parent[0],	866	XChangeProperty (dpy, parent[0],
867	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	867	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868	(const unsigned char *)s, strlen (s));	868	(const unsigned char *)s, strlen (s));
869		869
870	free (s);	870	free (s);
871	free (ws);	871	free (ws);
…		…
968		968
969	(ISSET_PIXCOLOR (Color_pointer_bg)	969	(ISSET_PIXCOLOR (Color_pointer_bg)
970	? pix_colors_focused[Color_pointer_bg]	970	? pix_colors_focused[Color_pointer_bg]
971	: pix_colors_focused[Color_bg]).get (bg);	971	: pix_colors_focused[Color_bg]).get (bg);
972		972
973	XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);	973	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974	}	974	}
975		975
976	/----------------------------------------------------------------------/	976	/----------------------------------------------------------------------/
977	/*	977	/*
978	* find if fg/bg matches any of the normal (low-intensity) colors	978	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1033	int fix_screen;	1033	int fix_screen;
1034	int old_width = szHint.width;	1034	int old_width = szHint.width;
1035	int old_height = szHint.height;	1035	int old_height = szHint.height;
1036		1036
1037	window_calc (newwidth, newheight);	1037	window_calc (newwidth, newheight);
1038	XSetWMNormalHints (xdisp, parent[0], &szHint);	1038	XSetWMNormalHints (dpy, parent[0], &szHint);
1039		1039
1040	if (!ignoreparent)	1040	if (!ignoreparent)
1041	{	1041	{
1042	#ifdef SMART_RESIZE	1042	#ifdef SMART_RESIZE
1043	/*	1043	/*
…		…
1047	int x, y, x1, y1;	1047	int x, y, x1, y1;
1048	int dx, dy;	1048	int dx, dy;
1049	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1049	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050	Window unused_cr;	1050	Window unused_cr;
1051		1051
1052	XTranslateCoordinates (xdisp, parent[0], display->root,	1052	XTranslateCoordinates (dpy, parent[0], display->root,
1053	0, 0, &x, &y, &unused_cr);	1053	0, 0, &x, &y, &unused_cr);
1054	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,	1054	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1055	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056	/*	1056	/*
1057	* if display->root isn't the parent window, a WM will probably have offset	1057	* if display->root isn't the parent window, a WM will probably have offset
1058	* our position for handles and decorations. Counter it	1058	* our position for handles and decorations. Counter it
1059	*/	1059	*/
…		…
1061	{	1061	{
1062	x -= x1;	1062	x -= x1;
1063	y -= y1;	1063	y -= y1;
1064	}	1064	}
1065		1065
1066	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;	1066	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;	1067	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068	dx = old_width - szHint.width;	1068	dx = old_width - szHint.width;
1069	dy = old_height - szHint.height;	1069	dy = old_height - szHint.height;
1070		1070
1071	/* Check position of the center of the window */	1071	/* Check position of the center of the window */
1072	if (x < x1) /* left half */	1072	if (x < x1) /* left half */
…		…
1076	if (y < y1) /* top half */	1076	if (y < y1) /* top half */
1077	dy = 0;	1077	dy = 0;
1078	else if (y == y1) /* exact center */	1078	else if (y == y1) /* exact center */
1079	dy /= 2;	1079	dy /= 2;
1080		1080
1081	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,	1081	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082	szHint.width, szHint.height);	1082	szHint.width, szHint.height);
1083	#else	1083	#else
1084	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);	1084	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085	#endif	1085	#endif
1086	}	1086	}
1087		1087
1088	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1088	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1089		1089
1090	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1090	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1091	{	1091	{
1092	if (scrollBar.state)	1092	if (scrollBar.state)
1093	{	1093	{
1094	XMoveResizeWindow (xdisp, scrollBar.win,	1094	XMoveResizeWindow (dpy, scrollBar.win,
1095	window_sb_x, 0,	1095	window_sb_x, 0,
1096	scrollbar_TotalWidth (), szHint.height);	1096	scrollbar_TotalWidth (), szHint.height);
1097	resize_scrollbar ();	1097	resize_scrollbar ();
1098	}	1098	}
1099		1099
1100	XMoveResizeWindow (xdisp, vt,	1100	XMoveResizeWindow (dpy, vt,
1101	window_vt_x, window_vt_y,	1101	window_vt_x, window_vt_y,
1102	width, height);	1102	width, height);
1103		1103
1104	scr_clear ();	1104	scr_clear ();
1105	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
…		…
1132	{	1132	{
1133	XWindowAttributes wattr;	1133	XWindowAttributes wattr;
1134		1134
1135	if (newwidth == 0 \|\| newheight == 0)	1135	if (newwidth == 0 \|\| newheight == 0)
1136	{	1136	{
1137	XGetWindowAttributes (xdisp, display->root, &wattr);	1137	XGetWindowAttributes (dpy, display->root, &wattr);
1138		1138
1139	if (newwidth == 0)	1139	if (newwidth == 0)
1140	newwidth = wattr.width - szHint.base_width;	1140	newwidth = wattr.width - szHint.base_width;
1141	if (newheight == 0)	1141	if (newheight == 0)
1142	newheight = wattr.height - szHint.base_height;	1142	newheight = wattr.height - szHint.base_height;
…		…
1204	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1204	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205		1205
1206	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1206	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207	*p = '\0';	1207	*p = '\0';
1208		1208
1209	atom = XInternAtom (xdisp, server, False);	1209	atom = XInternAtom (dpy, server, False);
1210	win = XGetSelectionOwner (xdisp, atom);	1210	win = XGetSelectionOwner (dpy, atom);
1211		1211
1212	if (win != None)	1212	if (win != None)
1213	return True;	1213	return True;
1214	}	1214	}
1215		1215
…		…
1439	"*",	1439	"*",
1440	fheight,	1440	fheight,
1441	fheight + 1, fheight - 1,	1441	fheight + 1, fheight - 1,
1442	fheight - 2, fheight + 2);	1442	fheight - 2, fheight + 2);
1443		1443
1444	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1444	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1445	&missing_charset_list, &missing_charset_count, &def_string);	1445	&missing_charset_list, &missing_charset_count, &def_string);
1446		1446
1447	if (missing_charset_list)	1447	if (missing_charset_list)
1448	XFreeStringList (missing_charset_list);	1448	XFreeStringList (missing_charset_list);
1449		1449
…		…
1525	status_attr ? XNStatusAttributes : NULL,	1525	status_attr ? XNStatusAttributes : NULL,
1526	status_attr, NULL);	1526	status_attr, NULL);
1527		1527
1528	if (preedit_attr) XFree (preedit_attr);	1528	if (preedit_attr) XFree (preedit_attr);
1529	if (status_attr) XFree (status_attr);	1529	if (status_attr) XFree (status_attr);
1530	if (fs) XFreeFontSet (xdisp, fs);	1530	if (fs) XFreeFontSet (dpy, fs);
1531		1531
1532	if (Input_Context == NULL)	1532	if (Input_Context == NULL)
1533	{	1533	{
1534	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1534	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535	im_destroy ();	1535	im_destroy ();

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC vs. Revision 1.218 by root, Thu Feb 2 18:04:46 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.218 by root, Thu Feb 2 18:04:46 2006 UTC