[packages/vim.git] / 6.2.043

To: vim-dev@vim.org
Subject: Patch 6.2.043
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2.043
Problem:    Compiling with both netbeans and workshop doesn't work.
Solution:   Move the shellRectangle() function to gui_x11.c. (Gordon Prieur)
Files:	    src/gui_x11.c, src/integration.c, src/netbeans.c,
	    src/proto/netbeans.pro


*** ../vim-6.2.042/src/gui_x11.c	Sat May 24 13:17:24 2003
--- src/gui_x11.c	Sun Jun 22 17:37:21 2003
***************
*** 627,632 ****
--- 627,675 ----
      gui_mch_update();
  }
  
+ #if (defined(FEAT_NETBEANS_INTG) || defined(FEAT_SUN_WORKSHOP)) \
+ 	|| defined(PROTO)
+ /*
+  *	This function fills in the XRectangle object with the current
+  *	x,y coordinates and height, width so that an XtVaSetValues to
+  *	the same shell of those resources will restore the window to its
+  *	formar position and dimensions.
+  *
+  *	Note: This function may fail, in which case the XRectangle will
+  *	be unchanged.  Be sure to have the XRectangle set with the
+  *	proper values for a failed condition prior to calling this
+  *	function.
+  */
+     static void
+ shellRectangle(Widget shell, XRectangle *r)
+ {
+     Window		rootw, shellw, child, parentw;
+     int			absx, absy;
+     XWindowAttributes	a;
+     Window		*children;
+     unsigned int	childrenCount;
+ 
+     shellw = XtWindow(shell);
+     if (shellw == 0)
+ 	return;
+     for (;;)
+     {
+ 	XQueryTree(XtDisplay(shell), shellw, &rootw, &parentw,
+ 						   &children, &childrenCount);
+ 	XFree(children);
+ 	if (parentw == rootw)
+ 	    break;
+ 	shellw = parentw;
+     }
+     XGetWindowAttributes(XtDisplay(shell), shellw, &a);
+     XTranslateCoordinates(XtDisplay(shell), shellw, a.root, 0, 0,
+ 							&absx, &absy, &child);
+     r->x = absx;
+     r->y = absy;
+     XtVaGetValues(shell, XmNheight, &r->height, XmNwidth, &r->width, NULL);
+ }
+ #endif
+ 
  /* ARGSUSED */
      static void
  gui_x11_resize_window_cb(w, dud, event, dum)
*** ../vim-6.2.042/src/integration.c	Mon Aug 27 17:25:25 2001
--- src/integration.c	Sun Jun 22 17:25:16 2003
***************
*** 890,937 ****
  	}
  }
  
- /*
-  *	This function fills in the XRectangle object with the current
-  *	x,y coordinates and height, width so that an XtVaSetValues to
-  *	the same shell of those resources will restore the window to its
-  *	formar position and dimensions.
-  *
-  *	Note: This function may fail, in which case the XRectangle will
-  *	be unchanged.  Be sure to have the XRectangle set with the
-  *	proper values for a failed condition prior to calling this
-  *	function.
-  *
-  * THIS FUNCTION IS LIFTED FROM libutil/src/Session.cc
-  */
- void	shellRectangle(Widget shell, XRectangle *r)
- {
- 	Window		rootw, shellw, child, parentw;
- 	int		absx, absy;
- 	XWindowAttributes	a;
- 	Window		*children;
- 	unsigned int	childrenCount;
- 
- 	shellw = XtWindow(shell);
- 	if (shellw == 0)
- 		return;
- 	for (;;){
- 		XQueryTree(XtDisplay(shell), shellw, &rootw, &parentw,
- 					&children, &childrenCount);
- 		XFree(children);
- 		if (parentw == rootw)
- 			break;
- 		shellw = parentw;
- 	}
- 	XGetWindowAttributes(XtDisplay(shell), shellw, &a);
- 	XTranslateCoordinates(XtDisplay(shell), shellw, a.root, 0, 0,
- 				&absx, &absy, &child);
- 	r->x = absx;
- 	r->y = absy;
- 	XtVaGetValues(shell, XmNheight, &r->height,
- 				XmNwidth, &r->width,
- 				NULL);
- }
- 
  
  Boolean workshop_get_width_height(int *width, int *height)
  {
--- 890,895 ----
*** ../vim-6.2.042/src/netbeans.c	Mon Jun  2 22:26:17 2003
--- src/netbeans.c	Tue Jul 22 10:39:55 2003
***************
*** 2790,2837 ****
      return offset;
  }
  
- 
- #if defined(FEAT_GUI_MOTIF) || defined(PROTO)
- /*
-  *	This function fills in the XRectangle object with the current
-  *	x,y coordinates and height, width so that an XtVaSetValues to
-  *	the same shell of those resources will restore the window to its
-  *	formar position and dimensions.
-  *
-  *	Note: This function may fail, in which case the XRectangle will
-  *	be unchanged.  Be sure to have the XRectangle set with the
-  *	proper values for a failed condition prior to calling this
-  *	function.
-  */
-     void
- shellRectangle(Widget shell, XRectangle *r)
- {
- 	Window		rootw, shellw, child, parentw;
- 	int		absx, absy;
- 	XWindowAttributes	a;
- 	Window		*children;
- 	unsigned int	childrenCount;
- 
- 	shellw = XtWindow(shell);
- 	if (shellw == 0)
- 		return;
- 	for (;;)
- 	{
- 	    XQueryTree(XtDisplay(shell), shellw, &rootw, &parentw,
- 					&children, &childrenCount);
- 	    XFree(children);
- 	    if (parentw == rootw)
- 		break;
- 	    shellw = parentw;
- 	}
- 	XGetWindowAttributes(XtDisplay(shell), shellw, &a);
- 	XTranslateCoordinates(XtDisplay(shell), shellw, a.root, 0, 0,
- 				&absx, &absy, &child);
- 	r->x = absx;
- 	r->y = absy;
- 	XtVaGetValues(shell, XmNheight, &r->height,
- 				XmNwidth, &r->width, NULL);
- }
- #endif
  
  #endif /* defined(FEAT_NETBEANS_INTG) */
--- 2813,2817 ----
*** ../vim-6.2.042/src/proto/netbeans.pro	Mon Jun  2 22:26:17 2003
--- src/proto/netbeans.pro	Sun Jun 22 17:37:19 2003
***************
*** 14,20 ****
  void netbeans_deleted_all_lines __ARGS((buf_T *bufp));
  int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot));
  void netbeans_draw_multisign_indicator __ARGS((int row));
- void netbeans_draw_multisign_indicator __ARGS((int row));
  void netbeans_gutter_click __ARGS((linenr_T lnum));
- void shellRectangle __ARGS((Widget shell, XRectangle *r));
  /* vim: set ft=c : */
--- 14,18 ----
*** ../vim-6.2.042/src/version.c	Sun Jul 27 13:40:24 2003
--- src/version.c	Sun Jul 27 14:10:16 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     43,
  /**/

-- 
Eye have a spelling checker, it came with my PC;
It plainly marks four my revue mistakes I cannot sea.
I've run this poem threw it, I'm sure your please to no,
It's letter perfect in it's weigh, my checker tolled me sew!

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///
Commit	Line	Data
d8621708	1	To: vim-dev@vim.org
	2	Subject: Patch 6.2.043
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=ISO-8859-1
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 6.2.043
	11	Problem: Compiling with both netbeans and workshop doesn't work.
	12	Solution: Move the shellRectangle() function to gui_x11.c. (Gordon Prieur)
	13	Files: src/gui_x11.c, src/integration.c, src/netbeans.c,
	14	src/proto/netbeans.pro
	15
	16
	17	*** ../vim-6.2.042/src/gui_x11.c Sat May 24 13:17:24 2003
	18	--- src/gui_x11.c Sun Jun 22 17:37:21 2003
	19	***************
	20	* 627,632 **
	21	--- 627,675 ----
	22	gui_mch_update();
	23	}
	24
	25	+ #if (defined(FEAT_NETBEANS_INTG) \|\| defined(FEAT_SUN_WORKSHOP)) \
	26	+ \|\| defined(PROTO)
	27	+ /*
	28	+ * This function fills in the XRectangle object with the current
	29	+ * x,y coordinates and height, width so that an XtVaSetValues to
	30	+ * the same shell of those resources will restore the window to its
	31	+ * formar position and dimensions.
	32	+ *
	33	+ * Note: This function may fail, in which case the XRectangle will
	34	+ * be unchanged. Be sure to have the XRectangle set with the
	35	+ * proper values for a failed condition prior to calling this
	36	+ * function.
	37	+ */
	38	+ static void
	39	+ shellRectangle(Widget shell, XRectangle *r)
	40	+ {
	41	+ Window rootw, shellw, child, parentw;
	42	+ int absx, absy;
	43	+ XWindowAttributes a;
	44	+ Window *children;
	45	+ unsigned int childrenCount;
	46	+
	47	+ shellw = XtWindow(shell);
	48	+ if (shellw == 0)
	49	+ return;
	50	+ for (;;)
	51	+ {
	52	+ XQueryTree(XtDisplay(shell), shellw, &rootw, &parentw,
	53	+ &children, &childrenCount);
	54	+ XFree(children);
	55	+ if (parentw == rootw)
	56	+ break;
	57	+ shellw = parentw;
	58	+ }
	59	+ XGetWindowAttributes(XtDisplay(shell), shellw, &a);
	60	+ XTranslateCoordinates(XtDisplay(shell), shellw, a.root, 0, 0,
	61	+ &absx, &absy, &child);
	62	+ r->x = absx;
	63	+ r->y = absy;
	64	+ XtVaGetValues(shell, XmNheight, &r->height, XmNwidth, &r->width, NULL);
65	+ }
66	+ #endif
67	+
68	/* ARGSUSED */
69	static void
70	gui_x11_resize_window_cb(w, dud, event, dum)
71	*** ../vim-6.2.042/src/integration.c Mon Aug 27 17:25:25 2001
72	--- src/integration.c Sun Jun 22 17:25:16 2003
73	***************
74	* 890,937 **
75	}
76	}
77
78	- /*
79	- * This function fills in the XRectangle object with the current
80	- * x,y coordinates and height, width so that an XtVaSetValues to
81	- * the same shell of those resources will restore the window to its
82	- * formar position and dimensions.
83	- *
84	- * Note: This function may fail, in which case the XRectangle will
85	- * be unchanged. Be sure to have the XRectangle set with the
86	- * proper values for a failed condition prior to calling this
87	- * function.
88	- *
89	- * THIS FUNCTION IS LIFTED FROM libutil/src/Session.cc
90	- */
91	- void shellRectangle(Widget shell, XRectangle *r)
92	- {
93	- Window rootw, shellw, child, parentw;
94	- int absx, absy;
95	- XWindowAttributes a;
96	- Window *children;
97	- unsigned int childrenCount;
98	-
99	- shellw = XtWindow(shell);
100	- if (shellw == 0)
101	- return;
102	- for (;;){
103	- XQueryTree(XtDisplay(shell), shellw, &rootw, &parentw,
104	- &children, &childrenCount);
105	- XFree(children);
106	- if (parentw == rootw)
107	- break;
108	- shellw = parentw;
109	- }
110	- XGetWindowAttributes(XtDisplay(shell), shellw, &a);
111	- XTranslateCoordinates(XtDisplay(shell), shellw, a.root, 0, 0,
112	- &absx, &absy, &child);
113	- r->x = absx;
114	- r->y = absy;
115	- XtVaGetValues(shell, XmNheight, &r->height,
116	- XmNwidth, &r->width,
117	- NULL);
118	- }
119	-
120
121	Boolean workshop_get_width_height(int width, int height)
122	{
123	--- 890,895 ----
124	*** ../vim-6.2.042/src/netbeans.c Mon Jun 2 22:26:17 2003
125	--- src/netbeans.c Tue Jul 22 10:39:55 2003
126	***************
127	* 2790,2837 **
128	return offset;
129	}
130
131	-
132	- #if defined(FEAT_GUI_MOTIF) \|\| defined(PROTO)
133	- /*
134	- * This function fills in the XRectangle object with the current
135	- * x,y coordinates and height, width so that an XtVaSetValues to
136	- * the same shell of those resources will restore the window to its
137	- * formar position and dimensions.
138	- *
139	- * Note: This function may fail, in which case the XRectangle will
140	- * be unchanged. Be sure to have the XRectangle set with the
141	- * proper values for a failed condition prior to calling this
142	- * function.
143	- */
144	- void
145	- shellRectangle(Widget shell, XRectangle *r)
146	- {
147	- Window rootw, shellw, child, parentw;
148	- int absx, absy;
149	- XWindowAttributes a;
150	- Window *children;
151	- unsigned int childrenCount;
152	-
153	- shellw = XtWindow(shell);
154	- if (shellw == 0)
155	- return;
156	- for (;;)
157	- {
158	- XQueryTree(XtDisplay(shell), shellw, &rootw, &parentw,
159	- &children, &childrenCount);
160	- XFree(children);
161	- if (parentw == rootw)
162	- break;
163	- shellw = parentw;
164	- }
165	- XGetWindowAttributes(XtDisplay(shell), shellw, &a);
166	- XTranslateCoordinates(XtDisplay(shell), shellw, a.root, 0, 0,
167	- &absx, &absy, &child);
168	- r->x = absx;
169	- r->y = absy;
170	- XtVaGetValues(shell, XmNheight, &r->height,
171	- XmNwidth, &r->width, NULL);
172	- }
173	- #endif
174
175	#endif /* defined(FEAT_NETBEANS_INTG) */
176	--- 2813,2817 ----
177	*** ../vim-6.2.042/src/proto/netbeans.pro Mon Jun 2 22:26:17 2003
178	--- src/proto/netbeans.pro Sun Jun 22 17:37:19 2003
179	***************
180	* 14,20 **
181	void netbeans_deleted_all_lines __ARGS((buf_T *bufp));
182	int netbeans_is_guarded __ARGS((linenr_T top, linenr_T bot));
183	void netbeans_draw_multisign_indicator __ARGS((int row));
184	- void netbeans_draw_multisign_indicator __ARGS((int row));
185	void netbeans_gutter_click __ARGS((linenr_T lnum));
186	- void shellRectangle __ARGS((Widget shell, XRectangle *r));
187	/* vim: set ft=c : */
188	--- 14,18 ----
189	*** ../vim-6.2.042/src/version.c Sun Jul 27 13:40:24 2003
190	--- src/version.c Sun Jul 27 14:10:16 2003
191	***************
192	* 632,633 **
193	--- 632,635 ----
194	{ /* Add new patch number below this line */
195	+ /**/
196	+ 43,
197	/**/
198
199	--
200	Eye have a spelling checker, it came with my PC;
201	It plainly marks four my revue mistakes I cannot sea.
202	I've run this poem threw it, I'm sure your please to no,
203	It's letter perfect in it's weigh, my checker tolled me sew!
204
205	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
206	/// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\
207	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
208	\\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html ///