#90132# removed USE_PSPRINT and USE_XRENDER defines (now default)

vcl/unx/inc/prex.h

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prex.h,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: obr $ $Date: 2001-02-01 16:04:03 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 //                                                                            //
 // (C) 1997 Star Division GmbH, Hamburg, Germany                              //
 //                                                                            //
-// $Revision: 1.6 $  $Author: obr $  $Date: 2001-02-01 16:04:03 $    //
+// $Revision: 1.7 $  $Author: pl $  $Date: 2001-08-27 09:42:34 $    //
 //                                                                            //
 // $Workfile:   prex.h  $                                                     //
 //  $Modtime:   08 Aug 1997 10:13:54  $                                       //
@@ -134,10 +134,7 @@ extern "C" {
 
 #define __Ol_OlXlibExt_h__
 
-#if !defined(_USE_PRINT_EXTENSION_) && ! defined USE_PSPRINT
-      #include <salpdecl.h>
-      #include <salpmacr.h>
-#elif ! defined USE_PSPRINT
+#if defined(_USE_PRINT_EXTENSION_)
       #include <X11/X.h>
       #include <X11/Xlib.h>
       #include <X11/Xutil.h>

vcl/unx/inc/salgdi.h

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salgdi.h,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: hdu $ $Date: 2001-07-06 13:15:35 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,7 +93,7 @@ class   SalPrinter;
 class   SalInfoPrinter;
 class   ServerFont;
 
-#ifdef USE_PSPRINT
+#ifndef _USE_PRINT_EXTENSION_
 namespace psp { struct JobData; class PrinterGfx; }
 #endif
 
@@ -112,7 +112,7 @@ class SalGraphicsData
 
                             STDAPI( SalGraphicsData )
 
-#ifdef USE_PSPRINT
+#ifndef _USE_PRINT_EXTENSION_
             ::psp::JobData*         m_pJobData;
             ::psp::PrinterGfx*      m_pPrinterGfx;
             String*                 m_pPhoneNr;

vcl/unx/inc/salprn.h

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salprn.h,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: pl $ $Date: 2001-06-21 16:34:47 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 #ifndef _SV_SALPRN_H
 #define _SV_SALPRN_H
 
-#ifdef USE_PSPRINT
+#ifndef _USE_PRINT_EXTENSION_
 
 #ifndef _PSPRINT_JOBDATA_HXX_
 #include <psprint/jobdata.hxx>

vcl/unx/source/app/keysymnames.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: keysymnames.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obo $ $Date: 2000-11-22 10:01:12 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -507,9 +507,9 @@ const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
         int opcode, event, error;
         int major = XkbMajorVersion, minor = XkbMinorVersion;
         if( ! m_aKeyboardName.Len() &&
-            #ifndef USE_PSPRINT
+#ifdef _USE_PRINT_EXTENSION_
             XSalIsDisplay( GetDisplay() ) &&
-            #endif
+#endif
             XkbQueryExtension( GetDisplay(), &opcode, &event,&error, &major, &minor ) )
         {
             XkbDescPtr pXkbDesc = NULL;

vcl/unx/source/app/saldisp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: saldisp.cxx,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: pl $ $Date: 2001-08-08 19:09:04 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -567,8 +567,7 @@ sal_GetServerVendor( Display *p_display )
         { vendor_none,        NULL,                               0 },
     };
 
-#ifndef USE_PSPRINT
-    // handle xprinter separately, since it doesnt implement ServerVendor()
+#ifdef _USE_PRINT_EXTENSION_
     if ( ! XSalIsDisplay( p_display ) )
         return vendor_xprinter;
 #endif
@@ -739,7 +738,7 @@ SalDisplay::SalDisplay( Display *display, Visual *pVisual, Colormap aColMap ) :
     if( !pSalData->GetCurDisp() )
         pSalData->SetCurDisp( this );
 
-#ifndef USE_PSPRINT
+#ifdef _USE_PRINT_EXTENSION_
     pXLib_    = XSalIsDisplay( pDisp_ ) ? pSalData->GetLib() : NULL;
 #else
     pXLib_    = pSalData->GetLib();
@@ -3553,7 +3552,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
             return pVisual_->GetTCColor( nPixel );
 
         if( !pPalette_
-#ifndef USE_PSPRINT
+#ifdef _USE_PRINT_EXTENSION_
             && ( hColormap_ || XSalIsPrinter( GetXDisplay() ) )
 #else
             && hColormap_
@@ -3570,7 +3569,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const
     if( pPalette_ && nPixel < nUsed_ )
         return pPalette_[nPixel];
 
-#ifndef USE_PSPRINT
+#ifdef _USE_PRINT_EXTENSION_
     if( !hColormap_ && !XSalIsPrinter( GetXDisplay() ) )
 #else
     if( !hColormap_ )
@@ -3625,7 +3624,7 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
     if( !pLookupTable_ )
     {
         if( !pPalette_
-#ifndef USE_PSPRINT
+#ifdef _USE_PRINT_EXTENSION_
             && ( hColormap_ || XSalIsPrinter( GetXDisplay() ) )
 #else
             && hColormap_
@@ -3644,7 +3643,7 @@ Pixel SalColormap::GetPixel( SalColor nSalColor ) const
                 if( pPalette_[i] == nSalColor )
                     return i;
 
-#ifndef USE_PSPRINT
+#ifdef _USE_PRINT_EXTENSION_
         if( hColormap_ || XSalIsPrinter( GetXDisplay() ) )
 #else
         if( hColormap_ )

vcl/unx/source/app/salinst.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salinst.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: pl $ $Date: 2001-07-26 15:45:26 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,16 +93,10 @@
 #include <dtint.hxx>
 #endif
 #if !defined(_USE_PRINT_EXTENSION_)
-    #ifndef _SV_SALPRN_H
-    #include <salprn.h>
-    #endif
+#ifndef _SV_SALPRN_H
+#include <salprn.h>
 #endif
-#if !defined(USE_PSPRINT) && !defined(_USE_PRINT_EXTENSION_)
-    #ifndef _VCL_SALCONFIG_HXX
-    #include <salconfig.hxx>
-    #endif
 #endif
-
 // -=-= C++ globals =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 void SalAbort( const XubString& rErrorText )
@@ -201,10 +195,6 @@ SalInstance *CreateSalInstance()
     // init instance (only one instance in this version !!!)
     pSalData->pFirstInstance_ = pInst;
 
-#if !defined(USE_PSPRINT) && !defined(_USE_PRINT_EXTENSION_)
-    StartPrinterListening();
-#endif
-
     return pInst;
 }
 
@@ -214,15 +204,7 @@ void DestroySalInstance( SalInstance *pInst )
 
     // reset instance (only one instance in this version !!!)
     if( pSalData->pFirstInstance_ == pInst )
-    {
-#if !defined(USE_PSPRINT) && !defined(_USE_PRINT_EXTENSION_)
-        StopPrinterListening();
-#endif
         pSalData->pFirstInstance_ = NULL;
-#if !defined(USE_PSPRINT) && !defined(_USE_PRINT_EXTENSION_)
-        ::vcl_sal::XpDefaults::release();
-#endif
-    }
 
     delete pInst;
 }

vcl/unx/source/gdi/gcach_xpeer.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gcach_xpeer.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: hdu $ $Date: 2001-07-11 15:27:23 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,19 +63,15 @@
 #include <gcach_xpeer.hxx>
 #include <stdlib.h>
 
-#ifdef USE_XRENDER
-    #include <dlfcn.h>
-#endif // USE_XRENDER
+#include <dlfcn.h>
 
 // ---------------------------------------------------------------------------
 
 X11GlyphPeer::X11GlyphPeer()
 :   mpDisplay(NULL)
 ,   mbForcedAA(false)
-#ifdef USE_XRENDER
 ,   mbUsingXRender(false)
 ,   mpGlyphFormat(NULL)
-#endif // USE_XRENDER
 {
     maRawBitmap.mnAllocated = 0;
     maRawBitmap.mpBits = NULL;
@@ -114,7 +110,6 @@ void X11GlyphPeer::SetDisplay( Display* _pDisplay, Visual* _pVisual )
     if( (nEnvAntiAlias & 1) == 0 )
         mbForcedAA = false;
 
-#if defined(USE_XRENDER)
     // but we prefer the hardware accelerated solution
     int nDummy;
     if( !XQueryExtension( mpDisplay, "RENDER", &nDummy, &nDummy, &nDummy ) )
@@ -184,7 +179,6 @@ void X11GlyphPeer::SetDisplay( Display* _pDisplay, Visual* _pVisual )
 
     if( (nEnvAntiAlias & 2) == 0 )
         mbUsingXRender = false;
-#endif // USE_XRENDER
 }
 
 // ---------------------------------------------------------------------------
@@ -197,11 +191,9 @@ void X11GlyphPeer::RemovingFont( ServerFont& rServerFont )
         case AAFORCED_KIND:
             break;
 
-#ifdef USE_XRENDER
         case XRENDER_KIND:
             (*pXRenderFreeGlyphSet)( mpDisplay,(GlyphSet)rServerFont.GetExtPointer() );
             break;
-#endif // USE_XRENDER
     }
 
     rServerFont.SetExtended( EMPTY_KIND, NULL );
@@ -240,7 +232,6 @@ void X11GlyphPeer::RemovingGlyph( ServerFont& rServerFont, GlyphData& rGlyphData
             }
             break;
 
-#ifdef USE_XRENDER
         case XRENDER_KIND:
         {
             GlyphSet aGlyphSet = GetGlyphSet( rServerFont );
@@ -251,7 +242,6 @@ void X11GlyphPeer::RemovingGlyph( ServerFont& rServerFont, GlyphData& rGlyphData
 
             break;
         }
-#endif // USE_XRENDER
     }
 
 
@@ -272,7 +262,6 @@ bool X11GlyphPeer::ForcedAntialiasing( const ServerFont& rServerFont ) const
 
 // ---------------------------------------------------------------------------
 
-#ifdef USE_XRENDER
 GlyphSet X11GlyphPeer::GetGlyphSet( ServerFont& rServerFont )
 {
     if( !mbUsingXRender )
@@ -310,7 +299,6 @@ GlyphSet X11GlyphPeer::GetGlyphSet( ServerFont& rServerFont )
 
     return aGlyphSet;
 }
-#endif // USE_XRENDER
 
 // ---------------------------------------------------------------------------
 
@@ -418,7 +406,6 @@ const RawBitmap* X11GlyphPeer::GetRawBitmap( ServerFont& rServerFont,
 
 // ---------------------------------------------------------------------------
 
-#ifdef USE_XRENDER
 Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex )
 {
     Glyph aGlyphId;
@@ -459,4 +446,3 @@ Glyph X11GlyphPeer::GetGlyphId( ServerFont& rServerFont, int nGlyphIndex )
 
     return aGlyphId;
 }
-#endif // USE_XRENDER

vcl/unx/source/gdi/gcach_xpeer.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gcach_xpeer.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hdu $ $Date: 2001-04-05 07:38:51 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,11 +64,9 @@
 
 #include <glyphcache.hxx>
 
-#ifdef USE_XRENDER
-    #define Region XLIB_Region
-    #include <X11/extensions/Xrender.h>
-    #undef Region
-#endif
+#define Region XLIB_Region
+#include <X11/extensions/Xrender.h>
+#undef Region
 
 class X11GlyphPeer
 : public GlyphCachePeer
@@ -82,10 +80,8 @@ public:
     const RawBitmap*    GetRawBitmap( ServerFont&, int nGlyphIndex );
     bool                ForcedAntialiasing( const ServerFont& ) const;
 
-#ifdef USE_XRENDER
     GlyphSet            GetGlyphSet( ServerFont& );
     Glyph               GetGlyphId( ServerFont&, int nGlyphIndex );
-#endif // USE_XRENDER
 
 protected:
     virtual void        RemovingFont( ServerFont& );
@@ -98,7 +94,6 @@ private:
     RawBitmap           maRawBitmap;
     bool                mbForcedAA;
 
-#ifdef USE_XRENDER
     bool                mbUsingXRender;
     XRenderPictFormat*  mpGlyphFormat;
 
@@ -114,7 +109,6 @@ public:
     Picture     (*pXRenderCreatePicture)(Display*,Drawable,XRenderPictFormat*,unsigned long,XRenderPictureAttributes*);
     void        (*pXRenderSetPictureClipRegion)(Display*,Picture,XLIB_Region);
     void        (*pXRenderFreePicture)(Display*,Picture);
-#endif // USE_XRENDER
 };
 
 #endif // _SV_GCACH_XPEER_HXX

vcl/unx/source/gdi/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.6 $
+#   $Revision: 1.7 $
 #
-#   last change: $Author: hdu $ $Date: 2001-02-15 15:30:00 $
+#   last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -98,16 +98,11 @@ SLOFILES=	\
         $(SLO)$/xlfd_smpl.obj	\
         $(SLO)$/salgdi3.obj
 
-.IF "$(PSPRINT)" != ""
-SLOFILES+=$(SLO)$/salprnpsp.obj
-.ELIF "$(USE_XPRINT)" == "TRUE"
+.IF "$(USE_XPRINT)" == "TRUE"
 CFLAGS+=-D_USE_PRINT_EXTENSION_=1
 SLOFILES+=$(SLO)$/xprintext.obj
 .ELSE
-SLOFILES+=\
-        $(SLO)$/salprn.obj 		\
-        $(SLO)$/salpimpl.obj 	\
-        $(SLO)$/salconfig.obj
+SLOFILES+=$(SLO)$/salprnpsp.obj
 .ENDIF
 
 .IF "$(OS)"=="SOLARIS"

vcl/unx/source/window/salframe.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salframe.cxx,v $
  *
- *  $Revision: 1.70 $
+ *  $Revision: 1.71 $
  *
- *  last change: $Author: cp $ $Date: 2001-08-24 16:00:00 $
+ *  last change: $Author: pl $ $Date: 2001-08-27 09:42:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -117,7 +117,7 @@
 #ifndef _VCL_WMADAPTOR_HXX_
 #include <wmadaptor.hxx>
 #endif
-#ifdef USE_PSPRINT
+#ifndef _USE_PRINT_EXTENSION_
 #ifndef _PSPRINT_PRINTERINFOMANAGER_HXX_
 #include <psprint/printerinfomanager.hxx>
 #endif
@@ -2196,7 +2196,7 @@ long SalFrameData::HandleFocusEvent( XFocusChangeEvent *pEvent )
     {
         if( FocusIn == pEvent->type )
         {
-#ifdef USE_PSPRINT
+#ifndef _USE_PRINT_EXTENSION_
             if( GetSalData()->pFirstInstance_->maInstData.mbPrinterInit )
             {
                 ::psp::PrinterInfoManager& rManager( ::psp::PrinterInfoManager::get() );

vcl/util/makefile.mk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.26 $
+#   $Revision: 1.27 $
 #
-#   last change: $Author: pl $ $Date: 2001-08-10 10:58:14 $
+#   last change: $Author: pl $ $Date: 2001-08-27 09:42:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -191,7 +191,7 @@ LIB1FILES+= \
 .ENDIF          # "$(remote)" != ""
 
 .IF "$(GUI)" == "UNX"
-.IF "$(PSPRINT)" != ""
+.IF "$(USE_XPRINT)" != "TRUE"
     SHL1STDLIBS=-lpsp$(VERSION)$(DLLPOSTFIX)
 .ENDIF
 .ENDIF
@@ -269,11 +269,7 @@ LINKFLAGSSHL += /ENTRY:LibMain@12
 .IF "$(USE_XPRINT)" == "TRUE"
 SHL1STDLIBS += -lXp -lXm -lXt -lX11
 .ELSE
-.IF "$(PSPRINT)"!=""
 SHL1STDLIBS += -lXm -lXt -lX11
-.ELSE
-SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXm -lXt -lX11
-.ENDIF
 .ENDIF          # "$(USE_XPRINT)" == "TRUE"
 
 # MacOSX
@@ -287,11 +283,7 @@ SHL1STDLIBS += -framework Cocoa
 .IF "$(USE_XPRINT)" == "TRUE"
 SHL1STDLIBS += -lXp -lXaw -lXt -lX11
 .ELSE
-.IF "$(PSPRINT)"!=""
 SHL1STDLIBS += -lXaw -lXt -lX11
-.ELSE
-SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXaw -lXt -lX11
-.ENDIF
 .ENDIF          # "$(USE_XPRINT)" == "TRUE"
 .ENDIF          # "$(OS)"=="MACOSX"
 .ENDIF          # "$(OS)"=="SOLARIS"

vcl/util/makefile.pmk

@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.pmk,v $
 #
-#   $Revision: 1.9 $
+#   $Revision: 1.10 $
 #
-#   last change: $Author: hdu $ $Date: 2001-05-16 08:00:03 $
+#   last change: $Author: pl $ $Date: 2001-08-27 09:42:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -67,21 +67,12 @@ PDBTARGET=vcl
 GUIBASE=aqua
 .ENDIF
 
-.IF "$(OS)" != "MACOSX"
-.IF "$(USE_XPRINTER)" == ""
-CFLAGSDEFS += -DUSE_PSPRINT
-PSPRINT=true
-.ENDIF
-.ENDIF
-
 .IF "$(OS)" != "MACOSX"
 .IF "$(remote)" != ""
 USE_BUILTIN_RASTERIZER=true
 .ENDIF
 .IF "$(GUI)" == "UNX"
 USE_BUILTIN_RASTERIZER=true
-USE_XRENDER=true
-ENVCFLAGS += -DUSE_XRENDER
 .ENDIF
 .ENDIF