head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3;
locks; strict;
comment	@# @;


1.3
date	2003.11.10.17.18.28;	author agc;	state dead;
branches;
next	1.2;

1.2
date	2003.10.01.01.14.35;	author christos;	state Exp;
branches;
next	1.1;

1.1
date	2003.09.30.23.03.59;	author christos;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Update xosview to version 1.8.1alpha, from a nudge by Brian Grayson.

Fixes build on NetBSD-1.6.2 and NetBSD-1.6ZE. Existing patches have
either been incorporated or are unnecessary.
@
text
@$NetBSD: patch-aq,v 1.2 2003/10/01 01:14:35 christos Exp $

--- xwin.cc.orig	1999-02-16 09:08:34.000000000 -0500
+++ xwin.cc	2003-09-30 20:47:37.000000000 -0400
@@@@ -5,2 +5,3 @@@@
 #include <X11/Xatom.h>
+#include <iostream>
 #include <stdlib.h>
@@@@ -24,4 +25,4 @@@@
 XWin::XWin( int argc, char *argv[], int x, int y, int width, int height ){
-  cerr << "This constructor call is not supported! (" << __FILE__
-       << ":" << __LINE__ << ")" << endl;
+  std::cerr << "This constructor call is not supported! (" << __FILE__
+       << ":" << __LINE__ << ")" << std::endl;
   exit (-1);
@@@@ -136,3 +137,3 @@@@
   if(XGetWindowAttributes(display_, window_, &attr_) == 0){
-    cerr <<"Error getting attributes of Main." <<endl;
+    std::cerr <<"Error getting attributes of Main." <<std::endl;
     exit(2);
@@@@ -156,4 +157,4 @@@@
   if ((font_ = XLoadQueryFont(display_, fontName)) == NULL){
-    cerr <<name_ <<": display " <<DisplayString(display_)
-      <<" cannot load font " << fontName << endl;
+    std::cerr <<name_ <<": display " <<DisplayString(display_)
+      <<" cannot load font " << fontName << std::endl;
     exit(1);
@@@@ -166,3 +167,3 @@@@
   if((classhints_ = XAllocClassHint()) == NULL){
-    cerr <<"Error allocating class hint!" <<endl;
+    std::cerr <<"Error allocating class hint!" <<std::endl;
     exit(1);
@@@@ -175,3 +176,3 @@@@
   if((wmhints_ = XAllocWMHints()) == NULL){
-    cerr <<"Error allocating Window Manager hints!" <<endl;
+    std::cerr <<"Error allocating Window Manager hints!" <<std::endl;
     exit(1);
@@@@ -184,3 +185,3 @@@@
   if(XStringListToTextProperty(&name_, 1, &title_) == 0){
-    cerr <<"Error creating XTextProperty!" <<endl;
+    std::cerr <<"Error creating XTextProperty!" <<std::endl;
     exit(1);
@@@@ -188,3 +189,3 @@@@
   if(XStringListToTextProperty(&name_, 1, &iconname_) == 0){
-    cerr <<"Error creating XTextProperty!" <<endl;
+    std::cerr <<"Error creating XTextProperty!" <<std::endl;
     exit(1);
@@@@ -206,3 +207,3 @@@@
   if ((display_ = XOpenDisplay (display_name_)) == NULL) {
-    cerr <<"Can't open display named " << display_name_ <<endl;
+    std::cerr <<"Can't open display named " << display_name_ <<std::endl;
     exit(1);
@@@@ -253,4 +254,4 @@@@
         	{
-                	cerr << "Pixmap " << pixmap_file  << " not found" << endl;
-                	cerr << "Defaulting to blank" << endl;
+                	std::cerr << "Pixmap " << pixmap_file  << " not found" << std::endl;
+                	std::cerr << "Defaulting to blank" << std::endl;
                 	pixmap=NULL;
@@@@ -263,3 +264,3 @@@@
 	(void) pixmap;
-	cerr << "Error:  getPixmap called, when Xpm is not enabled!\n" ;
+	std::cerr << "Error:  getPixmap called, when Xpm is not enabled!\n" ;
 	return 0;
@@@@ -275,3 +276,3 @@@@
   if((sizehints_ = XAllocSizeHints()) == NULL){
-    cerr <<"Error allocating size hints!" <<endl;
+    std::cerr <<"Error allocating size hints!" <<std::endl;
     exit(1);
@@@@ -352,3 +353,3 @@@@
   //  FIXME  We need to update this.  BCG
-  cerr <<name_ <<" [-display name] [-geometry geom]" <<endl;
+  std::cerr <<name_ <<" [-display name] [-geometry geom]" <<std::endl;
 //    exit (1);
@@@@ -388,3 +389,3 @@@@
   {
-    cerr << "Error:  Couldn't find '" << name << "' resource in the resource database!\n";
+    std::cerr << "Error:  Couldn't find '" << name << "' resource in the resource database!\n";
     exit (-1);
@@@@ -397,4 +398,4 @@@@
 
-void XWin::dumpResources( ostream &os ){
-cerr << "Function not implemented!\n";  //  BCG  FIXME  Need to make this.
+void XWin::dumpResources( std::ostream &os ){
+std::cerr << "Function not implemented!\n";  //  BCG  FIXME  Need to make this.
 (void) os;  //  Keep gcc happy.
@@@@ -407,3 +408,3 @@@@
   if ( XAllocNamedColor( display_, colormap(), name, &closest, &exact ) == 0 )
-    cerr <<"XWin::allocColor() : failed to alloc : " <<name <<endl;
+    std::cerr <<"XWin::allocColor() : failed to alloc : " <<name <<std::endl;
 
@@@@ -506,3 +507,3 @@@@
   default:
-    cerr <<"XWin::Event::Event() : unknown event type : " <<event_ <<endl;
+    std::cerr <<"XWin::Event::Event() : unknown event type : " <<event_ <<std::endl;
     mask_ = NoEventMask;
--- xwin.h.orig	1999-02-16 09:08:35.000000000 -0500
+++ xwin.h	2003-09-30 20:41:12.000000000 -0400
@@@@ -11,3 +11,3 @@@@
 #endif
-#include <iostream.h>
+#include <iostream>
 #include <string.h>
@@@@ -99,3 +99,3 @@@@
     return (!strncasecmp(getResource(name),"True", 5)); }
-  void dumpResources( ostream &os );
+  void dumpResources(std::ostream &os );
   
@@@@ -107,3 +107,3 @@@@
 
-    friend XWin;
+    friend class XWin;
 
@


1.2
log
@more g++-3 header issues. don't use the compat headers.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@g++-3.x compliance. std namespaces, etc.
@
text
@d4 2
a5 4
+++ xwin.cc	2003-09-30 18:46:45.000000000 -0400
@@@@ -3,6 +3,7 @@@@
 //
 
d9 1
a9 5
 #include <unistd.h>
 #include "snprintf.h"
@@@@ -22,8 +23,8 @@@@
 //-----------------------------------------------------------------------------
 
d16 1
a16 5
   //  FIXME BCG  This constructor needs to do much of the work of the above
   //  one.  Or, we need to drop this as a constructor.  As it is, it is
@@@@ -134,7 +135,7 @@@@
   map();
   flush();
d21 1
a21 5
   }
 
@@@@ -154,8 +155,8 @@@@
   const char* fontName = getResource("font");
 
d28 1
a28 5
   }
 }
@@@@ -164,7 +165,7 @@@@
 void XWin::setHints( int argc, char *argv[] ){
   // Set up class hint
d33 1
a33 5
   }
   //  We have to cast away the const's.
@@@@ -173,7 +174,7 @@@@
 
   // Set up the window manager hints
d38 1
a38 5
   }
   wmhints_->flags = (InputHint|StateHint);
@@@@ -182,11 +183,11 @@@@
 
   // Set up XTextProperty for window name and icon name
d43 1
a43 1
   }
d48 1
a48 5
   }
 
@@@@ -204,7 +205,7 @@@@
 void XWin::openDisplay( void ){
   // Open connection to display selected by user
d53 1
a53 5
   }
 
@@@@ -251,8 +252,8 @@@@
 		pixmap_att.valuemask=XpmSize|XpmReturnPixels|XpmColormap|XpmCloseness;
 		if(XpmReadFileToPixmap(display_,DefaultRootWindow(display_),pixmap_file, pixmap, NULL, &pixmap_att))
d60 1
a60 5
 			return 0; // OOps
         	}
@@@@ -261,7 +262,7 @@@@
 	return 0; // No file specified, none used
 #else
d65 1
a65 5
 #endif
 }
@@@@ -273,7 +274,7 @@@@
   // Fill out a XsizeHints structure to inform the window manager
   // of desired size and location of main window.
d70 1
a70 5
   }
   sizehints_->flags = PSize;
@@@@ -350,7 +351,7 @@@@
 #if 0
 void XWin::usage( void ){
d75 1
a75 5
 }
 #endif
@@@@ -386,7 +387,7 @@@@
     return retval;
   else
d80 1
a80 4
       /*  Some compilers aren't smart enough to know that exit() exits.  */
     return '\0';
@@@@ -396,7 +397,7 @@@@
 //-----------------------------------------------------------------------------
d82 1
a82 1
 void XWin::dumpResources( ostream &os ){
d84 1
d87 1
a87 5
 }
 //-----------------------------------------------------------------------------
@@@@ -405,7 +406,7 @@@@
   XColor exact, closest;
   
d92 1
a92 5
   return exact.pixel;
 }
@@@@ -504,7 +505,7 @@@@
     mask_ = ResizeRedirectMask;
     break;
a96 2
     break;
   }
d98 12
a109 4
+++ xwin.h	2003-09-30 18:33:56.000000000 -0400
@@@@ -105,7 +105,7 @@@@
     Event( XWin *parent, int event, EventCallBack callBack );
     virtual ~Event( void ){}
a113 2
     void callBack( XEvent &event )
       { if ( event.type == event_ ) (parent_->*callBack_)( event ); }
@