@@ -245,6 +245,38 @@ unsigned long map[256] = { U0, U0, U0, U0, U0, U0, U0, U0,
245245 U0 , U0 , U0 , U0 , U0 , U0 , U0 , U0 ,
246246 U0 , U0 , U0 , U0 , U0 , U0 , U0 , U0 };
247247
248+ /* routine to find display server; check getpar */
249+ Display * OpenDisplay (void )
250+ {
251+ char name [50 ], * host ;
252+ Display * display ;
253+
254+ display = NULL ;
255+
256+ /* check getpar first */
257+ host = sf_getstring ("server" ); /* X server */
258+ if (NULL != host )
259+ {
260+ display = XOpenDisplay (host );
261+ if (display != NULL )
262+ sf_warning ("X-server=%s" , DisplayString (display ));
263+ else /* add :0 to getpar name */
264+ {
265+ sprintf (name , "%s:0" , host );
266+ display = XOpenDisplay (name );
267+ if (display != NULL )
268+ fprintf (stderr , "X-server=%s\n" , DisplayString (display ));
269+ }
270+ return (display );
271+ }
272+
273+ display = XOpenDisplay (NULL );
274+ if (display != NULL )
275+ sf_warning ("X-server=%s" , DisplayString (display ));
276+ return (display );
277+ }
278+
279+
248280void xattributes (int command , int v , int v1 , int v2 , int v3 )
249281/*< attributes >*/
250282{
@@ -436,7 +468,6 @@ void opendev (int argc, char* argv[])
436468{
437469 int win_x , win_y , i ;
438470 char title [50 ], * ap , * option ;
439- Display * OpenDisplay ();
440471 XEvent event ;
441472
442473 dev .erase = xerase ;
@@ -569,36 +600,6 @@ void opendev (int argc, char* argv[])
569600 }
570601}
571602
572- /* routine to find display server; check getpar */
573- Display * OpenDisplay ()
574- {
575- char name [50 ], * host ;
576- Display * display ;
577-
578- display = NULL ;
579-
580- /* check getpar first */
581- host = sf_getstring ("server" ); /* X server */
582- if (NULL != host )
583- {
584- display = XOpenDisplay (host );
585- if (display != NULL )
586- sf_warning ("X-server=%s" , DisplayString (display ));
587- else /* add :0 to getpar name */
588- {
589- sprintf (name , "%s:0" , host );
590- display = XOpenDisplay (name );
591- if (display != NULL )
592- fprintf (stderr , "X-server=%s\n" , DisplayString (display ));
593- }
594- return (display );
595- }
596-
597- display = XOpenDisplay (NULL );
598- if (display != NULL )
599- sf_warning ("X-server=%s" , DisplayString (display ));
600- return (display );
601- }
602603
603604void xplot (int x , int y , int draw )
604605/*< plot >*/
0 commit comments