Packman Build Service PMBS

gogglesmm.changes Changed

gogglesmm.spec Changed

gogglesmm.patch Changed

gogglesmm-1.2.1.tar.gz/AUTHORS -> gogglesmm-1.2.2.tar.gz/AUTHORS Changed

gogglesmm-1.2.1.tar.gz/CMakeLists.txt -> gogglesmm-1.2.2.tar.gz/CMakeLists.txt Changed

gogglesmm-1.2.1.tar.gz/ChangeLog -> gogglesmm-1.2.2.tar.gz/ChangeLog Changed

gogglesmm-1.2.1.tar.gz/cfox/CMakeLists.txt -> gogglesmm-1.2.2.tar.gz/cfox/CMakeLists.txt Changed

@@ -2,24 +2,25 @@
 
 set(CMAKE_VERBOSE_MAKEFILE TRUE)
 
-project(cfox VERSION 1.7.64)
+project(cfox VERSION 1.7.74)
 
 option(WITH_NATIVE "Compile for native architecture" OFF)
 
 include(CheckCXXCompilerFlag)
 
-check_cxx_compiler_flag(-Wall                    HAS_CXX_WALL)
-check_cxx_compiler_flag(-Wextra                  HAS_CXX_WEXTRA)
-check_cxx_compiler_flag(-Wformat=2               HAS_CXX_WFORMAT)
-check_cxx_compiler_flag(-Woverloaded-virtual     HAS_CXX_WOVERLOADED_VIRTUAL)
-check_cxx_compiler_flag(-Wshadow                 HAS_CXX_WSHADOW)
-check_cxx_compiler_flag(-Wimplicit-fallthrough=0 HAS_CXX_IMPLICIT_FALLTHROUGH)
-
-check_cxx_compiler_flag(-Wfatal-errors       HAS_CXX_WFATAL)
-check_cxx_compiler_flag(-Og                  HAS_CXX_OPTIMIZE_DEBUG)
-check_cxx_compiler_flag(-ffast-math          HAS_CXX_FASTMATH)
-check_cxx_compiler_flag(-fstrict-aliasing    HAS_CXX_STRICTALIASING)
-check_cxx_compiler_flag(-finline-functions   HAS_CXX_INLINEFUNCTIONS)
+check_cxx_compiler_flag(-Wall                HAS_CXX_WALL)
+check_cxx_compiler_flag(-Wextra              HAS_CXX_WEXTRA)
+check_cxx_compiler_flag(-Wno-format          HAS_CXX_WFORMAT)
+check_cxx_compiler_flag(-Woverloaded-virtual HAS_CXX_WOVERLOADED_VIRTUAL)
+check_cxx_compiler_flag(-Wshadow             HAS_CXX_WSHADOW)
+check_cxx_compiler_flag(-Wno-implicit-fallthrough HAX_CXX_IMPLICIT_FALLTHROUGH)
+
+
+check_cxx_compiler_flag(-Wfatal-errors  HAS_CXX_WFATAL)
+check_cxx_compiler_flag(-Og             HAS_CXX_OPTIMIZE_DEBUG)
+check_cxx_compiler_flag(-ffast-math     HAS_CXX_FASTMATH)
+check_cxx_compiler_flag(-fstrict-aliasing HAS_CXX_STRICTALIASING)
+check_cxx_compiler_flag(-finline-functions HAS_CXX_INLINEFUNCTIONS)
 check_cxx_compiler_flag(-fomit-frame-pointer HAS_CXX_OMITFRAMEPOINTER)
 
 if(HAS_CXX_FASTMATH)
@@ -38,6 +39,8 @@
   add_compile_options("$<$<CONFIG:Release>:-fomit-frame-pointer>")
 endif()
 
+
+
 if(HAS_CXX_WALL)
     add_compile_options(-Wall)
 endif()
@@ -47,7 +50,7 @@
 endif()
 
 if(HAS_CXX_WFORMAT)
-    add_compile_options(-Wformat=2)
+    add_compile_options(-Wno-format)
 endif()
 
 if(HAS_CXX_WFATAL)
@@ -62,8 +65,8 @@
     add_compile_options(-Woverloaded-virtual)
 endif()
 
-if(HAS_CXX_IMPLICIT_FALLTHROUGH)
-    add_compile_options(-Wimplicit-fallthrough=0)
+if(HAX_CXX_IMPLICIT_FALLTHROUGH)
+    add_compile_options(-Wno-implicit-fallthrough)
 endif()
 
 if(WITH_NATIVE)

gogglesmm-1.2.1.tar.gz/cfox/include/FX4Splitter.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FX4Splitter.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FX7Segment.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FX7Segment.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXAccelTable.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXAccelTable.h Changed

@@ -3,7 +3,7 @@
 *                   A c c e l e r a t o r   T a b l e   C l a s s               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -56,68 +56,105 @@
   long onKeyRelease(FXObject*,FXSelector,void*);
 public:
 
-  /// Construct empty accelerator table
+  /**
+  * Construct empty accelerator table.
+  */
   FXAccelTable();
 
-  /// Add an accelerator into the table
+  /**
+  * Add accelerator key-combination into the accelerator table.
+  */
   void addAccel(FXHotKey hotkey,FXObject* target=NULL,FXSelector seldn=0,FXSelector selup=0);
 
-  /// Remove an accelerator from the table
+  /**
+  * Parse key-combination description and add it into the accelerator table.
+  */
+  void addAccel(const FXchar* string,FXObject* target=NULL,FXSelector seldn=0,FXSelector selup=0);
+  void addAccel(const FXString& string,FXObject* target=NULL,FXSelector seldn=0,FXSelector selup=0);
+
+  /**
+  * Remove accelerator key combination from the accelerator table.
+  */
   void removeAccel(FXHotKey hotkey);
 
-  /// Return true if accelerator specified
+  /**
+  * Parse key-combination description and remove it from the accelerator table.
+  */
+  void removeAccel(const FXchar* string);
+  void removeAccel(const FXString& string);
+
+  /**
+  * Return true if accelerator accelerator key-combination is in accelerator table.
+  */
   FXbool hasAccel(FXHotKey hotkey) const;
 
-  /// Return target object of the given accelerator
+  /**
+  * Parse key-combination description and return true if it is in the accelerator table.
+  */
+  FXbool hasAccel(const FXchar* string) const;
+  FXbool hasAccel(const FXString& string) const;
+
+  /**
+  * Return target object of the given accelerator key-combination.
+  */
   FXObject* targetOfAccel(FXHotKey hotkey) const;
 
+  /**
+  * Parse key-combination description and return its target.
+  */
+  FXObject* targetOfAccel(const FXchar* string) const;
+  FXObject* targetOfAccel(const FXString& string) const;
+
+  /**
+  * Parse accelerator from string, yielding modifier and key code.
+  * The syntax of the string is:
+  *
+  *  <Accelerator> ::= (<Modifier> ('-' | '+'))* <Key>
+  *
+  * where:
+  *
+  * <Modifier> ::= 'Ctl' | 'Ctrl' | 'Alt' | 'Meta' | 'Shift'
+  *
+  * <Key>      ::= 'Home' | 'End' | 'PgUp' | 'PgDn' | 'Left' | 'Right' |
+  *                'Up' | 'Down' | 'Ins' | 'Del' | 'Esc' | 'Tab' | 'Return' |
+  *                'Enter' | 'Back' | 'Spc' | 'Space' |
+  *                'F'<Digit><Digit>? |
+  *                '#'<HexDigit>+ |
+  *                <Letter>
+  *
+  * <Digit>    ::= '0' ... '1'
+  * <Letter>   ::= 'A' ... 'Z'
+  * <HexDigit> ::= '0' ... '9', 'A' ... 'F'
+  *
+  * Case is not significant, but uppercase is preferred.
+  * For example, parseAccel("Ctl+Shift+X") yields the same value as:
+  * MKUINT(KEY_X,CONTROLMASK|SHIFTMASK).
+  */
+  static FXHotKey parseAccel(const FXchar* string);
+  static FXHotKey parseAccel(const FXString& string);
+
+  /**
+  * Unparse hot key comprising modifier and key code back
+  * into a string suitable for parsing with fxparseHotKey.
+  * For example, an input of MKUINT(KEY_X,CONTROLMASK|SHIFTMASK)
+  * will return the string "Ctl+Shift+X".
+  */
+  static FXString unparseAccel(FXHotKey key);
+
   /// Save table to a stream
   virtual void save(FXStream& store) const;
 
   /// Load table from a stream
   virtual void load(FXStream& store);
 
-  /// Destructor
+  /**
+  * Destroy accelerator table.
+  */
   virtual ~FXAccelTable();
   };
 
 
 /**
-* Parse accelerator from string, yielding modifier and key code.
-* The syntax of the string is:
-*
-*  <Accelerator> ::= (<Modifier> ('-' | '+'))* <Key>
-*
-* where:
-*
-* <Modifier> ::= 'Ctl' | 'Ctrl' | 'Alt' | 'Meta' | 'Shift'
-*
-* <Key>      ::= 'Home' | 'End' | 'PgUp' | 'PgDn' | 'Left' | 'Right' |
-*                'Up' | 'Down' | 'Ins' | 'Del' | 'Esc' | 'Tab' | 'Return' |
-*                'Enter' | 'Back' | 'Spc' | 'Space' |
-*                'F'<Digit><Digit>? |
-*                '#'<HexDigit>+ |
-*                <Letter>
-*
-* <Digit>    ::= '0' ... '1'
-* <Letter>   ::= 'A' ... 'Z'
-* <HexDigit> ::= '0' ... '9', 'A' ... 'F'
-*
-* Case is not significant, but uppercase is preferred.
-* For example, parseAccel("Ctl+Shift+X") yields the same value as:
-* MKUINT(KEY_X,CONTROLMASK|SHIFTMASK).
-*/
-extern FXAPI FXHotKey parseAccel(const FXString& string);
-
-/**
-* Unparse hot key comprising modifier and key code back
-* into a string suitable for parsing with fxparseHotKey.
-* For example, an input of MKUINT(KEY_X,CONTROLMASK|SHIFTMASK)
-* will return the string "Ctl+Shift+X".
-*/
-extern FXAPI FXString unparseAccel(FXHotKey key);
-
-/**
 * Parse hot key from string of the form "&Hotkey", yielding modifier and
 * key code. If a '&' is to be just plain text, it should be doubled.
 * For example, parseHotKey(""Salt && &Pepper!"") yields the same value as

gogglesmm-1.2.1.tar.gz/cfox/include/FXApp.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXApp.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXArray.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXArray.h Changed

@@ -3,7 +3,7 @@
 *                          G e n e r i c   A r r a y                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -71,11 +71,11 @@
   /// Change number of elements in array to n
   FXbool no(FXival n){
     FXival m=no();
-    if(0<n-m){
+    if((n-m)>0){
       if(!resize(n,sizeof(EType))) return false;
       constructElms(&at(m),n-m);
       }
-    else if(0<m-n){
+    else if((m-n)>0){
       destructElms(&at(n),m-n);
       if(!resize(n,sizeof(EType))) return false;
       }

gogglesmm-1.2.1.tar.gz/cfox/include/FXArrowButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXArrowButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXAtomic.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXAtomic.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXAutoPtr.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXAutoPtr.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXAutoThreadStorageKey.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXAutoThreadStorageKey.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXBMPIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBMPIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXBMPImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBMPImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXBZFileStream.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBZFileStream.h Changed

@@ -3,7 +3,7 @@
 *                      B Z F i l e S t r e a m   C l a s s e s                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Lyle Johnson. All Rights Reserved.                 *
+* Copyright (C) 1999,2020 by Lyle Johnson. All Rights Reserved.                 *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -122,6 +122,14 @@
   /// Load object
   FXBZFileStream& loadObject(FXObject*& v){ FXStream::loadObject(v); return *this; }
 
+  /// Load object
+  template<class TYPE>
+  FXBZFileStream& operator>>(TYPE*& obj){ loadObject(reinterpret_cast<FXObject*&>(obj)); return *this; }
+
+  /// Save object
+  template<class TYPE>
+  FXBZFileStream& operator<<(const TYPE* obj){ saveObject(static_cast<const FXObject*>(obj)); return *this; }
+
   /// Clean up
   virtual ~FXBZFileStream();
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXBarrier.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBarrier.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXBitmap.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBitmap.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXBitmapFrame.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBitmapFrame.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXBitmapView.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXBitmapView.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCURCursor.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCURCursor.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCalendar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCalendar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCalendarView.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCalendarView.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCallback.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCallback.h Changed

@@ -3,7 +3,7 @@
 *                          C a l l B a c k    C l a s s                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2016,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -68,12 +68,13 @@
   // Copy constructor
   FXCallback(const FXCallback& org):method(org.method),object(org.object){ }
 
-  // Construct with given method and object
-  FXCallback(METHOD mw,const void* obj=0):method(mw),object(obj){ }
-
   // Assignment operator
   FXCallback& operator=(const FXCallback& org){ method=org.method; object=org.object; return *this; }
 
+  // Equality operators
+  FXbool operator==(const FXCallback& other) const { return method==other.method && object==other.object; }
+  FXbool operator!=(const FXCallback& other) const { return method!=other.method || object!=other.object; }
+
   // Invoke the function
   RT operator()() const { return (*method)(object); }
 
@@ -97,6 +98,21 @@
 
   // Disconnect conditionally
   void disconnect(const void* obj){ if(obj==object){ disconnect(); } }
+
+  // Create default callback
+  static inline FXCallback create(){ return FXCallback(); }
+
+  // Create callback to member function of object
+  template<typename TYPE,RT (TYPE::* mfn)()>
+  static inline FXCallback create(TYPE* obj){ return FXCallback(&method_call<TYPE,mfn>,obj); }
+
+  // Create callback to member function of constant object
+  template<typename TYPE,RT (TYPE::* mfn)() const>
+  static inline FXCallback create(const TYPE* obj){ return FXCallback(&const_method_call<TYPE,mfn>,obj); }
+
+  // Create callback to function
+  template<RT (*fn)()>
+  static inline FXCallback create(){ return FXCallback(&function_call<fn>,NULL); }
   };
 
 /********************************************************************************/
@@ -138,12 +154,13 @@
   // Copy constructor
   FXCallback(const FXCallback& org):method(org.method),object(org.object){ }
 
-  // Construct with given method and object
-  FXCallback(METHOD mw,const void* obj=0):method(mw),object(obj){ }
-
   // Assignment operator
   FXCallback& operator=(const FXCallback& org){ method=org.method; object=org.object; return *this; }
 
+  // Equality operators
+  FXbool operator==(const FXCallback& other) const { return method==other.method && object==other.object; }
+  FXbool operator!=(const FXCallback& other) const { return method!=other.method || object!=other.object; }
+
   // Invoke the function
   RT operator()(PT1 p1) const { return (*method)(object,p1); }
 
@@ -167,6 +184,21 @@
 
   // Disconnect conditionally
   void disconnect(const void* obj){ if(obj==object){ disconnect(); } }
+
+  // Create default callback
+  static inline FXCallback create(){ return FXCallback(); }
+
+  // Create callback to member function of object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1)>
+  static inline FXCallback create(TYPE* obj){ return FXCallback(&method_call<TYPE,mfn>,obj); }
+
+  // Create callback to member function of constant object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1) const>
+  static inline FXCallback create(const TYPE* obj){ return FXCallback(&const_method_call<TYPE,mfn>,obj); }
+
+  // Create callback to function
+  template<RT (*fn)(PT1)>
+  static inline FXCallback create(){ return FXCallback(&function_call<fn>,NULL); }
   };
 
 /********************************************************************************/
@@ -208,12 +240,13 @@
   // Copy constructor
   FXCallback(const FXCallback& org):method(org.method),object(org.object){ }
 
-  // Construct with given method and object
-  FXCallback(METHOD mw,const void* obj=0):method(mw),object(obj){ }
-
   // Assignment operator
   FXCallback& operator=(const FXCallback& org){ method=org.method; object=org.object; return *this; }
 
+  // Equality operators
+  FXbool operator==(const FXCallback& other) const { return method==other.method && object==other.object; }
+  FXbool operator!=(const FXCallback& other) const { return method!=other.method || object!=other.object; }
+
   // Invoke the function
   RT operator()(PT1 p1,PT2 p2) const { return (*method)(object,p1,p2); }
 
@@ -237,6 +270,21 @@
 
   // Disconnect conditionally
   void disconnect(const void* obj){ if(obj==object){ disconnect(); } }
+
+  // Create default callback
+  static inline FXCallback create(){ return FXCallback(); }
+
+  // Create callback to member function of object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1,PT2)>
+  static inline FXCallback create(TYPE* obj){ return FXCallback(&method_call<TYPE,mfn>,obj); }
+
+  // Create callback to member function of constant object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1,PT2) const>
+  static inline FXCallback create(const TYPE* obj){ return FXCallback(&const_method_call<TYPE,mfn>,obj); }
+
+  // Create callback to function
+  template<RT (*fn)(PT1,PT2)>
+  static inline FXCallback create(){ return FXCallback(&function_call<fn>,NULL); }
   };
 
 /********************************************************************************/
@@ -278,12 +326,13 @@
   // Copy constructor
   FXCallback(const FXCallback& org):method(org.method),object(org.object){ }
 
-  // Construct with given method and object
-  FXCallback(METHOD mw,const void* obj=0):method(mw),object(obj){ }
-
   // Assignment operator
   FXCallback& operator=(const FXCallback& org){ method=org.method; object=org.object; return *this; }
 
+  // Equality operators
+  FXbool operator==(const FXCallback& other) const { return method==other.method && object==other.object; }
+  FXbool operator!=(const FXCallback& other) const { return method!=other.method || object!=other.object; }
+
   // Invoke the function
   RT operator()(PT1 p1,PT2 p2,PT3 p3) const { return (*method)(object,p1,p2,p3); }
 
@@ -307,6 +356,21 @@
 
   // Disconnect conditionally
   void disconnect(const void* obj){ if(obj==object){ disconnect(); } }
+
+  // Create default callback
+  static inline FXCallback create(){ return FXCallback(); }
+
+  // Create callback to member function of object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1,PT2,PT3)>
+  static inline FXCallback create(TYPE* obj){ return FXCallback(&method_call<TYPE,mfn>,obj); }
+
+  // Create callback to member function of constant object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1,PT2,PT3) const>
+  static inline FXCallback create(const TYPE* obj){ return FXCallback(&const_method_call<TYPE,mfn>,obj); }
+
+  // Create callback to function
+  template<RT (*fn)(PT1,PT2,PT3)>
+  static inline FXCallback create(){ return FXCallback(&function_call<fn>,NULL); }
   };
 
 /********************************************************************************/
@@ -348,12 +412,13 @@
   // Copy constructor
   FXCallback(const FXCallback& org):method(org.method),object(org.object){ }
 
-  // Construct with given method and object
-  FXCallback(METHOD mw,const void* obj=0):method(mw),object(obj){ }
-
   // Assignment operator
   FXCallback& operator=(const FXCallback& org){ method=org.method; object=org.object; return *this; }
 
+  // Equality operators
+  FXbool operator==(const FXCallback& other) const { return method==other.method && object==other.object; }
+  FXbool operator!=(const FXCallback& other) const { return method!=other.method || object!=other.object; }
+
   // Invoke the function
   RT operator()(PT1 p1,PT2 p2,PT3 p3,PT4 p4) const { return (*method)(object,p1,p2,p3,p4); }
 
@@ -366,7 +431,7 @@
   inline void connect(const TYPE* obj){ method=&const_method_call<TYPE,mfn>; object=obj; }
 
   // Connect to plain function
-  template<RT (*fn)(PT1,PT2,PT3)>
+  template<RT (*fn)(PT1,PT2,PT3,PT4)>
   inline void connect(){ method=&function_call<fn>; object=NULL; }
 
   // Return trye if connected
@@ -377,6 +442,21 @@
 
   // Disconnect conditionally
   void disconnect(const void* obj){ if(obj==object){ disconnect(); } }
+
+  // Create default callback
+  static inline FXCallback create(){ return FXCallback(); }
+
+  // Create callback to member function of object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1,PT2,PT3,PT4)>
+  static inline FXCallback create(TYPE* obj){ return FXCallback(&method_call<TYPE,mfn>,obj); }
+
+  // Create callback to member function of constant object
+  template<typename TYPE,RT (TYPE::* mfn)(PT1,PT2,PT3,PT4) const>
+  static inline FXCallback create(const TYPE* obj){ return FXCallback(&const_method_call<TYPE,mfn>,obj); }
+
+  // Create callback to function
+  template<RT (*fn)(PT1,PT2,PT3,PT4)>
+  static inline FXCallback create(){ return FXCallback(&function_call<fn>,NULL); }
   };
 
 }

gogglesmm-1.2.1.tar.gz/cfox/include/FXCanvas.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCanvas.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCheckButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCheckButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXChoiceBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXChoiceBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorRing.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorRing.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorSelector.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorSelector.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorWell.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorWell.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColorWheel.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColorWheel.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXColors.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXColors.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXComboBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXComboBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCompletion.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCompletion.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXComplexd.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXComplexd.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXComplexf.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXComplexf.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXComposeContext.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXComposeContext.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXComposite.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXComposite.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCondition.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCondition.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXConsole.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXConsole.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXCursor.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXCursor.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDC.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDC.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDCPrint.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDCPrint.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDCWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDCWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDDSIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDDSIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDDSImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDDSImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDLL.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDLL.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDataTarget.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDataTarget.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDate.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDate.h Changed

@@ -3,7 +3,7 @@
 *                            D a t e   C l a s s                                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -89,10 +89,10 @@
   /// Get nanoseconds since 1/1/1970 from date
   FXTime getTime() const;
 
-  /// Return day of the month
+  /// Return day of the month (1..31)
   FXint day() const;
 
-  /// Return month
+  /// Return month (1..12)
   FXint month() const;
 
   /// Return year
@@ -101,7 +101,7 @@
   /// Return day of the week
   FXint dayOfWeek() const;
 
-  /// Return day of year
+  /// Return day of year (1..366)
   FXint dayOfYear() const;
 
   /// Return ISO8601 week number of this date

gogglesmm-1.2.1.tar.gz/cfox/include/FXDebugTarget.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDebugTarget.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDelegator.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDelegator.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDial.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDial.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDialogBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDialogBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDictionary.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDictionary.h Changed

@@ -3,7 +3,7 @@
 *                          D i c t i o n a r y    C l a s s                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -25,8 +25,8 @@
 
 
 /**
-* The dictionary class is a fast-access hash table, mapping strings to pointers.
-* Subclasses of dictionary can easily specialize the pointers to pointers to
+* The dictionary class is a fast-access hash table, mapping strings to void-pointers.
+* Subclasses of dictionary can easily specialize the void-pointers to pointers to
 * particular types; to this end subclasses must overload certain API's and
 * perform the necessary type-casts for the proper interpretation of the stored
 * pointer values.
@@ -151,70 +151,6 @@
  ~FXDictionary();
   };
 
-
-/// Dictionary of pointers to TYPE
-template<typename TYPE>
-class FXDictionaryOf : public FXDictionary {
-public:
-
-  /// Default constructor
-  FXDictionaryOf(){}
-
-  /// Copy constructor
-  FXDictionaryOf(const FXDictionaryOf<TYPE>& src):FXDictionary(src){ }
-
-  /// Assignment operator
-  FXDictionaryOf<TYPE>& operator=(const FXDictionaryOf<TYPE>& other){ return reinterpret_cast<FXDictionaryOf<TYPE>&>(FXDictionary::operator=(other)); }
-
-  /// Adopt objects from orig, leaving orig empty
-  FXDictionaryOf<TYPE>& adopt(FXDictionaryOf<TYPE>& src){ return reinterpret_cast<FXDictionaryOf<TYPE>&>(FXDictionary::adopt(src)); }
-
-  /// Return reference to slot assocated with given key
-  TYPE*& at(const FXchar* ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky)); }
-
-  /// Return constant reference to slot assocated with given key
-  TYPE *const& at(const FXchar* ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky)); }
-
-  /// Return reference to slot assocated with given key
-  TYPE*& at(const FXString& ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky.text())); }
-
-  /// Return constant reference to slot assocated with given key
-  TYPE *const& at(const FXString& ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky.text())); }
-
-  /// Return reference to slot assocated with given key
-  TYPE*& operator(const FXchar* ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky)); }
-
-  /// Return constant reference to slot assocated with given key
-  TYPE *const& operator(const FXchar* ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky)); }
-
-  /// Return reference to slot assocated with given key
-  TYPE*& operator(const FXString& ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky.text())); }
-
-  /// Return constant reference to slot assocated with given key
-  TYPE *const& operator(const FXString& ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky.text())); }
-
-  /// Insert association with given key; return old value, if any
-  TYPE* insert(const FXchar* ky,TYPE* ptr=NULL){ return reinterpret_cast<TYPE*>(FXDictionary::insert(ky,ptr)); }
-
-  /// Insert association with given key; return old value, if any
-  TYPE* insert(const FXString& ky,TYPE* ptr=NULL){ return insert(ky.text(),ptr); }
-
-  /// Remove association with given key; return old value, if any
-  TYPE* remove(const FXchar* ky){ return reinterpret_cast<TYPE*>(FXDictionary::remove(ky)); }
-
-  /// Remove association with given key; return old value, if any
-  TYPE* remove(const FXString& ky){ return reinterpret_cast<TYPE*>(FXDictionary::remove(ky.text())); }
-
-  /// Erase data at pos in the table; return old value, if any
-  TYPE* erase(FXival pos){ return reinterpret_cast<TYPE*>(FXDictionary::erase(pos)); }
-
-  /// Return reference to slot at position pos
-  TYPE*& data(FXival pos){ return reinterpret_cast<TYPE*&>(FXDictionary::data(pos)); }
-
-  /// Return constant reference to slot at position pos
-  TYPE *const& data(FXival pos) const { return reinterpret_cast<TYPE *const&>(FXDictionary::data(pos)); }
-  };
-
 }
 
 #endif

gogglesmm-1.2.2.tar.gz/cfox/include/FXDictionaryOf.h Added

@@ -0,0 +1,94 @@
+/********************************************************************************
+*                                                                               *
+*         D i c t i o n a r y   O f   P o i n t e r s   T o   T y p e           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXDICTIONARYOF_H
+#define FXDICTIONARYOF_H
+
+namespace FX {
+
+
+/**
+* Dictionary of pointers to TYPE.
+*/
+template<typename TYPE>
+class FXDictionaryOf : public FXDictionary {
+public:
+
+  /// Default constructor
+  FXDictionaryOf(){}
+
+  /// Copy constructor
+  FXDictionaryOf(const FXDictionaryOf<TYPE>& other):FXDictionary(other){ }
+
+  /// Assignment operator
+  FXDictionaryOf<TYPE>& operator=(const FXDictionaryOf<TYPE>& other){ return reinterpret_cast<FXDictionaryOf<TYPE>&>(FXDictionary::operator=(other)); }
+
+  /// Adopt dictionary from another
+  FXDictionaryOf<TYPE>& adopt(FXDictionaryOf<TYPE>& other){ return reinterpret_cast<FXDictionaryOf<TYPE>&>(FXDictionary::adopt(other)); }
+
+  /// Return reference to slot assocated with given key
+  TYPE*& at(const FXchar* ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky)); }
+
+  /// Return constant reference to slot assocated with given key
+  TYPE *const& at(const FXchar* ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky)); }
+
+  /// Return reference to slot assocated with given key
+  TYPE*& at(const FXString& ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky.text())); }
+
+  /// Return constant reference to slot assocated with given key
+  TYPE *const& at(const FXString& ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky.text())); }
+
+  /// Return reference to slot assocated with given key
+  TYPE*& operator(const FXchar* ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky)); }
+
+  /// Return constant reference to slot assocated with given key
+  TYPE *const& operator(const FXchar* ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky)); }
+
+  /// Return reference to slot assocated with given key
+  TYPE*& operator(const FXString& ky){ return reinterpret_cast<TYPE*&>(FXDictionary::at(ky.text())); }
+
+  /// Return constant reference to slot assocated with given key
+  TYPE *const& operator(const FXString& ky) const { return reinterpret_cast<TYPE *const&>(FXDictionary::at(ky.text())); }
+
+  /// Insert association with given key; return old value, if any
+  TYPE* insert(const FXchar* ky,TYPE* ptr=NULL){ return reinterpret_cast<TYPE*>(FXDictionary::insert(ky,ptr)); }
+
+  /// Insert association with given key; return old value, if any
+  TYPE* insert(const FXString& ky,TYPE* ptr=NULL){ return insert(ky.text(),ptr); }
+
+  /// Remove association with given key; return old value, if any
+  TYPE* remove(const FXchar* ky){ return reinterpret_cast<TYPE*>(FXDictionary::remove(ky)); }
+
+  /// Remove association with given key; return old value, if any
+  TYPE* remove(const FXString& ky){ return reinterpret_cast<TYPE*>(FXDictionary::remove(ky.text())); }
+
+  /// Erase data at pos in the table; return old value, if any
+  TYPE* erase(FXival pos){ return reinterpret_cast<TYPE*>(FXDictionary::erase(pos)); }
+
+  /// Return reference to slot at position pos
+  TYPE*& data(FXival pos){ return reinterpret_cast<TYPE*&>(FXDictionary::data(pos)); }
+
+  /// Return constant reference to slot at position pos
+  TYPE *const& data(FXival pos) const { return reinterpret_cast<TYPE *const&>(FXDictionary::data(pos)); }
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXDir.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDir.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDirBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDirBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDirDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDirDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDirList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDirList.h Changed

@@ -3,7 +3,7 @@
 *                     D i r e c t o r y   L i s t   W i d g e t                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -145,11 +145,12 @@
   FXbool              draggable;        // Dragable files
 protected:
   FXDirList();
-  void listRootItems();
-  void listChildItems(FXDirItem *par,FXbool force,FXbool notify);
+  void listItems(FXbool force,FXbool notify);
+  void listRootItems(FXbool force,FXbool notify);
+  FXbool listChildItems(FXDirItem *par,FXbool force,FXbool notify);
   FXString getSelectedFiles() const;
   virtual FXTreeItem* createItem(const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr);
-  FXTreeItem* getPathnameItem__(const FXString& path);
+  FXTreeItem* expandPath(const FXString& path,FXbool notify);
 private:
   FXDirList(const FXDirList&);
   FXDirList &operator=(const FXDirList&);
@@ -230,9 +231,6 @@
   /// Destroy server-side resources
   virtual void destroy();
 
-  /// Scan the directories and update the items if needed, or if force is true
-  void scan(FXbool force=true);
-
   /// Set current file; return true if success
   FXbool setCurrentFile(const FXString& file,FXbool notify=false);
 
@@ -249,7 +247,7 @@
   FXString getItemPathname(const FXTreeItem* item) const;
 
   /// Return the (closest) item from the absolute pathname
-  FXTreeItem* getPathnameItem(const FXString& path);
+  FXTreeItem* getPathnameItem(const FXString& path) const;
 
   /// Return true if item is a file
   FXbool isItemFile(const FXTreeItem* item) const;

gogglesmm-1.2.1.tar.gz/cfox/include/FXDirSelector.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDirSelector.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDirVisitor.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDirVisitor.h Changed

gogglesmm-1.2.2.tar.gz/cfox/include/FXDirWatch.h Added

@@ -0,0 +1,94 @@
+/********************************************************************************
+*                                                                               *
+*           W a t c h   D i r e c t o r i e s   f o r   C h a n g e s           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXDIRWATCH_H
+#define FXDIRWATCH_H
+
+#ifndef FXOBJECT_H
+#include "FXObject.h"
+#endif
+
+namespace FX {
+
+
+class FXApp;
+
+#define DIRWATCH 1
+
+/**
+*/
+class FXAPI FXDirWatch : public FXObject {
+  FXDECLARE(FXDirWatch)
+private:
+  FXApp*              app;              // Back link to application object
+protected:
+  FXInputHandle       hnd;              // Handle
+  FXDictionary        pathToHandle;     // Path to handle map
+  FXReverseDictionary handleToPath;     // Handle to path map
+  FXObject*           target;           // Target object
+  FXSelector          message;          // Message ID
+private:
+  FXDirWatch(const FXDirWatch&);
+  FXDirWatch& operator=(const FXDirWatch&);
+public:
+  enum{
+    ID_IO_READ=1,
+    ID_LAST
+    };
+public:
+  long onMessage(FXObject*,FXSelector,void*);
+public:
+
+  /// Initialize directory watcher
+  FXDirWatch(FXApp* a=NULL,FXObject* tgt=NULL,FXSelector sel=0);
+
+  /// Get application pointer
+  FXApp* getApp() const { return app; }
+
+  /// Set the message target object
+  void setTarget(FXObject *t){ target=t; }
+
+  /// Get the message target object
+  FXObject* getTarget() const { return target; }
+
+  /// Set the message identifier
+  void setSelector(FXSelector sel){ message=sel; }
+
+  /// Get the message identifier
+  FXSelector getSelector() const { return message; }
+
+  /// Add path to watch; return true if added
+  FXbool addWatch(const FXString& path);
+
+  /// Remove path to watch; return true if removed
+  FXbool remWatch(const FXString& path);
+
+  /// Clear all watches
+  FXbool clearAll();
+
+  /// Clean up directory watcher
+  virtual ~FXDirWatch();
+  };
+
+}
+
+#endif
+
+

gogglesmm-1.2.1.tar.gz/cfox/include/FXDispatcher.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDispatcher.h Changed

@@ -1,74 +1,52 @@
 /********************************************************************************
 *                                                                               *
-*                         E v e n t   D i s p a t c h e r                       *
+*                      C a l l b a c k   D i s p a t c h e r                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
-*********************************************************************************
-* This library is free software; you can redistribute it and/or modify          *
-* it under the terms of the GNU Lesser General Public License as published by   *
-* the Free Software Foundation; either version 3 of the License, or             *
-* (at your option) any later version.                                           *
-*                                                                               *
-* This library is distributed in the hope that it will be useful,               *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
-* GNU Lesser General Public License for more details.                           *
-*                                                                               *
-* You should have received a copy of the GNU Lesser General Public License      *
-* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 ********************************************************************************/
-#ifndef FXDISPATCHER_H
-#define FXDISPATCHER_H
-
-#ifndef FXOBJECT_H
-#include "FXObject.h"
-#endif
-
-//////////////////////////////  UNDER DEVELOPMENT  //////////////////////////////
-
+#ifndef DISPATCHER_H
+#define DISPATCHER_H
 
 namespace FX {
 
-
 /**
-* A Dispatcher watches a number of devices and signals for activity
+* A FXDispatcher watches a number of devices and signals for activity
 * and dispatches to the proper function when activity is observed.
 */
-class FXAPI FXDispatcher {
-protected:
-  struct FXHandles;
-protected:
-  FXHandles      *handles;              // Handle to watch
-  volatile FXint  signotified64;      // Signal notify flag
-  FXint           sigreceived;          // Most recent received signal
-  FXint           numhandles;           // Number of handles
-  FXint           numwatched;           // Number of watched
-  FXint           numraised;            // Number of raised handles
-  FXint           current;              // Current handle
-  FXbool          initialized;          // Is initialized
-protected:
-  static FXDispatcher* volatile sigmanager64; // Signals managed flag
-protected:
+class FXAPI FXDispatcher : public FXReactor {
+private:
+  struct Handle;
+  struct Signal;
+  struct Idle;
+  struct Timer;
+private:
+  FXHash        handles;                // Handle callbacks
+  Signal      **signals;                // Signal callbacks
+  Timer        *timers;                 // Timeout callbacks
+  Idle         *idles;                  // Idle callbacks
+  Timer        *timerrecs;              // Timer records
+  Idle         *idlerecs;               // Idle records
+private:
   FXDispatcher(const FXDispatcher&);
   FXDispatcher &operator=(const FXDispatcher&);
-private:
-  static CDECL void signalhandler(FXint sig);
-  static CDECL void signalhandlerasync(FXint sig);
+
+  /// Add new handle hnd to watch-list (no callback)
+  virtual FXbool addHandle(FXInputHandle hnd,FXuint mode=InputRead);
 public:
-  enum {
-    InputNone   = 0,            /// Inactive handle
-    InputRead   = 1,            /// Read input handle
-    InputWrite  = 2,            /// Write input handle
-    InputExcept = 4             /// Except input handle
-    };
-  enum {
-    DispatchAll     = 0xffffffff,       /// Dispatch all events
-    DispatchSignals = 0x00000001,       /// Dispatch signals
-    DispatchTimers  = 0x00000002,       /// Dispatch timers
-    DispatchIdle    = 0x00000004,       /// Dispatch idle processing
-    DispatchInputs  = 0x00000008        /// Dispatch i/o handles
-    };
+
+  /// I/O Handle callback when a handle is raised
+  typedef FXCallback<FXbool(FXDispatcher*,FXInputHandle,FXuint,void*)> HandleCallback;
+
+  /// Signal callback when signal has been fired
+  typedef FXCallback<FXbool(FXDispatcher*,FXint,void*)> SignalCallback;
+
+  /// Timer callback when timer expired
+  typedef FXCallback<FXbool(FXDispatcher*,FXTime,void*)> TimeoutCallback;
+
+  /// Idle callback when dispatcher is about to block
+  typedef FXCallback<FXbool(FXDispatcher*,void*)> IdleCallback;
+
 public:
 
   /// Construct dispatcher object.
@@ -77,50 +55,76 @@
   /// Initialize dispatcher.
   virtual FXbool init();
 
-  /// Is dispatcher initialized
-  FXbool isInitialized() const { return initialized; }
+  /// Add callback cb with new handle hnd to watch-list
+  virtual FXbool addHandle(HandleCallback cb,FXInputHandle hnd,FXuint mode=InputRead,void* ptr=NULL);
 
+  /// Remove handle hnd from watch-list
+  virtual FXbool remHandle(FXInputHandle hnd);
 
-  /// Return timeout when something needs to happen
-  virtual FXTime getTimeout();
+  /// Return true if handle has been set.
+  virtual FXbool hasHandle(FXInputHandle hnd) const;
 
+  /// Dispatch handler when handle index is raised.
+  /// Return true if the handle was raised and the callback returned true.
+  virtual FXbool dispatchHandle(FXInputHandle hnd,FXuint mode,FXuint flags);
 
-  /// Check if dispatcher handles given signal
-  virtual FXbool hasSignal(FXint sig);
+  /// Add (optionally asynchronous) callback cb for signal sig to signal-set
+  virtual FXbool addSignal(SignalCallback cb,FXint sig,void* ptr=NULL,FXbool async=false);
 
-  /// Append signal to signal-set
+  /// Add (optionally asynchronous) signal sig to signal-set (no callback)
   virtual FXbool addSignal(FXint sig,FXbool async=false);
 
   /// Remove signal from signal-set
   virtual FXbool remSignal(FXint sig);
 
-  /// Remvoe all signals
-  virtual FXbool remAllSignals();
+  /// Dispatch a signal handler if signal fired.
+  /// Return true if the signal was raised and the callback handler returned true.
+  virtual FXbool dispatchSignal(FXint sig);
 
+  /// Add timeout callback cb at time due (ns since Epoch).
+  /// If callback cb was already set, remove it and return its old
+  /// data pointer, then reset it to the new time and data pointer.
+  virtual void* addTimeout(TimeoutCallback cb,FXTime due,void* ptr=NULL);
 
-  /// Append handle hnd to watch-list.
-  virtual FXbool addHandle(FXInputHandle hnd,FXuint mode=InputRead);
+  /// Add timeout callback cb after time interval (ns).
+  /// If callback cb was already set, remove it and return its old
+  /// data pointer, then reset it to the new time and data pointer.
+  virtual void* addInterval(TimeoutCallback cb,FXTime interval,void* ptr=NULL);
 
-  /// Remove handle hnd from watch-list.
-  virtual FXbool remHandle(FXInputHandle hnd);
+  /// Remove timeout callback cb.
+  /// If callback cb was set, return its data pointer.
+  virtual void* remTimeout(TimeoutCallback cb);
 
+  /// Return when timeout callback cb is due.
+  /// If callback cb was not set or has expired, return forever.
+  virtual FXTime getTimeout(TimeoutCallback cb) const;
 
-  /// Dispatch if something happens within given timeout
-  virtual FXbool dispatch(FXTime blocking=forever,FXuint flags=DispatchAll);
+  /// Return true if timeout callback cb been set.
+  virtual FXbool hasTimeout(TimeoutCallback cb) const;
 
+  /// Return time when first timer callback is due.
+  /// If no timeout callback is currently set, return forever.
+  virtual FXTime nextTimeout();
 
-  /// Dispatch when a signal was fired
-  virtual FXbool dispatchSignal(FXint sig);
+  /// Dispatch a timer when due.
+  /// Return true if a timer was due and the callback returned true.
+  virtual FXbool dispatchTimeout(FXTime due);
 
-  /// Dispatch when handle with given mode becomes active
-  virtual FXbool dispatchHandle(FXInputHandle hnd,FXuint mode);
+  /// Add idle callback be executed when dispatch about to block.
+  /// If callback cb was already set, remove it and return its old
+  /// data pointer, then reset the callback with the new pointer.
+  virtual void* addIdle(IdleCallback cb,void* ptr=NULL);
 
-  /// Dispatch when timeout expires
-  virtual FXbool dispatchTimeout(FXTime due);
+  /// Remove idle callback cb.
+  /// If callback cb was set, return its data pointer.
+  virtual void* remIdle(IdleCallback cb);
 
-  /// Dispatch when idle
-  virtual FXbool dispatchIdle();
+  /// Return true if idle callback cb been set.
+  virtual FXbool hasIdle(IdleCallback cb) const;
 
+  /// Dispatch one idle callback.
+  /// Return true if a chore was set and the callback returned true.
+  virtual FXbool dispatchIdle();
 
   /// Exit dispatcher.
   virtual FXbool exit();
@@ -129,6 +133,7 @@
   virtual ~FXDispatcher();
   };
 
+
 }
 
 #endif

gogglesmm-1.2.2.tar.gz/cfox/include/FXDisplay.h Added

@@ -0,0 +1,39 @@
+/********************************************************************************
+*                                                                               *
+*                           D i s p l a y   C l a s s                           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXDISPLAY_H
+#define FXDISPLAY_H
+
+namespace FX {
+
+
+class FXAPI FXDisplay {
+private:
+  FXDisplay(const FXDisplay&);
+  FXDisplay &operator=(const FXDisplay&);
+public:
+  FXDisplay();
+ ~FXDisplay();
+  };
+
+}
+
+#endif
+

gogglesmm-1.2.1.tar.gz/cfox/include/FXDockBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDockBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDockHandler.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDockHandler.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDockSite.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDockSite.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDockTitle.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDockTitle.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDocument.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDocument.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDragCorner.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDragCorner.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDrawable.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDrawable.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXDriveBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXDriveBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXEXEIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXEXEIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXEXEImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXEXEImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXElement.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXElement.h Changed

@@ -3,7 +3,7 @@
 *                 G e n e r i c   E l e m e n t   H a n d l i n g               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -77,6 +77,13 @@
   }
 
 
+/// Bit-wise copy elements from overlapping place to another
+template<typename EType>
+inline void bitcopyElms(EType* dst,const EType* src,FXuval n){
+  memcpy((void*)dst,(const void*)src,n*sizeof(EType));
+  }
+
+
 /// Move some elements from overlapping place to another
 template<typename EType>
 inline void moveElms(EType* dst,const EType* src,FXuval n){
@@ -91,6 +98,13 @@
   }
 
 
+/// Bit-wise move elements from overlapping place to another
+template<typename EType>
+inline void bitmoveElms(EType* dst,const EType* src,FXuval n){
+  memmove((void*)dst,(const void*)src,n*sizeof(EType));
+  }
+
+
 /// Swap element dst and src
 template<typename EType>
 inline EType& swap(EType& dst,EType& src){

gogglesmm-1.2.1.tar.gz/cfox/include/FXEvent.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXEvent.h Changed

gogglesmm-1.2.2.tar.gz/cfox/include/FXEventDispatcher.h Added

@@ -0,0 +1,45 @@
+/********************************************************************************
+*                                                                               *
+*                          E v e n t   D i s p a t c h e r                      *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+********************************************************************************/
+#ifndef EVENTDISPATCHER_H
+#define EVENTDISPATCHER_H
+
+namespace FX {
+
+
+/**
+* A FXEventDispatcher extends FXDispatcher, adding graphical user interface
+* handling and other display-related events.
+*/
+class FXAPI FXEventDispatcher : public FXDispatcher {
+private:
+  FXptr   display;              // Display
+private:
+  FXEventDispatcher(const FXEventDispatcher&);
+  FXEventDispatcher &operator=(const FXEventDispatcher&);
+public:
+  typedef FXCallback<FXbool(FXEventDispatcher*,FXRawEvent& event)> EventCallback;
+public:
+
+  /// Construct event dispatcher object.
+  FXEventDispatcher();
+
+  /// Dispatch if something happens within given blocking time.
+  /// Flags control subsets of events to be dispatched (signals, timers,
+  /// idle, and more). Default is to dispatch all events.
+  virtual FXbool dispatch(FXTime blocking=forever,FXuint flags=DispatchAll);
+
+  /// Dispatch platform-dependent event
+  virtual FXbool dispatchEvent(FXRawEvent& event);
+
+  /// Destroy event dispatcher object.
+  virtual ~FXEventDispatcher();
+  };
+
+}
+
+#endif

gogglesmm-1.2.2.tar.gz/cfox/include/FXEventLoop.h Added

@@ -0,0 +1,77 @@
+/********************************************************************************
+*                                                                               *
+*                         F O X   E v e n t   L o o p                           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXEVENTLOOP_H
+#define FXEVENTLOOP_H
+
+namespace FX {
+
+// Forward declarations
+class FXWindow;
+class FXEventLoop;
+class FXEventDispatcher;
+
+
+/// Recursive event loop
+class FXAPI FXEventLoop {
+private:
+  FXEventDispatcher *dispatcher;        // Event dispatcher
+  FXEventLoop      **invocation;        // Pointer to variable holding pointer to current invocation
+  FXEventLoop       *upper;             // Invocation above this one
+  FXWindow          *window;            // Modal window (if any)
+  FXuint             modality;          // Modality mode
+  FXint              code;              // Return code
+  FXbool             done;              // True if breaking out
+public:
+  enum{
+    ModalForNone=0,
+    ModalForWindow=1,
+    ModalForPopup=2
+    };
+public:
+
+  /// Initialize event loop
+  FXEventLoop(FXEventLoop** inv,FXWindow* win=NULL,FXuint mode=0);
+
+  /// Test if the window is involved in a modal invocation
+  FXbool isModal(FXWindow *window) const;
+
+  /// Return modal window of event loop
+  FXWindow* getModalWindow() const { return window; }
+
+  /// Return mode of event loop
+  FXuint getModality() const { return modality; }
+
+  /// Break out of topmost event loop, closing all nested loops
+  void stop(FXint value);
+
+  /// Break out of modal loop matching window, and all deeper ones
+  void stopModal(FXWindow* window,FXint value);
+
+  /// Break out of modal loop, and all deeper non-modal ones
+  void stopModal(FXint value);
+
+  /// Destroy event loop
+ ~FXEventLoop();
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXException.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXException.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXExpression.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXExpression.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXExtentd.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXExtentd.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXExtentf.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXExtentf.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFile.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFile.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFileAssociations.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFileAssociations.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFileDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFileDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFileList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFileList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFileProgressDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFileProgressDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFileSelector.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFileSelector.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFileStream.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFileStream.h Changed

@@ -3,7 +3,7 @@
 *                       F i l e   S t r e a m   C l a s s                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -116,6 +116,14 @@
   /// Load object
   FXFileStream& loadObject(FXObject*& v){ FXStream::loadObject(v); return *this; }
 
+  /// Load object
+  template<class TYPE>
+  FXFileStream& operator>>(TYPE*& obj){ return loadObject(reinterpret_cast<FXObject*&>(obj)); }
+
+  /// Save object
+  template<class TYPE>
+  FXFileStream& operator<<(const TYPE* obj){ return saveObject(static_cast<const FXObject*>(obj)); }
+
   /// Destructor
   virtual ~FXFileStream();
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXFoldingList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFoldingList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFont.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFont.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFontDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFontDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFontSelector.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFontSelector.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXFrame.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXFrame.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGIFCursor.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGIFCursor.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGIFIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGIFIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGIFImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGIFImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGLCanvas.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGLCanvas.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGLContext.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGLContext.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGLObject.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGLObject.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGLViewer.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGLViewer.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGLVisual.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGLVisual.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGZFileStream.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGZFileStream.h Changed

@@ -3,7 +3,7 @@
 *                     G Z F i l e S t r e a m   C l a s s e s                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Sander Jansen.   All Rights Reserved.              *
+* Copyright (C) 2002,2020 by Sander Jansen.   All Rights Reserved.              *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -121,6 +121,14 @@
   /// Load object
   FXGZFileStream& loadObject(FXObject*& v){ FXStream::loadObject(v); return *this; }
 
+  /// Load object
+  template<class TYPE>
+  FXGZFileStream& operator>>(TYPE*& obj){ return loadObject(reinterpret_cast<FXObject*&>(obj)); }
+
+  /// Save object
+  template<class TYPE>
+  FXGZFileStream& operator<<(const TYPE* obj){ return saveObject(static_cast<const FXObject*>(obj)); }
+
   /// Clean up
   virtual ~FXGZFileStream();
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXGauge.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGauge.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGradientBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGradientBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXGroupBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXGroupBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXHash.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXHash.h Changed

@@ -3,7 +3,7 @@
 *                       H a s h   T a b l e   C l a s s                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -26,12 +26,14 @@
 
 /**
 * A hash table for mapping pointers to pointers.
-* Any value may be used as a key, except 0 and -1.
+* Two special key values are disallowed: NULL and the pointer value (-1L);
+* NULL is used to designate an unoccupied slot, while (-1L) is used to designate
+* a formerly occupied slot.
 */
 class FXAPI FXHash {
 protected:
   struct Entry {
-    FXptr name;
+    FXptr key;
     FXptr data;
     };
 protected:
@@ -94,38 +96,38 @@
   /**
   * Find position of given key, returning -1 if not found.
   */
-  FXival find(FXptr name) const;
+  FXival find(FXptr ky) const;
 
   /**
   * Return reference to slot assocated with given key.
   */
-  FXptr& at(FXptr name);
+  FXptr& at(FXptr ky);
 
   /**
   * Return constant reference to slot assocated with given key.
   */
-  const FXptr& at(FXptr name) const;
+  const FXptr& at(FXptr ky) const;
 
   /**
   * Return reference to slot assocated with given key.
   */
-  FXptr& operator(FXptr name){ return at(name); }
+  FXptr& operator(FXptr ky){ return at(ky); }
 
   /**
   * Return constant reference to slot assocated with given key.
   */
-  const FXptr& operator(FXptr name) const { return at(name); }
+  const FXptr& operator(FXptr ky) const { return at(ky); }
 
   /**
   * Replace key in table, overwriting the old value if the
   * given key already exists.  Returns the old value of the key.
   */
-  FXptr insert(FXptr name,FXptr data=NULL){ return swap(data,at(name)); }
+  FXptr insert(FXptr ky,FXptr ptr=NULL){ return swap(ptr,at(ky)); }
 
   /**
   * Remove key from the table. Returns the old value of the key.
   */
-  FXptr remove(FXptr name);
+  FXptr remove(FXptr ky);
 
   /**
   * Erase entry from table at pos, returning old value.
@@ -135,22 +137,22 @@
   /**
   * Return true if slot is not occupied by a key.
   */
-  FXbool empty(FXival pos) const { return (tablepos.name==(FXptr)0L)||(tablepos.name==(FXptr)-1L); }
+  FXbool empty(FXival pos) const { return (tablepos.key==(FXptr)0L)||(tablepos.key==(FXptr)-1L); }
 
   /**
   * Return key at position pos.
   */
-  FXptr key(FXival pos) const { return tablepos.name; }
+  FXptr key(FXival pos) const { return tablepos.key; }
 
   /**
   * Return reference to data pointer at position pos.
   */
-  FXptr& value(FXival pos){ return tablepos.data; }
+  FXptr& data(FXival pos){ return tablepos.data; }
 
   /**
   * Return constant reference data pointer at position pos.
   */
-  const FXptr& value(FXival pos) const { return tablepos.data; }
+  const FXptr& data(FXival pos) const { return tablepos.data; }
 
   /**
   * Clear hash table.
@@ -161,55 +163,6 @@
  ~FXHash();
   };
 
-
-/// Hash table of pointers to KEYTYPE to pointers of VALUETYPE
-template<typename KEYTYPE,typename VALUETYPE>
-class FXHashOf : public FXHash {
-public:
-
-  /// Default constructor
-  FXHashOf(){}
-
-  /// Copy constructor
-  FXHashOf(const FXHashOf<KEYTYPE,VALUETYPE>& src):FXHash(src){}
-
-  /// Assignment operator
-  FXHashOf<KEYTYPE,VALUETYPE>& operator=(const FXHashOf<KEYTYPE,VALUETYPE>& other){ return reinterpret_cast<FXHashOf<KEYTYPE,VALUETYPE>&>(FXHash::operator=(other)); }
-
-  /// Adopt objects from orig, leaving orig empty
-  FXHashOf<KEYTYPE,VALUETYPE>& adopt(FXHashOf<KEYTYPE,VALUETYPE>& src){ return reinterpret_cast<FXHashOf<KEYTYPE,VALUETYPE>&>(FXHash::adopt(src)); }
-
-  /// Return reference to slot assocated with given key
-  VALUETYPE*& at(KEYTYPE* name){ return (VALUETYPE*&)FXHash::at((FXptr)name); }
-
-  /// Return constant reference to slot assocated with given key
-  VALUETYPE *const& at(KEYTYPE* name) const { return (VALUETYPE *const&)FXHash::at((FXptr)name); }
-
-  /// Return reference to slot assocated with given key
-  VALUETYPE*& operator(KEYTYPE* name){ return (VALUETYPE*&)FXHash::at((FXptr)name); }
-
-  /// Return constant reference to slot assocated with given key
-  VALUETYPE *const& operator(KEYTYPE* name) const { return (VALUETYPE *const&)FXHash::at((FXptr)name); }
-
-  /// Insert association with given key; return old value, if any
-  VALUETYPE* insert(KEYTYPE* name,VALUETYPE* data=NULL){ return (VALUETYPE*)FXHash::insert((FXptr)name,(FXptr)data); }
-
-  /// Remove association with given key; return old value, if any
-  VALUETYPE* remove(KEYTYPE* name){ return (VALUETYPE*)FXHash::remove((FXptr)name); }
-
-  /// Erase data at pos in the table; return old value, if any
-  VALUETYPE* erase(FXival pos){ return (VALUETYPE*)FXHash::erase(pos); }
-
-  /// Return key at position pos
-  KEYTYPE* key(FXival pos) const { return (KEYTYPE*)FXHash::key(pos); }
-
-  /// Return reference to slot at position pos
-  VALUETYPE*& value(FXival pos){ return (VALUETYPE*&)FXHash::value(pos); }
-
-  /// Return constant reference to slot at position pos
-  VALUETYPE *const& value(FXival pos) const { return (VALUETYPE *const&)FXHash::value(pos); }
-  };
-
 }
 
 #endif

gogglesmm-1.2.2.tar.gz/cfox/include/FXHashOf.h Added

@@ -0,0 +1,85 @@
+/********************************************************************************
+*                                                                               *
+*         H a s h   T a b l e   O f   P o i n t e r s   T o   T y p e           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXHASHOF_H
+#define FXHASHOF_H
+
+namespace FX {
+
+
+/**
+* A hash table mapping pointers to KEYTYPE to pointers of VALUETYPE.
+* Two special key values are disallowed: NULL and the pointer value (-1L);
+* NULL is used to designate an unoccupied slot, while (-1L) is used to designate
+* a formerly occupied slot.
+*/
+template<typename KEYTYPE,typename VALUETYPE>
+class FXHashOf : public FXHash {
+public:
+
+  /// Default constructor
+  FXHashOf(){}
+
+  /// Copy constructor
+  FXHashOf(const FXHashOf<KEYTYPE,VALUETYPE>& other):FXHash(other){}
+
+  /// Assignment operator
+  FXHashOf<KEYTYPE,VALUETYPE>& operator=(const FXHashOf<KEYTYPE,VALUETYPE>& other){ return reinterpret_cast<FXHashOf<KEYTYPE,VALUETYPE>&>(FXHash::operator=(other)); }
+
+  /// Adopt objects from orig, leaving orig empty
+  FXHashOf<KEYTYPE,VALUETYPE>& adopt(FXHashOf<KEYTYPE,VALUETYPE>& other){ return reinterpret_cast<FXHashOf<KEYTYPE,VALUETYPE>&>(FXHash::adopt(other)); }
+
+  /// Find position of given key, returning -1 if not found.
+  FXival find(KEYTYPE* ky) const { return FXHash::find((FXptr)ky); }
+
+  /// Return reference to slot assocated with given key
+  VALUETYPE*& at(KEYTYPE* ky){ return (VALUETYPE*&)FXHash::at((FXptr)ky); }
+
+  /// Return constant reference to slot assocated with given key
+  VALUETYPE *const& at(KEYTYPE* ky) const { return (VALUETYPE *const&)FXHash::at((FXptr)ky); }
+
+  /// Return reference to slot assocated with given key
+  VALUETYPE*& operator(KEYTYPE* ky){ return (VALUETYPE*&)FXHash::at((FXptr)ky); }
+
+  /// Return constant reference to slot assocated with given key
+  VALUETYPE *const& operator(KEYTYPE* ky) const { return (VALUETYPE *const&)FXHash::at((FXptr)ky); }
+
+  /// Insert association with given key; return old value, if any
+  VALUETYPE* insert(KEYTYPE* ky,VALUETYPE* ptr=NULL){ return (VALUETYPE*)FXHash::insert((FXptr)ky,(FXptr)ptr); }
+
+  /// Remove association with given key; return old value, if any
+  VALUETYPE* remove(KEYTYPE* ky){ return (VALUETYPE*)FXHash::remove((FXptr)ky); }
+
+  /// Erase data at pos in the table; return old value, if any
+  VALUETYPE* erase(FXival pos){ return (VALUETYPE*)FXHash::erase(pos); }
+
+  /// Return key at position pos
+  KEYTYPE* key(FXival pos) const { return (KEYTYPE*)FXHash::key(pos); }
+
+  /// Return reference to slot at position pos
+  VALUETYPE*& data(FXival pos){ return (VALUETYPE*&)FXHash::data(pos); }
+
+  /// Return constant reference to slot at position pos
+  VALUETYPE *const& data(FXival pos) const { return (VALUETYPE *const&)FXHash::data(pos); }
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXHeader.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXHeader.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXHorizontalFrame.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXHorizontalFrame.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXICOIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXICOIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXICOImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXICOImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIFFIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIFFIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIFFImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIFFImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIO.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIO.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIOBuffer.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIOBuffer.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIODevice.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIODevice.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIconCache.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIconCache.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIconList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIconList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXIconSource.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXIconSource.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXId.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXId.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXImageFrame.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXImageFrame.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXImageView.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXImageView.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXInputDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXInputDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXJP2Icon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXJP2Icon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXJP2Image.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXJP2Image.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXJPGIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXJPGIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXJPGImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXJPGImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXJSON.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXJSON.h Changed

@@ -3,7 +3,7 @@
 *                      J S O N   R e a d e r  &  W r i t e r                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2013,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2013,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -25,10 +25,41 @@
 
 
 /**
-* The FXJSON serializer loads or saves an FXVariant to a json text file.
+* The FXJSON serializer loads or saves an FXVariant to a JSON text file.
 * Since FXVariant can contain an arbitrarily complex data structure, this
 * provides applications with a convenient way to load and save state information
 * in a well-defined and human-readable file format.
+* The base class implements serialization/deserialization to/from an external
+* buffer.
+* Subclasses FXJSONFile and FXJSONString serialize from/to strings and disk-
+* based files, respectively.
+* The new JSON5 standard may also be parsed, allowing for single- and multi-line
+* nested comments to be embedded in the input.
+* Syntax errors in the input cause the parser to return an error, and allow
+* diagnosis of the problem and its location in the file by line number, column
+* number, and byte-offset from the start of the file.
+* When writing a json stream, the generated output may be formatter in different
+* ways. The flow-mode controls the overall layout of the resulting text output;
+* when flow is set to Stream, all output is generated with no formatting to
+* improve human legibility.  This is the most space-friendly format possible.
+* If flow is set to Compact, a human readable, compact format, aiming to
+* maximize the amount of information on each line is generated.
+* When flow is set to Pretty, a nicely indented, but extremely airy output
+* results, and the resulting document will contain many, many lines with
+* little data.
+* Numeric values are printed with configurable precision; (default=15 digits
+* which results in minimal information loss for real numbers).
+* For Pretty flow format, output may be indented in multiples of the indent
+* level (default=2).  Depending on flow setting, lines may be wrapped at a
+* maximum number of columns (default=80).
+* Output strings containing reserved characters may be escaped; for UTF8
+* characters, there are 3 options for escaping.  When escape mode is 0, UTF8
+* characters are passed unescaped.  In escape mode 1, UTF8 characters are
+* escaped as \xXX, and in escape mode 2, UTF8 will be escaed using Unicode
+* escape sequences \uXXXX or \uXXXX\uXXXX (two surrogate-pairs  escape codes
+* for code points exceeding 16 bits).
+* The default setting is to allow UTF8 characters in the output, but be aware
+* that such outputs need UTF8-capable viewer software to be rendered properly.
 */
 class FXAPI FXJSON {
 public:
@@ -42,6 +73,7 @@
     ErrBracket,         /// Expected closing bracket
     ErrBrace,           /// Expected closing brace
     ErrQuotes,          /// Expected closing quotes
+    ErrQuote,           /// Expected closing quote
     ErrNumber,          /// Numeric conversion
     ErrEnd              /// Unexpected end of file
     };
@@ -58,56 +90,58 @@
 protected:
   FXchar     *begptr;           // Text buffer begin ptr
   FXchar     *endptr;           // Text buffer end ptr
-  FXchar     *sptr;             // Text buffer start ptr
-  FXchar     *rptr;             // Text buffer read ptr
   FXchar     *wptr;             // Text buffer write ptr
-  FXint       token;            // Token
+  FXchar     *rptr;             // Text buffer read ptr
+  FXchar     *sptr;             // Text buffer scan ptr
+  FXlong      offset;           // Position from start
   FXint       column;           // Column number
   FXint       indent;           // Indent level
   FXint       line;             // Line number
-  FXint       wrap;             // Line wrap column
   Direction   dir;              // Direction
+  FXint       token;            // Token
+  FXint       wrap;             // Line wrap column
   FXuchar     flow;             // Output flow
   FXuchar     prec;             // Float precision
   FXuchar     fmt;              // Float format
+  FXuchar     esc;              // Escape mode
   FXuchar     dent;             // Indentation amount
-  FXbool      owns;             // Owns the buffer
 private:
   FXint next();
-  FXbool need(FXival n);
-  Error emit(const FXchar* str,FXint count);
-  Error emit(FXchar ch,FXint count);
+  FXbool need(FXival count);
+  FXbool emit(const FXchar* str,FXival count);
+  FXbool emit(FXchar ch,FXival count);
   Error loadString(FXString& str);
+  Error loadIdent(FXString& str);
   Error loadMap(FXVariant& var);
   Error loadArray(FXVariant& var);
   Error loadVariant(FXVariant& var);
   Error saveString(const FXString& str);
+  Error saveIdent(const FXString& str);
   Error saveMap(const FXVariant& var);
   Error saveArray(const FXVariant& var);
   Error saveVariant(const FXVariant& var);
 private:
   static const FXchar *const errors;
 private:
-  FXJSON(const FXJSON&){}
+  FXJSON(const FXJSON&);
   FXJSON &operator=(const FXJSON&);
 public:
 
   /**
-  * Construct JSON serializer.
+  * Initialize JSON serializer with no buffer.
   */
   FXJSON();
 
   /**
-  * Construct JSON serializer and open for direction d.
-  * Use given buffer data of size sz, or allocate a local buffer.
+  * Construct JSON serializer with given buffer of size, and open it for
+  * direction d.
   */
-  FXJSON(FXchar* data,FXuval sz=4096,Direction d=Load);
+  FXJSON(FXchar* buffer,FXuval sz=8192,Direction d=Load);
 
   /**
-  * Open JSON stream for given direction d.
-  * Use given buffer data of size sz, or allocate a local buffer.
+  * Open JSON parse buffer with size and direction.
   */
-  FXbool open(FXchar* data=NULL,FXuval size=4096,Direction d=Load);
+  FXbool open(FXchar* buffer=NULL,FXuval sz=8192,Direction d=Load);
 
   /**
   * Return direction in effect.
@@ -120,38 +154,52 @@
   FXuval size() const { return endptr-begptr; }
 
   /**
-  * Load a variant from stream.
-  * Return false if stream wasn't opened for loading, or syntax error.
+  * Return current line number.
   */
-  Error load(FXVariant& variant);
+  FXint getLine() const { return line; }
 
   /**
-  * Save a variant to stream.
-  * Return false if stream wasn't opened for saving, or disk was full.
+  * Return current column number.
   */
-  Error save(const FXVariant& variant);
+  FXint getColumn() const { return column; }
 
   /**
-  * Return current line number.
+  * Return offset from begin of file.
   */
-  FXint getLine() const { return line; }
+  FXlong getOffset() const { return offset; }
 
   /**
-  * Return current column number.
+  * Load a variant from JSON stream.
+  * Return false if stream wasn't opened for loading, or syntax error.
   */
-  FXint getColumn() const { return column; }
+  Error load(FXVariant& variant);
+
+  /**
+  * Save a variant to JSON stream.
+  * Return false if stream wasn't opened for saving, or disk was full.
+  */
+  Error save(const FXVariant& variant);
 
   /// Returns error code for given error
   static const FXchar* getError(Error err){ return errorserr; }
 
   /**
   * Floating point output precision control.
+  * This controls the number of significant digits written to
+  * the output.  The default is 15.
   */
   void setNumericPrecision(FXint p){ prec=p; }
   FXint getNumericPrecision() const { return prec; }
 
   /**
-  * Floating point output precision control.
+  * Floating point output format control.
+  * The format mode is interpreted as follows:
+  *
+  *   0   No exponent.
+  *   1   Exponent.
+  *   2   Output exponent when required.
+  *
+  * The default mode is 2.
   */
   void setNumericFormat(FXint f){ fmt=f; }
   FXint getNumericFormat() const { return fmt; }
@@ -182,21 +230,32 @@
   FXint getLineWrap() const { return wrap; }
 
   /**
-  * Fill buffer from file.
-  * Return false if not open for reading, or fail to read from disk.
+  * Change string escape mode.
+  * The escape mode is interpreted as follows:
+  *
+  *  0  Don't escape unicode in strings;
+  *  1  Escape unicode as \xXX
+  *  2  Escape unicode as \uXXXX or \uXXXX\uXXXX.
+  *
+  * Default is to escape control characters only.
+  */
+  void setEscapeMode(FXint e){ esc=e; }
+  FXint getEscapeMode() const { return esc; }
+
+  /**
+  * Read at least count bytes into buffer; return bytes available, or -1 for error.
   */
-  virtual FXbool fill();
+  virtual FXival fill(FXival count);
 
   /**
-  * Flush buffer to file.
-  * Return false if not open for writing, or if fail to write to disk.
+  * Write at least count bytes from buffer; return space available, or -1 for error.
   */
-  virtual FXbool flush();
+  virtual FXival flush(FXival count);
 
   /**
   * Close stream and delete buffer, if owned.
   */
-  virtual FXbool close();
+  FXbool close();
 
   /**
   * Close JSON stream and clean up.

gogglesmm-1.2.1.tar.gz/cfox/include/FXJSONFile.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXJSONFile.h Changed

@@ -3,7 +3,7 @@
 *                            J S O N   F i l e   I / O                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2013,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2013,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -34,6 +34,9 @@
 class FXAPI FXJSONFile : public FXJSON {
 private:
   FXFile file;
+private:
+  FXJSONFile(const FXJSONFile&);
+  FXJSONFile &operator=(const FXJSONFile&);
 public:
 
   /**
@@ -57,21 +60,19 @@
   FXbool open(const FXString& filename,Direction d=Load,FXuval sz=4096);
 
   /**
-  * Fill buffer from file.
-  * Return false if not open for reading, or fail to read from disk.
+  * Read at least count bytes into buffer; return bytes available, or -1 for error.
   */
-  virtual FXbool fill();
+  virtual FXival fill(FXival count);
 
   /**
-  * Flush buffer to file.
-  * Return false if not open for writing, or if fail to write to disk.
+  * Write at least count bytes from buffer; return space available, or -1 for error.
   */
-  virtual FXbool flush();
+  virtual FXival flush(FXival count);
 
   /**
   * Close JSON file and delete buffers.
   */
-  virtual FXbool close();
+  FXbool close();
 
   /**
   * Close JSON file.

gogglesmm-1.2.2.tar.gz/cfox/include/FXJSONString.h Added

@@ -0,0 +1,95 @@
+/********************************************************************************
+*                                                                               *
+*                            J S O N   S t r i n g   I / O                      *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXJSONSTRING_H
+#define FXJSONSTRING_H
+
+#ifndef FXJSON_H
+#include "FXJSON.h"
+#endif
+
+namespace FX {
+
+
+/**
+* Serialize a variant to or from JSON formatted string.
+*/
+class FXAPI FXJSONString : public FXJSON {
+private:
+  FXString buffer;
+private:
+  FXJSONString(const FXJSONString&);
+  FXJSONString &operator=(const FXJSONString&);
+public:
+
+  /**
+  * Create JSON string i/o object.
+  */
+  FXJSONString();
+
+  /**
+  * Create JSON string i/o object and open it.
+  */
+  FXJSONString(const FXString& string,Direction d=Load);
+
+  /**
+  * Create JSON i/o object and open it.
+  */
+  FXJSONString(const FXchar* string,FXuval length,Direction d=Load);
+
+  /**
+  * Open JSON string for loading or saving.
+  */
+  FXbool open(const FXString& string,Direction d=Load);
+
+  /**
+  * Open JSON character string of length for direction d.
+  */
+  FXbool open(const FXchar* string,FXuval length,Direction d=Load);
+
+  /**
+  * Return string.
+  */
+  const FXString text() const { return buffer; }
+
+  /**
+  * Read at least count bytes into buffer; return bytes available, or -1 for error.
+  */
+  virtual FXival fill(FXival count);
+
+  /**
+  * Write at least count bytes from buffer; return space available, or -1 for error.
+  */
+  virtual FXival flush(FXival count);
+
+  /**
+  * Close JSON string and delete buffers.
+  */
+  FXbool close();
+
+  /**
+  * Close JSON string.
+  */
+  virtual ~FXJSONString();
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXKnob.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXKnob.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXLFQueue.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXLFQueue.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXLabel.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXLabel.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXListBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXListBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXLocale.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXLocale.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMDIButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMDIButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMDIChild.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMDIChild.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMDIClient.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMDIClient.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMainWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMainWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMat2d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMat2d.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMat2f.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMat2f.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMat3d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMat3d.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMat3f.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMat3f.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMat4d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMat4d.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMat4f.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMat4f.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMatrix.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMatrix.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMemMap.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMemMap.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMemoryStream.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMemoryStream.h Changed

@@ -3,7 +3,7 @@
 *                   M e m o r y   S t r e a m   C l a s s e s                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -124,6 +124,14 @@
   /// Load object
   FXMemoryStream& loadObject(FXObject*& v){ FXStream::loadObject(v); return *this; }
 
+  /// Load object
+  template<class TYPE>
+  FXMemoryStream& operator>>(TYPE*& obj){ return loadObject(reinterpret_cast<FXObject*&>(obj)); }
+
+  /// Save object
+  template<class TYPE>
+  FXMemoryStream& operator<<(const TYPE* obj){ return saveObject(static_cast<const FXObject*>(obj)); }
+
   /// Destructor
   virtual ~FXMemoryStream();
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuCaption.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuCaption.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuCascade.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuCascade.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuCheck.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuCheck.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuCommand.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuCommand.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuPane.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuPane.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuRadio.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuRadio.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuSeparator.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuSeparator.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMenuTitle.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMenuTitle.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMessageBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMessageBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMessageChannel.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMessageChannel.h Changed

@@ -3,7 +3,7 @@
 *         I n t e r - T h r e a d    M e s s a g i n g    C h a n n e l         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -47,6 +47,7 @@
 * any message handler in the context of the main user-interface thread.
 * If the size of the optional data is zero, the message handler will be passed a
 * NULL pointer.
+* The maximum payload size passed with message() is 8192 bytes.
 */
 class FXAPI FXMessageChannel : public FXObject {
   FXDECLARE(FXMessageChannel)
@@ -69,16 +70,30 @@
   long onMessage(FXObject*,FXSelector,void*);
 public:
 
-  /// Initialize message channel
+  /**
+  * Initialize message channel.
+  * Adds the message channel to FXApp's input watch set.
+  */
   FXMessageChannel(FXApp* a);
 
-  /// Get application pointer
+  /**
+  * Get application pointer.
+  */
   FXApp* getApp() const { return app; }
 
-  /// Send a message msg comprising of FXSEL(type,id) to a target tgt, and pass optional data of size bytes
+  /**
+  * Send a message msg comprising of FXSEL(type,id) to a target tgt, and pass optional
+  * data of size bytes.
+  * This asynchronously calls the indicated handler in the context of the main GUI
+  * thread's event loop.
+  * Up to 8192 bytes may be passed along.
+  */
   FXbool message(FXObject* tgt,FXSelector msg,const void* data=NULL,FXint size=0);
 
-  /// Clean up message channel
+  /**
+  * Clean up message channel.
+  * Removes the message channel from FXApp's input watch set.
+  */
   virtual ~FXMessageChannel();
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXMetaClass.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMetaClass.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXMutex.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXMutex.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXObject.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXObject.h Changed

@@ -1,9 +1,9 @@
 /********************************************************************************
 *                                                                               *
-*                         T o p l e v el   O b j e c t                          *
+*                         T o p l e v e l   O b j e c t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -28,6 +28,9 @@
 namespace FX {
 
 
+class FXStream;
+
+
 /// Macro to set up class declaration
 #define FXDECLARE(classname) \
   public: \
@@ -36,8 +39,6 @@
    static FX::FXObject* manufacture(); \
    virtual long handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr); \
    virtual const FX::FXMetaClass* getMetaClass() const { return &metaClass; } \
-   friend FX::FXStream& operator<<(FX::FXStream& store,const classname* obj){return store.saveObject((const FX::FXObject*)(obj));} \
-   friend FX::FXStream& operator>>(FX::FXStream& store,classname*& obj){return store.loadObject((FX::FXObject*&)(obj));} \
   private:
 
 
@@ -58,8 +59,6 @@
    static const FX::FXMetaClass metaClass; \
    virtual long handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr); \
    virtual const FX::FXMetaClass* getMetaClass() const { return &metaClass; } \
-   friend FX::FXStream& operator<<(FX::FXStream& store,const classname* obj){return store.saveObject((const FX::FXObject*)(obj));} \
-   friend FX::FXStream& operator>>(FX::FXStream& store,classname*& obj){return store.loadObject((FX::FXObject*&)(obj));} \
   private:

gogglesmm-1.2.1.tar.gz/cfox/include/FXObjectList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXObjectList.h Changed

@@ -3,7 +3,7 @@
 *                            O b j e c t   L i s t                              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -38,7 +38,7 @@
   FXObjectList();
 
   /// Copy constructor
-  FXObjectList(const FXObjectList& src);
+  FXObjectList(const FXObjectList& other);
 
   /// Construct and init with single object
   FXObjectList(FXObject* object);
@@ -50,10 +50,10 @@
   FXObjectList(FXObject** objects,FXival n);
 
   /// Assignment operator
-  FXObjectList& operator=(const FXObjectList& orig);
+  FXObjectList& operator=(const FXObjectList& other);
 
-  /// Adopt objects from orig, leaving orig empty
-  FXObjectList& adopt(FXObjectList& orig);
+  /// Adopt objects from other, leaving other empty
+  FXObjectList& adopt(FXObjectList& other);
 
   /// Return number of objects
   FXival no() const { return *((FXival*)(ptr-1)); }
@@ -188,13 +188,13 @@
   FXObjectListOf(const FXObjectListOf<TYPE>& src):FXObjectList(src){ }
 
   /// Construct and init with single object
-  FXObjectListOf(TYPE* object):FXObjectList(reinterpret_cast<FXObject*>(object)){ }
+  FXObjectListOf(TYPE* object):FXObjectList(object){ }
 
   /// Construct and init with n copies of object
-  FXObjectListOf(TYPE* object,FXival n):FXObjectList(reinterpret_cast<FXObject*>(object),n){ }
+  FXObjectListOf(TYPE* object,FXival n):FXObjectList(object,n){ }
 
   /// Construct and init with list of objects
-  FXObjectListOf(TYPE** objects,FXival n):FXObjectList(reinterpret_cast<FXObject**>(objects),n){ }
+  FXObjectListOf(TYPE** objects,FXival n):FXObjectList(objects,n){ }
 
   /// Assignment operator
   FXObjectListOf<TYPE>& operator=(const FXObjectListOf<TYPE>& orig){ return reinterpret_cast<FXObjectListOf<TYPE>&>(FXObjectList::operator=(orig)); }

gogglesmm-1.2.1.tar.gz/cfox/include/FXOptionMenu.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXOptionMenu.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPCXIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPCXIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPCXImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPCXImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPNGIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPNGIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPNGImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPNGImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPPMIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPPMIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPPMImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPPMImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPacker.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPacker.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXParallel.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXParallel.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPath.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPath.h Changed

@@ -3,7 +3,7 @@
 *                  P a t h   N a m e   M a n i p u l a t i o n                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2000,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2000,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -62,7 +62,9 @@
   */
   extern FXAPI FXString name(const FXString& file);
 
-  /// Return file title, i.e. document name only
+  /**
+  * Return file title, i.e. document name only.
+  */
   extern FXAPI FXString title(const FXString& file);
 
   /**
@@ -93,6 +95,12 @@
   */
   extern FXAPI FXString expand(const FXString& file);
 
+  /**
+ * Convert a foreign path(s) or paths to local conventions,
+  * replacing environment variables etc.
+  */
+  extern FXAPI FXString convert(const FXString& path);
+
   /// Contract path based on user name and environment variable
   extern FXAPI FXString contract(const FXString& file,const FXString& user=FXString::null,const FXString& var=FXString::null);
 
@@ -117,9 +125,6 @@
   /// Return relative path of file to given absolute base directory
   extern FXAPI FXString relative(const FXString& base,const FXString& file);
 
-  /// Convert path from using 'sepfm' or 'septo' to use only 'septo' path-separators
-  extern FXAPI FXString convert(const FXString& file,FXchar septo=PATHSEP,FXchar sepfm='/');
-
   /// Return path to directory above input directory name
   extern FXAPI FXString upLevel(const FXString& file);

gogglesmm-1.2.1.tar.gz/cfox/include/FXPicker.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPicker.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPipe.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPipe.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPoint.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPoint.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPopup.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPopup.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPrintDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPrintDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXProcess.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXProcess.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXProgressBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXProgressBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXProgressDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXProgressDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXPtrList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPtrList.h Changed

@@ -3,7 +3,7 @@
 *                            P o i n t e r   L i s t                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -34,7 +34,7 @@
   FXPtrList();
 
   /// Copy constructor
-  FXPtrList(const FXPtrList& src);
+  FXPtrList(const FXPtrList& other);
 
   /// Construct and init with single object
   FXPtrList(FXptr object);
@@ -46,7 +46,10 @@
   FXPtrList(FXptr* objects,FXival n);
 
   /// Assignment operator
-  FXPtrList& operator=(const FXPtrList& src);
+  FXPtrList& operator=(const FXPtrList& other);
+
+  /// Adopt objects from other, leaving other empty
+  FXPtrList& adopt(FXPtrList& other);
 
   /// Return number of objects
   FXival no() const { return *((FXival*)(ptr-1)); }
@@ -74,9 +77,6 @@
   FXptr* data(){ return ptr; }
   const FXptr* data() const { return ptr; }
 
-  /// Adopt objects from src, leaving src empty
-  FXPtrList& adopt(FXPtrList& src);
-
   /// Find object in list, searching forward; return position or -1
   FXival find(FXptr object,FXival pos=0) const;
 
@@ -179,13 +179,13 @@
   FXPtrListOf(const FXPtrListOf<TYPE>& src):FXPtrList(src){ }
 
   /// Construct and init with single object
-  FXPtrListOf(TYPE* object):FXPtrList(reinterpret_cast<FXptr>(object)){ }
+  FXPtrListOf(TYPE* object):FXPtrList(object){ }
 
   /// Construct and init with n copies of object
-  FXPtrListOf(TYPE* object,FXival n):FXPtrList(reinterpret_cast<FXptr>(object),n){ }
+  FXPtrListOf(TYPE* object,FXival n):FXPtrList(object,n){ }
 
   /// Construct and init with list of objects
-  FXPtrListOf(TYPE** objects,FXival n):FXPtrList(reinterpret_cast<FXptr*>(objects),n){ }
+  FXPtrListOf(TYPE** objects,FXival n):FXPtrList(objects,n){ }
 
   /// Assignment operator
   FXPtrListOf<TYPE>& operator=(const FXPtrListOf<TYPE>& src){ return reinterpret_cast<FXPtrListOf<TYPE>&>(FXPtrList::operator=(src)); }

gogglesmm-1.2.1.tar.gz/cfox/include/FXPtrQueue.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXPtrQueue.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXQuatd.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXQuatd.h Changed

@@ -3,7 +3,7 @@
 *              D o u b l e - P r e c i s i o n  Q u a t e r n i o n             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -24,6 +24,10 @@
 namespace FX {
 
 
+// Forward reference
+class FXMat3d;
+
+
 /// Double-precision quaternion
 class FXAPI FXQuatd {
 public:
@@ -33,49 +37,85 @@
   double w;
 public:
 
-  /// Default constructor; value is not initialized
+  /**
+  * Default constructor; value is not initialized.
+  */
   FXQuatd(){}
 
-  /// Copy constructor
+  /**
+  * Copy constructor.
+  */
   FXQuatd(const FXQuatd& q):x(q.x),y(q.y),z(q.z),w(q.w){}
 
-  /// Construct from array of doubles
+  /**
+  * Construct from array of four doubles.
+  */
   FXQuatd(const FXdouble v):x(v0),y(v1),z(v2),w(v3){}
 
-  /// Construct from components
+  /**
+  * Construct from four components.
+  */
   FXQuatd(FXdouble xx,FXdouble yy,FXdouble zz,FXdouble ww):x(xx),y(yy),z(zz),w(ww){}
 
-  /// Construct quaternion from two unit vectors
-  FXQuatd(const FXVec3d& fr,const FXVec3d& to);
+  /**
+  * Construct from rotation axis and angle in radians.
+  */
+  FXQuatd(const FXVec3d& axis,FXdouble phi);
 
-  /// Construct from axis and angle
-  FXQuatd(const FXVec3d& axis,FXdouble phi=0.0);
+  /**
+  * Construct quaternion from arc between two unit vectors fm and to.
+  */
+  FXQuatd(const FXVec3d& fr,const FXVec3d& to);
 
-  /// Construct from euler angles yaw (z), pitch (y), and roll (x)
+  /**
+  * Construct from euler angles yaw (z), pitch (y), and roll (x).
+  */
   FXQuatd(FXdouble roll,FXdouble pitch,FXdouble yaw);
 
-  /// Construct quaternion from three axes
+  /**
+  * Construct quaternion from three orthogonal unit vectors.
+  */
   FXQuatd(const FXVec3d& ex,const FXVec3d& ey,const FXVec3d& ez);
 
-  /// Return a non-const reference to the ith element
+  /**
+  * Construct quaternion from rotation vector rot, representing a rotation
+  * by |rot| radians about a unit vector rot/|rot|.
+  */
+  FXQuatd(const FXVec3d& rot);
+
+  /**
+  * Return a non-const reference to the ith element.
+  */
   FXdouble& operator(FXint i){return (&x)i;}
 
-  /// Return a const reference to the ith element
+  /**
+  * Return a const reference to the ith element.
+  */
   const FXdouble& operator(FXint i) const {return (&x)i;}
 
-  /// Assignment
+  /**
+  * Assignment from other quaternion.
+  */
   FXQuatd& operator=(const FXQuatd& v){x=v.x;y=v.y;z=v.z;w=v.w;return *this;}
 
-  /// Assignment from array of doubles
+  /**
+  * Assignment from array of four doubles.
+  */
   FXQuatd& operator=(const FXdouble v){x=v0;y=v1;z=v2;w=v3;return *this;}
 
-  /// Set value from another vector
+  /**
+  * Set value from another quaternion.
+  */
   FXQuatd& set(const FXQuatd& v){x=v.x;y=v.y;z=v.z;w=v.w;return *this;}
 
-  /// Set value from array of floats
+  /**
+  * Set value from array of four doubles.
+  */
   FXQuatd& set(const FXdouble v){x=v0;y=v1;z=v2;w=v3;return *this;}
 
-  /// Set value from components
+  /**
+  * Set value from four components.
+  */
   FXQuatd& set(FXdouble xx,FXdouble yy,FXdouble zz,FXdouble ww){x=xx;y=yy;z=zz;w=ww;return *this;}
 
   /// Assigning operators
@@ -90,6 +130,10 @@
   operator FXdouble*(){return &x;}
   operator const FXdouble*() const {return &x;}
 
+  /// Conversion to 3-vector, axis of rotation
+  operator FXVec3d&(){return *reinterpret_cast<FXVec3d*>(this);}
+  operator const FXVec3d&() const {return *reinterpret_cast<const FXVec3d*>(this);}
+
   /// Test if zero
   FXbool operator!() const {return x==0.0 && y==0.0 && z==0.0 && w==0.0; }
 
@@ -97,9 +141,6 @@
   FXQuatd operator+() const { return *this; }
   FXQuatd operator-() const { return FXQuatd(-x,-y,-z,-w); }
 
-  /// Rotation of a vector by a quaternion
-  FXVec3d operator*(const FXVec3d& v) const;
-
   /// Length and square of length
   FXdouble length2() const { return x*x+y*y+z*z+w*w; }
   FXdouble length() const { return Math::sqrt(length2()); }
@@ -107,34 +148,66 @@
   /// Adjust quaternion length
   FXQuatd& adjust();
 
-  /// Set quaternion from axis and angle
-  void setAxisAngle(const FXVec3d& axis,FXdouble phi=0.0);
-
-  /// Obtain axis and angle from quaternion
+  /**
+  * Set quaternion from axis and angle.
+  * Quaternion represents a rotation of phi radians about unit vector axis.
+  */
+  void setAxisAngle(const FXVec3d& axis,FXdouble phi);
+
+  /**
+  * Obtain axis and angle from quaternion.
+  * Return unit vector and angle of rotation phi, in radians.
+  * If identity quaternion (0,0,0,1), return axis as (1,0.0).
+  */
   void getAxisAngle(FXVec3d& axis,FXdouble& phi) const;
 
-  /// Set quaternion from roll (x), pitch (y), yaw (z)
+  /**
+  * Set quaternion from rotation vector rot, representing a rotation by |rot| radians
+  * about a unit vector rot/|rot|.  Set to the identity quaternion (0,0,0,1) if the rotation
+  * vector is equal to (0,0,0).
+  */
+  void setRotation(const FXVec3d& rot);
+
+  /**
+  * Get rotation vector from quaternion, representing a rotation of |rot| radians
+  * about an axis rot/|rot|.  If quaternion is identity quaternion (0,0,0,1), return (0,0,0).
+  */
+  FXVec3d getRotation() const;
+
+  /// Set quaternion from roll (x), pitch (y), yaw (z), in that order
   void setRollPitchYaw(FXdouble roll,FXdouble pitch,FXdouble yaw);
+
+  /// Return the roll (x), pitch (y), yaw (z) angles represented by the quaternion
   void getRollPitchYaw(FXdouble& roll,FXdouble& pitch,FXdouble& yaw) const;
 
-  /// Set quaternion from yaw (z), pitch (y), roll (x)
+  /// Set quaternion from yaw (z), pitch (y), roll (x), in that order
   void setYawPitchRoll(FXdouble yaw,FXdouble pitch,FXdouble roll);
+
+  /// Return the yaw (z), pitch (y), roll (x) angles represented by the quaternion
   void getYawPitchRoll(FXdouble& yaw,FXdouble& pitch,FXdouble& roll) const;
 
-  /// Set quaternion from roll (x), yaw (z), pitch (y)
+  /// Set quaternion from roll (x), yaw (z), pitch (y), in that order
   void setRollYawPitch(FXdouble roll,FXdouble yaw,FXdouble pitch);
+
+  /// Return the roll (x), yaw (z), pitch (y) angles represented by the quaternion
   void getRollYawPitch(FXdouble& roll,FXdouble& yaw,FXdouble& pitch) const;
 
-  /// Set quaternion from pitch (y), roll (x),yaw (z)
+  /// Set quaternion from pitch (y), roll (x),yaw (z), in that order
   void setPitchRollYaw(FXdouble pitch,FXdouble roll,FXdouble yaw);
+
+  /// Return the pitch (y), roll (x),yaw (z) angles represented by the quaternion
   void getPitchRollYaw(FXdouble& pitch,FXdouble& roll,FXdouble& yaw) const;
 
-  /// Set quaternion from pitch (y), yaw (z), roll (x)
+  /// Set quaternion from pitch (y), yaw (z), roll (x), in that order
   void setPitchYawRoll(FXdouble pitch,FXdouble yaw,FXdouble roll);
+
+  /// Return the pitch (y), yaw (z), roll (x) angles represented by the quaternion
   void getPitchYawRoll(FXdouble& pitch,FXdouble& yaw,FXdouble& roll) const;
 
-  /// Set quaternion from yaw (z), roll (x), pitch (y)
+  /// Set quaternion from yaw (z), roll (x), pitch (y), in that order
   void setYawRollPitch(FXdouble yaw,FXdouble roll,FXdouble pitch);
+
+  /// Return the yaw (z), roll (x), pitch (y) angles represented by the quaternion
   void getYawRollPitch(FXdouble& yaw,FXdouble& roll,FXdouble& pitch) const;
 
   /// Set quaternion from axes
@@ -161,19 +234,20 @@
   /// Power of quaternion
   FXQuatd pow(FXdouble t) const;
 
-  /// Invert quaternion
-  FXQuatd invert() const;
+  /// Conjugate quaternion
+  FXQuatd conj() const { return FXQuatd(-x,-y,-z,w); }
 
   /// Invert unit quaternion
-  FXQuatd unitinvert() const;
+  FXQuatd unitinvert() const { return FXQuatd(-x,-y,-z,w); }
 
-  /// Conjugate quaternion
-  FXQuatd conj() const;
+  /// Invert quaternion
+  FXQuatd invert() const { FXdouble m(length2()); return FXQuatd(-x/m,-y/m,-z/m,w/m); }
 
   /// Destructor
  ~FXQuatd(){}
   };
 
+
 /// Scaling
 inline FXQuatd operator*(const FXQuatd& a,FXdouble n){return FXQuatd(a.x*n,a.y*n,a.z*n,a.w*n);}
 inline FXQuatd operator*(FXdouble n,const FXQuatd& a){return FXQuatd(n*a.x,n*a.y,n*a.z,n*a.w);}
@@ -184,6 +258,12 @@
 inline FXQuatd operator*(const FXQuatd& a,const FXQuatd& b){ return FXQuatd(a.w*b.x+a.x*b.w+a.y*b.z-a.z*b.y, a.w*b.y+a.y*b.w+a.z*b.x-a.x*b.z, a.w*b.z+a.z*b.w+a.x*b.y-a.y*b.x, a.w*b.w-a.x*b.x-a.y*b.y-a.z*b.z); }
 inline FXQuatd operator/(const FXQuatd& a,const FXQuatd& b){ return a*b.invert(); }
 
+/// Rotation unit-quaternion and vector q . v = (q* . v . q)
+extern FXAPI FXVec3d operator*(const FXQuatd& q,const FXVec3d& v);
+
+/// Rotation a vector and unit-quaternion v . q = (q . v . q*)
+extern FXAPI FXVec3d operator*(const FXVec3d& v,const FXQuatd& q);
+
 /// Quaternion and quaternion addition
 inline FXQuatd operator+(const FXQuatd& a,const FXQuatd& b){ return FXQuatd(a.x+b.x,a.y+b.y,a.z+b.z,a.w+b.w); }
 inline FXQuatd operator-(const FXQuatd& a,const FXQuatd& b){ return FXQuatd(a.x-b.x,a.y-b.y,a.z-b.z,a.w-b.w); }
@@ -208,6 +288,19 @@
 /// Derivative of spherical lerp of unit quaternions u,v
 extern FXAPI FXQuatd lerpdot(const FXQuatd& u,const FXQuatd& v,FXdouble f);
 
+/// Cubic hermite quaternion interpolation
+extern FXAPI FXQuatd hermite(const FXQuatd& q0,const FXVec3d& r0,const FXQuatd& q1,const FXVec3d& r1,FXdouble t);
+
+/// Estimate angular body rates omega from unit quaternions Q0 and Q1 separated by time dt
+extern FXAPI FXVec3d omegaBody(const FXQuatd& q0,const FXQuatd& q1,FXdouble dt);
+
+/// Derivative of unit quaternion q with body angular rates omega (rad/s)
+extern FXAPI FXQuatd quatDot(const FXQuatd& q,const FXVec3d& omega);
+
+/// Calculate angular acceleration of a body with inertial moments tensor M
+/// Rotation about its axes with angular rates omega, under a torque torq
+extern FXAPI FXVec3d omegaDot(const FXMat3d& M,const FXVec3d& omega,const FXVec3d& torq);
+
 /// Save quaternion to a stream
 extern FXAPI FXStream& operator<<(FXStream& store,const FXQuatd& v);

gogglesmm-1.2.1.tar.gz/cfox/include/FXQuatf.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXQuatf.h Changed

@@ -3,7 +3,7 @@
 *              S i n g l e - P r e c i s i o n  Q u a t e r n i o n             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -24,6 +24,10 @@
 namespace FX {
 
 
+// Forward reference
+class FXMat3f;
+
+
 /// Single-precision quaternion
 class FXAPI FXQuatf {
 public:
@@ -33,49 +37,85 @@
   FXfloat w;
 public:
 
-  /// Default constructor; value is not initialized
+  /**
+  * Default constructor; value is not initialized.
+  */
   FXQuatf(){}
 
-  /// Copy constructor
+  /**
+  * Copy constructor.
+  */
   FXQuatf(const FXQuatf& q):x(q.x),y(q.y),z(q.z),w(q.w){}
 
-  /// Construct from array of floats
+  /**
+  * Construct from array of four floats.
+  */
   FXQuatf(const FXfloat v):x(v0),y(v1),z(v2),w(v3){}
 
-  /// Construct from components
+  /**
+  * Construct from four components.
+  */
   FXQuatf(FXfloat xx,FXfloat yy,FXfloat zz,FXfloat ww):x(xx),y(yy),z(zz),w(ww){}
 
-  /// Construct quaternion from two unit vectors
-  FXQuatf(const FXVec3f& fr,const FXVec3f& to);
+  /**
+  * Construct from rotation axis and angle in radians.
+  */
+  FXQuatf(const FXVec3f& axis,FXfloat phi);
 
-  /// Construct from axis and angle
-  FXQuatf(const FXVec3f& axis,FXfloat phi=0.0f);
+  /**
+  * Construct quaternion from arc between two unit vectors fm and to.
+  */
+  FXQuatf(const FXVec3f& fr,const FXVec3f& to);
 
-  /// Construct from euler angles yaw (z), pitch (y), and roll (x)
+  /**
+  * Construct from euler angles yaw (z), pitch (y), and roll (x).
+  */
   FXQuatf(FXfloat roll,FXfloat pitch,FXfloat yaw);
 
-  /// Construct quaternion from three axes
+  /**
+  * Construct quaternion from three orthogonal unit vectors.
+  */
   FXQuatf(const FXVec3f& ex,const FXVec3f& ey,const FXVec3f& ez);
 
-  /// Return a non-const reference to the ith element
+  /**
+  * Construct quaternion from rotation vector rot, representing a rotation
+  * by |rot| radians about a unit vector rot/|rot|.
+  */
+  FXQuatf(const FXVec3f& rot);
+
+  /**
+  * Return a non-const reference to the ith element.
+  */
   FXfloat& operator(FXint i){return (&x)i;}
 
-  /// Return a const reference to the ith element
+  /**
+  * Return a const reference to the ith element.
+  */
   const FXfloat& operator(FXint i) const {return (&x)i;}
 
-  /// Assignment
+  /**
+  * Assignment from other quaternion.
+  */
   FXQuatf& operator=(const FXQuatf& v){x=v.x;y=v.y;z=v.z;w=v.w;return *this;}
 
-  /// Assignment from array of doubles
+  /**
+  * Assignment from array of four floats.
+  */
   FXQuatf& operator=(const FXfloat v){x=v0;y=v1;z=v2;w=v3;return *this;}
 
-  /// Set value from another vector
+  /**
+  * Set value from another quaternion.
+  */
   FXQuatf& set(const FXQuatf& v){x=v.x;y=v.y;z=v.z;w=v.w;return *this;}
 
-  /// Set value from array of floats
+  /**
+  * Set value from array of four floats.
+  */
   FXQuatf& set(const FXfloat v){x=v0;y=v1;z=v2;w=v3;return *this;}
 
-  /// Set value from components
+  /**
+  * Set value from four components.
+  */
   FXQuatf& set(FXfloat xx,FXfloat yy,FXfloat zz,FXfloat ww){x=xx;y=yy;z=zz;w=ww;return *this;}
 
   /// Assigning operators
@@ -90,6 +130,10 @@
   operator FXfloat*(){return &x;}
   operator const FXfloat*() const {return &x;}
 
+  /// Conversion to 3-vector, axis of rotation
+  operator FXVec3f&(){return *reinterpret_cast<FXVec3f*>(this);}
+  operator const FXVec3f&() const {return *reinterpret_cast<const FXVec3f*>(this);}
+
   /// Test if zero
   FXbool operator!() const {return x==0.0f && y==0.0f && z==0.0f && w==0.0f; }
 
@@ -97,9 +141,6 @@
   FXQuatf operator+() const { return *this; }
   FXQuatf operator-() const { return FXQuatf(-x,-y,-z,-w); }
 
-  /// Rotation of a vector by a quaternion
-  FXVec3f operator*(const FXVec3f& v) const;
-
   /// Length and square of length
   FXfloat length2() const { return x*x+y*y+z*z+w*w; }
   FXfloat length() const { return Math::sqrt(length2()); }
@@ -107,34 +148,66 @@
   /// Adjust quaternion length
   FXQuatf& adjust();
 
-  /// Set quaternion from axis and angle
-  void setAxisAngle(const FXVec3f& axis,FXfloat phi=0.0f);
-
-  /// Obtain axis and angle from quaternion
+  /**
+  * Set quaternion from axis and angle.
+  * Quaternion represents a rotation of phi radians about unit vector axis.
+  */
+  void setAxisAngle(const FXVec3f& axis,FXfloat phi);
+
+  /**
+  * Obtain axis and angle from quaternion.
+  * Return unit vector and angle of rotation phi, in radians.
+  * If identity quaternion (0,0,0,1), return axis as (1,0.0).
+  */
   void getAxisAngle(FXVec3f& axis,FXfloat& phi) const;
 
-  /// Set quaternion from roll (x), pitch (y), yaw (z)
+  /**
+  * Set quaternion from rotation vector rot, representing a rotation by |rot| radians
+  * about a unit vector rot/|rot|.  Set to the identity quaternion (0,0,0,1) if the rotation
+  * vector is equal to (0,0,0).
+  */
+  void setRotation(const FXVec3f& rot);
+
+  /**
+  * Get rotation vector from quaternion, representing a rotation of |rot| radians
+  * about an axis rot/|rot|.  If quaternion is identity quaternion (0,0,0,1), return (0,0,0).
+  */
+  FXVec3f getRotation() const;
+
+  /// Set quaternion from roll (x), pitch (y), yaw (z), in that order
   void setRollPitchYaw(FXfloat roll,FXfloat pitch,FXfloat yaw);
+
+  /// Return the roll (x), pitch (y), yaw (z) angles represented by the quaternion
   void getRollPitchYaw(FXfloat& roll,FXfloat& pitch,FXfloat& yaw) const;
 
-  /// Set quaternion from yaw (z), pitch (y), roll (x)
+  /// Set quaternion from yaw (z), pitch (y), roll (x), in that order
   void setYawPitchRoll(FXfloat yaw,FXfloat pitch,FXfloat roll);
+
+  /// Return the yaw (z), pitch (y), roll (x) angles represented by the quaternion
   void getYawPitchRoll(FXfloat& yaw,FXfloat& pitch,FXfloat& roll) const;
 
-  /// Set quaternion from roll (x), yaw (z), pitch (y)
+  /// Set quaternion from roll (x), yaw (z), pitch (y), in that order
   void setRollYawPitch(FXfloat roll,FXfloat yaw,FXfloat pitch);
+
+  /// Return the roll (x), yaw (z), pitch (y) angles represented by the quaternion
   void getRollYawPitch(FXfloat& roll,FXfloat& yaw,FXfloat& pitch) const;
 
-  /// Set quaternion from pitch (y), roll (x),yaw (z)
+  /// Set quaternion from pitch (y), roll (x),yaw (z), in that order
   void setPitchRollYaw(FXfloat pitch,FXfloat roll,FXfloat yaw);
+
+  /// Return the pitch (y), roll (x),yaw (z) angles represented by the quaternion
   void getPitchRollYaw(FXfloat& pitch,FXfloat& roll,FXfloat& yaw) const;
 
-  /// Set quaternion from pitch (y), yaw (z), roll (x)
+  /// Set quaternion from pitch (y), yaw (z), roll (x), in that order
   void setPitchYawRoll(FXfloat pitch,FXfloat yaw,FXfloat roll);
+
+  /// Return the pitch (y), yaw (z), roll (x) angles represented by the quaternion
   void getPitchYawRoll(FXfloat& pitch,FXfloat& yaw,FXfloat& roll) const;
 
-  /// Set quaternion from yaw (z), roll (x), pitch (y)
+  /// Set quaternion from yaw (z), roll (x), pitch (y), in that order
   void setYawRollPitch(FXfloat yaw,FXfloat roll,FXfloat pitch);
+
+  /// Return the yaw (z), roll (x), pitch (y) angles represented by the quaternion
   void getYawRollPitch(FXfloat& yaw,FXfloat& roll,FXfloat& pitch) const;
 
   /// Set quaternion from axes
@@ -161,19 +234,20 @@
   /// Power of quaternion
   FXQuatf pow(FXfloat t) const;
 
-  /// Invert quaternion
-  FXQuatf invert() const;
+  /// Conjugate quaternion
+  FXQuatf conj() const { return FXQuatf(-x,-y,-z,w); }
 
   /// Invert unit quaternion
-  FXQuatf unitinvert() const;
+  FXQuatf unitinvert() const { return FXQuatf(-x,-y,-z,w); }
 
-  /// Conjugate quaternion
-  FXQuatf conj() const;
+  /// Invert quaternion
+  FXQuatf invert() const { FXfloat m(length2()); return FXQuatf(-x/m,-y/m,-z/m,w/m); }
 
   /// Destructor
  ~FXQuatf(){}
   };
 
+
 /// Scaling
 inline FXQuatf operator*(const FXQuatf& a,FXfloat n){return FXQuatf(a.x*n,a.y*n,a.z*n,a.w*n);}
 inline FXQuatf operator*(FXfloat n,const FXQuatf& a){return FXQuatf(n*a.x,n*a.y,n*a.z,n*a.w);}
@@ -184,6 +258,12 @@
 inline FXQuatf operator*(const FXQuatf& a,const FXQuatf& b){ return FXQuatf(a.w*b.x+a.x*b.w+a.y*b.z-a.z*b.y, a.w*b.y+a.y*b.w+a.z*b.x-a.x*b.z, a.w*b.z+a.z*b.w+a.x*b.y-a.y*b.x, a.w*b.w-a.x*b.x-a.y*b.y-a.z*b.z); }
 inline FXQuatf operator/(const FXQuatf& a,const FXQuatf& b){ return a*b.invert(); }
 
+/// Rotation unit-quaternion and vector q . v = (q* . v . q)
+extern FXAPI FXVec3f operator*(const FXQuatf& q,const FXVec3f& v);
+
+/// Rotation a vector and unit-quaternion v . q = (q . v . q*)
+extern FXAPI FXVec3f operator*(const FXVec3f& v,const FXQuatf& q);
+
 /// Quaternion and quaternion addition
 inline FXQuatf operator+(const FXQuatf& a,const FXQuatf& b){ return FXQuatf(a.x+b.x,a.y+b.y,a.z+b.z,a.w+b.w); }
 inline FXQuatf operator-(const FXQuatf& a,const FXQuatf& b){ return FXQuatf(a.x-b.x,a.y-b.y,a.z-b.z,a.w-b.w); }
@@ -208,6 +288,19 @@
 /// Derivative of spherical lerp of unit quaternions u,v
 extern FXAPI FXQuatf lerpdot(const FXQuatf& u,const FXQuatf& v,FXfloat f);
 
+/// Cubic hermite quaternion interpolation
+extern FXAPI FXQuatf hermite(const FXQuatf& q0,const FXVec3f& r0,const FXQuatf& q1,const FXVec3f& r1,FXfloat t);
+
+/// Estimate angular body rates omega from unit quaternions Q0 and Q1 separated by time dt
+extern FXAPI FXVec3f omegaBody(const FXQuatf& q0,const FXQuatf& q1,FXfloat dt);
+
+/// Derivative of unit quaternion q with body angular rates omega (rad/s)
+extern FXAPI FXQuatf quatDot(const FXQuatf& q,const FXVec3f& omega);
+
+/// Calculate angular acceleration of a body with inertial moments tensor M
+/// Rotation about its axes with angular rates omega, under a torque torq
+extern FXAPI FXVec3f omegaDot(const FXMat3f& M,const FXVec3f& omega,const FXVec3f& torq);
+
 /// Save quaternion to a stream
 extern FXAPI FXStream& operator<<(FXStream& store,const FXQuatf& v);

gogglesmm-1.2.1.tar.gz/cfox/include/FXRASIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRASIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRASImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRASImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRGBIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRGBIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRGBImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRGBImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRadioButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRadioButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRandom.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRandom.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRangeSlider.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRangeSlider.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRanged.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRanged.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRangef.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRangef.h Changed

gogglesmm-1.2.2.tar.gz/cfox/include/FXReactor.h Added

@@ -0,0 +1,158 @@
+/********************************************************************************
+*                                                                               *
+*                            R e a c t o r   C l a s s                          *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXREACTOR_H
+#define FXREACTOR_H
+
+namespace FX {
+
+
+/**
+* FXReactor implements the reactor pattern.
+* Given a list of file descriptors (handles), calling thread is blocked until
+* any of the following happens:
+*
+*   - One or more of the file descriptors becomes active;
+*   - A timeout occurs;
+*   - The maximum blocking time is exceeded;
+*   - An interrupt (signal) occurs.
+*   - One or more of the handles develops an error and an FXFatalException
+*     is thrown.
+*
+* Depending on what occurred, FXReactor dispatches to one of the handling
+* API's: dispatchHandle(), dispatchTimeout(), or dispatchSignal().
+* Prior to blocking, if nothing demands immediate attention, the special
+* handler dispatchIdle() is called.
+*
+* If dispatchHandle(), dispatchTimeout(), dispatchSignal() or dispatchIdle()
+* returned true, FXReactor will return with true; otherwise, it will continue
+* to loop, decreasing the initial blocking time until eventually returning false
+* when nothing happened during the entire blocking interval.
+*
+* Each FXReactor can manage a set of signals, but note that only one single
+* FXReactor is allowed to manage a particular signal; other signals may be
+* left unassigned, or managed by other FXReactors.
+*
+* If waiting for a very long but finite amount of time, FXReactor will wake up
+* after at most FXReactor::maxwait, which is about 1 day.
+* It will continue to loop and wait for additional intervals, decreasing the initial
+* blocking time until eventually returning false when nothing happened.
+*/
+class FXAPI FXReactor {
+  friend class FXEventDispatcher;
+private:
+  struct Internals;
+private:
+  Internals      *internals;            // Internals
+  FXint           sigreceived;          // Most recent received signal
+  FXint           numhandles;           // Number of handles
+  FXint           numwatched;           // Number of watched
+  FXint           numraised;            // Number of raised handles
+  FXint           current;              // Current handle
+private:
+  static FXReactor* volatile sigmanager64;
+private:
+  FXReactor(const FXReactor&);
+  FXReactor &operator=(const FXReactor&);
+private:
+  static void CDECL signalhandler(FXint sig);
+  static void CDECL signalhandlerasync(FXint sig);
+public:
+
+  /// Modes
+  enum {
+    InputNone   = 0,                    /// Inactive handle
+    InputRead   = 1,                    /// Read input handle
+    InputWrite  = 2,                    /// Write input handle
+    InputExcept = 4                     /// Except input handle
+    };
+
+  /// Dispatch flags
+  enum {
+    DispatchAll     = 0xffffffff,       /// Dispatch all events
+    DispatchSignals = 0x00000001,       /// Dispatch signals
+    DispatchTimers  = 0x00000002,       /// Dispatch timers
+    DispatchIdle    = 0x00000004,       /// Dispatch idle processing
+    DispatchEvents  = 0x00000008,       /// Dispatch events
+    DispatchOther   = 0x00000010        /// Dispatch other i/o
+    };
+
+
+  /// Sleep no longer than this
+  static const FXTime maxwait;
+
+public:
+
+  /// Construct reactor.
+  FXReactor();
+
+  /// Initialize reactor.
+  virtual FXbool init();
+
+  /// Is reactor initialized.
+  FXbool isInitialized() const { return (internals!=NULL); }
+
+  /// Dispatch if something happens within given blocking time.
+  /// Flags control subsets of events to be dispatched (signals, timers,
+  /// idle, and more). Default is to dispatch all events.
+  virtual FXbool dispatch(FXTime blocking=forever,FXuint flags=DispatchAll);
+
+  /// Add new handle hnd to watch-list
+  virtual FXbool addHandle(FXInputHandle hnd,FXuint mode=InputRead);
+
+  /// Remove handle hnd from watch-list
+  virtual FXbool remHandle(FXInputHandle hnd);
+
+  /// Dispatch handler for handle hnd.
+  /// Return true if the callback returned true.
+  virtual FXbool dispatchHandle(FXInputHandle hnd,FXuint mode,FXuint flags);
+
+  /// Add (optionally asynchronous) signal sig to signal-set
+  virtual FXbool addSignal(FXint sig,FXbool FXbool=false);
+
+  /// Remove signal sig from signal-set
+  virtual FXbool remSignal(FXint sig);
+
+  /// Return true if signal sig is handled by this dispatcher.
+  virtual FXbool hasSignal(FXint sig) const;
+
+  /// Dispatch when a signal was fired; return true when handled.
+  virtual FXbool dispatchSignal(FXint sig);
+
+  /// Return time when first timer callback is due; the special
+  /// value forever is returned when no timer is in effect.
+  virtual FXTime nextTimeout();
+
+  /// Dispatch when timeout expires; return true when handled.
+  virtual FXbool dispatchTimeout(FXTime due);
+
+  /// Dispatch when idle; return true when handled.
+  virtual FXbool dispatchIdle();
+
+  /// Exit reactor.
+  virtual FXbool exit();
+
+  /// Destroy reactor object.
+  virtual ~FXReactor();
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXReadWriteLock.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXReadWriteLock.h Changed

@@ -3,7 +3,7 @@
 *                  R e a d - W r i t e   L o c k   C l a s s                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -103,7 +103,7 @@
   void unlock(){ rwlock.readUnlock(); }
 
   /// Destroy and unlock associated read-write lock
-  ~FXScopedReadLock(){ unlock(); }
+ ~FXScopedReadLock(){ unlock(); }
   };
 
 
@@ -137,7 +137,7 @@
   void unlock(){ rwlock.writeUnlock(); }
 
   /// Destroy and unlock associated read-write lock
-  ~FXScopedWriteLock(){ unlock(); }
+ ~FXScopedWriteLock(){ unlock(); }
   };
 
 }

gogglesmm-1.2.1.tar.gz/cfox/include/FXRealSlider.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRealSlider.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRealSpinner.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRealSpinner.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRecentFiles.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRecentFiles.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRectangle.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRectangle.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRefPtr.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRefPtr.h Changed

@@ -3,7 +3,7 @@
 *         R e f e r e n c e   C o u n t e d   O b j e c t  P o i n t e r        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -80,15 +80,27 @@
   /// Conversion operators
   operator EType*() const { return ptr; }
 
-  /// Return pointer value
-  EType* get() const { return ptr; }
-
   /// Dereference operator
   EType& operator*() const { return *ptr; }
 
   /// Follow pointer operator
   EType* operator->() const { return ptr; }
 
+  /// Test for non-null
+  operator FXbool() const { return !!ptr; }
+
+  /// Test for NULL
+  FXbool operator!() const { return !ptr; }
+
+  /// Comparison operator.
+  FXbool operator==(EType *p) const { return ptr==p; }
+
+  /// Comparison operator.
+  FXbool operator!=(EType *p) const { return ptr!=p; }
+
+  /// Return pointer value
+  EType* get() const { return ptr; }
+
   /// Clear pointer
   void clear(){
     FXRefPtr<EType> tmp;

gogglesmm-1.2.1.tar.gz/cfox/include/FXRegion.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRegion.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRegistry.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRegistry.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXReplaceDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXReplaceDialog.h Changed

gogglesmm-1.2.2.tar.gz/cfox/include/FXReverseDictionary.h Added

@@ -0,0 +1,134 @@
+/********************************************************************************
+*                                                                               *
+*                 R e v e r s e   D i c t i o n a r y    C l a s s              *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef REVERSEDICTIONARY_H
+#define REVERSEDICTIONARY_H
+
+namespace FX {
+
+
+/**
+* The reverse dictionary class is a fast-access hash table, mapping void-pointers to
+* strings. Subclasses of dictionary can easily specialize the void-pointers to pointers
+* to particular types; to this end subclasses must overload certain API's and
+* perform the necessary type-casts for the proper interpretation of the stored
+* pointer values.
+* Two special key values are disallowed: NULL and the pointer value (-1L); NULL is
+* used to designate an unoccupied slot, while (-1L) is used to designate a formerly
+* occupied slot.
+* Note that many complex containers in TL now fit inside a pointer, and thus
+* these types can be used in dictionaries as well!
+*/
+class FXAPI FXReverseDictionary {
+protected:
+  struct Entry {
+    FXptr    key;       // Key
+    FXString data;      // Value
+    };
+protected:
+  Entry*     table;     // Hash table
+protected:
+
+  // Change size of the table
+  FXbool no(FXival n);
+
+  // Change number of used entries
+  void used(FXival u){ ((FXival*)table)-2=u; }
+
+  // Change number of free entries
+  void free(FXival f){ ((FXival*)table)-3=f; }
+
+  // Resize the table to the given size, keeping contents
+  FXbool resize(FXival n);
+public:
+
+  /// Construct empty dictionary
+  FXReverseDictionary();
+
+  /// Construct from another dictionary
+  FXReverseDictionary(const FXReverseDictionary& other);
+
+  /// Return the size of the table, including the empty slots
+  FXival no() const { return ((FXival*)table)-1; }
+
+  /// Return number of used slots in the table
+  FXival used() const { return ((FXival*)table)-2; }
+
+  /// Return number of free slots in the table
+  FXival free() const { return ((FXival*)table)-3; }
+
+  /// See if map is empty
+  FXbool empty() const { return ((FXival*)table)-1<=1; }
+
+  /// Assignment operator
+  FXReverseDictionary& operator=(const FXReverseDictionary& other);
+
+  /// Adopt dictionary from another
+  FXReverseDictionary& adopt(FXReverseDictionary& other);
+
+  /// Find position of given key, returning -1 if not found
+  FXival find(FXptr ky) const;
+
+  /// Check if key is mapped
+  FXbool has(FXptr ky) const { return 0<=find(ky); }
+
+  /// Return reference to slot assocated with given key
+  FXString& at(FXptr ky);
+
+  /// Return constant reference to slot assocated with given key
+  const FXString& at(FXptr ky) const;
+
+  /// Return reference to slot assocated with given key
+  FXString& operator(FXptr ky){ return at(ky); }
+
+  /// Return constant reference to slot assocated with given key
+  const FXString& operator(FXptr ky) const { return at(ky); }
+
+  /// Insert association with given key; return old value, if any
+  FXString insert(FXptr ky,const FXString& str=FXString::null){ FXString ret(str); return swap(at(ky),ret); }
+
+  /// Remove association with given key; return old value, if any
+  FXString remove(FXptr ky);
+
+  /// Erase data at pos in the table; return old value, if any
+  FXString erase(FXival pos);
+
+  /// Return true if slot is empty.
+  FXbool empty(FXival pos) const { return (tablepos.key==(FXptr)0L)||(tablepos.key==(FXptr)-1L); }
+
+  /// Return key at position pos
+  FXptr key(FXival pos) const { return tablepos.key; }
+
+  /// Return reference to slot at position pos
+  FXString& data(FXival pos){ return tablepos.data; }
+
+  /// Return constant reference to slot at position pos
+  const FXString& data(FXival pos) const { return tablepos.data; }
+
+  /// Clear entire table
+  void clear();
+
+  /// Destroy table
+ ~FXReverseDictionary();
+  };
+
+}
+
+#endif

gogglesmm-1.2.2.tar.gz/cfox/include/FXReverseDictionaryOf.h Added

@@ -0,0 +1,88 @@
+/********************************************************************************
+*                                                                               *
+*  R e v e r s e   D i c t i o n a r y   O f   P o i n t e r s   T o   T y p e  *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef REVERSEDICTIONARYOF_H
+#define REVERSEDICTIONARYOF_H
+
+namespace FX {
+
+
+/**
+* Dictionary of pointers to TYPE.
+* Two special key values are disallowed: NULL and the pointer value (-1L); NULL is
+* used to designate an unoccupied slot, while (-1L) is used to designate a formerly
+* occupied slot.
+*/
+template<typename TYPE>
+class FXReverseDictionaryOf : public FXReverseDictionary {
+public:
+
+  /// Default constructor
+  FXReverseDictionaryOf(){}
+
+  /// Copy constructor
+  FXReverseDictionaryOf(const FXReverseDictionaryOf<TYPE>& other):FXReverseDictionary(other){ }
+
+  /// Assignment operator
+  FXReverseDictionaryOf<TYPE>& operator=(const FXReverseDictionaryOf<TYPE>& other){ return reinterpret_cast<FXReverseDictionaryOf<TYPE>&>(FXReverseDictionary::operator=(other)); }
+
+  /// Adopt reverse dictionary from another
+  FXReverseDictionaryOf<TYPE>& adopt(FXReverseDictionaryOf<TYPE>& other){ return reinterpret_cast<FXReverseDictionaryOf<TYPE>&>(FXReverseDictionary::adopt(other)); }
+
+  /// Find position of given key, returning -1 if not found
+  FXival find(TYPE* ky) const { return FXReverseDictionary::find((FXptr)ky); }
+
+  /// Check if key is mapped
+  FXbool has(TYPE* ky) const { return FXReverseDictionary::has((FXptr)ky); }
+
+  /// Return reference to slot assocated with given key
+  FXString& at(TYPE* ky){ return FXReverseDictionary::at((FXptr)ky); }
+
+  /// Return constant reference to slot assocated with given key
+  const FXString& at(TYPE* ky) const { return FXReverseDictionary::at((FXptr)ky); }
+
+  /// Return reference to slot assocated with given key
+  FXString& operator(TYPE* ky){ return FXReverseDictionary::at((FXptr)ky); }
+
+  /// Return constant reference to slot assocated with given key
+  const FXString& operator(TYPE* ky) const { return FXReverseDictionary::at((FXptr)ky); }
+
+  /// Insert association with given key; return old value, if any
+  FXString insert(TYPE* ky,const FXString& str=FXString::null){ return FXReverseDictionary::insert((FXptr)ky,str); }
+
+  /// Remove association with given key; return old value, if any
+  FXString remove(TYPE* ky){ return FXReverseDictionary::remove((FXptr)ky); }
+
+  /// Erase data at pos in the table; return old value, if any
+  FXString erase(FXival pos){ return FXReverseDictionary::erase(pos); }
+
+  /// Return key at position pos
+  TYPE* key(FXival pos) const { return (TYPE*)tablepos.key; }
+
+  /// Return reference to slot at position pos
+  FXString& data(FXival pos){ return FXReverseDictionary::data(pos); }
+
+  /// Return constant reference to slot at position pos
+  const FXString& data(FXival pos) const { return FXReverseDictionary::data(pos); }
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXRex.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRex.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRootWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRootWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRuler.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRuler.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRulerView.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRulerView.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXRunnable.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXRunnable.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXScopedThread.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXScopedThread.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXScrollArea.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXScrollArea.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXScrollBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXScrollBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXScrollPane.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXScrollPane.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXScrollWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXScrollWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSearchDialog.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSearchDialog.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSemaQueue.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSemaQueue.h Changed

@@ -3,7 +3,7 @@
 *                          S e m a p h o r e   Q u e u e                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -24,10 +24,26 @@
 namespace FX {
 
 
-/// Semaphore protected queue
+/**
+* Semaphore protected queue for a single producer and
+* a single consumer thread.
+* Producer thread will only block in push() when the queue
+* is full; likewise, consumer will only block in pop() if
+* the queue is empty.
+* To avoid blocking the producer, call trypush() instead.
+* Without timeout parameter, trypush() will return immediately
+* if no space is available.
+* When the timeout parameter is passed, the producer will wait
+* a finite amount of time before giving up.
+* Similarly, to avoid blocking the consumer, call trypop().
+* Without the timeout parameter, trypop() will return immediately
+* if no items are available.
+* When the timeout parameter is passed, the consumer will wait
+* a finite amount of time before giving up.
+*/
 class FXAPI FXSemaQueue {
 private:
-  FXPtrQueue  list;     // Queue
+  FXPtrQueue  queue;    // Queue
   FXSemaphore free;     // Free cells
   FXSemaphore used;     // Used cells
 private:
@@ -35,21 +51,32 @@
   FXSemaQueue &operator=(const FXSemaQueue&);
 public:
 
-  /// Create initially empty queue
+  /// Create initially empty queue of given size sz
   FXSemaQueue(FXuint sz=32);
 
-  /// Try push object into queue
-  FXbool trypush(FXptr obj);
+  /// Return size
+  FXuint getSize() const { return queue.getSize(); }
 
   /// Add item to queue, return true if success
   FXbool push(FXptr ptr);
 
-  /// Try pop object from queue
-  FXbool trypop(FXptr& obj);
+  /// Try push object into queue
+  FXbool trypush(FXptr obj);
+
+  /// Try push object into queue, waiting up
+  /// to nsec for space to become available.
+  FXbool trypush(FXptr obj,FXTime nsec);
 
   /// Remove item from queue, return true if success
   FXbool pop(FXptr& ptr);
 
+  /// Try pop object from queue
+  FXbool trypop(FXptr& obj);
+
+  /// Try pop object from queue, waiting up
+  /// to nsec for object to become available.
+  FXbool trypop(FXptr& obj,FXTime nsec);
+
   /// Drop item from queue, return true if success
   FXbool pop();
 
@@ -62,12 +89,27 @@
 template<typename TYPE>
 class FXSemaQueueOf : public FXSemaQueue {
 public:
-  FXSemaQueueOf(){}
-  FXSemaQueueOf(FXuint sz):FXSemaQueue(sz){}
-  FXbool trypush(TYPE* obj){ return FXSemaQueue::trypush((FXptr)obj); }
+
+  /// Create initially empty queue of given size sz
+  FXSemaQueueOf(FXuint sz=32):FXSemaQueue(sz){}
+
+  /// Add item to queue, return true if success
   FXbool push(TYPE* obj){ return FXSemaQueue::push((FXptr)obj); }
-  FXbool trypop(TYPE*& obj){ return FXSemaQueue::trypop((FXptr&)obj); }
+
+  /// Try push object into queue, return true if success
+  FXbool trypush(TYPE* obj){ return FXSemaQueue::trypush((FXptr)obj); }
+
+  /// Try push object into queue, return true if success
+  FXbool trypush(TYPE* obj,FXTime nsec){ return FXSemaQueue::trypush((FXptr)obj,nsec); }
+
+  /// Drop item from queue, return true if success
   FXbool pop(TYPE*& obj){ return FXSemaQueue::pop((FXptr&)obj); }
+
+  /// Try pop object from queue, return true if success
+  FXbool trypop(TYPE*& obj){ return FXSemaQueue::trypop((FXptr&)obj); }
+
+  /// Try pop object from queue, return true if success
+  FXbool trypop(TYPE*& obj,FXTime nsec){ return FXSemaQueue::trypop((FXptr&)obj,nsec); }
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXSemaphore.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSemaphore.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSeparator.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSeparator.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSettings.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSettings.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXShell.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXShell.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXShutter.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXShutter.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSize.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSize.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSlider.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSlider.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSocket.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSocket.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSphered.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSphered.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSpheref.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSpheref.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSpinLock.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSpinLock.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSpinner.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSpinner.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSplashWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSplashWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSplitter.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSplitter.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSpring.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSpring.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXStat.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXStat.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXStatusBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXStatusBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXStatusLine.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXStatusLine.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXStream.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXStream.h Changed

@@ -3,7 +3,7 @@
 *       P e r s i s t e n t   S t o r a g e   S t r e a m   C l a s s e s       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -243,6 +243,14 @@
   /// Add object without saving or loading
   FXStream& addObject(const FXObject* v);
 
+  /// Load object
+  template<class TYPE>
+  FXStream& operator>>(TYPE*& obj){ return loadObject(reinterpret_cast<FXObject*&>(obj)); }
+
+  /// Save object
+  template<class TYPE>
+  FXStream& operator<<(const TYPE* obj){ return saveObject(static_cast<const FXObject*>(obj)); }
+
   /// Destructor
   virtual ~FXStream();
   };

gogglesmm-1.2.1.tar.gz/cfox/include/FXString.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXString.h Changed

@@ -3,7 +3,7 @@
 *                           S t r i n g   O b j e c t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -117,8 +117,10 @@
   /// Validate position to point to begin of utf8 character
   FXint validate(FXint p) const;
 
-  /// Get text contents
+  /// Get text contents as pointer
   FXchar* text(){ return str; }
+
+  /// Get text contents as const pointer
   const FXchar* text() const { return str; }
 
   /// See if string is empty
@@ -187,15 +189,6 @@
   /// Assign n characters c to this string
   FXString& assign(FXchar c,FXint n);
 
-  /// Assign first n characters of string s to this string
-  FXString& assign(const FXchar *s,FXint n);
-
-  /// Assign first n characters of narrow character string s to this string
-  FXString& assign(const FXnchar *s,FXint n);
-
-  /// Assign first n characters of wide character string s to this string
-  FXString& assign(const FXwchar *s,FXint n);
-
   /// Assign string s to this string
   FXString& assign(const FXchar* s);
 
@@ -205,6 +198,15 @@
   /// Assign wide character string s to this string
   FXString& assign(const FXwchar* s);
 
+  /// Assign first n characters of string s to this string
+  FXString& assign(const FXchar *s,FXint n);
+
+  /// Assign first n characters of narrow character string s to this string
+  FXString& assign(const FXnchar *s,FXint n);
+
+  /// Assign first n characters of wide character string s to this string
+  FXString& assign(const FXwchar *s,FXint n);
+
   /// Assign string s to this string
   FXString& assign(const FXString& s);
 
@@ -214,15 +216,6 @@
   /// Insert n characters c at specified position
   FXString& insert(FXint pos,FXchar c,FXint n);
 
-  /// Insert first n characters of string at specified position
-  FXString& insert(FXint pos,const FXchar* s,FXint n);
-
-  /// Insert first n characters of narrow character string at specified position
-  FXString& insert(FXint pos,const FXnchar* s,FXint n);
-
-  /// Insert first n characters of wide character string at specified position
-  FXString& insert(FXint pos,const FXwchar* s,FXint n);
-
   /// Insert string at specified position
   FXString& insert(FXint pos,const FXchar* s);
 
@@ -232,6 +225,15 @@
   /// Insert wide character string at specified position
   FXString& insert(FXint pos,const FXwchar* s);
 
+  /// Insert first n characters of string at specified position
+  FXString& insert(FXint pos,const FXchar* s,FXint n);
+
+  /// Insert first n characters of narrow character string at specified position
+  FXString& insert(FXint pos,const FXnchar* s,FXint n);
+
+  /// Insert first n characters of wide character string at specified position
+  FXString& insert(FXint pos,const FXwchar* s,FXint n);
+
   /// Insert string at specified position
   FXString& insert(FXint pos,const FXString& s);
 
@@ -241,15 +243,6 @@
   /// Prepend string with n characters c
   FXString& prepend(FXchar c,FXint n);
 
-  /// Prepend first n characters of string s
-  FXString& prepend(const FXchar* s,FXint n);
-
-  /// Prepend first n characters of narrow character string s
-  FXString& prepend(const FXnchar* s,FXint n);
-
-  /// Prepend first n characters of wide character string s
-  FXString& prepend(const FXwchar* s,FXint n);
-
   /// Prepend string with string s
   FXString& prepend(const FXchar* s);
 
@@ -259,6 +252,15 @@
   /// Prepend string with wide character string
   FXString& prepend(const FXwchar* s);
 
+  /// Prepend first n characters of string s
+  FXString& prepend(const FXchar* s,FXint n);
+
+  /// Prepend first n characters of narrow character string s
+  FXString& prepend(const FXnchar* s,FXint n);
+
+  /// Prepend first n characters of wide character string s
+  FXString& prepend(const FXwchar* s,FXint n);
+
   /// Prepend string with string s
   FXString& prepend(const FXString& s);
 
@@ -268,15 +270,6 @@
   /// Append n characters c to this string
   FXString& append(FXchar c,FXint n);
 
-  /// Append first n characters of string s to this string
-  FXString& append(const FXchar* s,FXint n);
-
-  /// Append first n characters of narrow character string s to this string
-  FXString& append(const FXnchar* s,FXint n);
-
-  /// Append first n characters of wide character string s to this string
-  FXString& append(const FXwchar* s,FXint n);
-
   /// Append string s to this string
   FXString& append(const FXchar* s);
 
@@ -286,6 +279,15 @@
   /// Append wide character string s to this string
   FXString& append(const FXwchar* s);
 
+  /// Append first n characters of string s to this string
+  FXString& append(const FXchar* s,FXint n);
+
+  /// Append first n characters of narrow character string s to this string
+  FXString& append(const FXnchar* s,FXint n);
+
+  /// Append first n characters of wide character string s to this string
+  FXString& append(const FXwchar* s,FXint n);
+
   /// Append string s to this string
   FXString& append(const FXString& s);
 
@@ -295,15 +297,6 @@
   /// Replace the r characters at pos with n characters c
   FXString& replace(FXint pos,FXint r,FXchar c,FXint n);
 
-  /// Replaces the r characters at pos with first n characters of string s
-  FXString& replace(FXint pos,FXint r,const FXchar* s,FXint n);
-
-  /// Replaces the r characters at pos with first n characters of narrow character string s
-  FXString& replace(FXint pos,FXint r,const FXnchar* s,FXint n);
-
-  /// Replaces the r characters at pos with first n characters of wide character string s
-  FXString& replace(FXint pos,FXint r,const FXwchar* s,FXint n);
-
   /// Replace the r characters at pos with string s
   FXString& replace(FXint pos,FXint r,const FXchar* s);
 
@@ -313,6 +306,15 @@
   /// Replace the r characters at pos with wide character string s
   FXString& replace(FXint pos,FXint r,const FXwchar* s);
 
+  /// Replaces the r characters at pos with first n characters of string s
+  FXString& replace(FXint pos,FXint r,const FXchar* s,FXint n);
+
+  /// Replaces the r characters at pos with first n characters of narrow character string s
+  FXString& replace(FXint pos,FXint r,const FXnchar* s,FXint n);
+
+  /// Replaces the r characters at pos with first n characters of wide character string s
+  FXString& replace(FXint pos,FXint r,const FXwchar* s,FXint n);
+
   /// Replace the r characters at pos with string s
   FXString& replace(FXint pos,FXint r,const FXString& s);
 
@@ -580,6 +582,70 @@
   */
   static FXString vvalue(const FXchar* fmt,va_list args);
 
+
+  /**
+  * Check if the string contains special characters or leading or trailing whitespace,
+  * or contains UTF8 if flag!=0.
+  */
+  static FXbool shouldEscape(const FXString& str,FXchar lquote=0,FXchar rquote=0,FXint flag=0);
+
+  /**
+  * Escape special characters.
+  * Optionally enclose return value with left and right quotes.
+  * Flag: 0 don't encode UTF8 multi-byte characters.
+  * Flag: 1 encodes UTF8 multi-byte characters to a sequence of hexadecimals of the form \xXX.
+  * Flag: 2 encodes UTF8 multi-byte characters to the form \uXXXX or \uXXXX\uYYYY.
+  * Ill-formed UTF8 will be encoded as hexadecimals \xXX regardless even if \uXXXX is requested.
+  * Quotes will be escaped if quoting is performed.
+  */
+  static FXString escape(const FXString& str,FXchar lquote=0,FXchar rquote=0,FXint flag=0);
+
+  /**
+  * Unescape special characters,
+  * Optionally remove surrounding left and right quotes.
+  * In particular, decode \xXX to the hexadecimal character XX, \uXXXX to the multi-byte
+  * UTF8 sequence representing unicode character XXXX, and decode \t, \n, etc.
+  * Handle surrogate pairs of the form \uXXXX\uYYYY properly.
+  */
+  static FXString unescape(const FXString& str,FXchar lquote=0,FXchar rquote=0);
+
+  /**
+  * Expand tabs with the equivalent amount of spaces.
+  * UTF8 encoded characters are counted as one column.
+  */
+  static FXString detab(const FXString& text,FXint tabcols=8);
+
+  /**
+  * Compress runs of more than 2 spaces with tabs.
+  * UTF8 characters are counted as one column.
+  */
+  static FXString entab(const FXString& text,FXint tabcols=8);
+
+  /**
+  * Retabbify lines of text.
+  * Given lines of text at given indent-level, insert of remove spaces or tabs to
+  * align the text to new outdent-level, shifting over by a number of columns left-ward
+  * or rightward. UTF8 characters are counted as one column, and trailing space will be
+  * deleted.
+  */
+  static FXString tabbify(const FXString& text,FXint tabcols=8,FXint indent=0,FXint outdent=0,FXint shift=0,FXbool tabs=false);
+
+  /**
+  * Return normalized string, i.e. reordering of diacritical marks.
+  */
+  static FXString normalize(const FXString& s);
+
+  /**
+  * Return normalized decomposition of string.
+  */
+  static FXString decompose(const FXString& s,FXbool canonical=true);
+
+  /**
+  * Return normalized composition of string; this first performs normalized
+  * decomposition.
+  */
+  static FXString compose(const FXString& s,FXbool canonical=true);
+
   /// Compute hash value of string
   FXuint hash() const;
 
@@ -702,43 +768,6 @@
 /// Convert dos string to unix string
 extern FXAPI FXString& dosToUnix(FXString& str);
 
-/**
-* Check if the string contains special characters or leading or trailing whitespace,
-* or contains UTF8 if flag!=0.
-*/
-extern FXAPI FXbool shouldEscape(const FXString& str,FXchar lquote=0,FXchar rquote=0,FXint flag=0);
-
-/**
-* Escape special characters.
-* Optionally enclose return value with left and right quotes.
-* Flag: 0 don't encode UTF8 multi-byte characters.
-* Flag: 1 encodes UTF8 multi-byte characters to a sequence of hexadecimals of the form \xXX.
-* Flag: 2 encodes UTF8 multi-byte characters to the form \uXXXX or \uXXXX\uYYYY.
-* Ill-formed UTF8 will be encoded as hexadecimals \xXX regardless even if \uXXXX is requested.
-* Quotes will be escaped if quoting is performed.
-*/
-extern FXAPI FXString escape(const FXString& str,FXchar lquote=0,FXchar rquote=0,FXint flag=0);
-
-/**
-* Unescape special characters,
-* Optionally remove surrounding left and right quotes.
-* In particular, decode \xXX to the hexadecimal character XX, \uXXXX to the multi-byte
-* UTF8 sequence representing unicode character XXXX, and decode \t, \n, etc.
-* Handle surrogate pairs of the form \uXXXX\uYYYY properly.
-*/
-extern FXAPI FXString unescape(const FXString& str,FXchar lquote=0,FXchar rquote=0);
-
-
-
-/// Return normalized string, i.e. reordering of diacritical marks
-extern FXAPI FXString normalize(const FXString& s);
-
-/// Return normalized decomposition of string
-extern FXAPI FXString decompose(const FXString& s,FXbool canonical=true);
-
-/// Return normalized composition of string; this first performs normalized decomposition
-extern FXAPI FXString compose(const FXString& s,FXbool canonical=true);
-
 }
 
 #endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXStringDictionary.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXStringDictionary.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSwitcher.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSwitcher.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXSystem.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXSystem.h Changed

@@ -3,7 +3,7 @@
 *         M i s c e l l a n e o u s   S y s t e m   F u n c t i o n s           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -25,30 +25,100 @@
 
 namespace FXSystem {
 
+  /// System Time in parts
+  struct Time {
+    FXint year;         /// Year (e.g. 1970)
+    FXint month;        /// Month 1..12
+    FXint mday;         /// Day of the month 1..31
+    FXint yday;         /// Day in the year 1..366
+    FXint wday;         /// Day of the week 0..6
+    FXint hour;         /// Hours 0..23
+    FXint min;          /// Minutes 0..59
+    FXint sec;          /// Seconds 0..60
+    FXint nano;         /// Nanoseconds 0..999999999
+    FXint offset;       /// Seconds east of utc
+    };
 
-  /// Default formatting string used for time formatting
-  extern FXAPI const char defaultTimeFormat;
+  /// Compute nanoseconds since Unix Epoch from system time
+  extern FXAPI FXTime timeFromSystemTime(const Time& st);
 
-  /// Convert time in nanoseconds since 1/1/1970 to local date string
-  extern FXAPI FXString localTime(FXTime value);
+  /// Return system time from utc in nanoseconds since Unix Epoch
+  extern FXAPI void systemTimeFromTime(Time& st,FXTime utc);
+
+
+  /// Default formatting (mm/dd/yyyy hh:mm:ss) string used for time formatting
+  extern FXAPI const FXchar defaultTimeFormat;
+
+  /// ISO 8601 time format (yyyy-mm-ddThh:mm:ss+hh:mm) formatting string
+  extern FXAPI const FXchar isoTimeFormat;
+
+
+  /// Format system time to string
+  extern FXAPI FXString systemTimeFormat(const Time& st,const FXchar* format=defaultTimeFormat);
+
+  /// Parse system time from string, returning number of characters parsed
+  extern FXAPI FXint systemTimeParse(Time& st,const FXchar* string,const FXchar* format=defaultTimeFormat);
+
+  /// Parse system time from string, returning number of characters parsed
+  extern FXAPI FXint systemTimeParse(Time& st,const FXString& string,const FXchar* format=defaultTimeFormat);
 
-  /// Convert time in nanoseconds since 1/1/1970 to universal date string
-  extern FXAPI FXString universalTime(FXTime value);
 
   /**
-  * Convert time in nanoseconds since 1/1/1970 to local date string as per strftime.
-  * Format characters supported by most systems are:
-  *
-  *  %a %A %b %B %c %d %H %I %j %m %M %p %S %U %w %W %x %X %y %Y %Z %%
-  *
-  * Some systems support additional conversions.
+  * Returns number of days since civil 1970-01-01.  Negative values indicate
+  * days prior to 1970-01-01.
+  * y is year, m is month of year (1..12), d is day of month (1..31).
   */
-  extern FXAPI FXString localTime(const FXchar *format,FXTime value);
+  extern FXAPI FXlong daysFromCivil(FXint y,FXint m,FXint d);
 
   /**
-  * Convert time in nanoseconds since 1/1/1970 to universal date string as per strftime.
+  * Returns year/month/day in civil calendar.
+  * z is number of days since 1970-01-01. Negative values indicate
+  * days prior to 1970-01-01.
+  * y is year, m is month of year (1..12), d is day of month (1..31).
   */
-  extern FXAPI FXString universalTime(const FXchar *format,FXTime value);
+  extern FXAPI void civilFromDays(FXint& y,FXint& m,FXint& d,FXlong z);
+
+
+  /// Return leap seconds from utc in nanocseconds since Unix Epoch
+  extern FXAPI FXival leapSeconds(FXTime utc);
+
+  /// Return leap seconds from tai in nanocseconds since Unix Epoch
+  extern FXAPI FXival leapSecondsTAI(FXTime tai);
+
+  /// Return offset between standard local time zone to UTC, in nanoseconds
+  extern FXAPI FXTime localTimeZoneOffset();
+
+  /// Return offset daylight savings time to standard time, in nanoseconds
+  extern FXAPI FXTime daylightSavingsOffset();
+
+  /// Return 1 if daylight savings time is active at utc in nanoseconds since Unix Epoch 
+  extern FXAPI FXTime daylightSavingsActive(FXTime utc);
+
+  /// Return time zone name (or daylight savings time time zone name)
+  extern FXAPI FXString localTimeZoneName(FXbool dst=false);
+
+
+  /// Convert NTP format (ssss:ffff) to nanoseconds since Unix Epoch
+  extern FXAPI FXTime timeFromNTPTime(FXulong ntptime);
+
+  /// Convert utc in nanoseconds since Unix Epoch to NTP (ssss:ffff)
+  extern FXAPI FXulong ntpTimeFromTime(FXTime utc);
+
+
+  /// Format utc in nanoseconds since Unix Epoch to date-time string using given format
+  extern FXAPI FXString universalTime(FXTime utc,const FXchar *format=defaultTimeFormat);
+
+  /// Parse date-time string to UTC nanoseconds since Unix Epoch using given format
+  extern FXAPI FXTime universalTime(const FXchar* string,const FXchar* format=defaultTimeFormat);
+  extern FXAPI FXTime universalTime(const FXString& string,const FXchar* format=defaultTimeFormat);
+
+
+  /// Format utc in nanoseconds since Unix Epoch to local date-time string using given format
+  extern FXAPI FXString localTime(FXTime utc,const FXchar *format=defaultTimeFormat);
+
+  /// Parse local date-time string to UTC nanoseconds since Unix Epoch using given format
+  extern FXAPI FXTime localTime(const FXchar* string,const FXchar* format=defaultTimeFormat);
+  extern FXAPI FXTime localTime(const FXString& string,const FXchar* format=defaultTimeFormat);
 
 
   /// Get effective user id
@@ -74,7 +144,6 @@
   extern FXAPI FXString modeString(FXuint mode);
 
 
-
   /// Return value of environment variable name
   extern FXAPI FXString getEnvironment(const FXString& name);
 
@@ -82,7 +151,6 @@
   extern FXAPI FXbool setEnvironment(const FXString& name,const FXString& value);
 
 
-
   /// Get the current working directory
   extern FXAPI FXString getCurrentDirectory();
 
@@ -96,13 +164,15 @@
   extern FXAPI FXbool setCurrentDrive(const FXString& prefix);
 
 
-
   /// Get executable path
   extern FXAPI FXString getExecPath();
 
   /// Return known executable file extensions (Windows)
   extern FXAPI FXString getExecExtensions();
 
+  /// Get name of calling executable
+  extern FXAPI FXString getExecFilename();
+
   /// Return the home directory for the current user
   extern FXAPI FXString getHomeDirectory();
 
@@ -120,9 +190,6 @@
   /// Determine if UTF8 locale in effect
   extern FXAPI FXbool localeIsUTF8();
 
-  /// Get name of calling executable
-  extern FXAPI FXString getExecFilename();
-
   /**
   * Get DLL name for given base name; for example "png"
   * becomes "libpng.so" on Linux, and "png.dll" on Windows.

gogglesmm-1.2.1.tar.gz/cfox/include/FXTGAIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTGAIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTGAImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTGAImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTIFIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTIFIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTIFImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTIFImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTabBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTabBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTabBook.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTabBook.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTabItem.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTabItem.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTable.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTable.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTaskGroup.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTaskGroup.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXText.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXText.h Changed

@@ -3,7 +3,7 @@
 *                   M u l t i - L i n e   T e x t   W i d g e t                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -97,8 +97,9 @@
 * text buffer, in sufficient detail for recording undo and redo info.
 *
 * When selections are made, SEL_SELECTED or SEL_DESELECTED messages
-* are issued, passing along the range of text affected by the change
-* in selection.
+* are issued, passing along the range of affected text affected as
+* an array of four numbers: position, number of bytes, column, number
+* of columns.
 *
 * As the cursor is being moved, matching parentheses, brackets, and
 * braces may be highlighted for a short time if the brace-matching
@@ -215,7 +216,6 @@
   FXText();
   void movegap(FXint pos);
   void sizegap(FXint sz);
-  void squeezegap();
   FXint charWidth(FXwchar ch,FXint indent) const;
   FXint xoffset(FXint start,FXint pos) const;
   FXint wrap(FXint start) const;
@@ -235,7 +235,7 @@
   FXint changeBeg(FXint pos) const;
   FXint changeEnd(FXint pos) const;
   void mutation(FXint pos,FXint ncins,FXint ncdel,FXint nrins,FXint nrdel);
-  FXint overstruck(FXint start,FXint end,const FXchar *text,FXint n);
+  FXint overstruck(FXint start,FXint end,const FXchar *text,FXint num);
   void drawCursor(FXuint state);
   virtual void paintCursor(FXDCWindow& dc) const;
   virtual void eraseCursor(FXDCWindow& dc) const;
@@ -246,19 +246,13 @@
   virtual void drawTextRow(FXDCWindow& dc,FXint row) const;
   virtual void drawContents(FXDCWindow& dc) const;
   virtual void drawNumbers(FXDCWindow& dc) const;
-  virtual void replace(FXint pos,FXint m,const FXchar *text,FXint n,FXint style);
-  void updateRows(FXint startrow,FXint endrow) const;
+  virtual void replace(FXint pos,FXint del,const FXchar *text,FXint ins,FXint style);
+  void updateRow(FXint row) const;
+  void updateLines(FXint startpos,FXint endpos) const;
   void updateRange(FXint startpos,FXint endpos) const;
-  FXbool deletePendingSelection(FXbool notify);
-  FXint countTextLines(const FXchar* text,FXint n) const;
-  FXint countTextColumns(const FXchar* text,FXint n) const;
-  FXString tabbify(const FXchar* str,FXint len,FXint indent=0,FXint outdent=0,FXint shift=0,FXbool tab=false) const;
-  FXString tabbify(const FXString& str,FXint indent=0,FXint outdent=0,FXint shift=0,FXbool tab=false) const;
-  FXString extractTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol) const;
-  FXint removeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,FXbool notify);
-  void replaceTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXbool notify);
   FXint shiftText(FXint startpos,FXint endpos,FXint shift,FXbool notify);
   FXint caseShift(FXint startpos,FXint endpos,FXint upper,FXbool notify);
+  FXbool deletePendingSelection(FXbool notify);
 protected:
   enum {
     MOUSE_NONE,                 // No mouse operation
@@ -277,7 +271,8 @@
     STYLE_SELECTED  = 0x0200,   // Selected
     STYLE_CONTROL   = 0x0400,   // Control character
     STYLE_HILITE    = 0x0800,   // Highlighted
-    STYLE_ACTIVE    = 0x1000    // Active
+    STYLE_ACTIVE    = 0x1000,   // Active
+    STYLE_INSERT    = 0x2000    // Column insert
     };
 public:
   enum {
@@ -351,7 +346,7 @@
   long onCmdCursorWordLeft(FXObject*,FXSelector,void*);
   long onCmdCursorWordRight(FXObject*,FXSelector,void*);
 
-  // Cursor drag movement
+  // Cursor shift-drag movement
   long onCmdCursorShiftTop(FXObject*,FXSelector,void*);
   long onCmdCursorShiftBottom(FXObject*,FXSelector,void*);
   long onCmdCursorShiftHome(FXObject*,FXSelector,void*);
@@ -365,6 +360,12 @@
   long onCmdCursorShiftWordLeft(FXObject*,FXSelector,void*);
   long onCmdCursorShiftWordRight(FXObject*,FXSelector,void*);
 
+  // Cursor alt-drag movement
+  long onCmdCursorAltUp(FXObject*,FXSelector,void*);
+  long onCmdCursorAltDown(FXObject*,FXSelector,void*);
+  long onCmdCursorAltLeft(FXObject*,FXSelector,void*);
+  long onCmdCursorAltRight(FXObject*,FXSelector,void*);
+
   // Positioning
   long onCmdScrollUp(FXObject*,FXSelector,void*);
   long onCmdScrollDown(FXObject*,FXSelector,void*);
@@ -392,7 +393,7 @@
   long onCmdSelectWord(FXObject*,FXSelector,void*);
   long onCmdSelectLine(FXObject*,FXSelector,void*);
   long onCmdSelectMatching(FXObject*,FXSelector,void*);
-  long onCmdSelectBlock(FXObject*,FXSelector,void*);
+  long onCmdSelectEnclosing(FXObject*,FXSelector,void*);
   long onCmdSelectAll(FXObject*,FXSelector,void*);
   long onCmdDeselectAll(FXObject*,FXSelector,void*);
 
@@ -465,6 +466,10 @@
     ID_CURSOR_SHIFT_PAGEDOWN,
     ID_CURSOR_SHIFT_WORD_LEFT,
     ID_CURSOR_SHIFT_WORD_RIGHT,
+    ID_CURSOR_ALT_UP,
+    ID_CURSOR_ALT_DOWN,
+    ID_CURSOR_ALT_LEFT,
+    ID_CURSOR_ALT_RIGHT,
     ID_SCROLL_UP,
     ID_SCROLL_DOWN,
     ID_SCROLL_TOP,
@@ -586,54 +591,12 @@
   /// Remove the focus from this window
   virtual void killFocus();
 
-  /// Change top margin
-  void setMarginTop(FXint pt);
-
-  /// Return top margin
-  FXint getMarginTop() const { return margintop; }
-
-  /// Change bottom margin
-  void setMarginBottom(FXint pb);
-
-  /// Return bottom margin
-  FXint getMarginBottom() const { return marginbottom; }
-
-  /// Change left margin
-  void setMarginLeft(FXint pl);
-
-  /// Return left margin
-  FXint getMarginLeft() const { return marginleft; }
-
-  /// Change right margin
-  void setMarginRight(FXint pr);
-
-  /// Return right margin
-  FXint getMarginRight() const { return marginright; }
-
-  /// Return wrap columns
-  FXint getWrapColumns() const { return wrapcolumns; }
-
-  /// Set wrap columns
-  void setWrapColumns(FXint cols);
-
-  /// Return tab columns
-  FXint getTabColumns() const { return tabcolumns; }
-
-  /// Change tab columns
-  void setTabColumns(FXint cols);
-
-  /// Return number of columns used for line numbers
-  FXint getBarColumns() const { return barcolumns; }
-
-  /// Change number of columns used for line numbers
-  void setBarColumns(FXint cols);
+  /// Set modified flag
+  void setModified(FXbool mod=true){ modified=mod; }
 
   /// Return true if text was modified
   FXbool isModified() const { return modified; }
 
-  /// Set modified flag
-  void setModified(FXbool mod=true){ modified=mod; }
-
   /// Set editable mode
   void setEditable(FXbool edit=true);
 
@@ -646,285 +609,259 @@
   /// Return true if overstrike mode in effect
   FXbool isOverstrike() const;
 
-  /// Set styled text mode; return true if success
-  FXbool setStyled(FXbool styled=true);
-
-  /// Return true if style buffer
-  FXbool isStyled() const { return (sbuffer!=NULL); }
-
-  /// Change delimiters of words
-  void setDelimiters(const FXchar* delims=textDelimiters){ delimiters=delims; }
-
-  /// Return word delimiters
-  const FXchar* getDelimiters() const { return delimiters; }
-
-  /// Change text font
-  void setFont(FXFont* fnt);
-
-  /// Return text font
-  FXFont* getFont() const { return font; }
-
-  /// Change text color
-  void setTextColor(FXColor clr);
-
-  /// Return text color
-  FXColor getTextColor() const { return textColor; }
-
-  /// Change selected background color
-  void setSelBackColor(FXColor clr);
-
-  /// Return selected background color
-  FXColor getSelBackColor() const { return selbackColor; }
+  /// Return length of buffer
+  FXint getLength() const { return length; }
 
-  /// Change selected text color
-  void setSelTextColor(FXColor clr);
+  /// Return number of rows in buffer
+  FXint getNumRows() const { return nrows; }
 
-  /// Return selected text color
-  FXColor getSelTextColor() const { return seltextColor; }
+  /// Get byte at position in text buffer
+  FXint getByte(FXint pos) const;
 
-  /// Change highlighted text color
-  void setHiliteTextColor(FXColor clr);
+  /// Get wide character at position pos
+  FXwchar getChar(FXint pos) const;
 
-  /// Return highlighted text color
-  FXColor getHiliteTextColor() const { return hilitetextColor; }
+  /// Get length of wide character at position pos
+  FXint getCharLen(FXint pos) const;
 
-  /// Change highlighted background color
-  void setHiliteBackColor(FXColor clr);
+  /// Get style at position pos
+  FXint getStyle(FXint pos) const;
 
-  /// Return highlighted background color
-  FXColor getHiliteBackColor() const { return hilitebackColor; }
+  /// Retreat to the previous valid utf8 character start
+  FXint dec(FXint pos) const;
 
-  /// Change active background color
-  void setActiveBackColor(FXColor clr);
+  /// Advance to the next valid utf8 character start
+  FXint inc(FXint pos) const;
 
-  /// Return active background color
-  FXColor getActiveBackColor() const { return activebackColor; }
+  /// Return position of begin of line containing position pos
+  FXint lineStart(FXint pos) const;
 
-  /// Change cursor color
-  void setCursorColor(FXColor clr);
+  /// Return position of end of line containing position pos
+  FXint lineEnd(FXint pos) const;
 
-  /// Return cursor color
-  FXColor getCursorColor() const { return cursorColor; }
+  /// Return start of next line
+  FXint nextLine(FXint pos,FXint nl=1) const;
 
-  /// Change line number color
-  void setNumberColor(FXColor clr);
+  /// Return start of previous line
+  FXint prevLine(FXint pos,FXint nl=1) const;
 
-  /// Return line number color
-  FXColor getNumberColor() const { return numberColor; }
+  /// Return row start
+  FXint rowStart(FXint pos) const;
 
-  /// Change bar color
-  void setBarColor(FXColor clr);
+  /// Return row end
+  FXint rowEnd(FXint pos) const;
 
-  /// Return bar color
-  FXColor getBarColor() const { return barColor; }
+  /// Return start of next row
+  FXint nextRow(FXint pos,FXint nr=1) const;
 
-  /// Set help text
-  void setHelpText(const FXString& text){ help=text; }
+  /// Return start of previous row
+  FXint prevRow(FXint pos,FXint nr=1) const;
 
-  /// Return help text
-  FXString getHelpText() const { return help; }
+  /// Return end of previous word
+  FXint leftWord(FXint pos) const;
 
-  /// Set the tool tip message for this text widget
-  void setTipText(const FXString& text){ tip=text; }
+  /// Return begin of next word
+  FXint rightWord(FXint pos) const;
 
-  /// Get the tool tip message for this text widget
-  FXString getTipText() const { return tip; }
+  /// Return begin of word
+  FXint wordStart(FXint pos) const;
 
-  /// Get character at position in text buffer
-  FXint getByte(FXint pos) const;
+  /// Return end of word
+  FXint wordEnd(FXint pos) const;
 
-  /// Get wide character at position pos
-  FXwchar getChar(FXint pos) const;
+  /// Return validated utf8 character start position
+  FXint validPos(FXint pos) const;
 
-  /// Get length of wide character at position pos
-  FXint getCharLen(FXint pos) const;
+  /**
+  * Count number of columns taken up by some text.
+  * Start should be on a row start.
+  */
+  FXint countCols(FXint start,FXint end) const;
 
-  /// Get style at position pos
-  FXint getStyle(FXint pos) const;
+  /**
+  * Count number of rows taken up by some text.
+  * Start and end should be on a row start.
+  */
+  FXint countRows(FXint start,FXint end) const;
 
-  /// Return length of buffer
-  FXint getLength() const { return length; }
+  /**
+  * Count number of newlines.
+  * Start should be on a line start.
+  */
+  FXint countLines(FXint start,FXint end) const;
 
-  /// Return number of rows in buffer
-  FXint getNumRows() const { return nrows; }
 
-  /// Return entire text as string
-  FXString getText() const;
+  /// Change the text in the buffer to new text
+  virtual FXint setText(const FXchar* text,FXint num,FXbool notify=false);
+  virtual FXint setText(const FXString& text,FXbool notify=false);
 
-  /// Retrieve text into buffer
-  void getText(FXchar* text,FXint n) const;
+  /// Change the text in the buffer to new text
+  virtual FXint setStyledText(const FXchar* text,FXint num,FXint style=0,FXbool notify=false);
+  virtual FXint setStyledText(const FXString& text,FXint style=0,FXbool notify=false);
 
-  /// Retrieve text into string
-  void getText(FXString& text) const;
+  /// Replace del bytes at pos by ins characters of text
+  virtual FXint replaceText(FXint pos,FXint del,const FXchar *text,FXint ins,FXbool notify=false);
+  virtual FXint replaceText(FXint pos,FXint del,const FXString& text,FXbool notify=false);
 
-  /// Get selected text
-  FXString getSelectedText() const;
+  /// Replace del bytes at pos by ins characters of text
+  virtual FXint replaceStyledText(FXint pos,FXint del,const FXchar *text,FXint ins,FXint style=0,FXbool notify=false);
+  virtual FXint replaceStyledText(FXint pos,FXint del,const FXString& text,FXint style=0,FXbool notify=false);
 
-  /// Change the text in the buffer to new text
-  virtual void setText(const FXchar* text,FXint n,FXbool notify=false);
-  virtual void setText(const FXString& text,FXbool notify=false);
+  /// Replace text columns startcol to endcol in lines starting at startpos to endpos by new text
+  virtual FXint replaceTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint num,FXbool notify=false);
+  virtual FXint replaceTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXbool notify=false);
 
-  /// Change the text in the buffer to new text
-  virtual void setStyledText(const FXchar* text,FXint n,FXint style=0,FXbool notify=false);
-  virtual void setStyledText(const FXString& text,FXint style=0,FXbool notify=false);
+  /// Replace text columns startcol to endcol in lines starting at startpos to endpos by new text with given style
+  virtual FXint replaceStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint num,FXint style=0,FXbool notify=false);
+  virtual FXint replaceStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXint style=0,FXbool notify=false);
 
-  /// Replace m bytes at pos by n characters
-  virtual void replaceText(FXint pos,FXint m,const FXchar *text,FXint n,FXbool notify=false);
-  virtual void replaceText(FXint pos,FXint m,const FXString& text,FXbool notify=false);
+  /// Overstrike text block
+  virtual FXint overstrikeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint num,FXbool notify=false);
+  virtual FXint overstrikeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXbool notify=false);
 
-  /// Replace m bytes at pos by n characters
-  virtual void replaceStyledText(FXint pos,FXint m,const FXchar *text,FXint n,FXint style=0,FXbool notify=false);
-  virtual void replaceStyledText(FXint pos,FXint m,const FXString& text,FXint style=0,FXbool notify=false);
+  /// Overstrike styled text block
+  virtual FXint overstrikeStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint num,FXint style=0,FXbool notify=false);
+  virtual FXint overstrikeStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXint style=0,FXbool notify=false);
 
   /// Append n bytes of text at the end of the buffer
-  virtual void appendText(const FXchar *text,FXint n,FXbool notify=false);
-  virtual void appendText(const FXString& text,FXbool notify=false);
+  virtual FXint appendText(const FXchar *text,FXint num,FXbool notify=false);
+  virtual FXint appendText(const FXString& text,FXbool notify=false);
 
   /// Append n bytes of text at the end of the buffer
-  virtual void appendStyledText(const FXchar *text,FXint n,FXint style=0,FXbool notify=false);
-  virtual void appendStyledText(const FXString& text,FXint style=0,FXbool notify=false);
+  virtual FXint appendStyledText(const FXchar *text,FXint num,FXint style=0,FXbool notify=false);
+  virtual FXint appendStyledText(const FXString& text,FXint style=0,FXbool notify=false);
 
   /// Insert n bytes of text at position pos into the buffer
-  virtual void insertText(FXint pos,const FXchar *text,FXint n,FXbool notify=false);
-  virtual void insertText(FXint pos,const FXString& text,FXbool notify=false);
+  virtual FXint insertText(FXint pos,const FXchar *text,FXint num,FXbool notify=false);
+  virtual FXint insertText(FXint pos,const FXString& text,FXbool notify=false);
 
   /// Insert n bytes of text at position pos into the buffer
-  virtual void insertStyledText(FXint pos,const FXchar *text,FXint n,FXint style=0,FXbool notify=false);
-  virtual void insertStyledText(FXint pos,const FXString& text,FXint style=0,FXbool notify=false);
+  virtual FXint insertStyledText(FXint pos,const FXchar *text,FXint num,FXint style=0,FXbool notify=false);
+  virtual FXint insertStyledText(FXint pos,const FXString& text,FXint style=0,FXbool notify=false);
 
-  /// Remove n bytes of text at position pos from the buffer
-  virtual void removeText(FXint pos,FXint n,FXbool notify=false);
+  /// Insert text columns at startcol in line starting at startpos to endpos
+  virtual FXint insertTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXchar *text,FXint num,FXbool notify=false);
+  virtual FXint insertTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXString& text,FXbool notify=false);
 
-  /// Remove all text from the buffer
-  virtual void clearText(FXbool notify=false);
+  /// Insert text columns at startcol in line starting at startpos to endpos with given style
+  virtual FXint insertStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXchar *text,FXint num,FXint style=0,FXbool notify=false);
+  virtual FXint insertStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXString& text,FXint style=0,FXbool notify=false);
 
   /// Change style of text range
-  virtual void changeStyle(FXint pos,FXint n,FXint style);
+  virtual FXint changeStyle(FXint pos,FXint num,FXint style);
 
   /// Change style of text range from style-array
-  virtual void changeStyle(FXint pos,const FXchar* style,FXint n);
-  virtual void changeStyle(FXint pos,const FXString& style);
+  virtual FXint changeStyle(FXint pos,const FXchar* style,FXint num);
+  virtual FXint changeStyle(FXint pos,const FXString& style);
+
+  /// Remove n bytes of text at position pos from the buffer
+  virtual FXint removeText(FXint pos,FXint num,FXbool notify=false);
+
+  /// Remove columns startcol to endcol from lines starting at startpos to endpos
+  virtual FXint removeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,FXbool notify=false);
+
+  /// Remove all text from the buffer
+  virtual FXint clearText(FXbool notify=false);
+
 
   /// Extract n bytes of text from position pos into already allocated buffer
-  void extractText(FXchar *text,FXint pos,FXint n) const;
+  void extractText(FXchar *text,FXint pos,FXint num) const;
 
   /// Extract n bytes of text from position pos into string text
-  void extractText(FXString& text,FXint pos,FXint n) const;
+  void extractText(FXString& text,FXint pos,FXint num) const;
 
   /// Return n bytes of contents of text buffer from position pos
-  FXString extractText(FXint pos,FXint n) const;
+  FXString extractText(FXint pos,FXint num) const;
 
   /// Extract n bytes of style info from position pos into already allocated buffer
-  void extractStyle(FXchar *style,FXint pos,FXint n) const;
+  void extractStyle(FXchar *style,FXint pos,FXint num) const;
 
   /// Extract n bytes of style info from position pos into string text
-  void extractStyle(FXString& style,FXint pos,FXint n) const;
+  void extractStyle(FXString& style,FXint pos,FXint num) const;
 
   /// Return n bytes of style info from buffer from position pos
-  FXString extractStyle(FXint pos,FXint n) const;
+  FXString extractStyle(FXint pos,FXint num) const;
 
-  /**
-  * Search for string in text buffer, returning the extent of the string in beg and end.
-  * The search starts from the given starting position, scans forward (SEARCH_FORWARD) or
-  * backward (SEARCH_BACKWARD), and wraps around if SEARCH_WRAP has been specified.
-  * If neither SEARCH_FORWARD or SEARCH_BACKWARD flags are set, an anchored match is performed
-  * at the given starting position.
-  * The search type is either a plain search (SEARCH_EXACT), case insensitive search
-  * (SEARCH_IGNORECASE), or regular expression search (SEARCH_REGEX).
-  * For regular expression searches, capturing parentheses are used if npar is greater than 1;
-  * in this case, the number of entries in the beg, end arrays must be npar also.
-  * If either beg or end or both are NULL, internal arrays are used.
-  */
-  FXbool findText(const FXString& string,FXint* beg=NULL,FXint* end=NULL,FXint start=0,FXuint flags=SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT,FXint npar=1);
+  /// Extract text columns startcol to endcol from lines starting at startpos to endpos
+  void extractTextBlock(FXString& text,FXint startpos,FXint endpos,FXint startcol,FXint endcol) const;
 
+  /// Return text columns startcol to endcol from lines starting at startpos to endpos
+  FXString extractTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol) const;
 
-  /// Return text position at given visible x,y coordinate
-  FXint getPosAt(FXint x,FXint y) const;
+  /// Return entire text as string
+  FXString getText() const;
 
-  /// Return text position containing x, y coordinate
-  FXint getPosContaining(FXint x,FXint y) const;
+  /// Retrieve text into buffer
+  void getText(FXchar* text,FXint num) const;
 
-  /// Return screen x-coordinate of pos
-  FXint getXOfPos(FXint pos) const;
+  /// Retrieve text into string
+  void getText(FXString& text) const;
 
-  /// Return screen y-coordinate of pos
-  FXint getYOfPos(FXint pos) const;
 
-  /**
-  * Return closest position and (row,col) of given x,y coordinate.
-  * The (row,col) is unconstrained, i.e. calculated as if tabs and
-  * area past the newline is comprised of spaces; the returned position
-  * however is inside the text.
-  * Note that when using proportional fonts, the width of a logical space
-  * inside a tab is variable, to account for the logical columns in a tab.
-  */
-  FXint getRowColumnAt(FXint x,FXint y,FXint& row,FXint& col) const;
+  /// Select all text
+  virtual FXbool selectAll(FXbool notify=false);
 
-  /// Return screen x-coordinate of unconstrained (row,col).
-  FXint getXOfRowColumn(FXint row,FXint col) const;
+  /// Select len characters starting at given position pos
+  virtual FXbool setSelection(FXint pos,FXint len,FXbool notify=false);
 
-  /// Return screen y-coordinate of unconstrained (row,col).
-  FXint getYOfRowColumn(FXint row,FXint col) const;
+  /// Extend the primary selection from the anchor to the given position
+  virtual FXbool extendSelection(FXint pos,FXuint sel=SelectChars,FXbool notify=false);
 
-  /**
-  * Count number of columns taken up by some text.
-  * Start should be on a row start.
-  */
-  FXint countCols(FXint start,FXint end) const;
+  /// Select block of characters within given box
+  virtual FXbool setBlockSelection(FXint trow,FXint lcol,FXint brow,FXint rcol,FXbool notify=false);
 
-  /**
-  * Count number of rows taken up by some text.
-  * Start should be on a row start.
-  */
-  FXint countRows(FXint start,FXint end) const;
+  /// Extend primary selection from anchor to given row, column
+  virtual FXbool extendBlockSelection(FXint row,FXint col,FXbool notify=false);
 
-  /// Count number of newlines
-  FXint countLines(FXint start,FXint end) const;
+  /// Get selected text
+  FXString getSelectedText() const;
 
-  /// Return position of begin of line containing position pos
-  FXint lineStart(FXint pos) const;
+  /// Return true if position pos is selected
+  FXbool isPosSelected(FXint pos) const;
 
-  /// Return position of end of line containing position pos
-  FXint lineEnd(FXint pos) const;
+  /// Return true if position pos (and column col) is selected
+  FXbool isPosSelected(FXint pos,FXint col) const;
 
-  /// Return start of next line
-  FXint nextLine(FXint pos,FXint nl=1) const;
+  /// Return selection start position
+  FXint getSelStartPos() const { return select.startpos; }
 
-  /// Return start of previous line
-  FXint prevLine(FXint pos,FXint nl=1) const;
+  /// Return selection end position
+  FXint getSelEndPos() const { return select.endpos; }
 
-  /// Return row start
-  FXint rowStart(FXint pos) const;
+  /// Return selection start column
+  FXint getSelStartColumn() const { return select.startcol; }
 
-  /// Return row end
-  FXint rowEnd(FXint pos) const;
+  /// Return selection end column
+  FXint getSelEndColumn() const { return select.endcol; }
 
-  /// Return start of next row
-  FXint nextRow(FXint pos,FXint nr=1) const;
+  /// Kill or deselect primary selection
+  virtual FXbool killSelection(FXbool notify=false);
 
-  /// Return start of previous row
-  FXint prevRow(FXint pos,FXint nr=1) const;
 
-  /// Return end of previous word
-  FXint leftWord(FXint pos) const;
+  /// Copy primary selection to clipboard
+  FXbool copySelection();
 
-  /// Return begin of next word
-  FXint rightWord(FXint pos) const;
+  /// Cut primary selection to clipboard
+  FXbool cutSelection(FXbool notify=false);
 
-  /// Return begin of word
-  FXint wordStart(FXint pos) const;
+  /// Delete primary selection
+  FXbool deleteSelection(FXbool notify=false);
 
-  /// Return end of word
-  FXint wordEnd(FXint pos) const;
+  /// Paste primary ("middle-mouse") selection
+  FXbool pasteSelection(FXbool notify=false);
 
-  /// Return validated utf8 character start position
-  FXint validPos(FXint pos) const;
+  /// Paste clipboard
+  FXbool pasteClipboard(FXbool notify=false);
 
-  /// Retreat to the previous valid utf8 character start
-  FXint dec(FXint pos) const;
+  /// Replace primary selection by other text
+  FXbool replaceSelection(const FXString& text,FXbool notify=false);
+
+  /// Highlight len characters starting at given position pos
+  FXbool setHighlight(FXint start,FXint len);
+
+  /// Unhighlight the text
+  FXbool killHighlight();
 
-  /// Advance to the next valid utf8 character start
-  FXint inc(FXint pos) const;
 
   /// Make line containing pos the top line
   void setTopLine(FXint pos);
@@ -941,65 +878,41 @@
   /// Make line containing pos the center line
   void setCenterLine(FXint pos);
 
-  /// Select all text
-  virtual FXbool selectAll(FXbool notify=false);
-
-  /// Select len characters starting at given position pos
-  virtual FXbool setSelection(FXint pos,FXint len,FXbool notify=false);
-
-  /// Extend the primary selection from the anchor to the given position
-  virtual FXbool extendSelection(FXint pos,FXuint sel=SelectChars,FXbool notify=false);
-
-  /// Select block of characters within given box
-  virtual FXbool setBlockSelection(FXint trow,FXint lcol,FXint brow,FXint rcol,FXbool notify=false);
-
-  /// Extend primary selection from anchor to given row, column
-  virtual FXbool extendBlockSelection(FXint row,FXint col,FXbool notify=false);
-
-  /// Kill or deselect primary selection
-  virtual FXbool killSelection(FXbool notify=false);
-
-  /// Copy primary selection to clipboard
-  FXbool copySelection();
-
-  /// Cut primary selection to clipboard
-  FXbool cutSelection(FXbool notify=false);
-
-  /// Delete primary selection
-  FXbool deleteSelection(FXbool notify=false);
-
-  /// Paste primary selection
-  FXbool pasteSelection(FXbool notify=false);
+  /// Return true if line containing position is fully visible
+  FXbool isPosVisible(FXint pos) const;
 
-  /// Paste clipboard
-  FXbool pasteClipboard(FXbool notify=false);
+  /// Scroll text to make the given position visible
+  void makePositionVisible(FXint pos);
 
-  /// Replace primary selection by other text
-  FXbool replaceSelection(const FXString& text,FXbool notify=false);
 
-  /// Enter text into editor as if typed
-  void enterText(const FXchar *text,FXint n,FXbool notify=false);
+  /// Return text position at given visible x,y coordinate
+  FXint getPosAt(FXint x,FXint y) const;
 
-  /// Enter text into editor as if typed
-  void enterText(const FXString& text,FXbool notify=false);
+  /// Return text position containing x, y coordinate
+  FXint getPosContaining(FXint x,FXint y) const;
 
-  /// Return true if position pos is selected
-  FXbool isPosSelected(FXint pos) const;
+  /// Return screen x-coordinate of pos
+  FXint getXOfPos(FXint pos) const;
 
-  /// Return true if position pos (and column col) is selected
-  FXbool isPosSelected(FXint pos,FXint col) const;
+  /// Return screen y-coordinate of pos
+  FXint getYOfPos(FXint pos) const;
 
-  /// Return true if line containing position is fully visible
-  FXbool isPosVisible(FXint pos) const;
+  /**
+  * Return closest position and (row,col) of given x,y coordinate.
+  * The (row,col) is unconstrained, i.e. calculated as if tabs and
+  * area past the newline is comprised of spaces; the returned position
+  * however is inside the text.
+  * Note that when using proportional fonts, the width of a logical space
+  * inside a tab is variable, to account for the logical columns in a tab.
+  */
+  FXint getRowColumnAt(FXint x,FXint y,FXint& row,FXint& col) const;
 
-  /// Scroll text to make the given position visible
-  void makePositionVisible(FXint pos);
+  /// Return screen x-coordinate of unconstrained (row,col).
+  FXint getXOfRowColumn(FXint row,FXint col) const;
 
-  /// Highlight len characters starting at given position pos
-  FXbool setHighlight(FXint start,FXint len);
+  /// Return screen y-coordinate of unconstrained (row,col).
+  FXint getYOfRowColumn(FXint row,FXint col) const;
 
-  /// Unhighlight the text
-  FXbool killHighlight();
 
   /// Set the cursor position
   virtual void setCursorPos(FXint pos,FXbool notify=false);
@@ -1049,17 +962,19 @@
   /// Move cursor to row and column, and extend the block selection to this point
   void moveCursorRowColumnAndSelect(FXint row,FXint col,FXbool notify=false);
 
-  /// Return selection start position
-  FXint getSelStartPos() const { return select.startpos; }
-
-  /// Return selection end position
-  FXint getSelEndPos() const { return select.endpos; }
-
-  /// Return selection start column
-  FXint getSelStartColumn() const { return select.startcol; }
-
-  /// Return selection end column
-  FXint getSelEndColumn() const { return select.endcol; }
+  /**
+  * Search for string in text buffer, returning the extent of the string in beg and end.
+  * The search starts from the given starting position, scans forward (SEARCH_FORWARD) or
+  * backward (SEARCH_BACKWARD), and wraps around if SEARCH_WRAP has been specified.
+  * If neither SEARCH_FORWARD or SEARCH_BACKWARD flags are set, an anchored match is performed
+  * at the given starting position.
+  * The search type is either a plain search (SEARCH_EXACT), case insensitive search
+  * (SEARCH_IGNORECASE), or regular expression search (SEARCH_REGEX).
+  * For regular expression searches, capturing parentheses are used if npar is greater than 1;
+  * in this case, the number of entries in the beg, end arrays must be npar also.
+  * If either beg or end or both are NULL, internal arrays are used.
+  */
+  FXbool findText(const FXString& string,FXint* beg=NULL,FXint* end=NULL,FXint start=0,FXuint flags=SEARCH_FORWARD|SEARCH_WRAP|SEARCH_EXACT,FXint npar=1);
 
   /// Change text widget style
   void setTextStyle(FXuint style);
@@ -1067,40 +982,125 @@
   /// Return text widget style
   FXuint getTextStyle() const;
 
-  /**
-  * Change number of visible rows.
-  * The number of visible rows is used to calculate the default height
-  * the text widget reports to its parent layout manager.
-  */
+  /// Change text font
+  void setFont(FXFont* fnt);
+
+  /// Return text font
+  FXFont* getFont() const { return font; }
+
+  /// Change number of visible rows
   void setVisibleRows(FXint rows);
 
   /// Return number of visible rows
   FXint getVisibleRows() const { return vrows; }
 
-  /**
-  * Change number of visible columns.
-  * The number of visible columns is used to calculate the default height
-  * the text widget reports to its parent layout manager.
-  */
+  /// Change number of visible columns
   void setVisibleColumns(FXint cols);
 
   /// Return number of visible columns
   FXint getVisibleColumns() const { return vcols; }
 
-  /**
-  * Change brace and parenthesis match highlighting time, in nanoseconds.
-  * If highlighting for a small interval, only flash if the matching brace
-  * is visible. If the highlighting interval is set to forever, highlighting
-  * stays on till cursor moves, and the brace is highlighted even if not
-  * (yet) visible.  Note that this may be expensive as a large part of the
-  * text buffer could be visited to find the matching brace.
-  */
-  void setHiliteMatchTime(FXTime t){ matchtime=t; }
+  /// Change top margin
+  void setMarginTop(FXint pt);
 
-  /**
-  * Return brace and parenthesis match highlighting time, in nanoseconds.
-  */
-  FXTime getHiliteMatchTime() const { return matchtime; }
+  /// Return top margin
+  FXint getMarginTop() const { return margintop; }
+
+  /// Change bottom margin
+  void setMarginBottom(FXint pb);
+
+  /// Return bottom margin
+  FXint getMarginBottom() const { return marginbottom; }
+
+  /// Change left margin
+  void setMarginLeft(FXint pl);
+
+  /// Return left margin
+  FXint getMarginLeft() const { return marginleft; }
+
+  /// Change right margin
+  void setMarginRight(FXint pr);
+
+  /// Return right margin
+  FXint getMarginRight() const { return marginright; }
+
+  /// Return number of columns used for line numbers
+  FXint getBarColumns() const { return barcolumns; }
+
+  /// Change number of columns used for line numbers
+  void setBarColumns(FXint cols);
+
+  /// Set wrap columns
+  void setWrapColumns(FXint cols);
+
+  /// Return wrap columns
+  FXint getWrapColumns() const { return wrapcolumns; }
+
+  /// Change tab columns
+  void setTabColumns(FXint cols);
+
+  /// Return tab columns
+  FXint getTabColumns() const { return tabcolumns; }
+
+  /// Change text color
+  void setTextColor(FXColor clr);
+
+  /// Return text color
+  FXColor getTextColor() const { return textColor; }
+
+  /// Change selected background color
+  void setSelBackColor(FXColor clr);
+
+  /// Return selected background color
+  FXColor getSelBackColor() const { return selbackColor; }
+
+  /// Change selected text color
+  void setSelTextColor(FXColor clr);
+
+  /// Return selected text color
+  FXColor getSelTextColor() const { return seltextColor; }
+
+  /// Change highlighted text color
+  void setHiliteTextColor(FXColor clr);
+
+  /// Return highlighted text color
+  FXColor getHiliteTextColor() const { return hilitetextColor; }
+
+  /// Change highlighted background color
+  void setHiliteBackColor(FXColor clr);
+
+  /// Return highlighted background color
+  FXColor getHiliteBackColor() const { return hilitebackColor; }
+
+  /// Change active background color
+  void setActiveBackColor(FXColor clr);
+
+  /// Return active background color
+  FXColor getActiveBackColor() const { return activebackColor; }
+
+  /// Change cursor color
+  void setCursorColor(FXColor clr);
+
+  /// Return cursor color
+  FXColor getCursorColor() const { return cursorColor; }
+
+  /// Change line number color
+  void setNumberColor(FXColor clr);
+
+  /// Return line number color
+  FXColor getNumberColor() const { return numberColor; }
+
+  /// Change bar color
+  void setBarColor(FXColor clr);
+
+  /// Return bar color
+  FXColor getBarColor() const { return barColor; }
+
+  /// Set styled text mode; return true if success
+  FXbool setStyled(FXbool styled=true);
+
+  /// Return true if style buffer
+  FXbool isStyled() const { return (sbuffer!=NULL); }
 
   /**
   * Set highlight styles.
@@ -1111,10 +1111,39 @@
   */
   void setHiliteStyles(FXHiliteStyle* styles);
 
+  /// Return current value of the style table.
+  FXHiliteStyle* getHiliteStyles() const { return hilitestyles; }
+
+  /// Change delimiters of words
+  void setDelimiters(const FXchar* delims=textDelimiters){ delimiters=delims; }
+
+  /// Return word delimiters
+  const FXchar* getDelimiters() const { return delimiters; }
+
   /**
-  * Return current value of the style table.
+  * Change brace and parenthesis match highlighting time, in nanoseconds.
+  * If highlighting for a small interval, only flash if the matching brace
+  * is visible. If the highlighting interval is set to forever, highlighting
+  * stays on till cursor moves, and the brace is highlighted even if not
+  * (yet) visible.  Note that this may be expensive as a large part of the
+  * text buffer could be visited to find the matching brace.
   */
-  FXHiliteStyle* getHiliteStyles() const { return hilitestyles; }
+  void setHiliteMatchTime(FXTime t){ matchtime=t; }
+
+  /// Return brace and parenthesis match highlighting time, in nanoseconds
+  FXTime getHiliteMatchTime() const { return matchtime; }
+
+  /// Set help text
+  void setHelpText(const FXString& text){ help=text; }
+
+  /// Return help text
+  FXString getHelpText() const { return help; }
+
+  /// Set the tool tip message for this text widget
+  void setTipText(const FXString& text){ tip=text; }
+
+  /// Get the tool tip message for this text widget
+  FXString getTipText() const { return tip; }
 
   /// Save to a stream
   virtual void save(FXStream& store) const;

gogglesmm-1.2.1.tar.gz/cfox/include/FXTextCodec.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTextCodec.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTextField.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTextField.h Changed

@@ -3,7 +3,7 @@
 *                         T e x t   F i e l d   W i d g e t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -259,17 +259,17 @@
   /// Remove the focus from this window
   virtual void killFocus();
 
-  /// Change the default width in terms of visible columns
-  void setNumColumns(FXint cols);
+  /// Set editable mode
+  void setEditable(FXbool edit=true);
 
-  /// Return number of visible columns
-  FXint getNumColumns() const { return columns; }
+  /// Return true if text field may be edited
+  FXbool isEditable() const;
 
-  /// Get entire text
-  FXString getText() const { return contents; }
+  /// Set overstrike mode
+  void setOverstrike(FXbool over=true);
 
-  /// Get selected text
-  FXString getSelectedText() const;
+  /// Return true if overstrike mode in effect
+  FXbool isOverstrike() const;
 
   /// Change the text and move cursor to end
   void setText(const FXString& text,FXbool notify=false);
@@ -289,6 +289,9 @@
   /// Remove all text
   void clearText(FXbool notify=false);
 
+  /// Get entire text
+  FXString getText() const { return contents; }
+
   /// Select all text
   FXbool selectAll();
 
@@ -298,6 +301,12 @@
   /// Extend the selection from the anchor to the given position
   FXbool extendSelection(FXint pos);
 
+  /// Unselect the text
+  FXbool killSelection();
+
+  /// Get selected text
+  FXString getSelectedText() const;
+
   /// Copy primary selection to clipboard
   FXbool copySelection();
 
@@ -316,9 +325,6 @@
   /// Paste clipboard
   FXbool pasteClipboard(FXbool notify=false);
 
-  /// Unselect the text
-  FXbool killSelection();
-
   /// Return true if position pos is selected
   FXbool isPosSelected(FXint pos) const;
 
@@ -346,17 +352,29 @@
   /// Return anchor position
   FXint getAnchorPos() const { return anchor; }
 
- /// Set editable mode
-  void setEditable(FXbool edit=true);
+  /// Change text style
+  void setTextStyle(FXuint style);
 
-  /// Return true if text field may be edited
-  FXbool isEditable() const;
+  /// Return text style
+  FXuint getTextStyle() const;
 
-  /// Set overstrike mode
-  void setOverstrike(FXbool over=true);
+  /// Set the text font
+  void setFont(FXFont* fnt);
 
-  /// Return true if overstrike mode in effect
-  FXbool isOverstrike() const;
+  /// Get the text font
+  FXFont* getFont() const { return font; }
+
+  /// Change number of visible columns
+  void setNumColumns(FXint cols);
+
+  /// Return number of visible columns
+  FXint getNumColumns() const { return columns; }
+
+  /// Change word delimiters
+  void setDelimiters(const FXchar* delims=textDelimiters){ delimiters=delims; }
+
+  /// Return word delimiters
+  const FXchar* getDelimiters() const { return delimiters; }
 
   /**
   * Change text justification mode. The justify mode is a combination of
@@ -370,24 +388,6 @@
   /// Return text justification mode
   FXuint getJustify() const;
 
-  /// Change word delimiters
-  void setDelimiters(const FXchar* delims=textDelimiters){ delimiters=delims; }
-
-  /// Return word delimiters
-  const FXchar* getDelimiters() const { return delimiters; }
-
-  /// Change text style
-  void setTextStyle(FXuint style);
-
-  /// Return text style
-  FXuint getTextStyle() const;
-
-  /// Set the text font
-  void setFont(FXFont* fnt);
-
-  /// Get the text font
-  FXFont* getFont() const { return font; }
-
   /// Change text color
   void setTextColor(FXColor clr);

gogglesmm-1.2.1.tar.gz/cfox/include/FXThread.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXThread.h Changed

@@ -3,7 +3,7 @@
 *                          T h r e a d   S u p p o r t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -170,6 +170,11 @@
   static FXTime time();
 
   /**
+  * Get steady time in nanoseconds since some arbitrary start time.
+  */
+  FXTime steadytime();
+
+  /**
   * Make the calling thread sleep for a number of nanoseconds.
   */
   static void sleep(FXTime nsec);
@@ -254,6 +259,16 @@
   FXulong affinity() const;
 
   /**
+  * Change thread description.
+  */
+  FXbool description(const FXString& desc);
+
+  /**
+  * Return thread description, if any.
+  */
+  FXString description() const;
+
+  /**
   * Suspend thread; return true if success.
   */
   FXbool suspend();

gogglesmm-1.2.1.tar.gz/cfox/include/FXThreadPool.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXThreadPool.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXToggleButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXToggleButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXToolBar.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXToolBar.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXToolBarGrip.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXToolBarGrip.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXToolBarShell.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXToolBarShell.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXToolBarTab.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXToolBarTab.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXToolTip.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXToolTip.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTopWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTopWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTranslator.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTranslator.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTreeList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTreeList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTreeListBox.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTreeListBox.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXTriStateButton.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXTriStateButton.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXURL.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXURL.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXUTF16Codec.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXUTF16Codec.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXUTF32Codec.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXUTF32Codec.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXUTF8Codec.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXUTF8Codec.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXUndoList.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXUndoList.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXVariant.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVariant.h Changed

@@ -3,7 +3,7 @@
 *                          V a r i a n t   T y p e                              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2013,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2013,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -35,7 +35,7 @@
 * Complex hierarchies of Variants can be loaded (and saved) using the JSON parser.
 * When writing Variants, dictionaries and arrays are automatically grown.  When
 * reading Variants, non-existing dictionary entries or indexes outside arrays will read
-* as 0 (for numbers), the empty string (for arrays), or empty dictionaries or arrays.
+* as 0 (for numbers), the empty string, or as an empty dictionary or array.
 * For efficiency, you can hold references to Variants, for example to avoid repeatedly
 * accessing dictionaries or arrays with the same key or index. However, be aware that
 * adding or removing sub-items to dictionaries or arrays may cause reallocations of
@@ -176,9 +176,6 @@
   /// Convert to pointer
   FXptr toPtr() const;
 
-  /// Convert to char pointer
-  const FXchar* toChars() const;
-
   /// Convert to int
   FXint toInt(FXbool* ok=NULL) const;
 
@@ -197,6 +194,9 @@
   /// Convert to double
   FXdouble toDouble(FXbool* ok=NULL) const;
 
+  /// Convert to char pointer
+  const FXchar* toChars() const;
+
   /// Convert to string
   FXString toString(FXbool* ok=NULL) const;

gogglesmm-1.2.1.tar.gz/cfox/include/FXVariantArray.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVariantArray.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXVariantMap.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVariantMap.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXVec2d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVec2d.h Changed

@@ -3,7 +3,7 @@
 *       D o u b l e - P r e c i s i o n   2 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -67,8 +67,12 @@
   /// Assigning operators
   FXVec2d& operator*=(FXdouble n){ return set(x*n,y*n); }
   FXVec2d& operator/=(FXdouble n){ return set(x/n,y/n); }
+
+  /// Element-wise assigning operators
   FXVec2d& operator+=(const FXVec2d& v){ return set(x+v.x,y+v.y); }
   FXVec2d& operator-=(const FXVec2d& v){ return set(x-v.x,y-v.y); }
+  FXVec2d& operator%=(const FXVec2d& v){ return set(x*v.x,y*v.y); }
+  FXVec2d& operator/=(const FXVec2d& v){ return set(x/v.x,y/v.y); }
 
   /// Conversions
   operator FXdouble*(){return &x;}
@@ -85,9 +89,6 @@
   FXdouble length2() const { return x*x+y*y; }
   FXdouble length() const { return Math::sqrt(length2()); }
 
-  /// Clamp values of vector between limits
-  FXVec2d& clamp(FXdouble lo,FXdouble hi){ return set(Math::fclamp(lo,x,hi),Math::fclamp(lo,y,hi)); }
-
   /// Destructor
  ~FXVec2d(){}
   };
@@ -106,6 +107,10 @@
 inline FXVec2d operator+(const FXVec2d& a,const FXVec2d& b){ return FXVec2d(a.x+b.x,a.y+b.y); }
 inline FXVec2d operator-(const FXVec2d& a,const FXVec2d& b){ return FXVec2d(a.x-b.x,a.y-b.y); }
 
+/// Element-wise multiply and divide
+inline FXVec2d operator%(const FXVec2d& a,const FXVec2d& b){ return FXVec2d(a.x*b.x,a.y*b.y); }
+inline FXVec2d operator/(const FXVec2d& a,const FXVec2d& b){ return FXVec2d(a.x/b.x,a.y/b.y); }
+
 /// Equality tests
 inline FXbool operator==(const FXVec2d& a,FXdouble n){return a.x==n && a.y==n;}
 inline FXbool operator!=(const FXVec2d& a,FXdouble n){return a.x!=n || a.y!=n;}
@@ -144,11 +149,26 @@
 inline FXVec2d hi(const FXVec2d& a,FXdouble n){return FXVec2d(Math::fmax(a.x,n),Math::fmax(a.y,n));}
 inline FXVec2d hi(FXdouble n,const FXVec2d& b){return FXVec2d(Math::fmax(n,b.x),Math::fmax(n,b.y));}
 
-/// Normalize vector
-extern FXAPI FXVec2d normalize(const FXVec2d& v);
+/// Clamp components of vector between lower and upper limits
+inline FXVec2d clamp(FXdouble lower,const FXVec2d& x,FXdouble upper){return hi(lo(x,upper),lower);}
+
+/// Clamp components of vector between lower corner and upper corner
+inline FXVec2d clamp(const FXVec2d& lower,const FXVec2d& x,const FXVec2d& upper){return hi(lo(x,upper),lower);}
+
+/// Return vector of absolute value of each element
+inline FXVec2d abs(const FXVec2d& a){return FXVec2d(Math::fabs(a.x),Math::fabs(a.y));}
+
+/// Return maximum component of vector
+inline FXdouble max(const FXVec2d& a){ return Math::fmax(a.x,a.y); }
+
+/// Return minimum component of vector
+inline FXdouble min(const FXVec2d& a){ return Math::fmin(a.x,a.y); }
 
 /// Linearly interpolate
-extern FXAPI FXVec2d lerp(const FXVec2d& u,const FXVec2d& v,FXdouble f);
+inline FXVec2d lerp(const FXVec2d& u,const FXVec2d& v,FXdouble f){return (v-u)*f+u;}
+
+/// Normalize vector
+extern FXAPI FXVec2d normalize(const FXVec2d& v);
 
 /// Save vector to a stream
 extern FXAPI FXStream& operator<<(FXStream& store,const FXVec2d& v);

gogglesmm-1.2.1.tar.gz/cfox/include/FXVec2f.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVec2f.h Changed

@@ -3,7 +3,7 @@
 *       S i n g l e - P r e c i s i o n   2 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -67,8 +67,12 @@
   /// Assigning operators
   FXVec2f& operator*=(FXfloat n){ return set(x*n,y*n); }
   FXVec2f& operator/=(FXfloat n){ return set(x/n,y/n); }
+
+  /// Element-wise assigning operators
   FXVec2f& operator+=(const FXVec2f& v){ return set(x+v.x,y+v.y); }
   FXVec2f& operator-=(const FXVec2f& v){ return set(x-v.x,y-v.y); }
+  FXVec2f& operator%=(const FXVec2f& v){ return set(x*v.x,y*v.y); }
+  FXVec2f& operator/=(const FXVec2f& v){ return set(x/v.x,y/v.y); }
 
   /// Conversions
   operator FXfloat*(){return &x;}
@@ -85,9 +89,6 @@
   FXfloat length2() const { return x*x+y*y; }
   FXfloat length() const { return Math::sqrt(length2()); }
 
-  /// Clamp values of vector between limits
-  FXVec2f& clamp(FXfloat lo,FXfloat hi){ return set(Math::fclamp(lo,x,hi),Math::fclamp(lo,y,hi)); }
-
   /// Destructor
  ~FXVec2f(){}
   };
@@ -106,6 +107,10 @@
 inline FXVec2f operator+(const FXVec2f& a,const FXVec2f& b){ return FXVec2f(a.x+b.x,a.y+b.y); }
 inline FXVec2f operator-(const FXVec2f& a,const FXVec2f& b){ return FXVec2f(a.x-b.x,a.y-b.y); }
 
+/// Element-wise multiply and divide
+inline FXVec2f operator%(const FXVec2f& a,const FXVec2f& b){ return FXVec2f(a.x*b.x,a.y*b.y); }
+inline FXVec2f operator/(const FXVec2f& a,const FXVec2f& b){ return FXVec2f(a.x/b.x,a.y/b.y); }
+
 /// Equality tests
 inline FXbool operator==(const FXVec2f& a,FXfloat n){return a.x==n && a.y==n;}
 inline FXbool operator!=(const FXVec2f& a,FXfloat n){return a.x!=n || a.y!=n;}
@@ -144,11 +149,26 @@
 inline FXVec2f hi(const FXVec2f& a,FXfloat n){return FXVec2f(Math::fmax(a.x,n),Math::fmax(a.y,n));}
 inline FXVec2f hi(FXfloat n,const FXVec2f& b){return FXVec2f(Math::fmax(n,b.x),Math::fmax(n,b.y));}
 
-/// Normalize vector
-extern FXAPI FXVec2f normalize(const FXVec2f& v);
+/// Clamp components of vector between lower and upper limits
+inline FXVec2f clamp(FXfloat lower,const FXVec2f& x,FXfloat upper){return hi(lo(x,upper),lower);}
+
+/// Clamp components of vector between lower corner and upper corner
+inline FXVec2f clamp(const FXVec2f& lower,const FXVec2f& x,const FXVec2f& upper){return hi(lo(x,upper),lower);}
+
+/// Return vector of absolute value of each element
+inline FXVec2f abs(const FXVec2f& a){return FXVec2f(Math::fabs(a.x),Math::fabs(a.y));}
+
+/// Return maximum component of vector
+inline FXfloat max(const FXVec2f& a){ return Math::fmax(a.x,a.y); }
+
+/// Return minimum component of vector
+inline FXfloat min(const FXVec2f& a){ return Math::fmin(a.x,a.y); }
 
 /// Linearly interpolate
-extern FXAPI FXVec2f lerp(const FXVec2f& u,const FXVec2f& v,FXfloat f);
+inline FXVec2f lerp(const FXVec2f& u,const FXVec2f& v,FXfloat f){return (v-u)*f+u;}
+
+/// Normalize vector
+extern FXAPI FXVec2f normalize(const FXVec2f& v);
 
 /// Save vector to a stream
 extern FXAPI FXStream& operator<<(FXStream& store,const FXVec2f& v);

gogglesmm-1.2.1.tar.gz/cfox/include/FXVec3d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVec3d.h Changed

@@ -3,7 +3,7 @@
 *       D o u b l e - P r e c i s i o n   3 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -71,8 +71,13 @@
   /// Assigning operators
   FXVec3d& operator*=(FXdouble n){ return set(x*n,y*n,z*n); }
   FXVec3d& operator/=(FXdouble n){ return set(x/n,y/n,z/n); }
+
+  /// Element-wise assigning operators
   FXVec3d& operator+=(const FXVec3d& v){ return set(x+v.x,y+v.y,z+v.z); }
   FXVec3d& operator-=(const FXVec3d& v){ return set(x-v.x,y-v.y,z-v.z); }
+  FXVec3d& operator%=(const FXVec3d& v){ return set(x*v.x,y*v.y,z*v.z); }
+
+  /// Cross product assigning operator
   FXVec3d& operator^=(const FXVec3d& v){ return set(y*v.z-z*v.y,z*v.x-x*v.z,x*v.y-y*v.x); }
 
   /// Conversions
@@ -92,9 +97,6 @@
   FXdouble length2() const { return x*x+y*y+z*z; }
   FXdouble length() const { return Math::sqrt(length2()); }
 
-  /// Clamp values of vector between limits
-  FXVec3d& clamp(FXdouble lo,FXdouble hi){ return set(Math::fclamp(lo,x,hi),Math::fclamp(lo,y,hi),Math::fclamp(lo,z,hi)); }
-
   /// Destructor
  ~FXVec3d(){}
   };
@@ -116,6 +118,10 @@
 inline FXVec3d operator+(const FXVec3d& a,const FXVec3d& b){ return FXVec3d(a.x+b.x,a.y+b.y,a.z+b.z); }
 inline FXVec3d operator-(const FXVec3d& a,const FXVec3d& b){ return FXVec3d(a.x-b.x,a.y-b.y,a.z-b.z); }
 
+/// Element-wise multiply and divide
+inline FXVec3d operator%(const FXVec3d& a,const FXVec3d& b){ return FXVec3d(a.x*b.x,a.y*b.y,a.z*b.z); }
+inline FXVec3d operator/(const FXVec3d& a,const FXVec3d& b){ return FXVec3d(a.x/b.x,a.y/b.y,a.z/b.z); }
+
 /// Equality tests
 inline FXbool operator==(const FXVec3d& a,FXdouble n){return a.x==n && a.y==n && a.z==n;}
 inline FXbool operator!=(const FXVec3d& a,FXdouble n){return a.x!=n || a.y!=n || a.z!=n;}
@@ -154,6 +160,24 @@
 inline FXVec3d hi(const FXVec3d& a,FXdouble n){return FXVec3d(Math::fmax(a.x,n),Math::fmax(a.y,n),Math::fmax(a.z,n));}
 inline FXVec3d hi(FXdouble n,const FXVec3d& b){return FXVec3d(Math::fmax(n,b.x),Math::fmax(n,b.y),Math::fmax(n,b.z));}
 
+/// Clamp components of vector between lower and upper limits
+inline FXVec3d clamp(FXdouble lower,const FXVec3d& x,FXdouble upper){return hi(lo(x,upper),lower);}
+
+/// Clamp components of vector between lower corner and upper corner
+inline FXVec3d clamp(const FXVec3d& lower,const FXVec3d& x,const FXVec3d& upper){return hi(lo(x,upper),lower);}
+
+/// Return vector of absolute value of each element
+inline FXVec3d abs(const FXVec3d& a){return FXVec3d(Math::fabs(a.x),Math::fabs(a.y),Math::fabs(a.z));}
+
+/// Return maximum component of vector
+inline FXdouble max(const FXVec3d& a){ return Math::fmax(Math::fmax(a.x,a.y),a.z); }
+
+/// Return minimum component of vector
+inline FXdouble min(const FXVec3d& a){ return Math::fmin(Math::fmin(a.x,a.y),a.z); }
+
+/// Linearly interpolate
+inline FXVec3d lerp(const FXVec3d& u,const FXVec3d& v,FXdouble f){return (v-u)*f+u;}
+
 /// Convert vector to color
 extern FXAPI FXColor colorFromVec3d(const FXVec3d& vec);
 
@@ -169,9 +193,6 @@
 /// Normalize vector
 extern FXAPI FXVec3d normalize(const FXVec3d& v);
 
-/// Linearly interpolate
-extern FXAPI FXVec3d lerp(const FXVec3d& u,const FXVec3d& v,FXdouble f);
-
 /// Rotate vector vec by unit-length axis about angle specified as (ca,sa)
 extern FXAPI FXVec3d rotate(const FXVec3d& vec,const FXVec3d& axis,FXdouble ca,FXdouble sa);

gogglesmm-1.2.1.tar.gz/cfox/include/FXVec3f.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVec3f.h Changed

@@ -3,7 +3,7 @@
 *       S i n g l e - P r e c i s i o n   3 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -71,8 +71,14 @@
   /// Assigning operators
   FXVec3f& operator*=(FXfloat n){ return set(x*n,y*n,z*n); }
   FXVec3f& operator/=(FXfloat n){ return set(x/n,y/n,z/n); }
+
+  /// Element-wise assigning operators
   FXVec3f& operator+=(const FXVec3f& v){ return set(x+v.x,y+v.y,z+v.z); }
   FXVec3f& operator-=(const FXVec3f& v){ return set(x-v.x,y-v.y,z-v.z); }
+  FXVec3f& operator%=(const FXVec3f& v){ return set(x*v.x,y*v.y,z*v.z); }
+  FXVec3f& operator/=(const FXVec3f& v){ return set(x/v.x,y/v.y,z/v.z); }
+
+  /// Cross product assigning operator
   FXVec3f& operator^=(const FXVec3f& v){ return set(y*v.z-z*v.y,z*v.x-x*v.z,x*v.y-y*v.x); }
 
   /// Conversions
@@ -92,9 +98,6 @@
   FXfloat length2() const { return x*x+y*y+z*z; }
   FXfloat length() const { return Math::sqrt(length2()); }
 
-  /// Clamp values of vector between limits
-  FXVec3f& clamp(FXfloat lo,FXfloat hi){ return set(Math::fclamp(lo,x,hi),Math::fclamp(lo,y,hi),Math::fclamp(lo,z,hi)); }
-
   /// Destructor
  ~FXVec3f(){}
   };
@@ -116,6 +119,10 @@
 inline FXVec3f operator+(const FXVec3f& a,const FXVec3f& b){ return FXVec3f(a.x+b.x,a.y+b.y,a.z+b.z); }
 inline FXVec3f operator-(const FXVec3f& a,const FXVec3f& b){ return FXVec3f(a.x-b.x,a.y-b.y,a.z-b.z); }
 
+/// Element-wise multiply and divide
+inline FXVec3f operator%(const FXVec3f& a,const FXVec3f& b){ return FXVec3f(a.x*b.x,a.y*b.y,a.z*b.z); }
+inline FXVec3f operator/(const FXVec3f& a,const FXVec3f& b){ return FXVec3f(a.x/b.x,a.y/b.y,a.z/b.z); }
+
 /// Equality tests
 inline FXbool operator==(const FXVec3f& a,FXfloat n){return a.x==n && a.y==n && a.z==n;}
 inline FXbool operator!=(const FXVec3f& a,FXfloat n){return a.x!=n || a.y!=n || a.z!=n;}
@@ -154,6 +161,24 @@
 inline FXVec3f hi(const FXVec3f& a,FXfloat n){return FXVec3f(Math::fmax(a.x,n),Math::fmax(a.y,n),Math::fmax(a.z,n));}
 inline FXVec3f hi(FXfloat n,const FXVec3f& b){return FXVec3f(Math::fmax(n,b.x),Math::fmax(n,b.y),Math::fmax(n,b.z));}
 
+/// Clamp components of vector between lower and upper limits
+inline FXVec3f clamp(FXfloat lower,const FXVec3f& x,FXfloat upper){return hi(lo(x,upper),lower);}
+
+/// Clamp components of vector between lower corner and upper corner
+inline FXVec3f clamp(const FXVec3f& lower,const FXVec3f& x,const FXVec3f& upper){return hi(lo(x,upper),lower);}
+
+/// Return vector of absolute value of each element
+inline FXVec3f abs(const FXVec3f& a){return FXVec3f(Math::fabs(a.x),Math::fabs(a.y),Math::fabs(a.z));}
+
+/// Return maximum component of vector
+inline FXfloat max(const FXVec3f& a){ return Math::fmax(Math::fmax(a.x,a.y),a.z); }
+
+/// Return minimum component of vector
+inline FXfloat min(const FXVec3f& a){ return Math::fmin(Math::fmin(a.x,a.y),a.z); }
+
+/// Linearly interpolate
+inline FXVec3f lerp(const FXVec3f& u,const FXVec3f& v,FXfloat f){return (v-u)*f+u;}
+
 /// Convert vector to color
 extern FXAPI FXColor colorFromVec3f(const FXVec3f& vec);
 
@@ -169,9 +194,6 @@
 /// Normalize vector
 extern FXAPI FXVec3f normalize(const FXVec3f& v);
 
-/// Linearly interpolate
-extern FXAPI FXVec3f lerp(const FXVec3f& u,const FXVec3f& v,FXfloat f);
-
 /// Rotate vector vec by unit-length axis about angle specified as (ca,sa)
 extern FXAPI FXVec3f rotate(const FXVec3f& vec,const FXVec3f& axis,FXfloat ca,FXfloat sa);

gogglesmm-1.2.1.tar.gz/cfox/include/FXVec4d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVec4d.h Changed

@@ -3,7 +3,7 @@
 *       D o u b l e - P r e c i s i o n   4 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -72,8 +72,12 @@
   /// Assigning operators
   FXVec4d& operator*=(FXdouble n){ return set(x*n,y*n,z*n,w*n); }
   FXVec4d& operator/=(FXdouble n){ return set(x/n,y/n,z/n,w/n); }
+
+  /// Element-wise assigning operators
   FXVec4d& operator+=(const FXVec4d& v){ return set(x+v.x,y+v.y,z+v.z,w+v.w); }
   FXVec4d& operator-=(const FXVec4d& v){ return set(x-v.x,y-v.y,z-v.z,w-v.w); }
+  FXVec4d& operator%=(const FXVec4d& v){ return set(x*v.x,y*v.y,z*v.z,w*v.w); }
+  FXVec4d& operator/=(const FXVec4d& v){ return set(x/v.x,y/v.y,z/v.z,w/v.w); }
 
   /// Conversion
   operator FXdouble*(){return &x;}
@@ -92,9 +96,6 @@
   FXdouble length2() const { return x*x+y*y+z*z+w*w; }
   FXdouble length() const { return Math::sqrt(length2()); }
 
-  /// Clamp values of vector between limits
-  FXVec4d& clamp(FXdouble lo,FXdouble hi){ return set(Math::fclamp(lo,x,hi),Math::fclamp(lo,y,hi),Math::fclamp(lo,z,hi),Math::fclamp(lo,w,hi)); }
-
   /// Signed distance normalized plane and point
   FXdouble distance(const FXVec3d& p) const;
 
@@ -119,6 +120,10 @@
 inline FXVec4d operator+(const FXVec4d& a,const FXVec4d& b){ return FXVec4d(a.x+b.x,a.y+b.y,a.z+b.z,a.w+b.w); }
 inline FXVec4d operator-(const FXVec4d& a,const FXVec4d& b){ return FXVec4d(a.x-b.x,a.y-b.y,a.z-b.z,a.w-b.w); }
 
+/// Element-wise multiply and divide
+inline FXVec4d operator%(const FXVec4d& a,const FXVec4d& b){ return FXVec4d(a.x*b.x,a.y*b.y,a.z*b.z,a.w*b.w); }
+inline FXVec4d operator/(const FXVec4d& a,const FXVec4d& b){ return FXVec4d(a.x/b.x,a.y/b.y,a.z/b.z,a.w/b.w); }
+
 /// Equality tests
 inline FXbool operator==(const FXVec4d& a,FXdouble n){return a.x==n && a.y==n && a.z==n && a.w==n;}
 inline FXbool operator!=(const FXVec4d& a,FXdouble n){return a.x!=n || a.y!=n || a.z!=n || a.w!=n;}
@@ -157,10 +162,34 @@
 inline FXVec4d hi(const FXVec4d& a,FXdouble n){return FXVec4d(Math::fmax(a.x,n),Math::fmax(a.y,n),Math::fmax(a.z,n),Math::fmax(a.w,n));}
 inline FXVec4d hi(FXdouble n,const FXVec4d& b){return FXVec4d(Math::fmax(n,b.x),Math::fmax(n,b.y),Math::fmax(n,b.z),Math::fmax(n,b.w));}
 
+/// Clamp components of vector between lower and upper limits
+inline FXVec4d clamp(FXdouble lower,const FXVec4d& x,FXdouble upper){return hi(lo(x,upper),lower);}
+
+/// Clamp components of vector between lower corner and upper corner
+inline FXVec4d clamp(const FXVec4d& lower,const FXVec4d& x,const FXVec4d& upper){return hi(lo(x,upper),lower);}
+
+/// Return vector of absolute value of each element
+inline FXVec4d abs(const FXVec4d& a){return FXVec4d(Math::fabs(a.x),Math::fabs(a.y),Math::fabs(a.z),Math::fabs(a.w));}
+
+/// Return maximum component of vector
+inline FXdouble max(const FXVec4d& a){ return Math::fmax(Math::fmax(a.x,a.y),Math::fmax(a.z,a.w)); }
+
+/// Return minimum component of vector
+inline FXdouble min(const FXVec4d& a){ return Math::fmin(Math::fmin(a.x,a.y),Math::fmin(a.z,a.w)); }
+
+/// Linearly interpolate
+inline FXVec4d lerp(const FXVec4d& u,const FXVec4d& v,FXdouble f){return (v-u)*f+u;}
+
 /// Compute normalized plane equation ax+by+cz+d=0
 extern FXAPI FXVec4d plane(const FXVec4d& vec);
+
+/// Compute plane equation from vector and distance
 extern FXAPI FXVec4d plane(const FXVec3d& vec,FXdouble dist);
+
+/// Compute plane equation from vector and point on plane
 extern FXAPI FXVec4d plane(const FXVec3d& vec,const FXVec3d& p);
+
+/// Compute plane equation from 3 points a,b,c
 extern FXAPI FXVec4d plane(const FXVec3d& a,const FXVec3d& b,const FXVec3d& c);
 
 /// Convert vector to color
@@ -172,9 +201,6 @@
 /// Normalize vector
 extern FXAPI FXVec4d normalize(const FXVec4d& v);
 
-/// Linearly interpolate
-extern FXAPI FXVec4d lerp(const FXVec4d& u,const FXVec4d& v,FXdouble f);
-
 /// Save vector to a stream
 extern FXAPI FXStream& operator<<(FXStream& store,const FXVec4d& v);

gogglesmm-1.2.1.tar.gz/cfox/include/FXVec4f.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVec4f.h Changed

@@ -3,7 +3,7 @@
 *       S i n g l e - P r e c i s i o n   4 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -72,8 +72,12 @@
   /// Assigning operators
   FXVec4f& operator*=(FXfloat n){ return set(x*n,y*n,z*n,w*n); }
   FXVec4f& operator/=(FXfloat n){ return set(x/n,y/n,z/n,w/n); }
+
+  /// Element-wise assigning operators
   FXVec4f& operator+=(const FXVec4f& v){ return set(x+v.x,y+v.y,z+v.z,w+v.w); }
   FXVec4f& operator-=(const FXVec4f& v){ return set(x-v.x,y-v.y,z-v.z,w-v.w); }
+  FXVec4f& operator%=(const FXVec4f& v){ return set(x*v.x,y*v.y,z*v.z,w*v.w); }
+  FXVec4f& operator/=(const FXVec4f& v){ return set(x/v.x,y/v.y,z/v.z,w/v.w); }
 
   /// Conversion
   operator FXfloat*(){return &x;}
@@ -92,9 +96,6 @@
   FXfloat length2() const { return x*x+y*y+z*z+w*w; }
   FXfloat length() const { return Math::sqrt(length2()); }
 
-  /// Clamp values of vector between limits
-  FXVec4f& clamp(FXfloat lo,FXfloat hi){ return set(Math::fclamp(lo,x,hi),Math::fclamp(lo,y,hi),Math::fclamp(lo,z,hi),Math::fclamp(lo,w,hi)); }
-
   /// Signed distance normalized plane and point
   FXfloat distance(const FXVec3f& p) const;
 
@@ -119,6 +120,10 @@
 inline FXVec4f operator+(const FXVec4f& a,const FXVec4f& b){ return FXVec4f(a.x+b.x,a.y+b.y,a.z+b.z,a.w+b.w); }
 inline FXVec4f operator-(const FXVec4f& a,const FXVec4f& b){ return FXVec4f(a.x-b.x,a.y-b.y,a.z-b.z,a.w-b.w); }
 
+/// Element-wise multiply and divide
+inline FXVec4f operator%(const FXVec4f& a,const FXVec4f& b){ return FXVec4f(a.x*b.x,a.y*b.y,a.z*b.z,a.w*b.w); }
+inline FXVec4f operator/(const FXVec4f& a,const FXVec4f& b){ return FXVec4f(a.x/b.x,a.y/b.y,a.z/b.z,a.w/b.w); }
+
 /// Equality tests
 inline FXbool operator==(const FXVec4f& a,FXfloat n){return a.x==n && a.y==n && a.z==n && a.w==n;}
 inline FXbool operator!=(const FXVec4f& a,FXfloat n){return a.x!=n || a.y!=n || a.z!=n || a.w!=n;}
@@ -157,10 +162,34 @@
 inline FXVec4f hi(const FXVec4f& a,FXfloat n){return FXVec4f(Math::fmax(a.x,n),Math::fmax(a.y,n),Math::fmax(a.z,n),Math::fmax(a.w,n));}
 inline FXVec4f hi(FXfloat n,const FXVec4f& b){return FXVec4f(Math::fmax(n,b.x),Math::fmax(n,b.y),Math::fmax(n,b.z),Math::fmax(n,b.w));}
 
+/// Clamp components of vector between lower and upper limits
+inline FXVec4f clamp(FXfloat lower,const FXVec4f& x,FXfloat upper){return hi(lo(x,upper),lower);}
+
+/// Clamp components of vector between lower corner and upper corner
+inline FXVec4f clamp(const FXVec4f& lower,const FXVec4f& x,const FXVec4f& upper){return hi(lo(x,upper),lower);}
+
+/// Return vector of absolute value of each element
+inline FXVec4f abs(const FXVec4f& a){return FXVec4f(Math::fabs(a.x),Math::fabs(a.y),Math::fabs(a.z),Math::fabs(a.w));}
+
+/// Return maximum component of vector
+inline FXfloat max(const FXVec4f& a){ return Math::fmax(Math::fmax(a.x,a.y),Math::fmax(a.z,a.w)); }
+
+/// Return minimum component of vector
+inline FXfloat min(const FXVec4f& a){ return Math::fmin(Math::fmin(a.x,a.y),Math::fmin(a.z,a.w)); }
+
+/// Linearly interpolate
+inline FXVec4f lerp(const FXVec4f& u,const FXVec4f& v,FXfloat f){return (v-u)*f+u;}
+
 /// Compute normalized plane equation ax+by+cz+d=0
 extern FXAPI FXVec4f plane(const FXVec4f& vec);
+
+/// Compute plane equation from vector and distance
 extern FXAPI FXVec4f plane(const FXVec3f& vec,FXfloat dist);
+
+/// Compute plane equation from vector and point on plane
 extern FXAPI FXVec4f plane(const FXVec3f& vec,const FXVec3f& p);
+
+/// Compute plane equation from 3 points a,b,c
 extern FXAPI FXVec4f plane(const FXVec3f& a,const FXVec3f& b,const FXVec3f& c);
 
 /// Convert vector to color
@@ -172,9 +201,6 @@
 /// Normalize vector
 extern FXAPI FXVec4f normalize(const FXVec4f& v);
 
-/// Linearly interpolate
-extern FXAPI FXVec4f lerp(const FXVec4f& u,const FXVec4f& v,FXdouble f);
-
 /// Save vector to a stream
 extern FXAPI FXStream& operator<<(FXStream& store,const FXVec4f& v);

gogglesmm-1.2.1.tar.gz/cfox/include/FXVerticalFrame.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVerticalFrame.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXVisual.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXVisual.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXWEBPIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXWEBPIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXWEBPImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXWEBPImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXWSQueue.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXWSQueue.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXWindow.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXWindow.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXWizard.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXWizard.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXWorker.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXWorker.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXXBMIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXXBMIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXXBMImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXXBMImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXXML.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXXML.h Changed

@@ -3,7 +3,7 @@
 *                       X M L   R e a d e r  &  W r i t e r                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2016,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -68,21 +68,21 @@
 protected:
   FXchar    *begptr;    // Text buffer begin ptr
   FXchar    *endptr;    // Text buffer end ptr
-  FXchar    *sptr;      // Text buffer start ptr
-  FXchar    *rptr;      // Text buffer read ptr
   FXchar    *wptr;      // Text buffer write ptr
+  FXchar    *rptr;      // Text buffer read ptr
+  FXchar    *sptr;      // Text buffer scan ptr
+  FXlong     offset;    // Position from start
   Element   *current;   // Current element instance
   FXint      column;    // Column number
   FXint      line;      // Line number
   Direction  dir;       // Direction
   FXString   vers;      // Version
   FXuint     enc;       // Encoding
-  FXbool     owns;      // Owns the buffer
 private:
   FXbool need(FXival n);
+  FXbool emit(const FXchar* str,FXint count);
+  FXbool emit(FXchar ch,FXint count);
   FXuint guess();
-  Error emit(const FXchar* str,FXint count);
-  Error emit(FXchar ch,FXint count);
   void spaces();
   FXbool name();
   FXbool match(FXchar ch);
@@ -143,13 +143,38 @@
   * Construct XML serializer and open for direction d.
   * Use given buffer data of size sz, or allocate a local buffer.
   */
-  FXXML(FXchar* data,FXuval sz=4096,Direction d=Load);
+  FXXML(FXchar* buffer,FXuval sz=4096,Direction d=Load);
 
   /**
   * Open XML stream for given direction d.
   * Use given buffer data of size sz, or allocate a local buffer.
   */
-  FXbool open(FXchar* data=NULL,FXuval sz=4096,Direction d=Load);
+  FXbool open(FXchar* buffer=NULL,FXuval sz=4096,Direction d=Load);
+
+  /**
+  * Return size of parse buffer.
+  */
+  FXuval size() const { return endptr-begptr; }
+
+  /**
+  * Return direction in effect.
+  */
+  Direction direction() const { return dir; }
+
+  /**
+  * Return current line number.
+  */
+  FXint getLine() const { return line; }
+
+  /**
+  * Return current column number.
+  */
+  FXint getColumn() const { return column; }
+
+  /**
+  * Return offset from begin of file.
+  */
+  FXlong getOffset() const { return offset; }
 
   /**
   * Parse the file, return error code to indicate success or
@@ -181,45 +206,23 @@
   /// Document end
   Error endDocument();
 
-  /**
-  * Return size of parse buffer.
-  */
-  FXuval size() const { return endptr-begptr; }
-
-  /**
-  * Return direction in effect.
-  */
-  Direction direction() const { return dir; }
-
-  /**
-  * Return current line number.
-  */
-  FXint getLine() const { return line; }
-
-  /**
-  * Return current column number.
-  */
-  FXint getColumn() const { return column; }
-
   /// Returns error code for given error
   static const FXchar* getError(Error err){ return errorserr; }
 
   /**
-  * Fill buffer from file.
-  * Return false if not open for reading, or no input left to read.
+  * Read at least count bytes into buffer; return bytes available, or -1 for error.
   */
-  virtual FXbool fill();
+  virtual FXival fill(FXival count);
 
   /**
-  * Flush buffer to file.
-  * Return false if not open for writing, or if no space left to write.
+  * Write at least count bytes from buffer; return space available, or -1 for error.
   */
-  virtual FXbool flush();
+  virtual FXival flush(FXival count);
 
   /**
   * Close stream and delete buffer, if owned.
   */
-  virtual FXbool close();
+  FXbool close();
 
   /**
   * Decode escaped special characters from XML stream.

gogglesmm-1.2.1.tar.gz/cfox/include/FXXMLFile.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXXMLFile.h Changed

@@ -3,7 +3,7 @@
 *                             X M L - F i l e   I / O                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2016,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -57,21 +57,19 @@
   FXbool open(const FXString& filename,Direction d=Load,FXuval sz=4096);
 
   /**
-  * Fill buffer from file.
-  * Return false if not open for reading, or fail to read from disk.
+  * Read at least count bytes into buffer; return bytes available, or -1 for error.
   */
-  virtual FXbool fill();
+  virtual FXival fill(FXival count);
 
   /**
-  * Flush buffer to file.
-  * Return false if not open for writing, or if fail to write to disk.
+  * Write at least count bytes from buffer; return space available, or -1 for error.
   */
-  virtual FXbool flush();
+  virtual FXival flush(FXival count);
 
   /**
   * Close XML file and delete buffers.
   */
-  virtual FXbool close();
+  FXbool close();
 
   /**
   * Close XML file.

gogglesmm-1.2.2.tar.gz/cfox/include/FXXMLString.h Added

@@ -0,0 +1,94 @@
+/********************************************************************************
+*                                                                               *
+*                             X M L   S t r i n g   I / O                       *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXXMLSTRING_H
+#define FXXMLSTRING_H
+
+#ifndef FXXML_H
+#include "FXXML.h"
+#endif
+
+namespace FX {
+
+
+/**
+* Serialize a variant to or from XML formatted string.
+*/
+class FXAPI FXXMLString : public FXXML {
+private:
+  FXString buffer;
+private:
+  FXXMLString(const FXXMLString&);
+  FXXMLString &operator=(const FXXMLString&);
+public:
+  /**
+  * Create XML string i/o object.
+  */
+  FXXMLString();
+
+  /**
+  * Open XML string for direction d.
+  */
+  FXXMLString(const FXString& string,Direction d=Load);
+
+  /**
+  * Create XML i/o object and open it.
+  */
+  FXXMLString(const FXchar* string,FXuval length,Direction d=Load);
+
+  /**
+  * Open XML file for direction d.
+  */
+  FXbool open(const FXString& string,Direction d=Load);
+
+  /**
+  * Open XML character string of length for direction d.
+  */
+  FXbool open(const FXchar* string,FXuval length,Direction d=Load);
+
+  /**
+  * Return string.
+  */
+  const FXString text() const { return buffer; }
+
+  /**
+  * Read at least count bytes into buffer; return bytes available, or -1 for error.
+  */
+  virtual FXival fill(FXival count);
+
+  /**
+  * Write at least count bytes from buffer; return space available, or -1 for error.
+  */
+  virtual FXival flush(FXival count);
+
+  /**
+  * Close XML file and delete buffers.
+  */
+  virtual FXbool close();
+
+  /**
+  * Close XML string.
+  */
+  virtual ~FXXMLString();
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/FXXPMIcon.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXXPMIcon.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXXPMImage.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXXPMImage.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/FXhalf.h -> gogglesmm-1.2.2.tar.gz/cfox/include/FXhalf.h Changed

@@ -3,7 +3,7 @@
 *                     H a l f - F l o a t   S u p p o r t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2008,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2008,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -47,10 +47,16 @@
   FXhalf(const FXhalf& h):v(h.v){}
 
   // Initialize half with float
-  FXhalf(FXfloat f){ union { FXuint u; FXfloat f; } r; r.f=f; v=fhb(r.u>>23)&0x1ff+((r.u&0x007fffff)>>fhs(r.u>>23)&0x1ff); }
+  FXhalf(FXfloat f){
+    union { FXfloat f; FXuint u; } r={f};
+    v=fhb(r.u>>23)&0x1ff+((r.u&0x007fffff)>>fhs(r.u>>23)&0x1ff);
+    }
 
   // Convert half to float
-  operator FXfloat() const { union { FXuint u; FXfloat f; } r; r.u=hfmhfwv>>10+(v&0x3ff)+hfev>>10; return r.f; }
+  operator FXfloat() const {
+    union { FXuint u; FXfloat f; } r={hfmhfwv>>10+(v&0x3ff)+hfev>>10};
+    return r.f;
+    }
 
   // Test for zero
   FXbool operator!() const { return v==0; }

gogglesmm-1.2.1.tar.gz/cfox/include/fx.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fx.h Changed

@@ -3,7 +3,7 @@
 *                   M a i n   F O X   I n c l u d e   F i l e                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or                 *
 * modify it under the terms of the GNU Lesser General Public                    *
@@ -48,6 +48,7 @@
 #include "FXElement.h"
 #include "FXArray.h"
 #include "FXHash.h"
+#include "FXHashOf.h"
 #include "FXCallback.h"
 #include "FXRandom.h"
 #include "FXMutex.h"
@@ -79,6 +80,9 @@
 #include "FXVariantArray.h"
 #include "FXVariantMap.h"
 #include "FXDictionary.h"
+#include "FXDictionaryOf.h"
+#include "FXReverseDictionary.h"
+#include "FXReverseDictionaryOf.h"
 #include "FXDLL.h"
 #include "FXSize.h"
 #include "FXPoint.h"
@@ -98,6 +102,7 @@
 #include "FXJSONFile.h"
 #include "FXXML.h"
 #include "FXXMLFile.h"
+#include "FXXMLString.h"
 #include "FXSettings.h"
 #include "FXRegistry.h"
 #include "FXObjectList.h"
@@ -115,6 +120,9 @@
 #include "FXVisual.h"
 #include "FXEvent.h"
 #include "FXId.h"
+#include "FXReactor.h"
+#include "FXDispatcher.h"
+#include "FXEventDispatcher.h"
 #include "FXDrawable.h"
 #include "FXBitmap.h"
 #include "FXImage.h"
@@ -289,6 +297,7 @@
 #include "FXCalendar.h"
 #include "FXGradientBar.h"
 #include "FXConsole.h"
+#include "FXDirWatch.h"
 #include "FXSplashWindow.h"

gogglesmm-1.2.1.tar.gz/cfox/include/fx3d.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fx3d.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/fxascii.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxascii.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/fxcpuid.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxcpuid.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/fxdefs.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxdefs.h Changed

@@ -3,7 +3,7 @@
 *                     FOX Definitions, Types, and Macros                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -68,9 +68,15 @@
 
 // Shared library support
 #ifdef WIN32
-#define FXLOCAL
+#if defined(__GNUC__)
+#define FXLOCAL  
+#define FXEXPORT __attribute__ ((dllexport))
+#define FXIMPORT __attribute__ ((dllimport))
+#else
+#define FXLOCAL  
 #define FXEXPORT __declspec(dllexport)
 #define FXIMPORT __declspec(dllimport)
+#endif
 #else
 #if defined(__GNUC__) && (__GNUC__ >= 4)
 #define FXLOCAL  __attribute__((visibility("hidden")))
@@ -189,12 +195,28 @@
 #endif
 
 
-// Suffixes for 64-bit long constants
-#if defined(WIN32) && !defined(__GNUC__)
-#define FXLONG(c)  c ## i64
+// Word size issues
+#if defined(_MSC_VER) || defined(__MINGW32__) // Windows
+#if defined(_WIN64)
+#define LLP64  1                // Long longs and pointers are 64 bit
+#else
+#define ILP32  1                // Ints, longs, and pointers are 32 bit
+#endif
+#elif defined(__LP64__) || defined(_LP64) || (_MIPS_SZLONG == 64) || (__WORDSIZE == 64)
+#define LP64   1                // Longs and pointers are 64 bit
+#else
+#define ILP32  1                // Longs, integers, and pointers are 32 bit
+#endif
+
+// Suffixes for 64-bit constants
+#if defined(LP64)
+#define FXLONG(c)  c ## L       // Long suffix for 64 bit
+#define FXULONG(c) c ## UL
+#elif defined(_MSC_VER) && (_MSC_VER < 1900)
+#define FXLONG(c)  c ## i64     // Special suffix for 64 bit
 #define FXULONG(c) c ## ui64
 #else
-#define FXLONG(c)  c ## LL
+#define FXLONG(c)  c ## LL      // Long long suffix for 64 bit
 #define FXULONG(c) c ## ULL
 #endif
 
@@ -268,88 +290,84 @@
 typedef wchar_t                 FXwchar;
 typedef unsigned short          FXnchar;
 #endif
-#if defined(__LP64__) || defined(_LP64) || (_MIPS_SZLONG == 64) || (__WORDSIZE == 64)
-typedef unsigned long           FXulong;
+#if defined(LP64)
 typedef long                    FXlong;
-#elif defined(_MSC_VER) || (defined(__BCPLUSPLUS__) && __BORLANDC__ > 0x500) || defined(__WATCOM_INT64__)
-typedef unsigned __int64        FXulong;
+typedef unsigned long           FXulong;
+#elif defined(_MSC_VER) && (_MSC_VER < 1900)
 typedef __int64                 FXlong;
-#elif defined(__GNUG__) || defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__MWERKS__) || defined(__SC__) || defined(_LONGLONG)
-typedef unsigned long long      FXulong;
-typedef long long               FXlong;
+typedef unsigned __int64        FXulong;
 #else
-#error "FXlong and FXulong not defined for this architecture!"
+typedef long long               FXlong;
+typedef unsigned long long      FXulong;
 #endif
 
-
 // Integral types large enough to hold value of a pointer
-#if defined(_WIN64)
-#if defined (_MSC_VER)
+#if defined(LP64) || defined(ILP32)     // Long for LP64 and ILP32 models
+typedef long                    FXival;
+typedef unsigned long           FXuval;
+#elif defined(LLP64)                    // Long long for LLP64 models
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
 typedef __int64                 FXival;
 typedef unsigned __int64        FXuval;
 #else
 typedef long long               FXival;
 typedef unsigned long long      FXuval;
 #endif
-#else
-typedef long                    FXival;
-typedef unsigned long           FXuval;
 #endif
 
-
 // Generic void pointer
 typedef void*                   FXptr;
 
 
 // Handle to something in server
 #ifdef WIN32
-typedef void*           FXID;
+typedef void*                   FXID;
 #else
-typedef unsigned long   FXID;
+typedef unsigned long           FXID;
 #endif
 
 // Time since January 1, 1970 (UTC)
-typedef FXlong          FXTime;
+typedef FXlong                  FXTime;
 
 // Pixel type (could be color index)
-typedef unsigned long   FXPixel;
+typedef unsigned long           FXPixel;
 
 // RGBA pixel value
-typedef FXuint          FXColor;
+typedef FXuint                  FXColor;
 
 // Hot key
-typedef FXuint          FXHotKey;
+typedef FXuint                  FXHotKey;
 
 // Input source handle type
 #ifdef WIN32
-typedef void*           FXInputHandle;
+typedef void*                   FXInputHandle;
 #else
-typedef FXint           FXInputHandle;
+typedef FXint                   FXInputHandle;
 #endif
 
 // Thread ID type
 #if defined(WIN32)
-typedef void*           FXThreadID;
+typedef void*                   FXThreadID;
 #else
-typedef unsigned long   FXThreadID;
+typedef unsigned long           FXThreadID;
 #endif
 
 // Thread-local storage key
-typedef FXuval          FXThreadStorageKey;
+typedef FXuval                  FXThreadStorageKey;
 
 // Raw event type
 #ifdef WIN32
-typedef tagMSG          FXRawEvent;
+typedef tagMSG                  FXRawEvent;
 #else
-typedef _XEvent         FXRawEvent;
+typedef _XEvent                 FXRawEvent;
 #endif
 
 
 /// Drag and drop data type
 #ifdef WIN32
-typedef FXushort        FXDragType;
+typedef FXushort                FXDragType;
 #else
-typedef FXID            FXDragType;
+typedef FXID                    FXDragType;
 #endif
 
 
@@ -435,6 +453,9 @@
 /// Check if c is part of a utf8 multi-byte sequence
 #define FXISSEQUTF8(c)     (((c)&0x80)==0x80)
 
+/// Number of FXchars in utf8 sequence
+#define FXUTF8LEN(c)       (((0xE5000000>>((((FXuchar)(c))>>4)<<1))&3)+1)
+
 /// Test if character c is at start of utf16 sequence (not a follower from surrogate pair)
 #define FXISUTF16(c)       (((c)&0xFC00)!=0xDC00)
 
@@ -445,6 +466,9 @@
 /// Check if c is part of a utf16 surrogate pair sequence
 #define FXISSEQUTF16(c)    (((c)&0xF800)==0xD800)
 
+/// Number of FXnchars in utf16 sequence
+#define FXUTF16LEN(c)      (FXISLEADUTF16(c)+1)
+
 /// Test if c is a legal utf32 character
 #define FXISUTF32(c)       ((c)<0x110000)
 
@@ -674,10 +698,16 @@
 extern FXAPI void fxhsl_to_rgb(FXfloat& r,FXfloat& g,FXfloat& b,FXfloat h,FXfloat s,FXfloat l);
 
 /// Encode src to dst in base64
-extern FXint fxencode64(FXchar* dst,const FXchar* src,FXint len);
+extern FXchar* fxencode64(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend);
 
 /// Decode src to dst from base64
-extern FXint fxdecode64(FXchar* dst,const FXchar* src,FXint len);
+extern FXchar* fxdecode64(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend);
+
+/// Encode src to dst in base85
+extern FXchar* fxencode85(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend);
+
+/// Decode src to dst from base85
+extern FXchar* fxdecode85(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend);
 
 /// Convert keysym to unicode character
 extern FXAPI FXwchar fxkeysym2ucs(FXwchar sym);
@@ -745,62 +775,62 @@
 extern FXAPI FXnchar* wcstart(FXnchar *ptr);
 
 /// Return number of FXchar's of wide character at ptr
-extern FXAPI FXint wclen(const FXchar *ptr);
+extern FXAPI FXival wclen(const FXchar *ptr);
 
 /// Return number of FXnchar's of narrow character at ptr
-extern FXAPI FXint wclen(const FXnchar *ptr);
+extern FXAPI FXival wclen(const FXnchar *ptr);
 
 /// Check if valid utf8 wide character representation; returns length or 0
-extern FXAPI FXint wcvalid(const FXchar* ptr);
+extern FXAPI FXival wcvalid(const FXchar* ptr);
 
 /// Check if valid utf16 wide character representation; returns length or 0
-extern FXAPI FXint wcvalid(const FXnchar* ptr);
+extern FXAPI FXival wcvalid(const FXnchar* ptr);
 
 
 /// Return number of bytes for utf8 representation of wide character w
-extern FXAPI FXint wc2utf(FXwchar w);
+extern FXAPI FXival wc2utf(FXwchar w);
 
 /// Return number of narrow characters for utf16 representation of wide character w
-extern FXAPI FXint wc2nc(FXwchar w);
+extern FXAPI FXival wc2nc(FXwchar w);
 
 /// Return number of bytes for utf8 representation of wide character string
-extern FXAPI FXint wcs2utf(const FXwchar* ptr,FXint len);
-extern FXAPI FXint wcs2utf(const FXwchar* ptr);
+extern FXAPI FXival wcs2utf(const FXwchar* src,FXival srclen);
+extern FXAPI FXival wcs2utf(const FXwchar* src);
 
 /// Return number of bytes for utf8 representation of narrow character string
-extern FXAPI FXint ncs2utf(const FXnchar* ptr,FXint len);
-extern FXAPI FXint ncs2utf(const FXnchar* ptr);
+extern FXAPI FXival ncs2utf(const FXnchar* src,FXival srclen);
+extern FXAPI FXival ncs2utf(const FXnchar* src);
 
 /// Return number of wide characters for utf8 character string
-extern FXAPI FXint utf2wcs(const FXchar *ptr,FXint len);
-extern FXAPI FXint utf2wcs(const FXchar *ptr);
+extern FXAPI FXival utf2wcs(const FXchar src,FXival srclen);
+extern FXAPI FXival utf2wcs(const FXchar *src);
 
 /// Return number of narrow characters for utf8 character string
-extern FXAPI FXint utf2ncs(const FXchar *ptr,FXint len);
-extern FXAPI FXint utf2ncs(const FXchar *ptr);
+extern FXAPI FXival utf2ncs(const FXchar *src,FXival srclen);
+extern FXAPI FXival utf2ncs(const FXchar *src);
 
 
 /// Convert wide character to utf8 string; return number of items written to dst
-extern FXAPI FXint wc2utf(FXchar *dst,FXwchar w);
+extern FXAPI FXival wc2utf(FXchar *dst,FXwchar w);
 
 /// Convert wide character to narrow character string; return number of items written to dst
-extern FXAPI FXint wc2nc(FXnchar *dst,FXwchar w);
+extern FXAPI FXival wc2nc(FXnchar *dst,FXwchar w);
 
 /// Convert wide character string to utf8 string; return number of items written to dst
-extern FXAPI FXint wcs2utf(FXchar *dst,const FXwchar* src,FXint dlen,FXint slen);
-extern FXAPI FXint wcs2utf(FXchar *dst,const FXwchar* src,FXint dlen);
+extern FXAPI FXival wcs2utf(FXchar *dst,const FXwchar* src,FXival dstlen,FXival srclen);
+extern FXAPI FXival wcs2utf(FXchar *dst,const FXwchar* src,FXival dstlen);
 
 /// Convert narrow character string to utf8 string; return number of items written to dst
-extern FXAPI FXint ncs2utf(FXchar *dst,const FXnchar* src,FXint dlen,FXint slen);
-extern FXAPI FXint ncs2utf(FXchar *dst,const FXnchar* src,FXint dlen);
+extern FXAPI FXival ncs2utf(FXchar *dst,const FXnchar* src,FXival dsrlen,FXival srclen);
+extern FXAPI FXival ncs2utf(FXchar *dst,const FXnchar* src,FXival dsrlen);
 
 /// Convert utf8 string to wide character string; return number of items written to dst
-extern FXAPI FXint utf2wcs(FXwchar *dst,const FXchar* src,FXint dlen,FXint slen);
-extern FXAPI FXint utf2wcs(FXwchar *dst,const FXchar* src,FXint dlen);
+extern FXAPI FXival utf2wcs(FXwchar *dst,const FXchar* src,FXival dsrlen,FXival srclen);
+extern FXAPI FXival utf2wcs(FXwchar *dst,const FXchar* src,FXival dsrlen);
 
 /// Convert utf8 string to narrow character string; return number of items written to dst
-extern FXAPI FXint utf2ncs(FXnchar *dst,const FXchar* src,FXint dlen,FXint slen);
-extern FXAPI FXint utf2ncs(FXnchar *dst,const FXchar* src,FXint dlen);
+extern FXAPI FXival utf2ncs(FXnchar *dst,const FXchar* src,FXival dsrlen,FXival srclen);
+extern FXAPI FXival utf2ncs(FXnchar *dst,const FXchar* src,FXival dsrlen);
 
 /// Swap non-overlapping arrays
 extern FXAPI void memswap(void* dst,void* src,FXuval n);

gogglesmm-1.2.1.tar.gz/cfox/include/fxendian.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxendian.h Changed

@@ -3,7 +3,7 @@
 *                      B y t e   S w a p p i n g   S u p p o r t                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2010,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2010,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -66,9 +66,6 @@
 static inline FXushort swap16(FXushort x){
 #if ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)))
   return __builtin_bswap16(x);
-#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-  __asm__ __volatile__("rorw $8,%0\n\t" : "=r"(x) : "0"(x) : "cc");
-  return x;
 #elif (_MSC_VER >= 1500)
   return _byteswap_ushort(x);
 #else
@@ -81,9 +78,6 @@
 static inline FXuint swap32(FXuint x){
 #if ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)))
   return __builtin_bswap32(x);
-#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
-  __asm__ __volatile__("bswapl %0\n\t" : "=r"(x): "0"(x));
-  return x;
 #elif (_MSC_VER >= 1500)
   return _byteswap_ulong(x);
 #else
@@ -97,16 +91,6 @@
 static inline FXulong swap64(FXulong x){
 #if ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)))
   return __builtin_bswap64(x);
-#elif (defined(__GNUC__) && defined(__i386__))
-  union { struct { FXuint l; FXuint h; } s; FXulong x; } n;
-  n.x=x;
-  __asm__ __volatile__("bswapl %0\n\t"
-                       "bswapl %1\n\t"
-                       "xchgl %0,%1\n\t" : "=r"(n.s.l), "=r" (n.s.h) : "0"(n.s.l), "1"(n.s.h));
-  return n.x;
-#elif (defined(__GNUC__) && defined(__x86_64__))
-  __asm__ __volatile__("bswapq %0\n\t" : "=r"(x) : "0"(x));
-  return x;
 #elif (_MSC_VER >= 1500)
   return _byteswap_uint64(x);
 #else
@@ -152,17 +136,30 @@
   }
 
 
-// Count one-bits in non-zero integer
+// Count one-bits in integer
 static inline FXuint pop32(FXuint x){
 #if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
   return __builtin_popcount(x);
 #else
   x=x-((x>>1)&0x55555555);
   x=(x&0x33333333)+((x>>2)&0x33333333);
-  x=(x+(x>>4))&0x0F0F0F0F;
-  x=x+(x>>8);
-  x=x+(x>>16);
-  return (x&0x3F);
+  return (((x+(x>>4))&0x0F0F0F0F)*0x01010101)>>24;
+#endif
+  }
+
+
+// Count one-bits in long
+static inline FXulong pop64(FXulong x){
+#if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
+#if defined(__LP64__) || defined(_LP64) || (__WORDSIZE == 64)
+  return __builtin_popcountl(x);
+#else
+  return __builtin_popcountll(x);
+#endif
+#else
+  x=x-((x>>1)&FXULONG(0x5555555555555555));
+  x=(x&FXULONG(0x3333333333333333))+((x>>2)&FXULONG(0x3333333333333333));
+  return (((x+(x>>4))&FXULONG(0xf0f0f0f0f0f0f0f))*FXULONG(0x101010101010101))>>56;
 #endif
   }
 
@@ -183,6 +180,27 @@
   }
 
 
+// Count leading zeros in non-zero long
+static inline FXulong clz64(FXulong x){
+#if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
+#if defined(__LP64__) || defined(_LP64) || (__WORDSIZE == 64)
+  return __builtin_clzl(x);
+#else
+  return __builtin_clzll(x);
+#endif
+#else
+  FXulong g,f,e,d,c,b;
+  g=!(x&FXULONG(0xffffffff00000000))<<8; x<<=g;
+  f=!(x&FXULONG(0xffff000000000000))<<4; x<<=f;
+  e=!(x&FXULONG(0xff00000000000000))<<3; x<<=e;
+  d=!(x&FXULONG(0xf000000000000000))<<2; x<<=d;
+  c=!(x&FXULONG(0xC000000000000000))<<1; x<<=c;
+  b=!(x&FXULONG(0x8000000000000000));
+  return g+f+e+d+c+b;
+#endif
+  }
+
+
 // Count trailing zeros in non-zero integer
 static inline FXuint ctz32(FXuint x){
 #if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
@@ -199,6 +217,70 @@
   }
 
 
+// Count trailing zeros in non-zero long
+static inline FXulong ctz64(FXulong x){
+#if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
+#if defined(__LP64__) || defined(_LP64) || (__WORDSIZE == 64)
+  return __builtin_ctzl(x);
+#else
+  return __builtin_ctzll(x);
+#endif
+#else
+  FXulong g,f,e,d,c,b;
+  g=!(x&FXULONG(0x00000000ffffffff))<<8; x>>=g;
+  f=!(x&FXULONG(0x000000000000ffff))<<4; x>>=f;
+  e=!(x&FXULONG(0x00000000000000ff))<<3; x>>=e;
+  d=!(x&FXULONG(0x000000000000000f))<<2; x>>=d;
+  c=!(x&FXULONG(0x0000000000000003))<<1; x>>=c;
+  b=!(x&FXULONG(0x0000000000000001));
+  return g+f+e+d+c+b;
+#endif
+  }
+
+
+// Roll bits left, 32-bit flavor (count<32)
+static inline FXuint rol32(FXuint value,FXuint count){
+  return (value<<count) | (value>>(32-count));
+  }
+
+// Roll bits right, 32-bit flavor (count<32)
+static inline FXuint ror32(FXuint value,FXuint count){
+  return (value>>count) | (value<<(32-count));
+  }
+
+
+// Roll bits left, 64-bit flavor (count<64)
+static inline FXulong rol64(FXulong value,FXulong count){
+  return (value<<count) | (value>>(64-count));
+  }
+
+// Roll bits right, 64-bit flavor (count<64)
+static inline FXulong ror64(FXulong value,FXulong count){
+  return (value>>count) | (value<<(64-count));
+  }
+
+
+// Shift bits left, 32-bit flavor (count<32)
+static inline FXuint shl32(FXuint value,FXuint count){
+  return (value<<count);
+  }
+
+// Shift bits right, 32-bit flavor (count<32)
+static inline FXuint shr32(FXuint value,FXuint count){
+  return (value>>count);
+  }
+
+
+// Shift bits left, 64-bit flavor (count<64)
+static inline FXulong shl64(FXulong value,FXulong count){
+  return (value<<count);
+  }
+
+// Shift bits right, 64-bit flavor (count<64)
+static inline FXulong shr64(FXulong value,FXulong count){
+  return (value>>count);
+  }
+
 }
 
 #endif

gogglesmm-1.2.1.tar.gz/cfox/include/fxkeys.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxkeys.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/fxmath.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxmath.h Changed

@@ -1,737 +1,1043 @@
-/********************************************************************************
-*                                                                               *
-*                           M a t h   F u n c t i o n s                         *
-*                                                                               *
-*********************************************************************************
-* Copyright (C) 2015,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
-*********************************************************************************
-* This library is free software; you can redistribute it and/or modify          *
-* it under the terms of the GNU Lesser General Public License as published by   *
-* the Free Software Foundation; either version 3 of the License, or             *
-* (at your option) any later version.                                           *
-*                                                                               *
-* This library is distributed in the hope that it will be useful,               *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
-* GNU Lesser General Public License for more details.                           *
-*                                                                               *
-* You should have received a copy of the GNU Lesser General Public License      *
-* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
-********************************************************************************/
-#ifndef FXMATH_H
-#define FXMATH_H
-
-// Remove macros
-#undef fabs
-#undef fabsf
-#undef fmod
-#undef fmodf
-
-#undef ceil
-#undef ceilf
-#undef floor
-#undef floorf
-#undef round
-#undef roundf
-#undef trunc
-#undef truncf
-#undef nearbyint
-#undef nearbyintf
-#undef rint
-#undef rintf
-
-#undef sin
-#undef sinf
-#undef cos
-#undef cosf
-#undef tan
-#undef tanf
-#undef asin
-#undef asinf
-#undef acos
-#undef acosf
-#undef atan
-#undef atanf
-#undef atan2
-#undef atan2f
-#undef sinh
-#undef sinhf
-#undef cosh
-#undef coshf
-#undef tanh
-#undef tanhf
-#undef asinh
-#undef asinhf
-#undef acosh
-#undef acoshf
-#undef atanh
-#undef atanhf
-
-#undef pow
-#undef powf
-#undef exp
-#undef expf
-#undef exp2
-#undef exp2f
-#undef exp10
-#undef exp10f
-#undef log
-#undef logf
-#undef log1p
-#undef log1pf
-#undef log2
-#undef log2f
-#undef log10
-#undef log10f
-
-#undef sqrt
-#undef sqrtf
-#undef cbrt
-#undef cbrtf
-#undef sqr
-#undef sqrf
-#undef cub
-#undef cubf
-
-#undef fmax
-#undef fmaxf
-#undef fmin
-#undef fminf
-#undef copysign
-#undef copysignf
-
-// Switch on remedial math on Windows with VC++
-#if defined(WIN32) && (defined(_MSC_VER) || defined(__MINGW32__))
-#define NO_CEILF
-#define NO_FLOORF
-#define NO_ROUNDF
-#define NO_ROUND
-#define NO_TRUNCF
-#define NO_TRUNC
-#define NO_NEARBYINTF
-#define NO_NEARBYINT
-#define NO_RINTF
-#define NO_RINT
-#define NO_EXPM1F
-#define NO_EXPM1
-#define NO_EXP2F
-#define NO_EXP2
-#define NO_EXP10F
-#define NO_EXP10
-#define NO_LOG1PF
-#define NO_LOG1P
-#define NO_LOG2F
-#define NO_LOG2
-#define NO_CBRTF
-#define NO_CBRT
-#define NO_SINHF
-#define NO_SINH
-#define NO_COSHF
-#define NO_COSH
-#define NO_TANHF
-#define NO_TANH
-#define NO_ASINHF
-#define NO_ASINH
-#define NO_ACOSHF
-#define NO_ACOSH
-#define NO_ATANHF
-#define NO_ATANH
-#define NO_FMAXF
-#define NO_FMAX
-#define NO_FMINF
-#define NO_FMIN
-#define NO_COPYSIGNF
-#define NO_COPYSIGN
-#define NO_FDIMF
-#define NO_FDIM
-#endif
-
-// Systems below are missing these functions
-#if defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-#define NO_EXP10F
-#define NO_EXP10
-#endif
-
-namespace FX {
-
-/*********************************  Constants  *********************************/
-
-/// Pi
-const FXdouble PI=3.1415926535897932384626433833;
-
-/// Euler constant
-const FXdouble EULER=2.7182818284590452353602874713;
-
-/// Multiplier for degrees to radians
-const FXdouble DTOR=0.0174532925199432957692369077;
-
-/// Multiplier for radians to degrees
-const FXdouble RTOD=57.295779513082320876798154814;
-
-/*********************************  Functions  *********************************/
-
-// FOX math functions live here
-namespace Math {
-
-
-/// Sign of single precision float point number
-static inline FXuint fpSign(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x}; return (z.u>>31);
-  }
-
-/// Sign of double precision float point number
-static inline FXulong fpSign(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x}; return (z.u>>63);
-  }
-
-
-/// Mantissa of single precision float point number
-static inline FXuint fpMantissa(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x}; return (z.u&0x007fffff);
-  }
-
-/// Mantissa of double precision float point number
-static inline FXulong fpMantissa(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x}; return (z.u&FXULONG(0x000fffffffffffff));
-  }
-
-
-/// Exponent of single precision float point number
-static inline FXuint fpExponent(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x}; return ((z.u>>23)&0xff);
-  }
-
-/// Exponent of double precision float point number
-static inline FXulong fpExponent(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x}; return ((z.u>>52)&0x7ff);
-  }
-
-
-/// Single precision floating point number is finite
-static inline FXbool fpFinite(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x}; return ((z.u&0x7fffffff)<0x7f800000);
-  }
-
-/// Double precision floating point number is finite
-static inline FXbool fpFinite(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x}; return ((z.u&FXULONG(0x7fffffffffffffff))<FXULONG(0x7ff0000000000000));
-  }
-
-
-/// Single precision floating point number is infinite
-static inline FXbool fpInfinite(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x}; return ((z.u&0x7fffffff)==0x7f800000);
-  }
-
-/// Double precision floating point number is infinite
-static inline FXbool fpInfinite(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x}; return ((z.u&FXULONG(0x7fffffffffffffff))==FXULONG(0x7ff0000000000000));
-  }
-
-
-/// Single precision floating point number is NaN
-static inline FXbool fpNan(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x}; return (0x7f800000<(z.u&0x7fffffff));
-  }
-
-/// Double precision floating point number is NaN
-static inline FXbool fpNan(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x}; return (FXULONG(0x7ff0000000000000)<(z.u&FXULONG(0x7fffffffffffffff)));
-  }
-
-
-/// Single precision floating point number is normalized
-static inline FXbool fpNormal(FXfloat x){
-  union{ FXfloat f; FXuint u; } z={x};
-  return ((z.u&0x7fffffff)==0) || ((0x00800000<=(z.u&0x7fffffff)) && ((z.u&0x7fffffff)<0x7f800000));
-  }
-
-/// Double precision floating point number is normalized
-static inline FXbool fpNormal(FXdouble x){
-  union{ FXdouble f; FXulong u; } z={x};
-  return ((z.u&FXULONG(0x7fffffffffffffff))==0) || ((FXULONG(0x0010000000000000)<=(z.u&FXULONG(0x7fffffffffffffff))) && ((z.u&FXULONG(0x7fffffffffffffff))<FXULONG(0x7ff0000000000000)));
-  }
-
-
-/// Single precision absolute value
-#if defined(NO_FABSF)
-static inline FXfloat fabs(FXfloat x){ return (x<0.0f) ? -x : x; }
-#else
-static inline FXfloat fabs(FXfloat x){ return ::fabsf(x); }
-#endif
-
-/// Double precision absolute value
-static inline FXdouble fabs(FXdouble x){ return ::fabs(x); }
-
-
-/// Single precision floating point remainder
-static inline FXfloat fmod(FXfloat x,FXfloat y){ return ::fmodf(x,y); }
-
-/// Double precision floating point remainder
-static inline FXdouble fmod(FXdouble x,FXdouble y){ return ::fmod(x,y); }
-
-
-
-/// Single precision ceiling (round upward to nearest integer)
-#if defined(NO_CEILF)
-extern FXAPI FXfloat ceil(FXfloat x);
-#else
-static inline FXfloat ceil(FXfloat x){ return ::ceilf(x); }
-#endif
-
-/// Double precision ceiling (round upward to nearest integer)
-static inline FXdouble ceil(FXdouble x){ return ::ceil(x); }
-
-
-/// Single precision floor (round down to nearest integer)
-#if defined(NO_FLOORF)
-extern FXAPI FXfloat floor(FXfloat x);
-#else
-static inline FXfloat floor(FXfloat x){ return ::floorf(x); }
-#endif
-
-/// Double precision floor (round down to nearest integer)
-static inline FXdouble floor(FXdouble x){ return ::floor(x); }
-
-/// Single precision round to nearest integer (away from zero)
-#if defined(NO_ROUNDF)
-extern FXAPI FXfloat round(FXfloat x);
-#else
-static inline FXfloat round(FXfloat x){ return ::roundf(x); }
-#endif
-
-/// Double precision round to nearest integer (away from zero)
-#if defined(NO_ROUND)
-extern FXAPI FXdouble round(FXdouble x);
-#else
-static inline FXdouble round(FXdouble x){ return ::round(x); }
-#endif
-
-
-/// Single precision truncate to nearest integer (toward zero)
-#if defined(NO_TRUNCF)
-extern FXAPI FXfloat trunc(FXfloat x);
-#else
-static inline FXfloat trunc(FXfloat x){ return ::truncf(x); }
-#endif
-
-/// Double precision truncate to nearest integer (toward zero)
-#if defined(NO_TRUNC)
-extern FXAPI FXdouble trunc(FXdouble x);
-#else
-static inline FXdouble trunc(FXdouble x){ return ::trunc(x); }
-#endif
-
-/// Single precision round to nearest integer
-#if defined(NO_NEARBYINTF)
-extern FXAPI FXfloat nearbyint(FXfloat x);
-#else
-static inline FXfloat nearbyint(FXfloat x){ return ::nearbyintf(x); }
-#endif
-
-/// Double precision round to nearest integer
-#if defined(NO_NEARBYINT)
-extern FXAPI FXdouble nearbyint(FXdouble x);
-#else
-static inline FXdouble nearbyint(FXdouble x){ return ::nearbyint(x); }
-#endif
-
-/// Single precision round to nearest integer
-#if defined(NO_RINTF)
-extern FXAPI FXfloat rint(FXfloat x);
-#else
-static inline FXfloat rint(FXfloat x){ return ::rintf(x); }
-#endif
-
-/// Double precision round to nearest integer
-#if defined(NO_RINT)
-extern FXAPI FXdouble rint(FXdouble x);
-#else
-static inline FXdouble rint(FXdouble x){ return ::rint(x); }
-#endif
-
-/// Single precision sine
-static inline FXfloat sin(FXfloat x){ return ::sinf(x); }
-
-/// Double precision sine
-static inline FXdouble sin(FXdouble x){ return ::sin(x); }
-
-
-/// Single precision cosine
-static inline FXfloat cos(FXfloat x){ return ::cosf(x); }
-
-/// Double precision cosine
-static inline FXdouble cos(FXdouble x){ return ::cos(x); }
-
-
-/// Single precision tangent
-static inline FXfloat tan(FXfloat x){ return ::tanf(x); }
-
-/// Double precision tangent
-static inline FXdouble tan(FXdouble x){ return ::tan(x); }
-
-
-/// Single precision arc sine
-static inline FXfloat asin(FXfloat x){ return ::asinf(x); }
-
-/// Double precision arc sine
-static inline FXdouble asin(FXdouble x){ return ::asin(x); }
-
-
-/// Single precision arc cosine
-static inline FXfloat acos(FXfloat x){ return ::acosf(x); }
-
-/// Double precision arc cosine
-static inline FXdouble acos(FXdouble x){ return ::acos(x); }
-
-
-/// Single precision arc tangent
-static inline FXfloat atan(FXfloat x){ return ::atanf(x); }
-
-/// Double precision arc tangent
-static inline FXdouble atan(FXdouble x){ return ::atan(x); }
-
-
-/// Single precision arc tangent
-static inline FXfloat atan2(FXfloat y,FXfloat x){ return ::atan2f(y,x); }
-
-/// Double precision arc tangent
-static inline FXdouble atan2(FXdouble y,FXdouble x){ return ::atan2(y,x); }
-
-
-/// Single precision hyperbolic sine
-#if defined(NO_SINHF)
-extern FXAPI FXfloat sinh(FXfloat x);
-#else
-static inline FXfloat sinh(FXfloat x){ return ::sinhf(x); }
-#endif
-
-/// Double precision hyperbolic sine
-#if defined(NO_SINH)
-extern FXAPI FXdouble sinh(FXdouble x);
-#else
-static inline FXdouble sinh(FXdouble x){ return ::sinh(x); }
-#endif
-
-
-/// Single precision hyperbolic cosine
-#if defined(NO_COSHF)
-extern FXAPI FXfloat cosh(FXfloat x);
-#else
-static inline FXfloat cosh(FXfloat x){ return ::coshf(x); }
-#endif
-
-/// Double precision hyperbolic cosine
-#if defined(NO_COSH)
-extern FXAPI FXdouble cosh(FXdouble x);
-#else
-static inline FXdouble cosh(FXdouble x){ return ::cosh(x); }
-#endif
-
-
-/// Single precision hyperbolic tangent
-#if defined(NO_TANHF)
-extern FXAPI FXfloat tanh(FXfloat x);
-#else
-static inline FXfloat tanh(FXfloat x){ return ::tanhf(x); }
-#endif
-
-/// Double precision hyperbolic tangent
-#if defined(NO_TANH)
-extern FXAPI FXdouble tanh(FXdouble x);
-#else
-static inline FXdouble tanh(FXdouble x){ return ::tanh(x); }
-#endif
-
-
-/// Single precision hyperbolic arc sine
-#if defined(NO_ASINHF)
-extern FXAPI FXfloat asinh(FXfloat x);
-#else
-static inline FXfloat asinh(FXfloat x){ return ::asinhf(x); }
-#endif
-
-/// Double precision hyperbolic arc sine
-#if defined(NO_ASINH)
-extern FXAPI FXdouble asinh(FXdouble x);
-#else
-static inline FXdouble asinh(FXdouble x){ return ::asinh(x); }
-#endif
-
-
-/// Single precision hyperbolic arc cosine
-#if defined(NO_ACOSHF)
-extern FXAPI FXfloat acosh(FXfloat x);
-#else
-static inline FXfloat acosh(FXfloat x){ return ::acoshf(x); }
-#endif
-
-/// Double precision  hyperbolic arc cosine
-#if defined(NO_ACOSH)
-extern FXAPI FXdouble acosh(FXdouble x);
-#else
-static inline FXdouble acosh(FXdouble x){ return ::acosh(x); }
-#endif
-
-
-/// Single precision hyperbolic arc tangent
-#if defined(NO_ATANHF)
-extern FXAPI FXfloat atanh(FXfloat x);
-#else
-static inline FXfloat atanh(FXfloat x){ return ::atanhf(x); }
-#endif
-
-/// Double precision hyperbolic arc tangent
-#if defined(NO_ATANH)
-extern FXAPI FXdouble atanh(FXdouble x);
-#else
-static inline FXdouble atanh(FXdouble x){ return ::atanh(x); }
-#endif
-
-
-/// Single precision power x^y
-static inline FXfloat pow(FXfloat x,FXfloat y){ return ::powf(x,y); }
-
-/// Double precision power x^y
-static inline FXdouble pow(FXdouble x,FXdouble y){ return ::pow(x,y); }
-
-
-/// Single precision base E exponential
-static inline FXfloat exp(FXfloat x){ return ::expf(x); }
-
-/// Double precision base E exponential
-static inline FXdouble exp(FXdouble x){ return ::exp(x); }
-
-
-/// Single precision base E exponential - 1
-#if defined(NO_EXPM1F)
-static inline FXfloat expm1(FXfloat x){ return ::expf(x)-1.0f; }
-#else
-static inline FXfloat expm1(FXfloat x){ return ::expm1f(x); }
-#endif
-
-/// Double precision base E exponential - 1
-#if defined(NO_EXPM1)
-static inline FXdouble expm1(FXdouble x){ return ::exp(x)-1.0; }
-#else
-static inline FXdouble expm1(FXdouble x){ return ::expm1(x); }
-#endif
-
-
-/// Single precision base 2 exponential
-#if defined(NO_EXP2F)
-static inline FXfloat exp2(FXfloat x){ return Math::pow(2.0f,x); }
-#else
-static inline FXfloat exp2(FXfloat x){ return ::exp2f(x); }
-#endif
-
-/// Double precision base 2 exponential
-#if defined(NO_EXP2)
-static inline FXdouble exp2(FXdouble x){ return Math::pow(2.0,x); }
-#else
-static inline FXdouble exp2(FXdouble x){ return ::exp2(x); }
-#endif
-
-
-/// Single precision base 10 exponential
-#if defined(NO_EXP10F)
-static inline FXfloat exp10(FXfloat x){ return Math::pow(10.0f,x); }
-#else
-static inline FXfloat exp10(FXfloat x){ return ::exp10f(x); }
-#endif
-
-/// Double precision base 10 exponential
-#if defined(NO_EXP10)
-static inline FXdouble exp10(FXdouble x){ return Math::pow(10.0,x); }
-#else
-static inline FXdouble exp10(FXdouble x){ return ::exp10(x); }
-#endif
-
-
-/// Single precision natural logarithm
-static inline FXfloat log(FXfloat x){ return ::logf(x); }
-
-/// Double precision natural logarithm
-static inline FXdouble log(FXdouble x){ return ::log(x); }
-
-
-/// Single precision logarithm of 1+x
-#if defined(NO_LOG1PF)
-static inline FXfloat log1p(FXfloat x){ return Math::log(1.0f+x); }
-#else
-static inline FXfloat log1p(FXfloat x){ return ::log1pf(x); }
-#endif
-
-/// Double precision logarithm of 1+x
-#if defined(NO_LOG1P)
-static inline FXdouble log1p(FXdouble x){ return Math::log(1.0+x); }
-#else
-static inline FXdouble log1p(FXdouble x){ return ::log1p(x); }
-#endif
-
-
-/// Single precision base 2 logarithm
-#if defined(NO_LOG2F)
-static inline FXfloat log2(FXfloat x){ return Math::log(x)*1.442695040888963407359924681001892137f; }
-#else
-static inline FXfloat log2(FXfloat x){ return ::log2f(x); }
-#endif
-
-/// Double precision base 2 logarithm
-#if defined(NO_LOG2)
-static inline FXdouble log2(FXdouble x){ return Math::log(x)*1.442695040888963407359924681001892137; }
-#else
-static inline FXdouble log2(FXdouble x){ return ::log2(x); }
-#endif
-
-
-/// Single precision base 10 logarithm
-static inline FXfloat log10(FXfloat x){ return ::log10f(x); }
-
-/// Double precision base 10 logarithm
-static inline FXdouble log10(FXdouble x){ return ::log10(x); }
-
-
-/// Single precision square root
-static inline FXfloat sqrt(FXfloat x){ return ::sqrtf(x); }
-
-/// Double precision square root
-static inline FXdouble sqrt(FXdouble x){ return ::sqrt(x); }
-
-
-/// Single precision cube root
-#if defined(NO_CBRTF)
-static inline FXfloat cbrt(FXfloat x){ return Math::pow(x,0.333333333333333333333333333333f); }
-#else
-static inline FXfloat cbrt(FXfloat x){ return ::cbrtf(x); }
-#endif
-
-/// Double precision cube root
-#if defined(NO_CBRT)
-static inline FXdouble cbrt(FXdouble x){ return Math::pow(x,0.333333333333333333333333333333); }
-#else
-static inline FXdouble cbrt(FXdouble x){ return ::cbrt(x); }
-#endif
-
-
-/// Single precision square
-static inline FXfloat sqr(FXfloat x){ return x*x; }
-
-/// Double precision square
-static inline FXdouble sqr(FXdouble x){ return x*x; }
-
-
-/// Single precision cube
-static inline FXfloat cub(FXfloat x){ return x*x*x; }
-
-/// Double precision cube
-static inline FXdouble cub(FXdouble x){ return x*x*x; }
-
-
-/// Single precision maximum of two
-#if defined(NO_FMAXF)
-static inline FXfloat fmax(FXfloat x,FXfloat y){ return (x>y)?x:y; }
-#else
-static inline FXfloat fmax(FXfloat x,FXfloat y){ return ::fmaxf(x,y); }
-#endif
-
-/// Double precision maximum of two
-#if defined(NO_FMAX)
-static inline FXdouble fmax(FXdouble x,FXdouble y){ return (x>y)?x:y; }
-#else
-static inline FXdouble fmax(FXdouble x,FXdouble y){ return ::fmax(x,y); }
-#endif
-
-
-/// Single precision minimum of two
-#if defined(NO_FMINF)
-static inline FXfloat fmin(FXfloat x,FXfloat y){ return (x<y)?x:y; }
-#else
-static inline FXfloat fmin(FXfloat x,FXfloat y){ return ::fminf(x,y); }
-#endif
-
-/// Double precision minimum of two
-#if defined(NO_FMIN)
-static inline FXdouble fmin(FXdouble x,FXdouble y){ return (x<y)?x:y; }
-#else
-static inline FXdouble fmin(FXdouble x,FXdouble y){ return ::fmin(x,y); }
-#endif
-
-/// Single precision positive difference
-#if defined(NO_FDIMF)
-static inline FXfloat fdim(FXfloat x,FXfloat y){ return fmax(x-y,0.0f); }
-#else
-static inline FXfloat fdim(FXfloat x,FXfloat y){ return ::fdimf(x,y); }
-#endif
-
-
-/// Double precision positive difference
-#if defined(NO_FDIM)
-static inline FXdouble fdim(FXdouble x,FXdouble y){ return fmax(x-y,0.0); }
-#else
-static inline FXdouble fdim(FXdouble x,FXdouble y){ return ::fdim(x,y); }
-#endif
-
-
-/// Single precision clamp of number x to lie within range lo..hi
-static inline FXfloat fclamp(FXfloat lo,FXfloat x,FXfloat hi){ return fmin(fmax(x,lo),hi); }
-
-/// Double precision clamp of number x to lie within range lo..hi
-static inline FXdouble fclamp(FXdouble lo,FXdouble x,FXdouble hi){ return fmin(fmax(x,lo),hi); }
-
-
-/// Minimum if two integers
-inline FXint imin(FXint x,FXint y){ return (x<y)?x:y; }
-inline FXlong imin(FXlong x,FXlong y){ return (x<y)?x:y; }
-
-
-/// Minimum of two integers
-inline FXint imax(FXint x,FXint y){ return (x>y)?x:y; }
-inline FXlong imax(FXlong x,FXlong y){ return (x>y)?x:y; }
-
-
-/// Absolute value of integer
-inline FXint iabs(FXint x){ return 0<x?x:-x; }
-inline FXlong iabs(FXlong x){ return 0L<x?x:-x; }
-
-
-/// Integer clamp of number x to lie within range lo..hi
-inline FXint iclamp(FXint lo,FXint x,FXint hi){ return imin(imax(x,lo),hi); }
-inline FXlong iclamp(FXlong lo,FXlong x,FXlong hi){ return imin(imax(x,lo),hi); }
-
-
-/// Single precision copy sign of y and apply to magnitude of x
-#if defined(NO_COPYSIGNF)
-static inline FXfloat copysign(FXfloat x,FXfloat y){
-  union{ FXfloat f; FXuint u; } xx={x},yy={y}; xx.u&=0x7fffffff; xx.u|=(yy.u&0x80000000); return xx.f;
-  }
-#else
-static inline FXfloat copysign(FXfloat x,FXfloat y){
-  return ::copysignf(x,y);
-  }
-#endif
-
-
-/// Double precision copy sign of y and apply to magnitude of x
-#if defined(NO_COPYSIGN)
-static inline FXdouble copysign(FXdouble x,FXdouble y){
-  union{ FXdouble f; FXulong u; } xx={x},yy={y}; xx.u&=FXULONG(0x7fffffffffffffff); xx.u|=(yy.u&FXULONG(0x8000000000000000)); return xx.f;
-  }
-#else
-static inline FXdouble copysign(FXdouble x,FXdouble y){
-  return ::copysign(x,y);
-  }
-#endif
-
-
-/// Single precision integer power
-extern FXAPI FXfloat ipow(FXfloat base,FXint ex);
-
-/// Double precision integer power
-extern FXAPI FXdouble ipow(FXdouble base,FXint ex);
-
-}
-
-}
-
-#endif
+/********************************************************************************
+*                                                                               *
+*                           M a t h   F u n c t i o n s                         *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2015,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXMATH_H
+#define FXMATH_H
+
+// Remove macros
+#undef fabs
+#undef fabsf
+#undef fmod
+#undef fmodf
+
+#undef ceil
+#undef ceilf
+#undef floor
+#undef floorf
+#undef round
+#undef roundf
+#undef trunc
+#undef truncf
+#undef nearbyint
+#undef nearbyintf
+#undef rint
+#undef rintf
+
+#undef sin
+#undef sinf
+#undef cos
+#undef cosf
+#undef tan
+#undef tanf
+#undef asin
+#undef asinf
+#undef acos
+#undef acosf
+#undef atan
+#undef atanf
+#undef atan2
+#undef atan2f
+#undef sincos
+#undef sincosf
+#undef sinh
+#undef sinhf
+#undef cosh
+#undef coshf
+#undef tanh
+#undef tanhf
+#undef asinh
+#undef asinhf
+#undef acosh
+#undef acoshf
+#undef atanh
+#undef atanhf
+
+#undef pow
+#undef powf
+#undef pow10
+#undef pow10f
+#undef exp
+#undef expf
+#undef expm1
+#undef expm1f
+#undef exp2
+#undef exp2f
+#undef exp10
+#undef exp10f
+#undef log
+#undef logf
+#undef log1p
+#undef log1pf
+#undef log2
+#undef log2f
+#undef log10
+#undef log10f
+
+#undef sqrt
+#undef sqrtf
+#undef cbrt
+#undef cbrtf
+#undef sqr
+#undef sqrf
+#undef cub
+#undef cubf
+
+#undef max
+#undef min
+#undef fmax
+#undef fmaxf
+#undef fmin
+#undef fminf
+#undef copysign
+#undef copysignf
+#undef hypot
+#undef hypotf
+
+
+// Switch on remedial math on Windows with VC++
+#if defined(WIN32) && (defined(_MSC_VER) || defined(__MINGW32__))
+#define NO_CEILF
+#define NO_FLOORF
+#define NO_ROUNDF
+#define NO_ROUND
+#define NO_TRUNCF
+#define NO_TRUNC
+#define NO_NEARBYINTF
+#define NO_NEARBYINT
+#define NO_RINTF
+#define NO_RINT
+#define NO_EXPM1F
+#define NO_EXPM1
+#define NO_EXP2F
+#define NO_EXP2
+#define NO_EXP10F
+#define NO_EXP10
+#define NO_POW10F
+#define NO_POW10
+#define NO_LOG1PF
+#define NO_LOG1P
+#define NO_LOG2F
+#define NO_LOG2
+#define NO_CBRTF
+#define NO_CBRT
+#define NO_SINHF
+#define NO_SINH
+#define NO_COSHF
+#define NO_COSH
+#define NO_TANHF
+#define NO_TANH
+#define NO_ASINHF
+#define NO_ASINH
+#define NO_ACOSHF
+#define NO_ACOSH
+#define NO_ATANHF
+#define NO_ATANH
+#define NO_FMAXF
+#define NO_FMAX
+#define NO_FMINF
+#define NO_FMIN
+#define NO_COPYSIGNF
+#define NO_COPYSIGN
+#define NO_HYPOTF
+#define NO_HYPOT
+#define NO_FDIMF
+#define NO_FDIM
+#define NO_SINCOS
+#define NO_SINCOSF
+#define NO_LRINT
+#define NO_LRINTF
+#endif
+
+// Systems below are missing these functions
+#if defined(__sun__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#define NO_EXP10F
+#define NO_EXP10
+#endif
+
+// Apple is missing sincos
+#if defined(__APPLE__)
+#define NO_SINCOS
+#define NO_SINCOSF
+#endif
+
+
+namespace FX {
+
+/*********************************  Constants  *********************************/
+
+/// Pi
+const FXdouble PI=3.1415926535897932384626433833;
+
+/// Euler constant
+const FXdouble EULER=2.7182818284590452353602874713;
+
+/// Multiplier for degrees to radians
+const FXdouble DTOR=0.0174532925199432957692369077;
+
+/// Multiplier for radians to degrees
+const FXdouble RTOD=57.295779513082320876798154814;
+
+/// Feigenbaum constant
+const FXdouble FEIGENBAUM=4.6692016091029906718532038215;
+
+/*********************************  Functions  *********************************/
+
+// FOX math functions live here
+namespace Math {
+
+/// Sign of single precision float point number (0..1)
+extern FXAPI FXint fpSign(FXfloat x);
+
+/// Sign of double precision float point number (0..1)
+extern FXAPI FXlong fpSign(FXdouble x);
+
+/// Signed exponent of single precision float point number (-127..128)
+extern FXAPI FXint fpExponent(FXfloat x);
+
+/// Signed exponent of double precision float point number (-1023..1023)
+extern FXAPI FXlong fpExponent(FXdouble x);
+
+/// Mantissa of single precision float point number (including hidden bit)
+extern FXAPI FXint fpMantissa(FXfloat x);
+
+/// Mantissa of double precision float point number (including hidden bit)
+extern FXAPI FXlong fpMantissa(FXdouble x);
+
+/// Single precision floating point number is finite
+extern FXAPI FXbool fpFinite(FXfloat x);
+
+/// Double precision floating point number is finite
+extern FXAPI FXbool fpFinite(FXdouble x);
+
+/// Single precision floating point number is infinite
+extern FXAPI FXbool fpInfinite(FXfloat x);
+
+/// Double precision floating point number is infinite
+extern FXAPI FXbool fpInfinite(FXdouble x);
+
+/// Single precision floating point number is NaN
+extern FXAPI FXbool fpNan(FXfloat x);
+
+/// Double precision floating point number is NaN
+extern FXAPI FXbool fpNan(FXdouble x);
+
+/// Single precision floating point number is normalized
+extern FXAPI FXbool fpNormal(FXfloat x);
+
+/// Double precision floating point number is normalized
+extern FXAPI FXbool fpNormal(FXdouble x);
+
+/// All bits of single precision floating point number
+extern FXAPI FXuint fpBits(FXfloat x);
+
+/// All bits of double precision floating point number
+extern FXAPI FXulong fpBits(FXdouble x);
+
+
+/// Evaluate integer (a < b) ? x : y
+static inline FXint iblend(FXint a,FXint b,FXint x,FXint y){
+  return a<b ? x : y;
+  }
+
+/// Evaluate long integer (a < b) ? x : y
+static inline FXlong iblend(FXlong a,FXlong b,FXlong x,FXlong y){
+  return a<b ? x : y;
+  }
+
+
+/// Minimum if two integers
+static inline FXint imin(FXint x,FXint y){
+  return (x<y)?x:y;
+  }
+
+/// Minimum if two longs
+static inline FXlong imin(FXlong x,FXlong y){
+  return (x<y)?x:y;
+  }
+
+
+/// Minimum of two integers
+static inline FXint imax(FXint x,FXint y){
+  return (x>y)?x:y;
+  }
+
+/// Minimum of two longs
+static inline FXlong imax(FXlong x,FXlong y){
+  return (x>y)?x:y;
+  }
+
+
+/// Absolute value of integer
+static inline FXint iabs(FXint x){
+  return 0<x?x:-x;
+  }
+
+/// Absolute value of long
+static inline FXlong iabs(FXlong x){
+  return 0<x?x:-x;
+  }
+
+
+/// Integer clamp of integer x to lie within range lo..hi
+static inline FXint iclamp(FXint lo,FXint x,FXint hi){
+  return Math::imin(Math::imax(x,lo),hi);
+  }
+
+/// Long clamp of long x to lie within range lo..hi
+static inline FXlong iclamp(FXlong lo,FXlong x,FXlong hi){
+  return Math::imin(Math::imax(x,lo),hi);
+  }
+
+
+/// Sign of integer, return -1 if x is <0, +1 if x>0, and zero otherwise
+static inline FXint isign(FXint x){
+  return (x>0)-(x<0);
+  }
+
+/// Sign of integer, return -1 if x is <0, +1 if x>0, and zero otherwise
+static inline FXlong isign(FXlong x){
+  return (x>0)-(x<0);
+  }
+
+
+/// Single precision minimum of two
+static inline FXfloat fmin(FXfloat x,FXfloat y){
+#if defined(NO_FMINF)
+  return (x<y)?x:y;
+#else
+  return ::fminf(x,y);
+#endif
+  }
+
+/// Double precision minimum of two
+static inline FXdouble fmin(FXdouble x,FXdouble y){
+#if defined(NO_FMIN)
+  return (x<y)?x:y;
+#else
+  return ::fmin(x,y);
+#endif
+  }
+
+
+/// Single precision maximum of two
+static inline FXfloat fmax(FXfloat x,FXfloat y){
+#if defined(NO_FMAXF)
+  return (x>y)?x:y;
+#else
+  return ::fmaxf(x,y);
+#endif
+  }
+
+/// Double precision maximum of two
+static inline FXdouble fmax(FXdouble x,FXdouble y){
+#if defined(NO_FMAX)
+  return (x>y)?x:y;
+#else
+  return ::fmax(x,y);
+#endif
+  }
+
+
+/// Single precision absolute value
+static inline FXfloat fabs(FXfloat x){
+#if defined(NO_FABSF)
+  return (x<0.0f) ? -x : x;
+#else
+  return ::fabsf(x);
+#endif
+  }
+
+/// Double precision absolute value
+static inline FXdouble fabs(FXdouble x){
+  return ::fabs(x);
+  }
+
+
+/// Single precision clamp of number x to lie within range lo..hi
+static inline FXfloat fclamp(FXfloat lo,FXfloat x,FXfloat hi){
+  return Math::fmin(Math::fmax(x,lo),hi);
+  }
+
+/// Double precision clamp of number x to lie within range lo..hi
+static inline FXdouble fclamp(FXdouble lo,FXdouble x,FXdouble hi){
+  return Math::fmin(Math::fmax(x,lo),hi);
+  }
+
+
+/// Single precision positive difference
+static inline FXfloat fdim(FXfloat x,FXfloat y){
+#if defined(NO_FDIMF)
+  return Math::fmax(x-y,0.0f);
+#else
+  return ::fdimf(x,y);
+#endif
+  }
+
+/// Double precision positive difference
+static inline FXdouble fdim(FXdouble x,FXdouble y){
+#if defined(NO_FDIM)
+  return Math::fmax(x-y,0.0);
+#else
+  return ::fdim(x,y);
+#endif
+  }
+
+
+/// Single precision floating point remainder
+static inline FXfloat fmod(FXfloat x,FXfloat y){
+  return ::fmodf(x,y);
+  }
+
+/// Double precision floating point remainder
+static inline FXdouble fmod(FXdouble x,FXdouble y){
+  return ::fmod(x,y);
+  }
+
+
+/// Evaluate single-precision (a < b) ? x : y
+static inline FXfloat fblend(FXfloat a,FXfloat b,FXfloat x,FXfloat y){
+  return a<b ? x : y;
+  }
+
+
+/// Evaluate double-precision (a < b) ? x : y
+static inline FXdouble fblend(FXdouble a,FXdouble b,FXdouble x,FXdouble y){
+  return a<b ? x : y;
+  }
+
+
+/// Single precision copy sign of y and apply to magnitude of x
+static inline FXfloat copysign(FXfloat x,FXfloat y){
+#if defined(NO_COPYSIGNF)
+  union{ FXfloat f; FXuint u; } xx={x},yy={y};
+  xx.u&=0x7fffffff;
+  xx.u|=(yy.u&0x80000000);
+  return xx.f;
+#else
+  return ::copysignf(x,y);
+#endif
+  }
+
+/// Double precision copy sign of y and apply to magnitude of x
+static inline FXdouble copysign(FXdouble x,FXdouble y){
+#if defined(NO_COPYSIGN)
+  union{ FXdouble f; FXulong u; } xx={x},yy={y};
+  xx.u&=FXULONG(0x7fffffffffffffff);
+  xx.u|=(yy.u&FXULONG(0x8000000000000000));
+  return xx.f;
+#else
+  return ::copysign(x,y);
+#endif
+  }
+
+
+/// Single precision ceiling (round upward to nearest integer)
+#if defined(NO_CEILF)
+extern FXAPI FXfloat ceil(FXfloat x);
+#else
+static inline FXfloat ceil(FXfloat x){ return ::ceilf(x); }
+#endif
+
+/// Double precision ceiling (round upward to nearest integer)
+static inline FXdouble ceil(FXdouble x){ return ::ceil(x); }
+
+
+/// Single precision floor (round down to nearest integer)
+#if defined(NO_FLOORF)
+extern FXAPI FXfloat floor(FXfloat x);
+#else
+static inline FXfloat floor(FXfloat x){ return ::floorf(x); }
+#endif
+
+/// Double precision floor (round down to nearest integer)
+static inline FXdouble floor(FXdouble x){ return ::floor(x); }
+
+/// Single precision round to nearest integer (away from zero)
+#if defined(NO_ROUNDF)
+extern FXAPI FXfloat round(FXfloat x);
+#else
+static inline FXfloat round(FXfloat x){ return ::roundf(x); }
+#endif
+
+/// Double precision round to nearest integer (away from zero)
+#if defined(NO_ROUND)
+extern FXAPI FXdouble round(FXdouble x);
+#else
+static inline FXdouble round(FXdouble x){ return ::round(x); }
+#endif
+
+
+/// Single precision truncate to nearest integer (toward zero)
+#if defined(NO_TRUNCF)
+extern FXAPI FXfloat trunc(FXfloat x);
+#else
+static inline FXfloat trunc(FXfloat x){ return ::truncf(x); }
+#endif
+
+/// Double precision truncate to nearest integer (toward zero)
+#if defined(NO_TRUNC)
+extern FXAPI FXdouble trunc(FXdouble x);
+#else
+static inline FXdouble trunc(FXdouble x){ return ::trunc(x); }
+#endif
+
+
+/// Single precision round to nearest integer
+#if defined(NO_NEARBYINTF)
+extern FXAPI FXfloat nearbyint(FXfloat x);
+#else
+static inline FXfloat nearbyint(FXfloat x){ return ::nearbyintf(x); }
+#endif
+
+/// Double precision round to nearest integer
+#if defined(NO_NEARBYINT)
+extern FXAPI FXdouble nearbyint(FXdouble x);
+#else
+static inline FXdouble nearbyint(FXdouble x){ return ::nearbyint(x); }
+#endif
+
+/// Single precision round to nearest integer
+#if defined(NO_RINTF)
+extern FXAPI FXfloat rint(FXfloat x);
+#else
+static inline FXfloat rint(FXfloat x){ return ::rintf(x); }
+#endif
+
+/// Double precision round to nearest integer
+#if defined(NO_RINT)
+extern FXAPI FXdouble rint(FXdouble x);
+#else
+static inline FXdouble rint(FXdouble x){ return ::rint(x); }
+#endif
+
+
+/// Single precision round to nearest integer
+static inline FXint lrint(FXfloat x){
+#if defined(NO_LRINTF)
+  return (FXint)(x+Math::copysign(0.5f,x));
+#else
+  return ::lrintf(x);
+#endif
+ }
+
+/// Double precision round to nearest integer
+static inline FXlong lrint(FXdouble x){
+#if defined(NO_LRINT)
+ return (FXlong)(x+Math::copysign(0.5,x));
+#else
+ return ::lrint(x);
+#endif
+ }
+
+
+/// Wrap single precision phase argument x to -PI...PI range
+static inline FXfloat wrap(FXfloat x){
+#if defined(__SSE4_1__)
+  return x-Math::nearbyint(x*0.159154943091895335768883763373f)*6.28318530717958647692528676656f;
+#else
+  return x-Math::lrint(x*0.159154943091895335768883763373f)*6.28318530717958647692528676656f;
+#endif
+  }
+
+/// Wrap double precision phase argument x to -PI...PI range
+static inline FXdouble wrap(FXdouble x){
+#if defined(__SSE4_1__)
+  return x-Math::nearbyint(x*0.159154943091895335768883763373)*6.28318530717958647692528676656;
+#else
+  return x-Math::lrint(x*0.159154943091895335768883763373)*6.28318530717958647692528676656;
+#endif
+  }
+
+
+/// Stepify single precision x into multiples of step s (where s>0)
+static inline FXfloat stepify(FXfloat x,FXfloat s){
+  return Math::nearbyint(x/s)*s;
+  }
+
+/// Stepify double precision x into multiples of step s (where s>0)
+static inline FXdouble stepify(FXdouble x,FXdouble s){
+  return Math::nearbyint(x/s)*s;
+  }
+
+
+/// Single precision sine
+static inline FXfloat sin(FXfloat x){
+  return ::sinf(x);
+  }
+
+/// Double precision sine
+static inline FXdouble sin(FXdouble x){
+  return ::sin(x);
+  }
+
+
+/// Single precision cosine
+static inline FXfloat cos(FXfloat x){
+  return ::cosf(x);
+  }
+
+/// Double precision cosine
+static inline FXdouble cos(FXdouble x){
+  return ::cos(x);
+  }
+
+
+/// Single precision tangent
+static inline FXfloat tan(FXfloat x){
+  return ::tanf(x);
+  }
+
+/// Double precision tangent
+static inline FXdouble tan(FXdouble x){
+  return ::tan(x);
+  }
+
+
+/// Single precision arc sine
+static inline FXfloat asin(FXfloat x){
+  return ::asinf(x);
+  }
+
+/// Double precision arc sine
+static inline FXdouble asin(FXdouble x){
+  return ::asin(x);
+  }
+
+
+/// Single precision arc cosine
+static inline FXfloat acos(FXfloat x){
+  return ::acosf(x);
+  }
+
+/// Double precision arc cosine
+static inline FXdouble acos(FXdouble x){
+  return ::acos(x);
+  }
+
+
+/// Single precision arc tangent
+static inline FXfloat atan(FXfloat x){
+  return ::atanf(x);
+  }
+
+/// Double precision arc tangent
+static inline FXdouble atan(FXdouble x){
+  return ::atan(x);
+  }
+
+
+/// Single precision arc tangent
+static inline FXfloat atan2(FXfloat y,FXfloat x){
+  return ::atan2f(y,x);
+  }
+
+/// Double precision arc tangent
+static inline FXdouble atan2(FXdouble y,FXdouble x){
+  return ::atan2(y,x);
+  }
+
+
+/// Single precision sincos
+static inline void sincos(FXfloat x,FXfloat& s,FXfloat& c){
+#if defined(NO_SINCOSF)
+  s=Math::sin(x);
+  c=Math::cos(x);
+#else
+  ::sincosf(x,&s,&c);
+#endif
+  }
+
+
+/// Double precision sincos
+static inline void sincos(FXdouble x,FXdouble& s,FXdouble& c){
+#if defined(NO_SINCOS)
+  s=Math::sin(x);
+  c=Math::cos(x);
+#else
+  ::sincos(x,&s,&c);
+#endif
+  }
+
+
+/// Single precision hyperbolic sine
+#if defined(NO_SINHF)
+extern FXAPI FXfloat sinh(FXfloat x);
+#else
+static inline FXfloat sinh(FXfloat x){ return ::sinhf(x); }
+#endif
+
+/// Double precision hyperbolic sine
+#if defined(NO_SINH)
+extern FXAPI FXdouble sinh(FXdouble x);
+#else
+static inline FXdouble sinh(FXdouble x){ return ::sinh(x); }
+#endif
+
+
+/// Single precision hyperbolic cosine
+#if defined(NO_COSHF)
+extern FXAPI FXfloat cosh(FXfloat x);
+#else
+static inline FXfloat cosh(FXfloat x){ return ::coshf(x); }
+#endif
+
+/// Double precision hyperbolic cosine
+#if defined(NO_COSH)
+extern FXAPI FXdouble cosh(FXdouble x);
+#else
+static inline FXdouble cosh(FXdouble x){ return ::cosh(x); }
+#endif
+
+
+/// Single precision hyperbolic tangent
+#if defined(NO_TANHF)
+extern FXAPI FXfloat tanh(FXfloat x);
+#else
+static inline FXfloat tanh(FXfloat x){ return ::tanhf(x); }
+#endif
+
+/// Double precision hyperbolic tangent
+#if defined(NO_TANH)
+extern FXAPI FXdouble tanh(FXdouble x);
+#else
+static inline FXdouble tanh(FXdouble x){ return ::tanh(x); }
+#endif
+
+
+/// Single precision hyperbolic arc sine
+#if defined(NO_ASINHF)
+extern FXAPI FXfloat asinh(FXfloat x);
+#else
+static inline FXfloat asinh(FXfloat x){ return ::asinhf(x); }
+#endif
+
+/// Double precision hyperbolic arc sine
+#if defined(NO_ASINH)
+extern FXAPI FXdouble asinh(FXdouble x);
+#else
+static inline FXdouble asinh(FXdouble x){ return ::asinh(x); }
+#endif
+
+
+/// Single precision hyperbolic arc cosine
+#if defined(NO_ACOSHF)
+extern FXAPI FXfloat acosh(FXfloat x);
+#else
+static inline FXfloat acosh(FXfloat x){ return ::acoshf(x); }
+#endif
+
+/// Double precision  hyperbolic arc cosine
+#if defined(NO_ACOSH)
+extern FXAPI FXdouble acosh(FXdouble x);
+#else
+static inline FXdouble acosh(FXdouble x){ return ::acosh(x); }
+#endif
+
+
+/// Single precision hyperbolic arc tangent
+#if defined(NO_ATANHF)
+extern FXAPI FXfloat atanh(FXfloat x);
+#else
+static inline FXfloat atanh(FXfloat x){ return ::atanhf(x); }
+#endif
+
+/// Double precision hyperbolic arc tangent
+#if defined(NO_ATANH)
+extern FXAPI FXdouble atanh(FXdouble x);
+#else
+static inline FXdouble atanh(FXdouble x){ return ::atanh(x); }
+#endif
+
+
+/// Single precision square root
+static inline FXfloat sqrt(FXfloat x){
+  return ::sqrtf(x);
+  }
+
+/// Double precision square root
+static inline FXdouble sqrt(FXdouble x){
+  return ::sqrt(x);
+  }
+
+
+/// Safe single precision square root
+static inline FXfloat safesqrt(FXfloat x){
+  return Math::sqrt(Math::fmax(x,0.0f));
+  }
+
+/// Safe double precision square root
+static inline FXdouble safesqrt(FXdouble x){
+  return Math::sqrt(Math::fmax(x,0.0));
+  }
+
+
+/// Single precision cube root
+static inline FXfloat cbrt(FXfloat x){
+#if defined(NO_CBRTF)
+  return ::powf(x,0.333333333333333333333333333333f);
+#else
+  return ::cbrtf(x);
+#endif
+  }
+
+/// Double precision cube root
+static inline FXdouble cbrt(FXdouble x){
+#if defined(NO_CBRT)
+  return ::pow(x,0.333333333333333333333333333333);
+#else
+  return ::cbrt(x);
+#endif
+  }
+
+
+/// Single precision square
+static inline FXfloat sqr(FXfloat x){
+  return x*x;
+  }
+
+/// Double precision square
+static inline FXdouble sqr(FXdouble x){
+  return x*x;
+  }
+
+
+/// Single precision cube
+static inline FXfloat cub(FXfloat x){
+  return x*x*x;
+  }
+
+/// Double precision cube
+static inline FXdouble cub(FXdouble x){
+  return x*x*x;
+  }
+
+
+/// Single precision calculate hypothenuse sqrt(x^2+y^2)
+static inline FXfloat hypot(FXfloat x,FXfloat y){
+#if defined(NO_HYPOTF)
+  return Math::sqrt(Math::sqr(x)+Math::sqr(y));
+#else
+  return ::hypotf(x,y);
+#endif
+  }
+
+/// Double precision calculate hypothenuse sqrt(x^2+y^2)
+static inline FXdouble hypot(FXdouble x,FXdouble y){
+#if defined(NO_HYPOT)
+  return Math::sqrt(Math::sqr(x)+Math::sqr(y));
+#else
+  return ::hypot(x,y);
+#endif
+  }
+
+
+/// Linearly interpolate between u and v as f goes from 0...1
+static inline FXfloat lerp(FXfloat u,FXfloat v,FXfloat f){
+  return (v-u)*f+u;
+  }
+
+
+/// Linearly interpolate between u and v as f goes from 0...1
+static inline FXdouble lerp(FXdouble u,FXdouble v,FXdouble f){
+  return (v-u)*f+u;
+  }
+
+
+/// Smooth transition from 0 to 1 as f goes from 0...1
+static inline FXfloat smoothstep(FXfloat f){
+  return (3.0f-2.0f*f)*f*f;
+  }
+
+/// Smooth transition from 0 to 1 as f goes from 0...1
+static inline FXdouble smoothstep(FXdouble f){
+  return (3.0-2.0*f)*f*f;
+  }
+
+
+/// Single precision base E exponential
+static inline FXfloat exp(FXfloat x){
+  return ::expf(x);
+  }
+
+/// Double precision base E exponential
+static inline FXdouble exp(FXdouble x){
+  return ::exp(x);
+  }
+
+
+/// Single precision base E exponential - 1
+static inline FXfloat expm1(FXfloat x){
+#if defined(NO_EXPM1F)
+  return ::expf(x)-1.0f;
+#else
+  return ::expm1f(x);
+#endif
+  }
+
+/// Double precision base E exponential - 1
+static inline FXdouble expm1(FXdouble x){
+#if defined(NO_EXPM1)
+  return ::exp(x)-1.0;
+#else
+  return ::expm1(x);
+#endif
+  }
+
+
+/// Single precision power x^y
+static inline FXfloat pow(FXfloat x,FXfloat y){
+  return ::powf(x,y);
+  }
+
+/// Double precision power x^y
+static inline FXdouble pow(FXdouble x,FXdouble y){
+  return ::pow(x,y);
+  }
+
+
+/// Single precision base 2 exponential
+static inline FXfloat exp2(FXfloat x){
+#if defined(NO_EXP2F)
+  return Math::pow(2.0f,x);
+#else
+  return ::exp2f(x);
+#endif
+  }
+
+
+/// Double precision base 2 exponential
+static inline FXdouble exp2(FXdouble x){
+#if defined(NO_EXP2)
+  return Math::pow(2.0,x);
+#else
+  return ::exp2(x);
+#endif
+  }
+
+
+/// Single precision base 10 exponential
+static inline FXfloat exp10(FXfloat x){
+#if defined(NO_EXP10F)
+  return Math::pow(10.0f,x);
+#else
+  return ::exp10f(x);
+#endif
+  }
+
+
+/// Double precision base 10 exponential
+static inline FXdouble exp10(FXdouble x){
+#if defined(NO_EXP10)
+  return Math::pow(10.0,x);
+#else
+  return ::exp10(x);
+#endif
+  }
+
+
+/// Single precision 10^x
+static inline FXfloat pow10(FXfloat x){
+  return Math::exp10(x);
+  }
+
+/// Double precision 10^x
+static inline FXdouble pow10(FXdouble x){
+  return Math::exp10(x);
+  }
+
+
+/// Double precision integer power of 10
+extern FXAPI FXdouble pow10i(FXint ex);
+
+
+/// Single precision integer power
+extern FXAPI FXfloat powi(FXfloat base,FXint ex);
+
+
+/// Double precision integer power
+extern FXAPI FXdouble powi(FXdouble base,FXint ex);
+
+
+/// Single precision natural logarithm
+static inline FXfloat log(FXfloat x){
+  return ::logf(x);
+  }
+
+/// Double precision natural logarithm
+static inline FXdouble log(FXdouble x){
+  return ::log(x);
+  }
+
+
+/// Single precision logarithm of 1+x
+static inline FXfloat log1p(FXfloat x){
+#if defined(NO_LOG1PF)
+  return Math::log(1.0f+x);
+#else
+  return ::log1pf(x);
+#endif
+  }
+
+
+/// Double precision logarithm of 1+x
+static inline FXdouble log1p(FXdouble x){
+#if defined(NO_LOG1P)
+  return Math::log(1.0+x);
+#else
+  return ::log1p(x);
+#endif
+  }
+
+
+/// Single precision base 2 logarithm
+static inline FXfloat log2(FXfloat x){
+#if defined(NO_LOG2F)
+  return Math::log(x)*1.442695040888963407359924681001892137f;
+#else
+  return ::log2f(x);
+#endif
+  }
+
+
+/// Double precision base 2 logarithm
+static inline FXdouble log2(FXdouble x){
+#if defined(NO_LOG2)
+  return Math::log(x)*1.442695040888963407359924681001892137;
+#else
+  return ::log2(x);
+#endif
+  }
+
+
+/// Single precision base 10 logarithm
+static inline FXfloat log10(FXfloat x){
+  return ::log10f(x);
+  }
+
+/// Double precision base 10 logarithm
+static inline FXdouble log10(FXdouble x){
+  return ::log10(x);
+  }
+
+}
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/include/fxunicode.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxunicode.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/fxver.h -> gogglesmm-1.2.2.tar.gz/cfox/include/fxver.h Changed

gogglesmm-1.2.1.tar.gz/cfox/include/xincs.h -> gogglesmm-1.2.2.tar.gz/cfox/include/xincs.h Changed

@@ -3,7 +3,7 @@
 *              F O X   P r i v a t e   I n c l u d e   F i l e s                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -75,6 +75,10 @@
 #define WIN32_LEAN_AND_MEAN
 #endif
 
+#if (_MSC_VER >= 1500)
+#pragma warning(disable: 4251)
+#endif
+
 // Common headers
 #include <windows.h>            // Core Windows stuff
 #include <winspool.h>           // Printer stuff
@@ -178,6 +182,9 @@
 #ifdef HAVE_SYS_TIMERFD_H
 #include <sys/timerfd.h>
 #endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
 #ifdef HAVE_SYS_IPC_H
 #include <sys/ipc.h>
 #endif
@@ -187,11 +194,16 @@
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#ifdef HAVE_SYS_PSTAT_H
+#include <sys/pstat.h>
+#endif
+#ifdef HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#endif
 #ifdef HAVE_SYS_SYSCTL_H
+#if !defined(__linux__)
 #include <sys/sysctl.h>
 #endif
-#ifdef HAVE_SYS_PSTAT_H
-#include <sys/pstat.h>
 #endif
 #if defined(__APPLE__)
 #include <libkern/OSAtomic.h>
@@ -265,7 +277,7 @@
 #if defined(__SSSE3__)
 #define FOX_HAS_SSSE3
 #endif
-#if defined(__SSE4_2__)
+#if defined(__SSE4_1__) && defined(__SSE4_2__)
 #define FOX_HAS_SSE4
 #endif
 #if defined(__AVX__)
@@ -277,6 +289,9 @@
 #if defined(__FMA__)
 #define FOX_HAS_FMA
 #endif
+#if defined(__F16C__)
+#define FOX_HAS_F16
+#endif
 #endif
 #endif
 
@@ -354,7 +369,7 @@
 #elif defined(MAX_PATH)
 #define MAXPATHLEN   MAX_PATH
 #else
-#define MAXPATHLEN   2048
+#define MAXPATHLEN   4096
 #endif
 #endif

gogglesmm-1.2.1.tar.gz/cfox/lib/CMakeLists.txt -> gogglesmm-1.2.2.tar.gz/cfox/lib/CMakeLists.txt Changed

@@ -112,13 +112,16 @@
             ../include/FXDial.h
             ../include/FXDialogBox.h
             ../include/FXDictionary.h
+            ../include/FXDictionaryOf.h
             ../include/FXDirBox.h
             ../include/FXDirDialog.h
             ../include/FXDir.h
             ../include/FXDirList.h
             ../include/FXDirSelector.h
             ../include/FXDirVisitor.h
+            ../include/FXDirWatch.h
             ../include/FXDispatcher.h
+            ../include/FXDisplay.h
             ../include/FXDLL.h
             ../include/FXDockBar.h
             ../include/FXDockHandler.h
@@ -131,6 +134,8 @@
             ../include/FXElement.h
             ../include/fxendian.h
             ../include/FXEvent.h
+            ../include/FXEventDispatcher.h
+            ../include/FXEventLoop.h
             ../include/FXException.h
             ../include/FXEXEIcon.h
             ../include/FXEXEImage.h
@@ -164,6 +169,7 @@
             ../include/fx.h
             ../include/FXhalf.h
             ../include/FXHash.h
+            ../include/FXHashOf.h
             ../include/FXHeader.h
             ../include/FXHorizontalFrame.h
             ../include/FXICOIcon.h
@@ -186,8 +192,9 @@
             ../include/FXJP2Image.h
             ../include/FXJPGIcon.h
             ../include/FXJPGImage.h
-            ../include/FXJSONFile.h
             ../include/FXJSON.h
+            ../include/FXJSONFile.h
+            ../include/FXJSONString.h
             ../include/fxkeys.h
             ../include/FXKnob.h
             ../include/FXKOI8RCodec.h
@@ -255,6 +262,7 @@
             ../include/FXRangeSlider.h
             ../include/FXRASIcon.h
             ../include/FXRASImage.h
+            ../include/FXReactor.h
             ../include/FXReadWriteLock.h
             ../include/FXRealSlider.h
             ../include/FXRealSpinner.h
@@ -264,6 +272,8 @@
             ../include/FXRegion.h
             ../include/FXRegistry.h
             ../include/FXReplaceDialog.h
+            ../include/FXReverseDictionary.h
+            ../include/FXReverseDictionaryOf.h
             ../include/FXRex.h
             ../include/FXRGBIcon.h
             ../include/FXRGBImage.h
@@ -352,8 +362,9 @@
             ../include/FXWSQueue.h
             ../include/FXXBMIcon.h
             ../include/FXXBMImage.h
-            ../include/FXXMLFile.h
             ../include/FXXML.h
+            ../include/FXXMLFile.h
+            ../include/FXXMLString.h
             ../include/FXXPMIcon.h
             ../include/FXXPMImage.h
             ../include/xincs.h)
@@ -384,6 +395,7 @@
             FXAutoThreadStorageKey.cpp
             FXBarrier.cpp
             fxbase64.cpp
+            fxbase85.cpp
             FXBitmap.cpp
             FXBitmapFrame.cpp
             FXBitmapView.cpp
@@ -408,10 +420,9 @@
             FXComplexd.cpp
             FXComplexf.cpp
             FXComposeContext.cpp
-	          fxcompose.cpp
+            fxcompose.cpp
             FXComposite.cpp
             FXCondition.cpp
-            FXConsole.cpp
             FXCP1250Codec.cpp
             FXCP1251Codec.cpp
             FXCP1252Codec.cpp
@@ -458,13 +469,20 @@
             FXDirList.cpp
             FXDirSelector.cpp
             FXDirVisitor.cpp
+            FXDirWatch.cpp
             FXDispatcher.cpp
+            FXDisplay.cpp
             FXDLL.cpp
+            FXDockBar.cpp
+            FXDockHandler.cpp
+            FXDockSite.cpp
             FXDocument.cpp
             FXDragCorner.cpp
             FXDrawable.cpp
             FXDriveBox.cpp
-	          fxescape.cpp
+            fxescape.cpp
+            FXEventDispatcher.cpp
+            FXEventLoop.cpp
             FXException.cpp
             FXEXEIcon.cpp
             FXEXEImage.cpp
@@ -492,8 +510,6 @@
             fxgifio.cpp
             FXGLCanvas.cpp
             FXGLContext.cpp
-            FXGLObject.cpp
-            FXGLViewer.cpp
             FXGLVisual.cpp
             FXGradientBar.cpp
             FXGroupBox.cpp
@@ -527,11 +543,12 @@
             FXJPGImage.cpp
             FXJSON.cpp
             FXJSONFile.cpp
+            FXJSONString.cpp
             fxkeyboard.cpp
             fxkeysym.cpp
-            FXKnob.cpp
             FXKOI8RCodec.cpp
             FXLabel.cpp
+            fxleaps.cpp
             FXLFQueue.cpp
             FXListBox.cpp
             FXList.cpp
@@ -555,6 +572,7 @@
             FXMessageChannel.cpp
             FXMetaClass.cpp
             FXMutex.cpp
+            fxntp.cpp
             FXObject.cpp
             FXObjectList.cpp
             FXOptionMenu.cpp
@@ -574,6 +592,7 @@
             FXPPMIcon.cpp
             FXPPMImage.cpp
             fxppmio.cpp
+            FXPrintDialog.cpp
             fxprintf.cpp
             fxpriv.cpp
             FXProcess.cpp
@@ -582,10 +601,9 @@
             fxpsio.cpp
             FXPtrList.cpp
             FXPtrQueue.cpp
+            FXReactor.cpp
             FXRadioButton.cpp
             FXRandom.cpp
-            FXRanged.cpp
-            FXRangef.cpp
             FXRangeSlider.cpp
             FXRASIcon.cpp
             FXRASImage.cpp
@@ -598,6 +616,7 @@
             FXRegion.cpp
             FXRegistry.cpp
             FXReplaceDialog.cpp
+            FXReverseDictionary.cpp
             FXRex.cpp
             FXRGBIcon.cpp
             FXRGBImage.cpp
@@ -620,8 +639,6 @@
             FXShutter.cpp
             FXSize.cpp
             FXSlider.cpp
-            FXSphered.cpp
-            FXSpheref.cpp
             FXSpinLock.cpp
             FXSpinner.cpp
             FXSplashWindow.cpp
@@ -638,6 +655,10 @@
             fxstrtoull.cpp
             FXSwitcher.cpp
             FXSystem.cpp
+            FXSystemTime.cpp
+            FXSystemTimeFormat.cpp
+            FXSystemTimeParse.cpp
+            fxtabbify.cpp
             FXTabBar.cpp
             FXTabBook.cpp
             FXTabItem.cpp
@@ -691,6 +712,7 @@
             fxxbmio.cpp
             FXXML.cpp
             FXXMLFile.cpp
+            FXXMLString.cpp
             FXXPMIcon.cpp
             FXXPMImage.cpp
             fxxpmio.cpp
@@ -785,9 +807,9 @@
 find_package(Freetype)
 pkg_check_modules(FONTCONFIG fontconfig)
 
-if(WITH_OPENGL)
-  find_package(OpenGL)
-endif()
+#if(WITH_OPENGL)
+#  find_package(OpenGL)
+#endif()
 
 check_cxx_source_compiles( "#include <immintrin.h>
 int main(int argc,char *argv) { return 0; }" HAVE_IMMINTRIN_H)
@@ -892,6 +914,11 @@
   add_definitions(-DHAVE_TIMERFD_CREATE)
 endif()
 
+check_cxx_symbol_exists(inotify_init1 "sys/inotify.h" HAVE_INOTIFY_INIT1)
+if(HAVE_INOTIFY_INIT1)
+  add_definitions(-DHAVE_INOTIFY_INIT1)
+endif()
+
 check_cxx_symbol_exists(statvfs "sys/statvfs.h" HAVE_STATVFS)
 if(HAVE_STATVFS)
   add_definitions(-DHAVE_STATVFS)
@@ -938,7 +965,7 @@
 
 # check for xinput2
 # find_path(X11_Xi2_INCLUDE_PATH X11/extensions/XInput2.h ${X11_INC_SEARCH_PATH})
-#if (X11_Xi2_INCLUDE_PATH AND X11_Xi_LIB)
+# if (X11_Xi2_INCLUDE_PATH AND X11_Xi_LIB)
 #  set(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xi2_INCLUDE_PATH})
 #  list(REMOVE_DUPLICATES X11_INCLUDE_DIR)
 #  add_definitions(-DHAVE_XINPUT2_H)
@@ -1060,6 +1087,11 @@
   add_definitions(-DHAVE_SYS_PSTAT_H)
 endif()
 
+check_include_file_cxx(sys/inotify.h HAVE_SYS_INOTIFY_H)
+if(HAVE_SYS_INOTIFY_H)
+  add_definitions(-DHAVE_SYS_INOTIFY_H)
+endif()
+
 if(WITH_JPEG)
   find_package(JPEG)
   if(JPEG_FOUND)
@@ -1125,6 +1157,7 @@
   endif()
 endif()
 
+
 if(WITH_OPENGL)
   pkg_check_modules(EPOXY REQUIRED epoxy)
   target_compile_definitions(cfox PUBLIC -DHAVE_GL_H)
@@ -1159,4 +1192,3 @@
 # install(FILES ${HEADERS} DESTINATION include/cfox-${cfox_VERSION_MAJOR}.${cfox_VERSION_MINOR})
 
 
-

gogglesmm-1.2.1.tar.gz/cfox/lib/FX4Splitter.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FX4Splitter.cpp Changed

@@ -3,7 +3,7 @@
 *                       F o u r - W a y   S p l i t t e r                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -307,7 +307,7 @@
 
 // Determine split mode
 FXuchar FX4Splitter::getMode(FXint x,FXint y){
-  register FXuchar mm=ONCENTER;
+  FXuchar mm=ONCENTER;
   if(x<splitx) mm&=~ONVERTICAL;
   if(y<splity) mm&=~ONHORIZONTAL;
   if(x>=splitx+barsize) mm&=~ONVERTICAL;
@@ -539,7 +539,7 @@
 
 // Update show pane
 long FX4Splitter::onUpdExpand(FXObject* sender,FXSelector sel,void*){
-  register FXuint ex=FXSELID(sel)-ID_EXPAND_NONE;
+  FXuint ex=FXSELID(sel)-ID_EXPAND_NONE;
   sender->handle(this,(getExpanded()==ex)?FXSEL(SEL_COMMAND,ID_CHECK):FXSEL(SEL_COMMAND,ID_UNCHECK),NULL);
   return 1;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FX7Segment.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FX7Segment.cpp Changed

@@ -3,7 +3,7 @@
 *                7 - S e g m e n t   D i s p l a y   W i d g e t                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -221,7 +221,7 @@
 
 // Get default width
 FXint FX7Segment::getDefaultWidth(){
-  register FXint w=(cellwidth+2)*label.length();
+  FXint w=(cellwidth+2)*label.length();
   if(label.length()) w-=2;
   return padleft+padright+(border<<1)+w;
   }
@@ -348,8 +348,8 @@
 
 // Handle repaint
 long FX7Segment::onPaint(FXObject*,FXSelector,void *ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint tx,ty,tw,ch,cw;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint tx,ty,tw,ch,cw;
   FXDCWindow dc(this,event);
 
   // Draw frame
@@ -415,9 +415,8 @@
 
 // Draw cells
 void FX7Segment::drawCells(FXDCWindow &dc,FXint x,FXint y,FXint cw,FXint ch){
-  register FXint c,t;
-  for(c=0; c<label.length(); c++){
-    t=(FXuchar)labelc;
+  for(FXint c=0; c<label.length(); c++){
+    FXint t=(FXuchar)labelc;
     if(' '<=t && t<127){
       drawSegments(dc,x+c*(cellwidth+2),y,cw,ch,segmt-' ');
       }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXAccelTable.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXAccelTable.cpp Changed

@@ -3,7 +3,7 @@
 *                   A c c e l e r a t o r   T a b l e   C l a s s               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -46,11 +46,16 @@
 
 /*
   Notes:
-  - We also dropped the "fx" since we now have namespaces to keep stuff out of each
-    other's hair.
-  - Turned parseAccel() cum suis to simple global functions.  The rules for friend
-    declarations have change in GCC 4.1 so declaring them as friends is no longer
-    possible.
+  - Routines parseAccel(), unparseAccel(), and parseHotKey() now static members of
+    FXAccelTable.
+
+  - Need to call parseAccel() is much reduced since addition of convenience functions
+    that take a string as input; these new routines overload addAccel(), removeAccel(),
+    hasAccel() and targetOfAccel().
+
+  - Thus, often no need to call parseAccel() directly in many cases, and much less
+    cumbersome stuff to learn.
+
   - We need to deal with X11 unicode keysyms (with 0x01000000 flag) in some way.
 */
 
@@ -64,7 +69,6 @@
 
 namespace FX {
 
-extern FXAPI FXint __snprintf(FXchar* string,FXint length,const FXchar* format,...);
 
 // Map
 FXDEFMAP(FXAccelTable) FXAccelTableMap={
@@ -92,7 +96,7 @@
 
 // Resize hash table, and rehash old stuff into it
 void FXAccelTable::resize(FXuint m){
-  register FXuint p,i,c;
+  FXuint p,i,c;
   FXAccelKey *newkey;
   allocElms(newkey,m+1);
   for(i=0; i<=m; i++){
@@ -112,13 +116,14 @@
   max=m;
   }
 
+/*******************************************************************************/
 
-// Add (or replace) accelerator
+// Add accelerator key combination into the accelerator table
 void FXAccelTable::addAccel(FXHotKey hotkey,FXObject* target,FXSelector seldn,FXSelector selup){
   if(hotkey){
     FXTRACE((160,"%p->FXAccelTable::addAccel: code=%04x state=%04x\n",this,(FXushort)hotkey,(FXushort)(hotkey>>16)));
-    register FXuint p=(hotkey*13)&max;
-    register FXuint c;
+    FXuint p=(hotkey*13)&max;
+    FXuint c;
     FXASSERT(hotkey!=UNUSEDSLOT);
     FXASSERT(hotkey!=EMPTYSLOT);
     while((c=keyp.code)!=UNUSEDSLOT){ // Check if in table already
@@ -140,14 +145,25 @@
   }
 
 
-// Remove accelerator.
-// When removed, the slot may still be in a chain of probe
-// positions, unless it is demonstrably the last item in a chain.
+// Parse key-combination description and add it into the accelerator table
+void FXAccelTable::addAccel(const FXString& string,FXObject* target,FXSelector seldn,FXSelector selup){
+  addAccel(parseAccel(string),target,seldn,selup);
+  }
+
+
+// Parse key-combination description and add it into the accelerator table
+void FXAccelTable::addAccel(const FXchar* string,FXObject* target,FXSelector seldn,FXSelector selup){
+  addAccel(parseAccel(string),target,seldn,selup);
+  }
+
+/*******************************************************************************/
+
+// Remove accelerator key combination from the accelerator table
 void FXAccelTable::removeAccel(FXHotKey hotkey){
   if(hotkey){
     FXTRACE((160,"%p->FXAccelTable::removeAccel: code=%04x state=%04x\n",this,(FXushort)hotkey,(FXushort)(hotkey>>16)));
-    register FXuint p=(hotkey*13)&max;
-    register FXuint c;
+    FXuint p=(hotkey*13)&max;
+    FXuint c;
     FXASSERT(hotkey!=UNUSEDSLOT);
     FXASSERT(hotkey!=EMPTYSLOT);
     while((c=keyp.code)!=hotkey){
@@ -170,11 +186,24 @@
   }
 
 
-// See if accelerator exists
+// Parse key-combination description and remove it from the accelerator table
+void FXAccelTable::removeAccel(const FXString& string){
+  removeAccel(parseAccel(string));
+  }
+
+
+// Parse key-combination description and remove it from the accelerator table
+void FXAccelTable::removeAccel(const FXchar* string){
+  removeAccel(parseAccel(string));
+  }
+
+/*******************************************************************************/
+
+// Return true if accelerator accelerator key-combination is in accelerator table
 FXbool FXAccelTable::hasAccel(FXHotKey hotkey) const {
   if(hotkey){
-    register FXuint p=(hotkey*13)&max;
-    register FXuint c;
+    FXuint p=(hotkey*13)&max;
+    FXuint c;
     FXASSERT(hotkey!=UNUSEDSLOT);
     FXASSERT(hotkey!=EMPTYSLOT);
     while((c=keyp.code)!=hotkey){
@@ -187,11 +216,24 @@
   }
 
 
-// Return target object of the given accelerator
+// Parse key-combination description and return true if it is in the accelerator table
+FXbool FXAccelTable::hasAccel(const FXString& string) const {
+  return hasAccel(parseAccel(string));
+  }
+
+
+// Parse key-combination description and return true if it is in the accelerator table
+FXbool FXAccelTable::hasAccel(const FXchar* string) const {
+  return hasAccel(parseAccel(string));
+  }
+
+/*******************************************************************************/
+
+// Return target object of the given accelerator key-combination
 FXObject* FXAccelTable::targetOfAccel(FXHotKey hotkey) const {
   if(hotkey){
-    register FXuint p=(hotkey*13)&max;
-    register FXuint c;
+    FXuint p=(hotkey*13)&max;
+    FXuint c;
     FXASSERT(hotkey!=UNUSEDSLOT);
     FXASSERT(hotkey!=EMPTYSLOT);
     while((c=keyp.code)!=hotkey){
@@ -204,13 +246,26 @@
   }
 
 
+// Parse key-combination description and return its target
+FXObject* FXAccelTable::targetOfAccel(const FXString& string) const {
+  return targetOfAccel(parseAccel(string));
+  }
+
+
+// Parse key-combination description and return its target
+FXObject* FXAccelTable::targetOfAccel(const FXchar* string) const {
+  return targetOfAccel(parseAccel(string));
+  }
+
+/*******************************************************************************/
+
 // Keyboard press; forward to accelerator target
 long FXAccelTable::onKeyPress(FXObject* sender,FXSelector,void* ptr){
   FXTRACE((200,"%p->FXAccelTable::onKeyPress keysym=0x%04x state=%04x\n",this,((FXEvent*)ptr)->code,((FXEvent*)ptr)->state));
-  register FXEvent* event=(FXEvent*)ptr;
-  register FXuint code=MKUINT(event->code,event->state&(SHIFTMASK|CONTROLMASK|ALTMASK));
-  register FXuint p=(code*13)&max;
-  register FXuint c;
+  FXEvent* event=(FXEvent*)ptr;
+  FXuint code=MKUINT(event->code,event->state&(SHIFTMASK|CONTROLMASK|ALTMASK));
+  FXuint p=(code*13)&max;
+  FXuint c;
   FXASSERT(code!=UNUSEDSLOT);
   FXASSERT(code!=EMPTYSLOT);
   while((c=keyp.code)!=code){
@@ -227,10 +282,10 @@
 // Keyboard release; forward to accelerator target
 long FXAccelTable::onKeyRelease(FXObject* sender,FXSelector,void* ptr){
   FXTRACE((200,"%p->FXAccelTable::onKeyRelease keysym=0x%04x state=%04x\n",this,((FXEvent*)ptr)->code,((FXEvent*)ptr)->state));
-  register FXEvent* event=(FXEvent*)ptr;
-  register FXuint code=MKUINT(event->code,event->state&(SHIFTMASK|CONTROLMASK|ALTMASK));
-  register FXuint p=(code*13)&max;
-  register FXuint c;
+  FXEvent* event=(FXEvent*)ptr;
+  FXuint code=MKUINT(event->code,event->state&(SHIFTMASK|CONTROLMASK|ALTMASK));
+  FXuint p=(code*13)&max;
+  FXuint c;
   FXASSERT(code!=UNUSEDSLOT);
   FXASSERT(code!=EMPTYSLOT);
   while((c=keyp.code)!=code){
@@ -243,12 +298,135 @@
   return 1;
   }
 
+/*******************************************************************************/
+
+// Parse accelerator from string, yielding modifier and key code
+FXHotKey FXAccelTable::parseAccel(const FXString& string){
+  return FXAccelTable::parseAccel(string.text());
+  }
+
+
+// Parse accelerator from string, yielding modifier and key code
+FXHotKey FXAccelTable::parseAccel(const FXchar* string){
+  const FXchar* ptr=string;
+  FXuint code=0;
+  FXuint mods=0;
+
+  // Parse leading space
+  while(*ptr && Ascii::isSpace(*ptr)) ptr++;
+
+  // Parse modifiers
+  while(*ptr){
+
+    // Modifier
+    if(comparecase(ptr,"ctl",3)==0){ mods|=CONTROLMASK; ptr+=3; }
+    else if(comparecase(ptr,"ctrl",4)==0){ mods|=CONTROLMASK; ptr+=4; }
+    else if(comparecase(ptr,"alt",3)==0){ mods|=ALTMASK; ptr+=3; }
+    else if(comparecase(ptr,"meta",4)==0){ mods|=METAMASK; ptr+=4; }
+    else if(comparecase(ptr,"shift",5)==0){ mods|=SHIFTMASK; ptr+=5; }
+    else break;
+
+    // Separator
+    if(*ptr=='+' || *ptr=='-' || Ascii::isSpace(*ptr)) ptr++;
+    }
+
+  // Test for some special keys
+  if(comparecase(ptr,"home",4)==0){
+    code=KEY_Home;
+    }
+  else if(comparecase(ptr,"end",3)==0){
+    code=KEY_End;
+    }
+  else if(comparecase(ptr,"pgup",4)==0){
+    code=KEY_Page_Up;
+    }
+  else if(comparecase(ptr,"pgdn",4)==0){
+    code=KEY_Page_Down;
+    }
+  else if(comparecase(ptr,"left",4)==0){
+    code=KEY_Left;
+    }
+  else if(comparecase(ptr,"right",5)==0){
+    code=KEY_Right;
+    }
+  else if(comparecase(ptr,"up",2)==0){
+    code=KEY_Up;
+    }
+  else if(comparecase(ptr,"down",4)==0){
+    code=KEY_Down;
+    }
+  else if(comparecase(ptr,"ins",3)==0){
+    code=KEY_Insert;
+    }
+  else if(comparecase(ptr,"del",3)==0){
+    code=KEY_Delete;
+    }
+  else if(comparecase(ptr,"delete",6)==0){
+    code=KEY_Delete;
+    }
+  else if(comparecase(ptr,"esc",3)==0){
+    code=KEY_Escape;
+    }
+  else if(comparecase(ptr,"tab",3)==0){
+    code=KEY_Tab;
+    }
+  else if(comparecase(ptr,"return",6)==0){
+    code=KEY_Return;
+    }
+  else if(comparecase(ptr,"enter",5)==0){
+    code=KEY_Return;
+    }
+  else if(comparecase(ptr,"back",4)==0){
+    code=KEY_BackSpace;
+    }
+  else if(comparecase(ptr,"backspace",9)==0){
+    code=KEY_BackSpace;
+    }
+  else if(comparecase(ptr,"spc",3)==0){
+    code=KEY_space;
+    }
+  else if(comparecase(ptr,"space",5)==0){
+    code=KEY_space;
+    }
+
+  // Test for function keys
+  else if(Ascii::toLower(*ptr)=='f' && Ascii::isDigit(*(ptr+1))){
+    if(Ascii::isDigit(*(ptr+2))){
+      code=KEY_F1+10*(*(ptr+1)-'0')+(*(ptr+2)-'0')-1;
+      }
+    else{
+      code=KEY_F1+*(ptr+1)-'0'-1;
+      }
+    }
+
+  // Test if hexadecimal code designator
+  else if(*ptr=='#' && Ascii::isHexDigit(*(ptr+1))){
+    code=Ascii::digitValue(*(ptr+1));
+    ptr+=2;
+    while(Ascii::isHexDigit(*ptr)){
+      code=(code<<4)+Ascii::digitValue(*ptr);
+      ptr++;
+      }
+    }
+
+  // Test if its a single character accelerator
+  else if(Ascii::isPrint(*ptr)){
+    if(mods&SHIFTMASK)
+      code=Ascii::toUpper(*ptr)+KEY_space-' ';
+    else
+      code=Ascii::toLower(*ptr)+KEY_space-' ';
+    }
+
+  FXTRACE((160,"parseAccel(%s) = code=%04x mods=%04x\n",string,code,mods));
+  return MKUINT(code,mods);
+  }
+
+/*******************************************************************************/
 
 // Unparse hot key back into a string
-FXString unparseAccel(FXHotKey key){
+FXString FXAccelTable::unparseAccel(FXHotKey key){
   FXuint mods=(key&0xffff0000)>>16;
   FXuint code=(key&0xffff);
-  FXchar buffer64;
   FXString s;
 
   // Handle modifier keys
@@ -339,8 +517,7 @@
     case KEY_F33:
     case KEY_F34:
     case KEY_F35:
-      __snprintf(buffer,sizeof(buffer),"F%d",code-KEY_F1+1);
-      s+=buffer;
+      s+=FXString::value("F%d",code-KEY_F1+1);
       break;
     default:
       if(Ascii::isPrint(code)){
@@ -350,137 +527,33 @@
           s+=Ascii::toLower(code);
         }
       else{
-        __snprintf(buffer,sizeof(buffer),"#%04x",code);
-        s+=buffer;
+        s+=FXString::value("#%04X",code);
         }
       break;
     }
   return s;
   }
 
-
-// Parse accelerator from menu
-FXHotKey parseAccel(const FXString& string){
-  register FXuint code=0,mods=0;
-  register FXint pos=0;
-
-  // Parse leading space
-  while(pos<string.length() && Ascii::isSpace(stringpos)) pos++;
-
-  // Parse modifiers
-  while(pos<string.length()){
-
-    // Modifier
-    if(comparecase(&stringpos,"ctl",3)==0){ mods|=CONTROLMASK; pos+=3; }
-    else if(comparecase(&stringpos,"ctrl",4)==0){ mods|=CONTROLMASK; pos+=4; }
-    else if(comparecase(&stringpos,"alt",3)==0){ mods|=ALTMASK; pos+=3; }
-    else if(comparecase(&stringpos,"meta",4)==0){ mods|=METAMASK; pos+=4; }
-    else if(comparecase(&stringpos,"shift",5)==0){ mods|=SHIFTMASK; pos+=5; }
-    else break;
-
-    // Separator
-    if(stringpos=='+' || stringpos=='-' || Ascii::isSpace(stringpos)) pos++;
-    }
-
-  // Test for some special keys
-  if(comparecase(&stringpos,"home",4)==0){
-    code=KEY_Home;
-    }
-  else if(comparecase(&stringpos,"end",3)==0){
-    code=KEY_End;
-    }
-  else if(comparecase(&stringpos,"pgup",4)==0){
-    code=KEY_Page_Up;
-    }
-  else if(comparecase(&stringpos,"pgdn",4)==0){
-    code=KEY_Page_Down;
-    }
-  else if(comparecase(&stringpos,"left",4)==0){
-    code=KEY_Left;
-    }
-  else if(comparecase(&stringpos,"right",5)==0){
-    code=KEY_Right;
-    }
-  else if(comparecase(&stringpos,"up",2)==0){
-    code=KEY_Up;
-    }
-  else if(comparecase(&stringpos,"down",4)==0){
-    code=KEY_Down;
-    }
-  else if(comparecase(&stringpos,"ins",3)==0){
-    code=KEY_Insert;
-    }
-  else if(comparecase(&stringpos,"del",3)==0){
-    code=KEY_Delete;
-    }
-  else if(comparecase(&stringpos,"esc",3)==0){
-    code=KEY_Escape;
-    }
-  else if(comparecase(&stringpos,"tab",3)==0){
-    code=KEY_Tab;
-    }
-  else if(comparecase(&stringpos,"return",6)==0){
-    code=KEY_Return;
-    }
-  else if(comparecase(&stringpos,"enter",5)==0){
-    code=KEY_Return;
-    }
-  else if(comparecase(&stringpos,"back",4)==0){
-    code=KEY_BackSpace;
-    }
-  else if(comparecase(&stringpos,"spc",3)==0){
-    code=KEY_space;
-    }
-  else if(comparecase(&stringpos,"space",5)==0){
-    code=KEY_space;
-    }
-
-  // Test for function keys
-  else if(Ascii::toLower(stringpos)=='f' && Ascii::isDigit(stringpos+1)){
-    if(Ascii::isDigit(stringpos+2)){
-      code=KEY_F1+10*(stringpos+1-'0')+(stringpos+2-'0')-1;
-      }
-    else{
-      code=KEY_F1+stringpos+1-'1';
-      }
-    }
-
-  // Test if hexadecimal code designator
-  else if(stringpos=='#'){
-    code=strtoul(&stringpos+1,NULL,16);
-    }
-
-  // Test if its a single character accelerator
-  else if(Ascii::isPrint(stringpos)){
-    if(mods&SHIFTMASK)
-      code=Ascii::toUpper(stringpos)+KEY_space-' ';
-    else
-      code=Ascii::toLower(stringpos)+KEY_space-' ';
-    }
-
-  FXTRACE((160,"parseAccel(%s) = code=%04x mods=%04x\n",string.text(),code,mods));
-  return MKUINT(code,mods);
-  }
-
+/*******************************************************************************/
 
 // Parse hot key from string
 FXHotKey parseHotKey(const FXString& string){
-  register FXuint code=0,mods=0;
-  register FXint pos=0;
-  register FXwchar w;
-  while(pos<string.length()){
-    if(stringpos=='&'){
-      if(stringpos+1!='&'){
-        w=string.wc(pos+1);
+  const FXchar* ptr=string.text();
+  FXuint code=0;
+  FXuint mods=0;
+  while(*ptr){
+    if(*ptr=='&'){
+      if(*(ptr+1)!='&'){
+        FXwchar w=wc(ptr+1);
         if(Unicode::isAlphaNumeric(w)){
           mods=ALTMASK;
           code=fxucs2keysym(Unicode::toLower(w));
           }
         break;
         }
-      pos++;
+      ptr++;
       }
-    pos++;
+    ptr++;
     }
   FXTRACE((160,"parseHotKey(%s) = code=%04x mods=%04x\n",string.text(),code,mods));
   return MKUINT(code,mods);
@@ -489,8 +562,8 @@
 
 // Obtain hot key offset in string
 FXint findHotKey(const FXString& string){
-  register FXint pos=0;
-  register FXint n=0;
+  FXint pos=0;
+  FXint n=0;
   while(pos<string.length()){
     if(stringpos=='&'){
       if(stringpos+1!='&'){
@@ -508,8 +581,8 @@
 // Strip hot key from string
 FXString stripHotKey(const FXString& string){
   FXString result=string;
-  register FXint len=result.length();
-  register FXint i,j;
+  FXint len=result.length();
+  FXint i,j;
   for(i=j=0; j<len; j++){
     if(resultj=='&'){
       if(resultj+1!='&') continue;
@@ -521,14 +594,14 @@
   return result;
   }
 
+/*******************************************************************************/
 
 // Save data
 void FXAccelTable::save(FXStream& store) const {
-  register FXuint i;
   FXObject::save(store);
   store << max;
   store << num;
-  for(i=0; i<=max; i++){
+  for(FXuint i=0; i<=max; i++){
     store << keyi.code;
     store << keyi.target;
     store << keyi.messagedn;
@@ -539,12 +612,11 @@
 
 // Load data
 void FXAccelTable::load(FXStream& store){
-  register FXuint i;
   FXObject::load(store);
   store >> max;
   store >> num;
   resizeElms(key,max+1);
-  for(i=0; i<=max; i++){
+  for(FXuint i=0; i<=max; i++){
     store >> keyi.code;
     store >> keyi.target;
     store >> keyi.messagedn;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXApp.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXApp.cpp Changed

@@ -3,7 +3,7 @@
 *                     A p p l i c a t i o n   O b j e c t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -336,7 +336,7 @@
 
 
 // Copyright information
-const FXuchar FXApp::copyright="Copyright (C) 1997,2018 Jeroen van der Zijp. All Rights Reserved.";
+const FXuchar FXApp::copyright="Copyright (C) 1997,2020 Jeroen van der Zijp. All Rights Reserved.";
 
 
 // Conversion
@@ -894,7 +894,7 @@
 #ifdef WIN32
       SetCursor((HCURSOR)waitCursor->id());
 #else
-      register FXWindow* child;
+      FXWindow* child;
       FXASSERT(display);
       child=getRootWindow()->getFirst();
       while(child){
@@ -925,7 +925,7 @@
         SetCursor((HCURSOR)cursorWindow->getDefaultCursor()->id());
         }
 #else
-      register FXWindow* child;
+      FXWindow* child;
       child=getRootWindow()->getFirst();
       while(child){
         if(child->id()){
@@ -953,7 +953,7 @@
 #ifdef WIN32
         SetCursor((HCURSOR)waitCursor->id());
 #else
-        register FXWindow* child;
+        FXWindow* child;
         child=getRootWindow()->getFirst();
         while(child){
           if(child->id()){
@@ -1088,7 +1088,7 @@
             //   FXTRACE((1,"usUsagePage:\t%d\n", devinfo.hid.usUsagePage));
             //   FXTRACE((1,"usUsage:\t%d\n", devinfo.hid.usUsage));
             //
-            // register to receive input from the SpaceNavigator
+            // to receive input from the SpaceNavigator
             //
             //	See:
             //	    www.3dconnexion.com/forum/viewtopic.php?t=1031#5666
@@ -1839,8 +1839,8 @@
 
 // Add deadline in nanoseconds
 FXptr FXApp::addDeadline(FXObject* tgt,FXSelector sel,FXTime due,FXptr ptr){
-  register FXptr result=NULL;
-  register FXTimer *t,**tt;
+  FXptr result=NULL;
+  FXTimer *t,**tt;
   for(tt=&timers; (t=*tt)!=NULL; tt=&t->next){
     if(t->target==tgt && t->message==sel){ *tt=t->next; result=t->data; goto a; }
     }
@@ -1870,7 +1870,7 @@
 
 // Check if timeout identified by tgt and sel has been set
 FXbool FXApp::hasTimeout(FXObject* tgt,FXSelector sel) const {
-  for(register FXTimer *t=timers; t; t=t->next){
+  for(FXTimer *t=timers; t; t=t->next){
     if(t->target==tgt && (sel==0 || t->message==sel)) return true;
     }
   return false;
@@ -1879,9 +1879,9 @@
 
 // Remove timeout(s) identified by tgt and sel from the list
 FXptr FXApp::removeTimeout(FXObject* tgt,FXSelector sel){
-  register FXptr result=NULL;
-  register FXTimer **tt=&timers;
-  register FXTimer *t;
+  FXptr result=NULL;
+  FXTimer **tt=&timers;
+  FXTimer *t;
   while((t=*tt)!=NULL){
     if(t->target==tgt && (sel==0 || t->message==sel)){
       *tt=t->next; result=t->data; t->next=timerrecs; timerrecs=t;
@@ -1895,9 +1895,9 @@
 
 // Return the remaining time, in nanoseconds
 FXTime FXApp::remainingTimeout(FXObject *tgt,FXSelector sel) const {
-  for(register FXTimer *t=timers; t; t=t->next){
+  for(FXTimer *t=timers; t; t=t->next){
     if(t->target==tgt && (sel==0 || t->message==sel)){
-      register FXTime now=FXThread::time();
+      FXTime now=FXThread::time();
       return t->due>now ? t->due-now : 0L;
       }
     }
@@ -1994,8 +1994,8 @@
 
 // Add chore to the END of the list
 FXptr FXApp::addChore(FXObject* tgt,FXSelector sel,FXptr ptr){
-  register FXptr result=NULL;
-  register FXChore *c,**cc;
+  FXptr result=NULL;
+  FXChore *c,**cc;
   for(cc=&chores; (c=*cc)!=NULL; cc=&c->next){
     if(c->target==tgt && c->message==sel){ *cc=c->next; result=c->data; goto a; }
     }
@@ -2018,9 +2018,9 @@
 
 // Remove chore(s) identified by tgt and sel from the list
 FXptr FXApp::removeChore(FXObject* tgt,FXSelector sel){
-  register FXptr result=NULL;
-  register FXChore **cc=&chores;
-  register FXChore *c;
+  FXptr result=NULL;
+  FXChore **cc=&chores;
+  FXChore *c;
   while((c=*cc)!=NULL){
     if(c->target==tgt && (sel==0 || c->message==sel)){
       *cc=c->next; result=c->data; c->next=chorerecs; chorerecs=c;
@@ -2034,7 +2034,7 @@
 
 // Check if chore identified by tgt and sel has been set
 FXbool FXApp::hasChore(FXObject* tgt,FXSelector sel) const {
-  for(register FXChore *c=chores; c; c=c->next){
+  for(FXChore *c=chores; c; c=c->next){
     if(c->target==tgt && (sel==0 || c->message==sel)) return true;
     }
   return false;
@@ -2047,7 +2047,7 @@
 FXbool FXApp::addInput(FXObject *tgt,FXSelector sel,FXInputHandle fd,FXuint mode,FXptr ptr){
   if(mode==INPUT_NONE) return false;
 #ifdef WIN32
-  register FXint in;
+  FXint in;
   if(fd==INVALID_HANDLE_VALUE || fd==NULL) return false;
   for(in=0; in<=maxhandle; in++){       // See if existing handle
     if(handles->hndin==fd) goto r;    // If existing handle, just replace callbacks
@@ -2113,7 +2113,7 @@
 FXbool FXApp::removeInput(FXInputHandle fd,FXuint mode){
   if(mode==INPUT_NONE) return false;
 #ifdef WIN32
-  register FXint in;
+  FXint in;
   if(fd==INVALID_HANDLE_VALUE || fd==NULL) return false;
   for(in=0; in<=maxhandle; in++){       // See if existing handle
     if(handles->hndin==fd) goto r;
@@ -2204,8 +2204,8 @@
 
 // Smart rectangle compositing algorithm
 void FXApp::addRepaint(FXID win,FXint x,FXint y,FXint w,FXint h,FXbool synth){
-  register FXint px,py,pw,ph,newarea,area;
-  register FXRepaint *r,**pr;
+  FXint px,py,pw,ph,newarea,area;
+  FXRepaint *r,**pr;
   area=w*h;
   w+=x;
   h+=y;
@@ -2280,7 +2280,7 @@
   // Fish out the expose events and compound them
   while(XCheckMaskEvent((Display*)display,ExposureMask,&ev)){
     if(ev.xany.type==NoExpose) continue;
-    addRepaint(ev.xexpose.window,ev.xexpose.x,ev.xexpose.y,ev.xexpose.width,ev.xexpose.height,0);
+    addRepaint(ev.xexpose.window,ev.xexpose.x,ev.xexpose.y,ev.xexpose.width,ev.xexpose.height,false);
     }
 
   // Then process events pertaining to window win and overlapping
@@ -2313,7 +2313,7 @@
 // This means the original dirty area will remain part of the area to
 // be painted.
 void FXApp::scrollRepaints(FXID win,FXint dx,FXint dy){
-  register FXRepaint *r;
+  FXRepaint *r;
   for(r=repaints; r; r=r->next){
     if(r->window==win){
       if(dx>0) r->rect.w+=dx; else r->rect.x+=dx;
@@ -2340,7 +2340,7 @@
 
   // If a timer is due, handle it
   if(timers && timers->due<=FXThread::time()){
-    register FXTimer* t=timers;
+    FXTimer* t=timers;
     timers=t->next;
     t->next=timerrecs;
     timerrecs=t;
@@ -2401,7 +2401,7 @@
 
       // Release the expose events
       if(repaints){
-        register FXRepaint *r=repaints;
+        FXRepaint *r=repaints;
         ev.xany.type=Expose;
         ev.xexpose.window=r->window;
         ev.xexpose.send_event=r->synth;
@@ -2417,7 +2417,7 @@
 
       // Do our chores :-)
       if(chores){
-        register FXChore *c=chores;
+        FXChore *c=chores;
         chores=c->next;
         c->next=chorerecs;
         chorerecs=c;
@@ -2460,7 +2460,7 @@
 
       // If there are timers, we block only for a little while.
       if(timers || blocking<forever){
-        register FXTime interval;
+        FXTime interval;
 
         // All that testing above may have taken some time...
         if(timers && (interval=timers->due-FXThread::time())<blocking) blocking=interval;
@@ -2564,7 +2564,7 @@
 
   // Event was repaint event; get next one
   if(ev.xany.type==Expose || ev.xany.type==GraphicsExpose){
-    addRepaint((FXID)ev.xexpose.window,ev.xexpose.x,ev.xexpose.y,ev.xexpose.width,ev.xexpose.height,0);
+    addRepaint((FXID)ev.xexpose.window,ev.xexpose.x,ev.xexpose.y,ev.xexpose.width,ev.xexpose.height,false);
     goto a;
     }
 
@@ -3007,6 +3007,7 @@
         event.rect.h=ev.xexpose.height;
         event.synthetic=ev.xexpose.send_event;
         window->handle(this,FXSEL(SEL_PAINT,0),&event);
+        return true;
       case NoExpose:
         return true;
 
@@ -3768,7 +3769,7 @@
 
   // If a timer is due, handle it
   if(timers && timers->due<=FXThread::time()){
-    register FXTimer* t=timers;
+    FXTimer* t=timers;
     timers=t->next;
     t->next=timerrecs;
     timerrecs=t;
@@ -3804,7 +3805,7 @@
 
     // Do our chores :-)
     if(chores){
-      register FXChore *c=chores;
+      FXChore *c=chores;
       chores=c->next;
       c->next=chorerecs;
       chorerecs=c;
@@ -3843,7 +3844,7 @@
     // If there are timers, block only a little time
     allinputs=maxhandle+1;
     if(timers || blocking<forever){
-      register FXTime interval;
+      FXTime interval;
 
       // All that testing above may have taken some time...
       if(timers && (interval=timers->due-FXThread::time())<blocking) blocking=interval;
@@ -3889,7 +3890,7 @@
     // MsgWaitForMultipleObjects. We copy the stuff out of the arrays
     // before issueing callbacks, in case an entry is removed.
     for(FXint i=0; i<=maxhandle; i++){
-      register FXInputHandle fff=handles->hndi;
+      FXInputHandle fff=handles->hndi;
       if((i==(FXint)(signaled-WAIT_OBJECT_0)) || (WaitForSingleObject(fff,0)==WAIT_OBJECT_0)){
         FXInput in=inputsi;
         if(in.read.target && in.read.target->tryHandle(this,FXSEL(SEL_IO_READ,in.read.message),in.read.data)) refresh();
@@ -4097,7 +4098,7 @@
 
 // Test if the window is involved in a modal invocation
 FXbool FXApp::isModal(FXWindow *window) const {
-  register FXInvocation* inv;
+  FXInvocation* inv;
   for(inv=invocation; inv; inv=inv->upper){
     if(inv->window==window && inv->modality!=MODAL_FOR_NONE) return true;
     }
@@ -4119,7 +4120,7 @@
 
 // Break out of topmost event loop, closing all nested loops also
 void FXApp::stop(FXint value){
-  register FXInvocation* inv;
+  FXInvocation* inv;
   for(inv=invocation; inv; inv=inv->upper){
     inv->done=true;
     inv->code=0;
@@ -4133,7 +4134,7 @@
 
 // Break out of modal loop matching window, and all deeper ones
 void FXApp::stopModal(FXWindow* window,FXint value){
-  register FXInvocation* inv;
+  FXInvocation* inv;
   if(isModal(window)){
     for(inv=invocation; inv; inv=inv->upper){
       inv->done=true;
@@ -4149,7 +4150,7 @@
 
 // Break out of innermost modal loop, and all deeper non-modal ones
 void FXApp::stopModal(FXint value){
-  register FXInvocation* inv;
+  FXInvocation* inv;
   for(inv=invocation; inv; inv=inv->upper){
     inv->done=true;
     inv->code=0;
@@ -5252,8 +5253,9 @@
     case WM_STYLECHANGING:
     case WM_SIZING:
     case WM_MOVING:
-    case WM_ERASEBKGND:         // Do nothing, erasing background causes flashing
       return 0;
+    case WM_ERASEBKGND:         // Do nothing, erasing background causes flashing
+      return 1;
 
     case WM_ACTIVATE:
       //FXTRACE((100,"WM_ACTIVATE %d\n",LOWORD(wParam)));
@@ -5560,10 +5562,10 @@
 
 // Dump widget information
 void FXApp::dumpWidgets() const {
-  register FXWindow *w=getRootWindow();
-  register FXObject *t;
-  register FXint lev=0;
-  register FXchar s;
+  FXWindow *w=getRootWindow();
+  FXObject *t;
+  FXint lev=0;
+  FXchar s;
   while(w){
     t=w->getTarget();
     s=w->shown()?'+':'-';
@@ -5800,9 +5802,9 @@
 
 // Virtual destructor
 FXApp::~FXApp(){
-  register FXRepaint *r;
-  register FXTimer *t;
-  register FXChore *c;
+  FXRepaint *r;
+  FXTimer *t;
+  FXChore *c;
 
   // Close display
   closeDisplay();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXArray.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXArray.cpp Changed

@@ -3,7 +3,7 @@
 *                          G e n e r i c   A r r a y                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -60,9 +60,9 @@
 
 // Change number of items in list
 FXbool FXArrayBase::resize(FXival num,FXival sz){
-  register FXival old=*(((FXival*)ptr)-1);
+  FXival old=*(((FXival*)ptr)-1);
   if(__likely(old!=num)){
-    register FXptr p;
+    FXptr p;
     if(0<num){
       if(ptr!=EMPTY){
         if(__unlikely((p=::realloc(((FXival*)ptr)-1,sizeof(FXival)+num*sz))==NULL)) return false;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXArrowButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXArrowButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXAtomic.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXAtomic.cpp Changed

@@ -3,7 +3,7 @@
 *                         A t o m i c   O p e r a t i o n s                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -115,7 +115,7 @@
 #elif defined(HAVE_BUILTIN_SYNC)
   return __sync_val_compare_and_swap(ptr,0,0);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXint ret=0;
+  FXint ret=0;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(ret), "a"(ret) : "memory", "cc");
   return ret;
@@ -149,7 +149,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1500)
   return _InterlockedExchange((LONG*)ptr,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXint ret=v;
+  FXint ret=v;
   __asm__ __volatile__("xchgl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
   return ret;
 #elif defined(HAVE_BUILTIN_SYNC)
@@ -167,7 +167,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1500)
   return _InterlockedExchangeAdd((LONG*)ptr,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXint ret=v;
+  FXint ret=v;
   __asm__ __volatile__ ("lock\n\t"
                         "xaddl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
   return ret;
@@ -186,7 +186,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1500)
   return _InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXint ret;
+  FXint ret;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
@@ -207,7 +207,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1500)
   return (_InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect)==(LONG)expect);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchgl %2, (%1)\n\t"
                         "sete   %%al\n\t"
@@ -231,7 +231,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1800)
   return _InterlockedExchange64(ptr,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
                         "1:\n\t"
                         "lock\n\t"
@@ -240,14 +240,14 @@
                         "xchgl %%esi, %%ebx\n\t" : "=A"(ret) : "D"(ptr), "S"((FXint)v), "c"((FXint)(v>>32)), "A"(*ptr) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__ ("1:\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "jnz 1b\n\t" : "=A"(ret) : "D"(ptr), "b"((FXint)v), "c"((FXint)(v>>32)), "A"(*ptr) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__("xchgq %0,(%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(v) : "memory", "cc");
   return ret;
 #elif defined(HAVE_BUILTIN_ATOMIC)
@@ -273,7 +273,7 @@
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
   FXuint inclo=v;
   FXuint inchi=(v>>32);
-  register FXlong ret;
+  FXlong ret;
   __asm __volatile("movl %%ebx, %%esi\n\t"
                    "1:\n\t"
                    "movl %2, %%ebx\n\t"
@@ -288,7 +288,7 @@
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
   FXuint inclo=v;
   FXuint inchi=(v>>32);
-  register FXlong ret;
+  FXlong ret;
   __asm __volatile("1:\n\t"
                    "movl %2, %%ebx\n\t"
                    "movl %3, %%ecx\n\t"
@@ -299,7 +299,7 @@
                    "jnz 1b\n\t" : "=A"(ret) : "D"(ptr), "m"(inclo), "m"(inchi), "A"(*ptr) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__ ("lock\n\t"
                         "xaddq %0,(%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(v) : "memory", "cc");
   return ret;
@@ -318,19 +318,19 @@
 #elif defined(HAVE_BUILTIN_SYNC)
   return __sync_val_compare_and_swap(ptr,expect,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "movl %%esi, %%ebx\n\t" : "=A"(ret) : "D"(ptr), "S"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchg8b (%1)\n\t" : "=A"(ret) : "D"(ptr), "b"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXlong ret;
+  FXlong ret;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgq %2,(%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
@@ -351,7 +351,7 @@
 #elif defined(HAVE_BUILTIN_SYNC)
   return __sync_bool_compare_and_swap(ptr,expect,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
@@ -360,14 +360,14 @@
                         "xchgl %%esi, %%ebx\n\t" : "=A"(ret) : "D"(ptr), "S"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "setz %%al\n\t"
                         "andl $1, %%eax\n\t" : "=a"(ret) : "D"(ptr), "b"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchgq %2,(%1)\n\t"
                         "sete %%al\n\t"
@@ -390,7 +390,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1800)
   return _InterlockedExchange64(reinterpret_cast<volatile FXlong*>(ptr),v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
                         "1:\n\t"
                         "lock\n\t"
@@ -399,14 +399,14 @@
                         "xchgl %%esi, %%ebx\n\t" : "=A"(ret) : "D"(ptr), "S"((FXuint)v), "c"((FXuint)(v>>32)), "A"(*ptr) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__ ("1:\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "jnz 1b\n\t" : "=A"(ret) : "D"(ptr), "b"((FXuint)v), "c"((FXuint)(v>>32)), "A"(*ptr) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__("xchgq %0,(%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(v) : "memory", "cc");
   return ret;
 #elif defined(HAVE_BUILTIN_ATOMIC)
@@ -432,7 +432,7 @@
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
   FXuint inclo=v;
   FXuint inchi=(v>>32);
-  register FXulong ret;
+  FXulong ret;
   __asm __volatile("movl %%ebx, %%esi\n\t"
                    "1:\n\t"
                    "movl %2, %%ebx\n\t"
@@ -447,7 +447,7 @@
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
   FXuint inclo=v;
   FXuint inchi=(v>>32);
-  register FXulong ret;
+  FXulong ret;
   __asm __volatile("1:\n\t"
                    "movl %2, %%ebx\n\t"
                    "movl %3, %%ecx\n\t"
@@ -458,7 +458,7 @@
                    "jnz 1b\n\t" : "=A"(ret) : "D"(ptr), "m"(inclo), "m"(inchi), "A"(*ptr) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__ ("lock\n\t"
                         "xaddq %0,(%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(v) : "memory", "cc");
   return ret;
@@ -477,19 +477,19 @@
 #elif defined(HAVE_BUILTIN_SYNC)
   return __sync_val_compare_and_swap(ptr,expect,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "movl %%esi, %%ebx\n\t" : "=A"(ret) : "D"(ptr), "S"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchg8b (%1)\n\t" : "=A"(ret) : "D"(ptr), "b"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXulong ret;
+  FXulong ret;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgq %2,(%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
@@ -510,7 +510,7 @@
 #elif defined(HAVE_BUILTIN_SYNC)
   return __sync_bool_compare_and_swap(ptr,expect,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("xchgl %%esi, %%ebx\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
@@ -519,14 +519,14 @@
                         "xchgl %%esi, %%ebx\n\t" : "=A"(ret) : "D"(ptr), "S"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "setz %%al\n\t"
                         "andl $1, %%eax\n\t" : "=a"(ret) : "D"(ptr), "b"((FXuint)v), "c"((FXuint)(v>>32)), "A"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchgq %2,(%1)\n\t"
                         "sete %%al\n\t"
@@ -552,7 +552,7 @@
 #elif defined(HAVE_BUILTIN_SYNC)
   return __sync_val_compare_and_swap(ptr,0,0);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXuint ret=0;
+  FXuint ret=0;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(ret), "a"(ret) : "memory", "cc");
   return ret;
@@ -586,7 +586,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1500)
   return _InterlockedExchange((LONG*)ptr,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXuint ret=v;
+  FXuint ret=v;
   __asm__ __volatile__("xchgl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
   return ret;
 #elif defined(HAVE_BUILTIN_SYNC)
@@ -604,7 +604,7 @@
 #if defined(WIN32) && (_MSC_VER >= 1500)
   return _InterlockedExchangeAdd((LONG*)ptr,v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXuint ret=v;
+  FXuint ret=v;
   __asm__ __volatile__ ("lock\n\t"
                         "xaddl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
   return ret;
@@ -623,7 +623,7 @@
 #if defined(WIN32) && ((_MSC_VER >= 1500))
   return _InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXuint ret;
+  FXuint ret;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
@@ -644,7 +644,7 @@
 #if defined(WIN32) && ((_MSC_VER >= 1500))
   return (_InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect)==(LONG)expect);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && (defined(__i386__) || defined(__x86_64__)))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchgl %2, (%1)\n\t"
                         "sete   %%al\n\t"
@@ -672,12 +672,12 @@
 #elif defined(HAVE_BUILTIN_ATOMIC)
   return __atomic_load_n(ptr,__ATOMIC_SEQ_CST);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXptr ret=0;
+  FXptr ret=0;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(ret), "a"(ret) : "memory", "cc");
   return ret;
 #elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__x86_64__))
-  register FXptr ret=0;
+  FXptr ret=0;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgq %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(ret), "a"(ret) : "memory", "cc");
   return ret;
@@ -747,12 +747,12 @@
 #elif (defined(WIN32) && (_MSC_VER >= 1600))
   return (FXptr)_InterlockedExchangeAdd((LONG*)ptr,(LONG)v);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXptr ret=(void*)v;
+  FXptr ret=(void*)v;
   __asm__ __volatile__ ("lock\n\t"
                         "xaddl %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0"(ret) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXptr ret=(FXptr)v;
+  FXptr ret=(FXptr)v;
   __asm__ __volatile__ ("lock\n\t"
                         "xaddq %0, (%1)\n\t" : "=r"(ret) : "r"(ptr), "0" (ret) : "memory", "cc");
   return ret;
@@ -773,12 +773,12 @@
 #elif defined(WIN32) && (MSC_VER >=1500)
   return (FXptr)_InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXptr ret;
+  FXptr ret;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgl %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXptr ret;
+  FXptr ret;
   __asm__ __volatile__("lock\n\t"
                        "cmpxchgq %2, (%1)\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
@@ -801,14 +801,14 @@
 #elif defined(WIN32) && (MSC_VER >=1500)
   return (_InterlockedCompareExchange((LONG*)ptr,(LONG)v,(LONG)expect)==(LONG)expect);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchgl %2, (%1)\n\t"
                         "sete   %%al\n\t"
                         "andl   $1, %%eax\n\t" : "=a"(ret) : "r"(ptr), "r"(v), "a"(expect) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchgq %2, (%1)\n\t"
                         "sete   %%al\n\t"
@@ -836,7 +836,7 @@
   LONGLONG compab=(((LONGLONG)(FXuval)cmpa)|((LONGLONG)(FXuval)cmpb)<<32);
   return (_InterlockedCompareExchange64((LONGLONG volatile *)ptr,ab,compab)==compab);
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__) && (defined(__PIC__) || defined(__PIE__)))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("xchgl  %%esi, %%ebx\n\t"
                         "lock\n\t"
                         "cmpxchg8b (%1)\n\t"
@@ -845,14 +845,14 @@
                         "xchgl  %%esi, %%ebx\n\t" : "=a"(ret) : "D"(ptr), "a"(cmpa), "d"(cmpb), "S"(a), "c"(b) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__i386__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchg8b (%1)\n\t"
                         "setz   %%al\n\t"
                         "andl   $1, %%eax\n\t" : "=a"(ret) : "D"(ptr), "a"(cmpa), "d"(cmpb), "b"(a), "c"(b) : "memory", "cc");
   return ret;
 #elif (defined(HAVE_INLINE_ASSEMBLY) && defined(__x86_64__))
-  register FXbool ret;
+  FXbool ret;
   __asm__ __volatile__ ("lock\n\t"
                         "cmpxchg16b (%1)\n\t"
                         "setz   %%al\n\t"

gogglesmm-1.2.1.tar.gz/cfox/lib/FXAutoThreadStorageKey.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXAutoThreadStorageKey.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBMPIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBMPIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBMPImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBMPImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBZFileStream.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBZFileStream.cpp Changed

@@ -3,7 +3,7 @@
 *                      B Z F i l e S t r e a m   C l a s s e s                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Lyle Johnson. All Rights Reserved.                 *
+* Copyright (C) 1999,2020 by Lyle Johnson. All Rights Reserved.                 *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -75,7 +75,7 @@
 
 // Save to a file
 FXuval FXBZFileStream::writeBuffer(FXuval){
-  register FXival m,n; int bzerror;
+  FXival m,n; int bzerror;
   if(dir!=FXStreamSave){fxerror("FXBZFileStream::writeBuffer: wrong stream direction.\n");}
   FXASSERT(begptr<=rdptr);
   FXASSERT(rdptr<=wrptr);
@@ -103,7 +103,7 @@
 
 // Load from file
 FXuval FXBZFileStream::readBuffer(FXuval){
-  register FXival n; int bzerror;
+  FXival n; int bzerror;
   if(dir!=FXStreamLoad){fxerror("FXBZFileStream::readBuffer: wrong stream direction.\n");}
   FXASSERT(begptr<=rdptr);
   FXASSERT(rdptr<=wrptr);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBarrier.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBarrier.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBitmap.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBitmap.cpp Changed

@@ -3,7 +3,7 @@
 *                             B i t m a p    O b j e c t                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -115,7 +115,7 @@
       // Initialize visual
       visual->create();
 
-#ifdef WIN32
+#if defined(WIN32)
       xid=CreateBitmap(FXMAX(width,1),FXMAX(height,1),1,1,NULL);
 #else
       xid=XCreatePixmap((Display*)getApp()->getDisplay(),XDefaultRootWindow((Display*)getApp()->getDisplay()),FXMAX(width,1),FXMAX(height,1),1);
@@ -159,7 +159,7 @@
   if(xid){
     if(getApp()->isInitialized()){
       FXTRACE((100,"%s::destroy %p\n",getClassName(),this));
-#ifdef WIN32
+#if defined(WIN32)
       DeleteObject(xid);
 #else
       XFreePixmap((Display*)getApp()->getDisplay(),xid);
@@ -170,7 +170,7 @@
   }
 
 
-#ifdef WIN32            // WINDOWS
+#if defined(WIN32)      // WINDOWS
 
 
 struct BITMAPINFO256 {
@@ -182,9 +182,6 @@
 // Restore client-side pixel buffer from bitmap
 void FXBitmap::restore(){
   if(xid){
-    register FXint x,y,bytes_per_line;
-    register FXuchar *p,*q;
-    FXuchar *pixels;
 
     FXTRACE((100,"%s::restore image %p\n",getClassName(),this));
 
@@ -199,9 +196,11 @@
 
     // Got local buffer to receive into
     if(data){
+      FXuchar *pixels,*p,*q;;
+      FXint x,y;
 
       // Bytes per line, rounded to nearest DWORD
-      bytes_per_line=((width+31)&~31)>>3;
+      FXint bytes_per_line=((width+31)&~31)>>3;
 
       // Set up the bitmap info
       BITMAPINFO256 bmi;
@@ -254,17 +253,16 @@
 // Render into pixmap
 void FXBitmap::render(){
   if(xid){
-    register FXint x,y,bytes_per_line;
-    register FXuchar *p,*q;
-    FXuchar *pixels;
 
     FXTRACE((100,"%s::render bitmap %p\n",getClassName(),this));
 
     // Fill with pixels if there is data
     if(data && 0<width && 0<height){
+      FXuchar *pixels,*p,*q;
+      FXint x,y;
 
       // Bytes per line, rounded to nearest DWORD
-      bytes_per_line=((width+31)&~31)>>3;
+      FXint bytes_per_line=((width+31)&~31)>>3;
 
       // Set up the bitmap info
       BITMAPINFO256 bmi;
@@ -323,8 +321,8 @@
 // Restore client-side pixel buffer from bitmap
 void FXBitmap::restore(){
   if(xid){
-    register XImage *xim=NULL;
-    register FXint size,x,y;
+    XImage *xim=NULL;
+    FXint size,x,y;
 
     FXTRACE((100,"%s::restore bitmap %p\n",getClassName(),this));
 
@@ -375,10 +373,10 @@
 // Render into pixmap
 void FXBitmap::render(){
   if(xid){
-    register XImage *xim=NULL;
-    register int size;
-    register FXuchar *pix;
-    register int i;
+    XImage *xim=NULL;
+    int size;
+    FXuchar *pix;
+    int i;
     XGCValues values;
     GC gc;
 
@@ -439,14 +437,14 @@
 
 // Resize bitmap to the specified width and height; the contents become undefined
 void FXBitmap::resize(FXint w,FXint h){
-  register FXint bw;
+  FXint bw;
   if(w<1) w=1;
   if(h<1) h=1;
   FXTRACE((100,"%s::resize(%d,%d)\n",getClassName(),w,h));
   bw=(w+7)>>3;
   if(xid){
 
-#ifdef WIN32
+#if defined(WIN32)
 
     // Delete old bitmap
     DeleteObject(xid);
@@ -503,11 +501,11 @@
   FXTRACE((100,"%s::scale(%d,%d)\n",getClassName(),w,h));
   if(w!=width || h!=height){
     if(data){
-      register FXuchar *q,*p,bits;
-      register FXint xs=(width<<16)/w;
-      register FXint ys=(height<<16)/h;
-      register FXint bw=bytewidth;
-      register FXint i,j,x,y,xx;
+      FXuchar *q,*p,bits;
+      FXint xs=(width<<16)/w;
+      FXint ys=(height<<16)/h;
+      FXint bw=bytewidth;
+      FXint i,j,x,y,xx;
       FXuchar *interim;
 
       // Copy to old buffer
@@ -554,10 +552,10 @@
   FXTRACE((100,"%s::mirror(%d,%d)\n",getClassName(),horizontal,vertical));
   if(horizontal || vertical){
     if(data){
-      register FXuchar *paa,*pa,*pbb,*pb;
-      register FXint sa=(8-width)&7;
-      register FXint sb=8-sa;
-      register FXuint t;
+      FXuchar *paa,*pa,*pbb,*pb;
+      FXint sa=(8-width)&7;
+      FXint sb=8-sa;
+      FXuint t;
       FXuchar line4096;               // Maximum width is 32768/8=4096 bytes
       if(vertical && height>1){         // Mirror vertically
         paa=data;
@@ -603,9 +601,9 @@
   degrees=(degrees+360)%360;
   if(degrees!=0 && width>1 && height>1){
     if(data){
-      register FXuchar *p,*q,bits;
-      register FXint bw=bytewidth;
-      register FXint i,j,x;
+      FXuchar *p,*q,bits;
+      FXint bw=bytewidth;
+      FXint i,j,x;
       FXuchar *olddata;
       if(!dupElms(olddata,data,bytewidth*height)){ throw FXMemoryException("unable to rotate bitmap"); }
       switch(degrees){
@@ -698,18 +696,18 @@
   if(x>=width || y>=height || x+w<=0 || y+h<=0){ fxerror("%s::crop: bad arguments.\n",getClassName()); }
   FXTRACE((100,"%s::crop(%d,%d,%d,%d)\n",getClassName(),x,y,w,h));
   if(data){
-    register FXuchar *pnn,*poo,*yyy,*pn,*po,*xx;
-    register FXint oldbw=bytewidth;
-    register FXint newbw=(w+7)>>3;
-    register FXint cpybw;
-    register FXint ow=width;
-    register FXint oh=height;
-    register FXint nw=w;
-    register FXint nh=h;
-    register FXint cw;
-    register FXint ch;
-    register FXint sh;
-    register FXuint t;
+    FXuchar *pnn,*poo,*yyy,*pn,*po,*xx;
+    FXint oldbw=bytewidth;
+    FXint newbw=(w+7)>>3;
+    FXint cpybw;
+    FXint ow=width;
+    FXint oh=height;
+    FXint nw=w;
+    FXint nh=h;
+    FXint cw;
+    FXint ch;
+    FXint sh;
+    FXuint t;
     FXuchar *olddata;
     if(!allocElms(olddata,oh*bytewidth+1)){ throw FXMemoryException("unable to crop bitmap"); }
     memcpy(olddata,data,oh*bytewidth);
@@ -804,7 +802,7 @@
 
 
 
-#ifdef WIN32
+#if defined(WIN32)
 
 // Get the image's device context
 FXID FXBitmap::GetDC() const {

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBitmapFrame.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBitmapFrame.cpp Changed

@@ -3,7 +3,7 @@
 *                       I m a g e   F r a m e   W i d g e t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2001,2018 by H. J. Daniel III. All Rights Reserved.             *
+* Copyright (C) 2001,2020 by H. J. Daniel III. All Rights Reserved.             *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -95,7 +95,7 @@
 
 // Get default width
 FXint FXBitmapFrame::getDefaultWidth(){
-  register FXint w=0;
+  FXint w=0;
   if(bitmap) w=bitmap->getWidth();
   return w+padleft+padright+(border<<1);
   }
@@ -103,7 +103,7 @@
 
 // Get default height
 FXint FXBitmapFrame::getDefaultHeight(){
-  register FXint h=0;
+  FXint h=0;
   if(bitmap) h=bitmap->getHeight();
   return h+padtop+padbottom+(border<<1);
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXBitmapView.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXBitmapView.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCURCursor.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCURCursor.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCalendar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCalendar.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCalendarView.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCalendarView.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCanvas.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCanvas.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCheckButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCheckButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXChoiceBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXChoiceBox.cpp Changed

@@ -3,7 +3,7 @@
 *                            C h o i c e   B o x                                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -81,7 +81,7 @@
 
 // Construct choice box with given caption, icon, message text, and with choices from array of strings
 FXChoiceBox::FXChoiceBox(FXWindow* own,const FXString& caption,const FXString& text,FXIcon* icn,const FXchar** choices,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXDialogBox(own,caption,opts|DECOR_TITLE|DECOR_BORDER,x,y,w,h,10,10,10,10, 10,10){
-  register FXint n;
+  FXint n;
   initialize(text,icn);
   n=list->fillItems(choices);
   list->setNumVisible(FXMIN(n,5));
@@ -90,7 +90,7 @@
 
 // Construct choice box with given caption, icon, message text, and with choices from newline separated strings
 FXChoiceBox::FXChoiceBox(FXWindow* own,const FXString& caption,const FXString& text,FXIcon* icn,const FXString& choices,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXDialogBox(own,caption,opts|DECOR_TITLE|DECOR_BORDER,x,y,w,h,10,10,10,10, 10,10){
-  register FXint n;
+  FXint n;
   initialize(text,icn);
   n=list->fillItems(choices);
   list->setNumVisible(FXMIN(n,5));
@@ -99,7 +99,7 @@
 
 // Construct free floating choice box with given caption, icon, message text, and with choices from array of strings
 FXChoiceBox::FXChoiceBox(FXApp* a,const FXString& caption,const FXString& text,FXIcon* icn,const FXchar** choices,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXDialogBox(a,caption,opts|DECOR_TITLE|DECOR_BORDER,x,y,w,h,10,10,10,10, 10,10){
-  register FXint n;
+  FXint n;
   initialize(text,icn);
   n=list->fillItems(choices);
   list->setNumVisible(FXMIN(n,5));
@@ -108,7 +108,7 @@
 
 // Construct free floating choice box with given caption, icon, message text, and with choices from newline separated strings
 FXChoiceBox::FXChoiceBox(FXApp* a,const FXString& caption,const FXString& text,FXIcon* icn,const FXString& choices,FXuint opts,FXint x,FXint y,FXint w,FXint h):FXDialogBox(a,caption,opts|DECOR_TITLE|DECOR_BORDER,x,y,w,h,10,10,10,10, 10,10){
-  register FXint n;
+  FXint n;
   initialize(text,icn);
   n=list->fillItems(choices);
   list->setNumVisible(FXMIN(n,5));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorBar.cpp Changed

@@ -3,7 +3,7 @@
 *                       C o l o r   B a r   W i d g e t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2001,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2001,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -111,7 +111,7 @@
 
 // Resize the bar
 void FXColorBar::layout(){
-  register FXint ww,hh;
+  FXint ww,hh;
   ww=width-padleft-padright-(border<<1)-4;
   hh=height-padtop-padbottom-(border<<1)-4;
   if(ww<1) ww=1;
@@ -127,8 +127,8 @@
 
 // Recompute the bar image
 void FXColorBar::updatebar(){
-  register FXint x,y,w,h;
-  register FXColor clr;
+  FXint x,y,w,h;
+  FXColor clr;
   FXfloat r,g,b,d;
   w=bar->getWidth();
   h=bar->getHeight();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorList.cpp Changed

@@ -3,7 +3,7 @@
 *                         C o l o r   L i s t   W i d g e t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -74,8 +74,8 @@
 
 // Draw item
 void FXColorItem::draw(const FXList* list,FXDC& dc,FXint xx,FXint yy,FXint ww,FXint hh) const {
-  register FXFont *font=list->getFont();
-  register FXint th=0;
+  FXFont *font=list->getFont();
+  FXint th=0;
   if(!label.empty()) th=font->getFontHeight();
   if(isSelected())
     dc.setForeground(list->getSelBackColor());
@@ -106,8 +106,8 @@
 
 // See if item got hit, and where: 0 is outside, 1 is icon, 2 is text
 FXint FXColorItem::hitItem(const FXList* list,FXint xx,FXint yy) const {
-  register FXint tw=0,th=0,ix,iy,tx,ty,h;
-  register FXFont *font=list->getFont();
+  FXint tw=0,th=0,ix,iy,tx,ty,h;
+  FXFont *font=list->getFont();
   if(!label.empty()){
     tw=4+font->getTextWidth(label);
     th=4+font->getFontHeight();
@@ -131,8 +131,8 @@
 
 // Get width of item
 FXint FXColorItem::getWidth(const FXList* list) const {
-  register FXFont *font=list->getFont();
-  register FXint w=SWATCH_WIDTH;
+  FXFont *font=list->getFont();
+  FXint w=SWATCH_WIDTH;
   if(!label.empty()) w+=ICON_SPACING+font->getTextWidth(label);
   return SIDE_SPACING+w;
   }
@@ -140,8 +140,8 @@
 
 // Get height of item
 FXint FXColorItem::getHeight(const FXList* list) const {
-  register FXFont *font=list->getFont();
-  register FXint h=0;
+  FXFont *font=list->getFont();
+  FXint h=0;
   if(!label.empty()) h=font->getFontHeight();
   return LINE_SPACING+FXMAX(h,SWATCH_HEIGHT);
   }
@@ -167,7 +167,7 @@
 
 // Fill list by appending color items from array of strings and array of colors
 FXint FXColorList::fillItems(const FXchar *const *strings,FXColor *colors,void* ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(stringsn){
       appendItem(stringsn,colorsn,ptr,notify);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorRing.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorRing.cpp Changed

@@ -3,7 +3,7 @@
 *                         C o l o r R i n g   W i d g e t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -213,9 +213,9 @@
 
 // Resize the dial
 void FXColorRing::layout(){
-  register FXint ww=width-padleft-padright-(border<<1);
-  register FXint hh=height-padtop-padbottom-(border<<1);
-  register FXint ss;
+  FXint ww=width-padleft-padright-(border<<1);
+  FXint hh=height-padtop-padbottom-(border<<1);
+  FXint ss;
 
   // Enforce minimum triangle size
   ringinner=FXMIN(ww,hh)/2-ringwidth;
@@ -260,9 +260,8 @@
 
 // Recompute the dial image
 void FXColorRing::updatering(){
-  register FXfloat invdet,a,s,v;
-  register FXint o2,i2,r2,rx,ry,x,y;
-  FXfloat r,g,b;
+  FXfloat invdet,a,s,v,r,g,b;
+  FXint o2,i2,r2,rx,ry,x,y;
 
   // Hue angle in radians
   a=(hsv0-180.0f)*DTOR;
@@ -323,8 +322,8 @@
 
 // Test if inside hue ring
 FXbool FXColorRing::inHueRing(FXint x,FXint y) const {
-  register FXint rx=x-dialx-ringouter;
-  register FXint ry=y-dialy-ringouter;
+  FXint rx=x-dialx-ringouter;
+  FXint ry=y-dialy-ringouter;
   return ringinner*ringinner<=rx*rx+ry*ry;
   }
 
@@ -337,8 +336,8 @@
 
 // Compute position on ring from hue
 void FXColorRing::hueToXY(FXint& x,FXint& y,FXfloat hue) const {
-  register FXfloat a=(hue-180.0f)*DTOR;
-  register FXfloat r=ringouter-ringwidth*0.5f;
+  FXfloat a=(hue-180.0f)*DTOR;
+  FXfloat r=ringouter-ringwidth*0.5f;
   x=dialx+ringouter+(FXint)(r*Math::cos(a)+0.5f);
   y=dialy+ringouter+(FXint)(r*Math::sin(a)+0.5f);
   }
@@ -347,16 +346,16 @@
 
 // Test if inside saturation/value triangle
 FXbool FXColorRing::inTriangle(FXint x,FXint y) const {
-  register FXint rx=x-dialx-ringouter;
-  register FXint ry=y-dialy-ringouter;
+  FXint rx=x-dialx-ringouter;
+  FXint ry=y-dialy-ringouter;
   return 0<=(clry-blky)*(rx-clrx)-(clrx-blkx)*(ry-clry) && 0<=(whty-clry)*(rx-whtx)-(whtx-clrx)*(ry-whty) && 0<=(blky-whty)*(rx-blkx)-(blkx-whtx)*(ry-blky);
   }
 
 
 // Compute x,y location from saturation and value
 void FXColorRing::satValToXY(FXint& x,FXint& y,FXfloat s,FXfloat v) const {
-  register FXfloat px=whtx+(clrx-whtx)*s;
-  register FXfloat py=whty+(clry-whty)*s;
+  FXfloat px=whtx+(clrx-whtx)*s;
+  FXfloat py=whty+(clry-whty)*s;
   x=dialx+ringouter+blkx+(FXint)((px-blkx)*v+0.5f);
   y=dialy+ringouter+blky+(FXint)((py-blky)*v+0.5f);
   }
@@ -364,9 +363,9 @@
 
 // Compute saturation and value given x, y in triangle and hue
 void FXColorRing::satValFromXY(FXfloat& s,FXfloat& v,FXint x,FXint y) const {
-  register FXint rx=x-dialx-ringouter;
-  register FXint ry=y-dialy-ringouter;
-  register FXfloat ss,vv;
+  FXint rx=x-dialx-ringouter;
+  FXint ry=y-dialy-ringouter;
+  FXfloat ss,vv;
 
   // Outside triangle on blk-clr side
   if((clry-blky)*(rx-clrx)-(clrx-blkx)*(ry-clry)<0){
@@ -509,8 +508,8 @@
 
 // Determine if special case applies
 FXbool FXColorRing::inCorner(FXint x,FXint y) const {
-  register FXint rx=x-dialx-ringouter;
-  register FXint ry=y-dialy-ringouter;
+  FXint rx=x-dialx-ringouter;
+  FXint ry=y-dialy-ringouter;
   return (ringouter*ringouter<=rx*rx+ry*ry) && (0.99999f<=hsv1 && 0.99999f<=hsv2);
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorSelector.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorSelector.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorWell.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorWell.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColorWheel.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColorWheel.cpp Changed

@@ -3,7 +3,7 @@
 *                        C o l o r W h e e l   W i d g e t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2001,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2001,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -137,9 +137,9 @@
 
 // Resize the dial
 void FXColorWheel::layout(){
-  register FXint ww=width-padleft-padright-(border<<1);
-  register FXint hh=height-padtop-padbottom-(border<<1);
-  register FXint ss=FXMAX(3,FXMIN(ww,hh));
+  FXint ww=width-padleft-padright-(border<<1);
+  FXint hh=height-padtop-padbottom-(border<<1);
+  FXint ss=FXMAX(3,FXMIN(ww,hh));
 
   // New dial location in widget
   if(options&JUSTIFY_LEFT) dialx=padleft+border;
@@ -164,8 +164,8 @@
 
 // Compute x,y location from hue and saturation
 FXbool FXColorWheel::hstoxy(FXint& x,FXint& y,FXfloat h,FXfloat s) const {
-  register FXfloat r=dial->getWidth()*0.5f;
-  register FXfloat a=(h-180.0f)*DTOR;
+  FXfloat r=dial->getWidth()*0.5f;
+  FXfloat a=(h-180.0f)*DTOR;
   x=(FXint)(s*r*Math::cos(a)+r+0.5f);
   y=(FXint)(s*r*Math::sin(a)+r+0.5f);
   return true;
@@ -174,10 +174,10 @@
 
 // Compute hue and saturation from x,y, return false if outside of dial
 FXbool FXColorWheel::xytohs(FXfloat& h,FXfloat& s,FXint x,FXint y) const {
-  register FXfloat r=dial->getWidth()*0.5f;
-  register FXfloat rx=x-r;
-  register FXfloat ry=y-r;
-  register FXfloat v=Math::sqrt(rx*rx+ry*ry);
+  FXfloat r=dial->getWidth()*0.5f;
+  FXfloat rx=x-r;
+  FXfloat ry=y-r;
+  FXfloat v=Math::sqrt(rx*rx+ry*ry);
   h=0.0f;
   s=0.0f;
   if(0.0f<v){
@@ -195,8 +195,8 @@
 // Recompute the dial image
 void FXColorWheel::updatedial(){
   FXfloat h,s,r,g,b;
-  for(register FXint y=0; y<dial->getHeight(); y++){
-    for(register FXint x=0; x<dial->getWidth(); x++){
+  for(FXint y=0; y<dial->getHeight(); y++){
+    for(FXint x=0; x<dial->getWidth(); x++){
       if(xytohs(h,s,x,y)){
         fxhsv_to_rgb(r,g,b,h,s,hsv2);
         dial->setPixel(x,y,FXRGB(255.0f*r,255.0f*g,255.0f*b));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXColors.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXColors.cpp Changed

@@ -3,7 +3,7 @@
 *                      C o l o r   N a m e   F u n c t i o n s                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -1492,13 +1492,12 @@
 
 // Get color name from rgb value
 FXchar* nameFromColor(FXchar* name,FXColor color){
-  register FXuint i;
   if(!name){ fxerror("FXColorName::nameFromColor: NULL name argument.\n"); }
   if(color && FXALPHAVAL(color)<255){
     __snprintf(name,MAXCOLORNAME,"#%02x%02x%02x%02x",FXREDVAL(color),FXGREENVAL(color),FXBLUEVAL(color),FXALPHAVAL(color));
     }
   else{
-    for(i=0; i<ARRAYNUMBER(colorValue); i++){
+    for(FXuint i=0; i<ARRAYNUMBER(colorValue); i++){
       if(colorValuei==color){
         fxstrlcpy(name,colorNamei,MAXCOLORNAME);
         return name;
@@ -1519,13 +1518,13 @@
 
 // Blend source color over background color
 FXColor blendOverBackground(FXColor back,FXColor clr){
-  register FXint as=FXALPHAVAL(clr);
-  register FXint rb=FXREDVAL(back);
-  register FXint gb=FXGREENVAL(back);
-  register FXint bb=FXBLUEVAL(back);
-  register FXint rs=(FXREDVAL(clr)-rb)*as;
-  register FXint gs=(FXGREENVAL(clr)-gb)*as;
-  register FXint bs=(FXBLUEVAL(clr)-bb)*as;
+  FXint as=FXALPHAVAL(clr);
+  FXint rb=FXREDVAL(back);
+  FXint gb=FXGREENVAL(back);
+  FXint bb=FXBLUEVAL(back);
+  FXint rs=(FXREDVAL(clr)-rb)*as;
+  FXint gs=(FXGREENVAL(clr)-gb)*as;
+  FXint bs=(FXBLUEVAL(clr)-bb)*as;
   rb+=((rs+(rs>>8)+128)>>8);
   gb+=((gs+(gs>>8)+128)>>8);
   bb+=((gs+(bs>>8)+128)>>8);
@@ -1535,33 +1534,33 @@
 
 // Blend source color over black background color
 FXColor blendOverBlack(FXColor clr){
-  register FXint as=FXALPHAVAL(clr);
-  register FXint rs=FXREDVAL(clr)*as;
-  register FXint gs=FXGREENVAL(clr)*as;
-  register FXint bs=FXBLUEVAL(clr)*as;
-  register FXint rd=((rs+(rs>>8)+128)>>8);
-  register FXint gd=((gs+(gs>>8)+128)>>8);
-  register FXint bd=((bs+(bs>>8)+128)>>8);
+  FXint as=FXALPHAVAL(clr);
+  FXint rs=FXREDVAL(clr)*as;
+  FXint gs=FXGREENVAL(clr)*as;
+  FXint bs=FXBLUEVAL(clr)*as;
+  FXint rd=((rs+(rs>>8)+128)>>8);
+  FXint gd=((gs+(gs>>8)+128)>>8);
+  FXint bd=((bs+(bs>>8)+128)>>8);
   return FXRGB(rd,gd,bd);
   }
 
 
 // Blend source color over white background color
 FXColor blendOverWhite(FXColor clr){
-  register FXint as=FXALPHAVAL(clr);
-  register FXint rs=(FXREDVAL(clr)-255)*as;
-  register FXint gs=(FXGREENVAL(clr)-255)*as;
-  register FXint bs=(FXBLUEVAL(clr)-255)*as;
-  register FXint rd=255+((rs+(rs>>8)+128)>>8);
-  register FXint gd=255+((gs+(gs>>8)+128)>>8);
-  register FXint bd=255+((bs+(bs>>8)+128)>>8);
+  FXint as=FXALPHAVAL(clr);
+  FXint rs=(FXREDVAL(clr)-255)*as;
+  FXint gs=(FXGREENVAL(clr)-255)*as;
+  FXint bs=(FXBLUEVAL(clr)-255)*as;
+  FXint rd=255+((rs+(rs>>8)+128)>>8);
+  FXint gd=255+((gs+(gs>>8)+128)>>8);
+  FXint bd=255+((bs+(bs>>8)+128)>>8);
   return FXRGB(rd,gd,bd);
   }
 
 
 // Blend color src toward color dst by a given percentage
 FXColor makeBlendColor(FXColor src,FXColor dst,FXint percent){
-  register FXuint r,g,b,tnecrep=100-percent;
+  FXuint r,g,b,tnecrep=100-percent;
   r=(FXREDVAL(dst)*percent+FXREDVAL(src)*tnecrep+50)/100;
   g=(FXGREENVAL(dst)*percent+FXGREENVAL(src)*tnecrep+50)/100;
   b=(FXBLUEVAL(dst)*percent+FXBLUEVAL(src)*tnecrep+50)/100;
@@ -1571,7 +1570,7 @@
 
 // Get highlight color
 FXColor makeHiliteColor(FXColor clr,FXint percent){
-  register FXuint r,g,b,tnecrep=100-percent;
+  FXuint r,g,b,tnecrep=100-percent;
   r=(255*percent+FXREDVAL(clr)*tnecrep+50)/100;
   g=(255*percent+FXGREENVAL(clr)*tnecrep+50)/100;
   b=(255*percent+FXBLUEVAL(clr)*tnecrep+50)/100;
@@ -1581,7 +1580,7 @@
 
 // Get shadow color
 FXColor makeShadowColor(FXColor clr,FXint percent){
-  register FXuint r,g,b,tnecrep=100-percent;
+  FXuint r,g,b,tnecrep=100-percent;
   r=(FXREDVAL(clr)*tnecrep+50)/100;
   g=(FXGREENVAL(clr)*tnecrep+50)/100;
   b=(FXBLUEVAL(clr)*tnecrep+50)/100;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXComboBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXComboBox.cpp Changed

@@ -3,7 +3,7 @@
 *                       C o m b o   B o x   O b j e c t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -426,8 +426,8 @@
 
 // Fill list by appending items from array of strings
 FXint FXComboBox::fillItems(const FXchar *const *strings,FXbool notify){
-  register FXint numberofitems=list->getNumItems();
-  register FXint n=list->fillItems(strings);
+  FXint numberofitems=list->getNumItems();
+  FXint n=list->fillItems(strings);
   recalc();
   if(numberofitems<=list->getCurrentItem()){
     setText(list->getItemText(list->getCurrentItem()),notify);
@@ -438,8 +438,8 @@
 
 // Fill list by appending items from array of strings
 FXint FXComboBox::fillItems(const FXString* strings,FXbool notify){
-  register FXint numberofitems=list->getNumItems();
-  register FXint n=list->fillItems(strings);
+  FXint numberofitems=list->getNumItems();
+  FXint n=list->fillItems(strings);
   recalc();
   if(numberofitems<=list->getCurrentItem()){
     setText(list->getItemText(list->getCurrentItem()),notify);
@@ -450,8 +450,8 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXComboBox::fillItems(const FXString& strings,FXbool notify){
-  register FXint numberofitems=list->getNumItems();
-  register FXint n=list->fillItems(strings);
+  FXint numberofitems=list->getNumItems();
+  FXint n=list->fillItems(strings);
   recalc();
   if(numberofitems<=list->getCurrentItem()){
     setText(list->getItemText(list->getCurrentItem()),notify);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCompletion.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCompletion.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXComplexd.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXComplexd.cpp Changed

@@ -3,7 +3,7 @@
 *          D o u b l e - P r e c i s i o n   C o m p l e x   N u m b e r        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -111,9 +111,9 @@
 
 // Complex square root
 FXComplexd csqrt(const FXComplexd& c){
-  register FXdouble mag=abs(c);
-  register FXdouble rr=Math::sqrt((mag+c.re)*0.5);
-  register FXdouble ii=Math::sqrt((mag-c.re)*0.5);
+  FXdouble mag=abs(c);
+  FXdouble rr=Math::sqrt((mag+c.re)*0.5);
+  FXdouble ii=Math::sqrt((mag-c.re)*0.5);
   return FXComplexd(rr,Math::copysign(ii,c.im));
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXComplexf.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXComplexf.cpp Changed

@@ -3,7 +3,7 @@
 *          S i n g l e - P r e c i s i o n   C o m p l e x   N u m b e r        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -39,9 +39,9 @@
 
 // Complex square root
 FXComplexf csqrt(const FXComplexf& c){
-  register FXfloat mag=abs(c);
-  register FXfloat rr=Math::sqrt((mag+c.re)*0.5f);
-  register FXfloat ii=Math::sqrt((mag-c.re)*0.5f);
+  FXfloat mag=abs(c);
+  FXfloat rr=Math::sqrt((mag+c.re)*0.5f);
+  FXfloat ii=Math::sqrt((mag-c.re)*0.5f);
   return FXComplexf(rr,Math::copysign(ii,c.im));
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXComposeContext.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXComposeContext.cpp Changed

@@ -3,7 +3,7 @@
 *                         C o m p o s e - C o n t e x t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -174,7 +174,7 @@
       mstr=new FXnchar mlen+1;
       ImmGetCompositionString(himc,GCS_COMPSTR,mstr,mlen);
       }
-	mstrmlen/sizeof(FXnchar)=0;
+    mstrmlen/sizeof(FXnchar)=0;
     ImmReleaseContext(event.hwnd,himc);
     int utf8len=WideCharToMultiByte(CP_UTF8,0,mstr,-1,NULL,0,NULL,NULL);
     FXchar* utf8str=new FXchar utf8len;
@@ -246,7 +246,7 @@
 FXbool isIMRunning(Display *display){
   const FXchar *p=XSetLocaleModifiers(NULL);
   if(p){
-    FXTRACE((1,"XSetLocaleModifiers=%s\n",p));
+    FXTRACE((100,"XSetLocaleModifiers=%s\n",p));
     FXString server("@server=");
     server.append(p+4);         // skip "@im="
     FXint pos=server.find('@',1);
@@ -342,7 +342,7 @@
 
         // Have status callbacks
         if(style&XIMStatusCallbacks){
-          FXTRACE((1,"On the Spot/Status\n"));
+          FXTRACE((100,"On the Spot/Status\n"));
           statusStartStruct.client_data=(XPointer)this;
           statusStartStruct.callback=(XIMProc)statusStartCallback;
           statusDoneStruct.client_data=(XPointer)this;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXComposite.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXComposite.cpp Changed

@@ -3,7 +3,7 @@
 *                C o m p o s i t e   W i n d o w   O b j e c t                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -120,9 +120,8 @@
 
 // Get width
 FXint FXComposite::getDefaultWidth(){
-  register FXWindow *child;
-  FXint t,w=0;
-  for(child=getFirst(); child; child=child->getNext()){
+  FXint w=0,t;
+  for(FXWindow *child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
       t=child->getX()+child->getWidth();
       if(w<t) w=t;
@@ -134,9 +133,8 @@
 
 // Get height
 FXint FXComposite::getDefaultHeight(){
-  register FXWindow *child;
-  FXint t,h=0;
-  for(child=getFirst(); child; child=child->getNext()){
+  FXint h=0,t;
+  for(FXWindow *child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
       t=child->getY()+child->getHeight();
       if(h<t) h=t;
@@ -148,10 +146,9 @@
 
 // Get maximum child width
 FXint FXComposite::maxChildWidth() const {
-  register FXWindow* child;
-  register FXuint hints;
-  register FXint t,m;
-  for(m=0,child=getFirst(); child; child=child->getNext()){
+  FXuint hints;
+  FXint m=0,t;
+  for(FXWindow *child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
       hints=child->getLayoutHints();
       if(hints&LAYOUT_FIX_WIDTH) t=child->getWidth();
@@ -165,10 +162,9 @@
 
 // Get maximum child height
 FXint FXComposite::maxChildHeight() const {
-  register FXWindow* child;
-  register FXuint hints;
-  register FXint t,m;
-  for(m=0,child=getFirst(); child; child=child->getNext()){
+  FXuint hints;
+  FXint m=0,t;
+  for(FXWindow *child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
       hints=child->getLayoutHints();
       if(hints&LAYOUT_FIX_HEIGHT) t=child->getHeight();
@@ -182,8 +178,7 @@
 
 // Just tell server where the windows are!
 void FXComposite::layout(){
-  register FXWindow *child;
-  for(child=getFirst(); child; child=child->getNext()){
+  for(FXWindow *child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
       child->position(child->getX(),child->getY(),child->getWidth(),child->getHeight());
       }
@@ -194,9 +189,8 @@
 
 // Update all subwindows
 long FXComposite::onCmdUpdate(FXObject* sender,FXSelector,void* ptr){
-  register FXWindow *child;
   update();
-  for(child=getFirst(); child; child=child->getNext()){
+  for(FXWindow *child=getFirst(); child; child=child->getNext()){
     if(child->shown()) child->handle(sender,FXSEL(SEL_COMMAND,ID_UPDATE),ptr);
     }
   return 1;
@@ -241,7 +235,7 @@
 
 // Keyboard press
 long FXComposite::onKeyPress(FXObject* sender,FXSelector sel,void* ptr){
-  register FXEvent* event=(FXEvent*)ptr;
+  FXEvent* event=(FXEvent*)ptr;
 
   FXTRACE((200,"%p->%s::onKeyPress keysym=0x%04x state=%04x\n",this,getClassName(),((FXEvent*)ptr)->code,((FXEvent*)ptr)->state));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCondition.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCondition.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXConsole.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXConsole.cpp Changed

@@ -3,7 +3,7 @@
 *                         C o n s o l e   W i d g e t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -187,7 +187,7 @@
     if(style.no()){ style.no(totallines); }
     }
 
-  FXTRACE((1,"visiblelines=%d historylines=%d totallines=%d hh=%d space=%d\n",visiblelines,historylines,totallines,hh,height-margintop-marginbottom));
+  FXTRACE((100,"visiblelines=%d historylines=%d totallines=%d hh=%d space=%d\n",visiblelines,historylines,totallines,hh,height-margintop-marginbottom));
 
   // Scrollbars adjusted
   placeScrollBars(width,height);
@@ -211,8 +211,8 @@
 
 // Determine style
 FXuint FXConsole::styleOf(FXint line,FXint index,FXint p,FXint c) const {
-  register FXuint s=0;
-  register FXchar ch;
+  FXuint s=0;
+  FXchar ch;
 
   // Selected part of text
 //  if(selstartpos<=p && p<selendpos) s|=STYLE_SELECTED;
@@ -250,7 +250,7 @@
 
 // Draw fragment of text in given style
 void FXConsole::drawTextFragment(FXDCWindow& dc,FXint x,FXint y,FXint,FXint,const FXchar *text,FXint n,FXuint sty) const {
-  register FXColor color=FXRGB(255,255,255);
+  FXColor color=FXRGB(255,255,255);
   dc.setForeground(color);
   y+=font->getFontAscent();
   dc.drawText(x,y,text,n);
@@ -259,15 +259,15 @@
 
 // Draw text line with correct style
 void FXConsole::drawTextLine(FXDCWindow& dc,FXint line,FXint left,FXint right) const {
-  register FXint index=(topline+line)%contents.no();
-  register FXint edge=pos_x+marginleft;
-  register FXint h=font->getFontHeight();
-  register FXint y=pos_y+margintop+line*h;
-  register FXint x=0;
-  register FXint w=0;
-  register FXuint curstyle;
-  register FXuint newstyle;
-  register FXint cw,sp,ep,sc,ec;
+  FXint index=(topline+line)%contents.no();
+  FXint edge=pos_x+marginleft;
+  FXint h=font->getFontHeight();
+  FXint y=pos_y+margintop+line*h;
+  FXint x=0;
+  FXint w=0;
+  FXuint curstyle;
+  FXuint newstyle;
+  FXint cw,sp,ep,sc,ec;
 
   // Scan ahead till until we hit the end or the left edge
   for(sp=sc=0; sp<contentsindex.length(); sp=contentsindex.inc(sp),sc++){
@@ -310,14 +310,14 @@
 
 // Repaint lines of text
 void FXConsole::drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXint hh=font->getFontHeight();
-  register FXint yy=pos_y+margintop;
-  register FXint tl=(y-yy)/hh;
-  register FXint bl=(y+h-yy)/hh;
-  register FXint ln;
+  FXint hh=font->getFontHeight();
+  FXint yy=pos_y+margintop;
+  FXint tl=(y-yy)/hh;
+  FXint bl=(y+h-yy)/hh;
+  FXint ln;
   if(tl<0) tl=0;
   if(bl>=contents.no()) bl=contents.no()-1;
-  FXTRACE((1,"tl=%d bl=%d\n",tl,bl));
+  FXTRACE((100,"tl=%d bl=%d\n",tl,bl));
   for(ln=tl; ln<=bl; ln++){
     drawTextLine(dc,ln,x,x+w);
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXCursor.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXCursor.cpp Changed

@@ -3,7 +3,7 @@
 *                         C u r s o r - O b j e c t                             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -133,7 +133,7 @@
   if(!xid){
     if(getApp()->isInitialized()){
       FXTRACE((100,"%s::create %p\n",getClassName(),this));
-#ifdef WIN32            // WIN32
+#if defined(WIN32)      // WIN32
 
       // Mapping to standard WIN32 cursors
       const LPCTSTR stock={IDC_ARROW,IDC_ARROW,IDC_ARROW,IDC_IBEAM,IDC_WAIT,IDC_CROSS,IDC_SIZENS,IDC_SIZEWE,IDC_SIZEALL};
@@ -185,7 +185,12 @@
           if(!hmask){ throw FXImageException("unable to create cursor"); }
 
           // Create cursor
-          ICONINFO iconinfo={false,hotx,hoty,hmask,himage};
+          ICONINFO iconinfo;
+          iconinfo.fIcon=false;
+          iconinfo.xHotspot=hotx;
+          iconinfo.yHotspot=hoty;
+          iconinfo.hbmMask=hmask;
+          iconinfo.hbmColor=himage;
           xid=CreateIconIndirect(&iconinfo);
 
           // No longer needed
@@ -334,7 +339,7 @@
   if(xid){
     if(getApp()->isInitialized()){
       FXTRACE((100,"%s::destroy %p\n",getClassName(),this));
-#ifdef WIN32
+#if defined(WIN32)
       DestroyCursor((HCURSOR)xid);
 #else
       XFreeCursor(DISPLAY(getApp()),xid);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDC.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDC.cpp Changed

@@ -3,7 +3,7 @@
 *               D e v i c e   C o n t e x t   B a s e   C l a s s               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -335,7 +335,7 @@
 
 // Set dash pattern
 void FXDC::setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength){
-  register FXuint len,i;
+  FXuint len,i;
   if(dashlength>32){ fxerror("FXDCWindow::setDashes: bad dashlength parameter.\n"); }
   for(i=len=0; i<dashlength; i++){
     dashpati=dashpatterni;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDCPrint.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDCPrint.cpp Changed

@@ -3,7 +3,7 @@
 *           D e v i c e   C o n t e x t   F o r   P r i n t i n g               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -568,7 +568,7 @@
 // Draw points in the current pen color.
 // Each point's position is relative to the drawable's origin (as usual).
 void FXDCPrint::drawPoints(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   FXfloat xx,yy;
   for(i=0; i<npoints; i++){
     tfm(xx,yy,pointsi.x,pointsi.y);
@@ -600,7 +600,7 @@
 // Draw multiple lines. All points are drawn connected.
 // Each point is specified relative to Drawable's origin.
 void FXDCPrint::drawLines(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   FXfloat xx,yy;
   if(npoints<2) return;
   tfm(xx,yy,points0.x,points0.y);
@@ -619,7 +619,7 @@
 // First point's coordinate is relative to drawable's origin, but
 // subsequent points' coordinates are relative to previous point.
 void FXDCPrint::drawLinesRel(const FXPoint* points,FXuint npoints){
-  register FXuint i,x,y;
+  FXuint i,x,y;
   FXfloat xx,yy;
   if(npoints<2) return;
   x=points0.x;
@@ -640,7 +640,7 @@
 
 // Draw unconnected line segments
 void FXDCPrint::drawLineSegments(const FXSegment* segments,FXuint nsegments){
-  register FXuint i;
+  FXuint i;
   for(i=0; i<=nsegments; i++)
     outf(" %d %d %d %d",
 		segmentsi.x1,Yr-segmentsi.y1,
@@ -662,7 +662,7 @@
 
 // Draw unfilled rectangles
 void FXDCPrint::drawRectangles(const FXRectangle* rectangles,FXuint nrectangles){
-  register FXuint i;
+  FXuint i;
   for(i=0; i<nrectangles; i++){
     drawRectangle(rectanglesi.x,rectanglesi.y,rectanglesi.w,rectanglesi.h);
     }
@@ -709,7 +709,7 @@
 
 // Filled rectangles
 void FXDCPrint::fillRectangles(const FXRectangle* rectangles,FXuint nrectangles){
-  register FXuint i;
+  FXuint i;
   for(i=0; i<nrectangles; i++){
     fillRectangle(rectanglesi.x,rectanglesi.y,rectanglesi.w,rectanglesi.h);
     }
@@ -749,7 +749,7 @@
 
 // Filled simple polygon
 void FXDCPrint::fillPolygon(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   FXfloat xx,yy;
   if(npoints<2) return;
   tfm(xx,yy,points0.x,points0.y);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDCWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDCWindow.cpp Changed

@@ -3,7 +3,7 @@
 *  D e v i c e   C o n t e x t   F o r   W i n d o w s   a n d   I m a g e s    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -282,7 +282,7 @@
 
 // Draw points
 void FXDCWindow::drawPoints(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::drawPoints: DC not connected to drawable.\n"); }
   for(i=0; i<npoints; i++){
     ::SetPixel((HDC)ctx,pointsi.x,pointsi.y,devfg);
@@ -292,8 +292,8 @@
 
 // Draw points relative
 void FXDCWindow::drawPointsRel(const FXPoint* points,FXuint npoints){
-  register int x=0,y=0;
-  register FXuint i;
+  int x=0,y=0;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::drawPointsRel: DC not connected to drawable.\n"); }
   for(i=0; i<npoints; i++){
     x+=pointsi.x;
@@ -323,7 +323,7 @@
 
 // Draw lines
 void FXDCWindow::drawLines(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::drawLines: DC not connected to drawable.\n"); }
   if(needsNewPen) updatePen();
@@ -350,8 +350,8 @@
 
 // Draw lines relative
 void FXDCWindow::drawLinesRel(const FXPoint* points,FXuint npoints){
-  register int x=0,y=0;
-  register FXuint i;
+  int x=0,y=0;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::drawLinesRel: DC not connected to drawable.\n"); }
   if(needsNewPen) updatePen();
@@ -382,7 +382,7 @@
 
 // Draw line segments
 void FXDCWindow::drawLineSegments(const FXSegment* segments,FXuint nsegments){
-  register FXuint i;
+  FXuint i;
   POINT pts2;
   if(!surface){ fxerror("FXDCWindow::drawLineSegments: DC not connected to drawable.\n"); }
   if(needsNewPen) updatePen();
@@ -413,7 +413,7 @@
 
 // Draw unfilled rectangles
 void FXDCWindow::drawRectangles(const FXRectangle* rectangles,FXuint nrectangles){
-  register FXuint i;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::drawRectangles: DC not connected to drawable.\n"); }
   if(needsNewPen) updatePen();
   HBRUSH hbrush=(HBRUSH)::SelectObject((HDC)ctx,(HBRUSH)GetStockObject(NULL_BRUSH));
@@ -440,7 +440,7 @@
 // If angle is negative flip the start and end; also, if ang2 is zero,
 // don't draw anything at all (patch: Sander Jansen <sander@knology.net>).
 void FXDCWindow::drawArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){
-  register FXbool reversed=(ang2<0);
+  FXbool reversed=(ang2<0);
   if(!surface){ fxerror("FXDCWindow::drawArc: DC not connected to drawable.\n"); }
   if(ang2==0) return;
   if(needsNewPen) updatePen();
@@ -467,7 +467,7 @@
 
 // Draw arcs
 void FXDCWindow::drawArcs(const FXArc* arcs,FXuint narcs){
-  register FXuint i;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::drawArcs: DC not connected to drawable.\n"); }
   for(i=0; i<narcs; i++){
     drawArc(arcsi.x,arcsi.y,arcsi.w,arcsi.h,arcsi.a,arcsi.b);
@@ -505,7 +505,7 @@
 
 // Fill using currently selected ROP code
 void FXDCWindow::fillRectangles(const FXRectangle* rectangles,FXuint nrectangles){
-  register FXuint i;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::fillRectangles: DC not connected to drawable.\n"); }
   if(needsNewBrush) updateBrush();
   HPEN hpen=(HPEN)::SelectObject((HDC)ctx,GetStockObject(NULL_PEN));
@@ -530,7 +530,7 @@
 
 // Fill chord
 void FXDCWindow::fillChord(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){
-  register FXbool reversed=(ang2<0);
+  FXbool reversed=(ang2<0);
   if(!surface){ fxerror("FXDCWindow::fillChord: DC not connected to drawable.\n"); }
   if(ang2==0) return;
   if(needsNewBrush) updateBrush();
@@ -552,7 +552,7 @@
 
 // Fill chords
 void FXDCWindow::fillChords(const FXArc* chords,FXuint nchords){
-  register FXuint i;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::fillChords: DC not connected to drawable.\n"); }
   for(i=0; i<nchords; i++){
     fillChord(chordsi.x,chordsi.y,chordsi.w,chordsi.h,chordsi.a,chordsi.b);
@@ -564,7 +564,7 @@
 // If angle is negative flip the start and end; also, if ang2 is zero,
 // don't draw anything at all (patch: Sander Jansen <sander@knology.net>).
 void FXDCWindow::fillArc(FXint x,FXint y,FXint w,FXint h,FXint ang1,FXint ang2){
-  register FXbool reversed=(ang2<0);
+  FXbool reversed=(ang2<0);
   if(!surface){ fxerror("FXDCWindow::fillArc: DC not connected to drawable.\n"); }
   if(ang2==0) return;
   if(needsNewBrush) updateBrush();
@@ -587,7 +587,7 @@
 
 // Fill arcs
 void FXDCWindow::fillArcs(const FXArc* arcs,FXuint narcs){
-  register FXuint i;
+  FXuint i;
   if(!surface){ fxerror("FXDCWindow::fillArcs: DC not connected to drawable.\n"); }
   for(i=0; i<narcs; i++){
     fillArc(arcsi.x,arcsi.y,arcsi.w,arcsi.h,arcsi.a,arcsi.b);
@@ -609,7 +609,7 @@
 
 // Filled simple polygon
 void FXDCWindow::fillPolygon(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::fillPolygon: DC not connected to drawable.\n"); }
   if(npoints>=1360){ fxerror("FXDCWindow::fillPolygon: too many points.\n"); }
@@ -626,7 +626,7 @@
 
 // Filled concave polygon
 void FXDCWindow::fillConcavePolygon(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::fillConcavePolygon: DC not connected to drawable.\n"); }
   if(npoints>=1360){ fxerror("FXDCWindow::fillConcavePolygon: too many points.\n"); }
@@ -643,7 +643,7 @@
 
 // Filled complex polygon relative
 void FXDCWindow::fillComplexPolygon(const FXPoint* points,FXuint npoints){
-  register FXuint i;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::fillComplexPolygon: DC not connected to drawable.\n"); }
   if(npoints>=1360){ fxerror("FXDCWindow::fillComplexPolygon: too many points.\n"); }
@@ -660,8 +660,8 @@
 
 // Filled simple polygon with relative points
 void FXDCWindow::fillPolygonRel(const FXPoint* points,FXuint npoints){
-  register int x=0,y=0;
-  register FXuint i;
+  int x=0,y=0;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::fillPolygonRel: DC not connected to drawable.\n"); }
   if(npoints>=1360){ fxerror("FXDCWindow::fillPolygonRel: too many points.\n"); }
@@ -678,8 +678,8 @@
 
 // Filled concave polygon relative
 void FXDCWindow::fillConcavePolygonRel(const FXPoint* points,FXuint npoints){
-  register int x=0,y=0;
-  register FXuint i;
+  int x=0,y=0;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::fillConcavePolygonRel: DC not connected to drawable.\n"); }
   if(npoints>=1360){ fxerror("FXDCWindow::fillConcavePolygonRel: too many points.\n"); }
@@ -696,8 +696,8 @@
 
 // Filled complex polygon relative
 void FXDCWindow::fillComplexPolygonRel(const FXPoint* points,FXuint npoints){
-  register int x=0,y=0;
-  register FXuint i;
+  int x=0,y=0;
+  FXuint i;
   POINT pts1360;      // Worst case limit according to MSDN
   if(!surface){ fxerror("FXDCWindow::fillComplexPolygonRel: DC not connected to drawable.\n"); }
   if(npoints>=1360){ fxerror("FXDCWindow::fillComplexPolygonRel: too many points.\n"); }
@@ -774,7 +774,7 @@
   if(!surface){ fxerror("FXDCWindow::drawText: DC not connected to drawable.\n"); }
   if(!font){ fxerror("FXDCWindow::drawText: no font selected.\n"); }
   FXnchar sbuffer4096;
-  FXint count=utf2ncs(sbuffer,string,4096,length);
+  FXint count=utf2ncs(sbuffer,string,ARRAYNUMBER(sbuffer),length);
   FXint bkmode=::SetBkMode((HDC)ctx,TRANSPARENT);
   ::TextOutW((HDC)ctx,x,y,sbuffer,count);
   ::SetBkMode((HDC)ctx,bkmode);
@@ -786,7 +786,7 @@
   if(!surface){ fxerror("FXDCWindow::drawImageText: DC not connected to drawable.\n"); }
   if(!font){ fxerror("FXDCWindow::drawImageText: no font selected.\n"); }
   FXnchar sbuffer4096;
-  FXint count=utf2ncs(sbuffer,string,4096,length);
+  FXint count=utf2ncs(sbuffer,string,ARRAYNUMBER(sbuffer),length);
   FXint bkmode=::SetBkMode((HDC)ctx,OPAQUE);
   ::TextOutW((HDC)ctx,x,y,sbuffer,count);
 //    RECT r;
@@ -1426,7 +1426,7 @@
 
 // Set dash pattern (for the LINE_ONOFF_DASH line style)
 void FXDCWindow::setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength){
-  register FXuint len,i;
+  FXuint len,i;
   if(!surface){ fxerror("FXDCWindow::setDashes: DC not connected to drawable.\n"); }
   if(dashlength>32){ fxerror("FXDCWindow::setDashes: bad dashlength parameter.\n"); }
   for(i=len=0; i<dashlength; i++){
@@ -2104,7 +2104,7 @@
 
 // Fill vertical gradient rectangle
 void FXDCWindow::fillVerticalGradient(FXint x,FXint y,FXint w,FXint h,FXColor top,FXColor bottom){
-  register FXint rr,gg,bb,dr,dg,db,r1,g1,b1,r2,g2,b2,yl,yh,yy,dy,n,t;
+  FXint rr,gg,bb,dr,dg,db,r1,g1,b1,r2,g2,b2,yl,yh,yy,dy,n,t;
   if(!surface){ fxerror("FXDCWindow::fillVerticalGradient: DC not connected to drawable.\n"); }
   if(0<w && 0<h){
     r1=FXREDVAL(top);
@@ -2174,7 +2174,7 @@
 
 // Fill horizontal gradient rectangle
 void FXDCWindow::fillHorizontalGradient(FXint x,FXint y,FXint w,FXint h,FXColor left,FXColor right){
-  register FXint rr,gg,bb,dr,dg,db,r1,g1,b1,r2,g2,b2,xl,xh,xx,dx,n,t;
+  FXint rr,gg,bb,dr,dg,db,r1,g1,b1,r2,g2,b2,xl,xh,xx,dx,n,t;
   if(!surface){ fxerror("FXDCWindow::fillHorizontalGradient: DC not connected to drawable.\n"); }
   if(0<w && 0<h){
     r1=FXREDVAL(left);
@@ -2280,8 +2280,8 @@
 
 
 static FXint utf2db(XChar2b *dst,const FXchar *src,FXint n){
-  register FXint len,p;
-  register FXwchar w;
+  FXint len,p;
+  FXwchar w;
   for(p=len=0; p<n; p+=wclen(src+p),len++){
     w=wc(src+p);
     dstlen.byte1=(w>>8);
@@ -2304,9 +2304,9 @@
   color.color.alpha=FXALPHAVAL(fg)*257;
   XftDrawStringUtf8((XftDraw*)xftDraw,&color,(XftFont*)font->font,x,y,(const FcChar8*)string,length);
 #else
-  register FXint count,escapement,defwidth,ww,size,i;
-  register FXdouble ang,ux,uy;
-  register FXuchar r,c;
+  FXint count,escapement,defwidth,ww,size,i;
+  FXdouble ang,ux,uy;
+  FXuchar r,c;
   XChar2b sbuffer4096;
   count=utf2db(sbuffer,string,FXMIN(length,4096));
   if(font->getAngle()){
@@ -2372,9 +2372,9 @@
 //XftDrawRect((XftDraw*)xftDraw,&bgcolor,x+cache->xoff,y-((XftFont*)font->font)->ascent,cache->x2off-cache->xoff,((XftFont*)font->font)->ascent+((XftFont*)font->font)->descent);
   XftDrawStringUtf8((XftDraw*)xftDraw,&fgcolor,(XftFont*)font->font,x,y,(const FcChar8*)string,length);
 #else
-  register FXint count,escapement,defwidth,ww,size,i;
-  register FXdouble ang,ux,uy;
-  register FXuchar r,c;
+  FXint count,escapement,defwidth,ww,size,i;
+  FXdouble ang,ux,uy;
+  FXuchar r,c;
   XChar2b sbuffer4096;
   count=utf2db(sbuffer,string,FXMIN(length,4096));
   if(font->getAngle()){
@@ -2438,7 +2438,7 @@
 
 // Draw area stretched area from source; FIXME this works but it's like molasses!
 void FXDCWindow::drawArea(const FXDrawable* source,FXint sx,FXint sy,FXint sw,FXint sh,FXint dx,FXint dy,FXint dw,FXint dh){
-  register FXint i,j,x,y,xs,ys;
+  FXint i,j,x,y,xs,ys;
   if(!surface){ fxerror("FXDCWindow::drawArea: DC not connected to drawable.\n"); }
   if(!source || !source->id()){ fxerror("FXDCWindow::drawArea: illegal source specified.\n"); }
   xs=(sw<<16)/dw;
@@ -2636,7 +2636,7 @@
 
 // Set dashes
 void FXDCWindow::setDashes(FXuint dashoffset,const FXchar *dashpattern,FXuint dashlength){
-  register FXuint len,i;
+  FXuint len,i;
   if(!surface){ fxerror("FXDCWindow::setDashes: DC not connected to drawable.\n"); }
   if(dashlength>32){ fxerror("FXDCWindow::setDashes: bad dashlength parameter.\n"); }
   for(i=len=0; i<dashlength; i++){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDDSIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDDSIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDDSImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDDSImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDLL.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDLL.cpp Changed

@@ -3,7 +3,7 @@
 *             D y n a m i c   L i n k   L i b r a r y   S u p p o r t           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -198,6 +198,10 @@
     if(GetModuleFileNameA((HINSTANCE)mbi.AllocationBase,buffer,sizeof(buffer))){
       return FXString(buffer);
       }
+//  FXnchar buffer1024;
+//  if(GetModuleFileNameW((HINSTANCE)mbi.AllocationBase,buffer,sizeof(buffer))){
+//    return FXString(buffer);
+//    }
     }
 #elif defined(HAVE_SHL_LOAD)    // HP-UX
   // FIXME //

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDataTarget.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDataTarget.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDate.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDate.cpp Changed

@@ -3,7 +3,7 @@
 *                            D a t e   C l a s s                                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -34,6 +34,8 @@
     Processing Calendar Dates". CACM, Vol. 11, No. 10, October 1968, pp 657.
   - Major clean up and simplification was done!
   - Added week number calculations!
+  - Start of the JD count is 0 at 12 NOON 1 JAN -4712 (4713 BC).
+  - Reminder, MJD = JD - 2400000.5.
 */
 
 
@@ -45,13 +47,19 @@
 
 
 // Many nanoseconds in a second
-const FXTime seconds=1000000000L;
+static const FXTime seconds=1000000000L;
 
-// Julian day number of GPS week zero
-const FXuint GPS_EPOCH_JDAY=2444245;
+// Julian day number of GPS week zero (Jan 6, 1980)
+static const FXuint GPS_EPOCH_JDAY=2444245;
 
-// Julian day number of UNIX epoch
-const FXuint UNIX_EPOCH_JDAY=2440588;
+// Julian day number of UNIX epoch (Jan 1, 1970)
+static const FXuint UNIX_EPOCH_JDAY=2440588;
+
+// Julian day number of J2000 (Jan 1, 2000)
+static const FXuint J2000_EPOCH_JDAY=2451545;
+
+// UNIX time to GPS time offset in nanoseconds
+static const FXTime UNIX_TO_GPS=315964800L*seconds;
 
 // Short month names
 const FXchar FXDate::shortMonthName124={
@@ -106,7 +114,7 @@
 
 // Get year and day of year from date
 void FXDate::getDate(FXint& yr,FXint& dy) const {
-  register FXint l,n,i,j;
+  FXint l,n,i,j;
   l=julian+68569;
   n=(4*l)/146097;
   l=l-(146097*n+3)/4;
@@ -128,7 +136,7 @@
 
 // Get year, month, and day of month from date
 void FXDate::getDate(FXint& yr,FXint& mo,FXint& dy) const {
-  register FXint l,n,i,j;
+  FXint l,n,i,j;
   l=julian+68569;
   n=(4*l)/146097;
   l=l-(146097*n+3)/4;
@@ -143,14 +151,19 @@
 
 
 // Set date from nanoseconds since 1/1/1970
+// Technically, Julian Day starts at noon; however we truncate
+// incoming time to 00:00:00.
 void FXDate::setTime(FXTime ns){
-  julian=(FXuint)(UNIX_EPOCH_JDAY+ns/(86400L*seconds));
+  const FXTime days=86400L*seconds;
+  julian=UNIX_EPOCH_JDAY+(((0<=ns)?ns:ns-days+1)/days);
   }
 
 
 // Get nanoseconds since 1/1/1970 from date
+// Return time in nanoseconds at start of the day
 FXTime FXDate::getTime() const {
-  return (julian-UNIX_EPOCH_JDAY)*(86400L*seconds);
+  const FXTime days=86400L*seconds;
+  return ((FXTime)julian-(FXTime)UNIX_EPOCH_JDAY)*days;
   }
 
 
@@ -198,7 +211,6 @@
 
 // Return day of the week
 FXint FXDate::dayOfWeek() const {
-//  return (((julian+1)%7)+6)%7;        // Monday is day 0 of week
   return (julian+1)%7;                  // Sunday is day 0 of week
   }
 
@@ -232,10 +244,9 @@
 
 // Return ISO8601 week number of this date
 FXint FXDate::weekOfYear() const {
-  FXint d4,L,d1;
-  d4=(((julian+31741-julian%7)%146097)%36524)%1461;
-  L=d4/1460;
-  d1=(d4-L)%365+L;
+  FXint d4=(((julian+31741-julian%7)%146097)%36524)%1461;
+  FXint L=d4/1460;
+  FXint d1=(d4-L)%365+L;
   return 1+d1/7;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDebugTarget.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDebugTarget.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDelegator.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDelegator.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDial.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDial.cpp Changed

@@ -3,7 +3,7 @@
 *                                D i a l   W i d g e t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -133,14 +133,14 @@
 
 // Get minimum width
 FXint FXDial::getDefaultWidth(){
-  register FXint w=(options&DIAL_HORIZONTAL)?DIALDIAMETER:DIALWIDTH;
+  FXint w=(options&DIAL_HORIZONTAL)?DIALDIAMETER:DIALWIDTH;
   return w+padleft+padright+(border<<1);
   }
 
 
 // Get minimum height
 FXint FXDial::getDefaultHeight(){
-  register FXint h=(options&DIAL_HORIZONTAL)?DIALWIDTH:DIALDIAMETER;
+  FXint h=(options&DIAL_HORIZONTAL)?DIALWIDTH:DIALDIAMETER;
   return h+padtop+padbottom+(border<<1);
   }
 
@@ -682,7 +682,7 @@
 
 // Set dial value
 void FXDial::setValue(FXint p,FXbool notify){
-  register FXint n;
+  FXint n;
   if(p<range0) p=range0;
   if(p>range1) p=range1;
   n=(notchOffset+(3600*(p-range0))/incr)%3600;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDialogBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDialogBox.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDictionary.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDictionary.cpp Changed

@@ -3,7 +3,7 @@
 *                          D i c t i o n a r y    C l a s s                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -108,11 +108,10 @@
   FXASSERT((n-used())>0);       // At least one free slot
   if(elbat.no(n)){
     if(1<elbat.no() && 1<no()){
-      FXuval p,b,h,x;
-      FXival i;
+      FXuval p,b,h,x; FXival i;
       for(i=0; i<no(); ++i){                  // Hash existing entries into new table
-        p=b=h=tablei.hash;
         if(!tablei.key.empty()){
+          p=b=h=tablei.hash;
           while(elbat.tablex=p&(n-1).hash){ // Locate slot
             p=(p<<2)+p+b+1;
             b>>=BSHIFT;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDir.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDir.cpp Changed

@@ -3,7 +3,7 @@
 *                    D i r e c t o r y   E n u m e r a t o r                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -94,13 +94,13 @@
   if(!path.empty()){
 #ifdef WIN32
 #ifdef UNICODE
-    FXnchar bufferMAXPATHLEN;
-    utf2ncs(buffer,path.text(),MAXPATHLEN-2);
-    wcsncat(buffer,TEXT("\\*"),MAXPATHLEN);
+    FXnchar bufferMAXPATHLEN+2;
+    utf2ncs(buffer,path.text(),MAXPATHLEN);
+    wcsncat(buffer,TEXT("\\*"),MAXPATHLEN+2);
 #else
-    FXchar bufferMAXPATHLEN;
+    FXchar bufferMAXPATHLEN+2;
     fxstrlcpy(buffer,path.text(),MAXPATHLEN);
-    fxstrlcat(buffer,"\\*",MAXPATHLEN);
+    fxstrlcat(buffer,"\\*",MAXPATHLEN+2);
 #endif
     ((SPACE*)space)->handle=FindFirstFile(buffer,&((SPACE*)space)->result);
     if(((SPACE*)space)->handle!=INVALID_HANDLE_VALUE){
@@ -269,7 +269,7 @@
 
 // List drives, i.e. roots of directory trees.
 FXint FXDir::listDrives(FXString*& drivelist){
-  register FXint count=0;
+  FXint count=0;
 #ifdef WIN32
   FXchar drives256;
   clearElms(drives,ARRAYNUMBER(drives));
@@ -291,7 +291,7 @@
 #if 0
 
 FXint FXDir::listShares(FXString*& sharelist){
-  register FXint count=0;
+  FXint count=0;
 #ifdef WIN32
 #else
   sharelist=new FXString 2;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDirBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDirBox.cpp Changed

@@ -3,7 +3,7 @@
 *                     D i r e c t o r y   B o x   O b j e c t                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -64,6 +64,7 @@
 #include "FXTreeListBox.h"
 #include "FXDirBox.h"
 #include "FXDictionary.h"
+#include "FXDictionaryOf.h"
 #include "FXIconCache.h"
 #include "FXFileAssociations.h"
 #include "icons.h"
@@ -315,11 +316,11 @@
 
 // Return the item from the absolute pathname
 FXTreeItem* FXDirBox::getPathnameItem(const FXString& path){
-  register FXFileAssoc *fileassoc;
-  register FXTreeItem *item,*it;
-  register FXIcon *icon;
-  register FXint beg=0;
-  register FXint end=0;
+  FXFileAssoc *fileassoc;
+  FXTreeItem *item,*it;
+  FXIcon *icon;
+  FXint beg=0;
+  FXint end=0;
   FXchar drivename10;
 //  FXchar volumename256;
 //  FXchar filesystem100;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDirDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDirDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDirList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDirList.cpp Changed

@@ -3,7 +3,7 @@
 *                     D i r e c t o r y   L i s t   O b j e c t                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -57,6 +57,7 @@
 #include "FXMenuCheck.h"
 #include "FXMenuSeparator.h"
 #include "FXDictionary.h"
+#include "FXDictionaryOf.h"
 #include "FXIconCache.h"
 #include "FXFileAssociations.h"
 #include "FXMessageBox.h"
@@ -221,7 +222,7 @@
   networkicon->create();
   floppyicon->create();
   zipdiskicon->create();
-  scan(false);
+  listItems(false,true);          // FIXME
   }
 
 
@@ -266,33 +267,54 @@
 
 // Sort ascending order, keeping directories first
 FXint FXDirList::ascending(const FXTreeItem* pa,const FXTreeItem* pb){
-  register FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
+  FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
   return diff ? diff : compare(pa->label,pb->label);
   }
 
 
 // Sort descending order, keeping directories first
 FXint FXDirList::descending(const FXTreeItem* pa,const FXTreeItem* pb){
-  register FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
+  FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
   return diff ? diff : compare(pb->label,pa->label);
   }
 
 
 // Sort ascending order, case insensitive, keeping directories first
 FXint FXDirList::ascendingCase(const FXTreeItem* pa,const FXTreeItem* pb){
-  register FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
+  FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
   return diff ? diff : comparecase(pa->label,pb->label);
   }
 
 
 // Sort descending order, case insensitive, keeping directories first
 FXint FXDirList::descendingCase(const FXTreeItem* pa,const FXTreeItem* pb){
-  register FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
+  FXint diff=static_cast<const FXDirItem*>(pb)->isDirectory() - static_cast<const FXDirItem*>(pa)->isDirectory();
   return diff ? diff : comparecase(pb->label,pa->label);
   }
 
 /*******************************************************************************/
 
+// Return uri-list of selected files
+FXString FXDirList::getSelectedFiles() const {
+  FXTreeItem *item=getFirstItem();
+  FXString result;
+  while(item){
+    if(isItemSelected(item)){
+      result.append(FXURL::fileToURL(getItemPathname(item)));
+      result.append("\r\n");
+      }
+    if(item->getFirst()){
+      item=item->getFirst();
+      }
+    else{
+      while(!item->getNext() && item->getParent()) item=item->getParent();
+      item=item->getNext();
+      }
+    }
+  return result;
+  }
+
+
 // Update if we have selection
 long FXDirList::onUpdHaveSel(FXObject* sender,FXSelector,void*){
   FXTreeItem *item=getFirstItem();
@@ -313,6 +335,7 @@
   return 1;
   }
 
+/*******************************************************************************/
 
 // Delete selection
 long FXDirList::onCmdDeleteSel(FXObject*,FXSelector,void*){     // FIXME
@@ -456,7 +479,7 @@
       dropaction=inquireDNDAction();
 
       // See if this is writable
-      if(FXStat::isWritable(dropdirectory)){
+      if(FXStat::isAccessible(dropdirectory,FXIO::ReadOnly|FXIO::WriteOnly)){
         acceptDrop(DRAG_ACCEPT);
         }
       }
@@ -731,10 +754,12 @@
 
 /*******************************************************************************/
 
+
 // Refresh; don't update if user is interacting with the list
 long FXDirList::onRefreshTimer(FXObject*,FXSelector,void*){
   if(flags&FLAG_UPDATE){
-    scan(false);
+    listItems(false,true);                      // FIXME
+//    listItems((counter==0),true);
     counter=(counter+1)%REFRESHFREQUENCY;
     }
   getApp()->addTimeout(this,ID_REFRESHTIMER,REFRESHINTERVAL);
@@ -744,70 +769,59 @@
 
 // Force an immediate update of the list
 long FXDirList::onCmdRefresh(FXObject*,FXSelector,void*){
-  scan(true);
+  listItems(true,true);
   return 1;
   }
 
 
-// Scan items to see if listing is necessary
-void FXDirList::scan(FXbool force){
-  FXString   pathname;
+// List items
+void FXDirList::listItems(FXbool force,FXbool notify){
   FXDirItem *item;
-  FXStat     info;
 
   // Do root first time
-  if(!firstitem || force){
-    listRootItems();
+  if(!getFirstItem() || force){
+    listRootItems(force,notify);
     }
 
   // Check all items
-  item=(FXDirItem*)firstitem;
+  item=(FXDirItem*)getFirstItem();
   while(item){
 
     // Is directory already populated?
     if(item->isDirectory() && item->getFirst()){
 
-      // Get the full path of the item
-      pathname=getItemPathname(item);
-
-      // Stat this directory; should not fail as parent has been scanned already
-      FXStat::statFile(pathname,info);
-
-      // Get the mod date of the item
-      FXTime newdate=info.modified();
-
-      // Forced, date was changed, or failed to get proper date and counter expired
-      if(force || (item->date!=newdate) || (counter==0)){
-
-        // And do the refresh
-        listChildItems(item,force,true);
-
-        // Remember when we did this
-        item->date=newdate;
-        }
+      // Do the refresh if needed
+      // FIXME if listChildItems() returns false, the item
+      // may have gone away; remove it in that case...
+      listChildItems(item,force,notify);
 
       // Go deeper
-      if(item->first){
-        item=(FXDirItem*)item->first;
+      if(item->getFirst()){
+        item=(FXDirItem*)item->getFirst();
         continue;
         }
       }
 
     // Go up
-    while(!item->next && item->parent){
-      item=(FXDirItem*)item->parent;
+    while(!item->getNext() && item->getParent()){
+      item=(FXDirItem*)item->getParent();
       }
 
     // Go to next
-    item=(FXDirItem*)item->next;
+    item=(FXDirItem*)item->getNext();
     }
   }
 
 
+// FIXME
+// Interpret force flag properly.
+// Issue callbacks properly.
+// Windows:- can we finally list shares?
+
 #ifdef WIN32            // Windows flavor
 
 // List root directories
-void FXDirList::listRootItems(){
+void FXDirList::listRootItems(FXbool force,FXbool notify){
   FXDirItem  *oldlist=list;
   FXDirItem  *newlist=NULL;
   FXDirItem **po=&oldlist;
@@ -832,7 +846,7 @@
       }
 
     // Not found; prepend before list
-    item=(FXDirItem*)appendItem(NULL,name,opendiricon,closeddiricon,NULL,true);
+    item=(FXDirItem*)appendItem(NULL,name,opendiricon,closeddiricon,NULL,notify);
 
     // Next gets hung after this one
 fnd:*pn=item; pn=&item->link;
@@ -894,7 +908,7 @@
   // Wipe items remaining in list:- they have disappeared!!
   for(item=oldlist; item; item=link){
     link=item->link;
-    removeItem(item,true);
+    removeItem(item,notify);
     }
 
   // Remember new list
@@ -907,11 +921,11 @@
 #else                   // UNIX flavor
 
 // List root directories
-void FXDirList::listRootItems(){
+void FXDirList::listRootItems(FXbool force,FXbool notify){
   FXDirItem *item=(FXDirItem*)firstitem;
 
   // First time, make root node
-  if(!item) item=list=(FXDirItem*)appendItem(NULL,PATHSEPSTRING,harddiskicon,harddiskicon,NULL,true);
+  if(!item) item=list=(FXDirItem*)appendItem(NULL,PATHSEPSTRING,harddiskicon,harddiskicon,NULL,notify);
 
   // Update item information
   item->setHasItems(true);
@@ -941,163 +955,175 @@
 
 /*******************************************************************************/
 
-// List child items
-void FXDirList::listChildItems(FXDirItem *par,FXbool force,FXbool notify){
-  FXDirItem  *oldlist=par->list;
-  FXDirItem  *newlist=NULL;
-  FXDirItem **po=&oldlist;
-  FXDirItem **pn=&newlist;
-  FXDirItem  *olditem=NULL;
-  FXDirItem  *newitem=NULL;
-  FXDirItem  *link;
-  FXString    pathname;
-  FXString    directory;
-  FXString    name;
-  FXStat      info;
-  FXDir       dir;
-  FXuint      mode;
-
-//FXTRACE((1,"FXDirList::listChildItems(%p = \"%s\",%s)\n",par,par->getText().text(),force?"true":"false"));
-
-  // Path to parent node
-  directory=getItemPathname(par);
-
-  // Managed to open directory
-  if(dir.open(directory)){
-
-    // Process directory entries
-    while(dir.next(name)){
 
-      // Never show "." and ".." in the directory list widget
-      if(name0=='.' && (name1==0 || (name1=='.' && name2==0))) continue;
-
-      // Normally don't show hiden files or directories
-      if(name0=='.' && !(options&DIRLIST_SHOWHIDDEN)) continue;
+// List child items
+FXbool FXDirList::listChildItems(FXDirItem *par,FXbool force,FXbool notify){
+  FXString directory=getItemPathname(par);
+  FXStat   info;
+
+  // See if directory still there
+  if(FXStat::statFile(directory,info)){
+
+    // Last modified time of parent directory
+    FXTime date=info.modified();
+
+    // Regenerate list if update forced or modified time changed
+    if(force || date!=par->getDate()){
+      FXDirItem  *oldlist=par->list;
+      FXDirItem  *newlist=NULL;
+      FXDirItem **po=&oldlist;
+      FXDirItem **pn=&newlist;
+      FXDirItem  *olditem=NULL;
+      FXDirItem  *newitem=NULL;
+      FXDirItem  *link;
+      FXString    pathname;
+      FXString    name;
+      FXuint      mode;
+      FXDir       dir;
+
+      // Managed to open directory
+      if(dir.open(directory)){
+
+        // Process directory entries
+        while(dir.next(name)){
+
+          // Never show "." and ".." in the directory list widget, and
+          // optionally suppress hidden files or directories
+          if(name0=='.'){
+            if(name1=='\0') continue;
+            if(name1=='.' && name2=='\0') continue;
+            if(!(options&DIRLIST_SHOWHIDDEN)) continue;
+            }
 
-      // Build full pathname of entry
-      pathname=directory;
-      if(!ISPATHSEP(pathname.tail())) pathname+=PATHSEPSTRING;
-      pathname+=name;
+          // Build full pathname of entry
+          pathname=directory;
+          if(!ISPATHSEP(pathname.tail())) pathname+=PATHSEPSTRING;
+          pathname+=name;
 
 #ifdef WIN32
 
-      // Get file/link info
-      if(!FXStat::statFile(pathname,info)) continue;
+          // Get file/link info
+          if(!FXStat::statFile(pathname,info)) continue;
 
-      mode=info.mode();
+          mode=info.mode();
 
-      // Normally don't show hiden files or directories
-      if((mode&FXIO::Hidden) && !(options&DIRLIST_SHOWHIDDEN)) continue;
+          // Suppress hidden files or directories
+          if((mode&FXIO::Hidden) && !(options&DIRLIST_SHOWHIDDEN)) continue;
 
 #else
 
-      // Get file/link info
-      if(!FXStat::statLink(pathname,info)) continue;
+          // Get file/link info
+          if(!FXStat::statLink(pathname,info)) continue;
 
-      mode=info.mode();
+          mode=info.mode();
 
-      // If its a link, get file mode from target
-      if(info.isLink()){
-        mode=FXStat::mode(pathname) | FXIO::SymLink;
-        }
+          // If its a link, get file mode from target
+          if(info.isLink()){
+            mode=FXStat::mode(pathname) | FXIO::SymLink;
+            }
 
 #endif
 
-      // Skip item if it is a file and we want only directories, or if it fails to match wildcard pattern
-      if(!(mode&FXIO::Directory) && !((options&DIRLIST_SHOWFILES) && FXPath::match(name,pattern,matchmode))) continue;
+          // Skip item if it is a file and we want only directories, or if it fails to match wildcard pattern
+          if(!(mode&FXIO::Directory) && !((options&DIRLIST_SHOWFILES) && FXPath::match(name,pattern,matchmode))) continue;
 
-      // Find it, and take it out from the old list if found
-      for(FXDirItem** pp=po; (olditem=*pp)!=NULL; pp=&olditem->link){
-        if(compare(olditem->label,name)==0){
-          *pp=olditem->link; olditem->link=NULL;
-          break;
-          }
-        }
-
-      // Use a new item if forced, if there was no old item, or if the item information was changed
-      if(force || !olditem || olditem->getDate()!=info.modified() || olditem->getSize()!=info.size() || olditem->getMode()!=mode){
-
-        // Make new item
-        newitem=(FXDirItem*)createItem(name,NULL,NULL,NULL);
-
-        // Update item information
-        newitem->setDraggable(draggable);
-        newitem->setAssoc(NULL);
-        newitem->setSize(info.size());
-        newitem->setDate(info.modified());
-        newitem->setMode(mode);
-
-        // Determine icons and type
-        if(newitem->isDirectory()){
-          newitem->setHasItems(true);
-          newitem->setOpenIcon(opendiricon);
-          newitem->setClosedIcon(closeddiricon);
-          if(associations) newitem->setAssoc(associations->findDirBinding(pathname));
-          }
-        else if(newitem->isExecutable()){
-          newitem->setHasItems(false);
-          newitem->setOpenIcon(applicationicon);
-          newitem->setClosedIcon(applicationicon);
-          if(associations) newitem->setAssoc(associations->findExecBinding(pathname));
-          }
-        else{
-          newitem->setHasItems(false);
-          newitem->setOpenIcon(documenticon);
-          newitem->setClosedIcon(documenticon);
-          if(associations) newitem->setAssoc(associations->findFileBinding(pathname));
-          }
-
-        // If association is found, use it
-        if(newitem->getAssoc()){
-          if(newitem->getAssoc()->miniicon) newitem->setClosedIcon(newitem->getAssoc()->miniicon);
-          if(newitem->getAssoc()->miniiconopen) newitem->setOpenIcon(newitem->getAssoc()->miniiconopen);
-          }
+          // Find it, and take it out from the old list if found
+          for(FXDirItem** pp=po; (olditem=*pp)!=NULL; pp=&olditem->link){
+            if(compare(olditem->label,name)==0){
+              *pp=olditem->link; olditem->link=NULL;
+              break;
+              }
+            }
 
-        // Create item
-        if(id()) newitem->create();
+          // Use a new item if forced, if there was no old item, or if the item information was changed
+          if(force || !olditem || olditem->getDate()!=info.modified() || olditem->getSize()!=info.size() || olditem->getMode()!=mode){
+
+            // Make new item
+            newitem=(FXDirItem*)createItem(name,NULL,NULL,NULL);
+
+            // Update item information
+            newitem->setDraggable(draggable);
+            newitem->setSize(info.size());
+            newitem->setDate(info.modified());
+            newitem->setMode(mode);
+            newitem->setAssoc(NULL);
+
+            // Determine icons and type
+            if(newitem->isDirectory()){
+              newitem->setHasItems(true);
+              newitem->setOpenIcon(opendiricon);
+              newitem->setClosedIcon(closeddiricon);
+              if(associations) newitem->setAssoc(associations->findDirBinding(pathname));
+              }
+            else if(newitem->isExecutable()){
+              newitem->setHasItems(false);
+              newitem->setOpenIcon(applicationicon);
+              newitem->setClosedIcon(applicationicon);
+              if(associations) newitem->setAssoc(associations->findExecBinding(pathname));
+              }
+            else{
+              newitem->setHasItems(false);
+              newitem->setOpenIcon(documenticon);
+              newitem->setClosedIcon(documenticon);
+              if(associations) newitem->setAssoc(associations->findFileBinding(pathname));
+              }
+
+            // If association is found, use it
+            if(newitem->getAssoc()){
+              if(newitem->getAssoc()->miniicon) newitem->setClosedIcon(newitem->getAssoc()->miniicon);
+              if(newitem->getAssoc()->miniiconopen) newitem->setOpenIcon(newitem->getAssoc()->miniiconopen);
+              }
+
+            // Create item
+            if(id()) newitem->create();
+
+            // Replace existing item or add new one
+            if(olditem){
+              newitem->list=olditem->list;          // Old items list of children
+              setItem(olditem,newitem,notify);
+              }
+            else{
+              appendItem(par,newitem,notify);
+              }
+            *pn=newitem; pn=&newitem->link;         // Hang newitem in list
+            }
 
-        // Replace existing item or add new one
-        if(olditem){
-          newitem->list=olditem->list;          // Old items list of children
-          setItem(olditem,newitem,notify);
-          }
-        else{
-          appendItem(par,newitem,notify);
+          // No change
+          else{
+            *pn=olditem; pn=&olditem->link;         // Hang olditem in list
+            }
           }
-        *pn=newitem; pn=&newitem->link;         // Hang newitem in list
+        dir.close();
         }
 
-      // No change
-      else{
-        *pn=olditem; pn=&olditem->link;         // Hang olditem in list
+      // Wipe items remaining in list:- they have disappeared!!
+      for(olditem=oldlist; olditem; olditem=link){
+        link=olditem->link;
+        removeItem(olditem,notify);
         }
-      }
-    dir.close();
-    }
 
-  // Wipe items remaining in list:- they have disappeared!!
-  for(olditem=oldlist; olditem; olditem=link){
-    link=olditem->link;
-    removeItem(olditem,notify);
-    }
+      // Remember new list
+      par->list=newlist;
 
-  // Now we know for sure whether we really have subitems or not
-  par->setHasItems(!!par->first);
+      // Update sort order
+      sortChildItems(par);
 
-  // Remember new list
-  par->list=newlist;
-
-  // Update sort order
-  sortChildItems(par);
+      // Now we know for sure whether we really have subitems or not
+      par->setHasItems(!!par->first);
 
-  // Need to layout
-  recalc();
+      // Update timestamp
+      par->date=date;
+      }
+    return true;
+    }
+  return false;
   }
 
 /*******************************************************************************/
 
+
 // Find child of item matching name
-static FXTreeItem* findItemChild(FXTreeItem* item,const FXString& name){
+static FXTreeItem* findChildItem(FXTreeItem* item,const FXString& name){
   while(item){
 #ifdef WIN32
     if(comparecase(name,item->getText())==0) return item;
@@ -1110,18 +1136,89 @@
   }
 
 
+// Return the item from the absolute pathname
+FXTreeItem* FXDirList::expandPath(const FXString& path,FXbool notify){
+  FXTreeItem *item=NULL;
+  if(!path.empty()){
+    FXTreeItem *it;
+    FXString name;
+    FXint beg=0;
+    FXint end=0;
+#ifdef WIN32
+    if(ISPATHSEP(path0)){
+      end++;
+      if(ISPATHSEP(path1)) end++;
+      }
+    else if(Ascii::isLetter(path0) && path1==':'){
+      end+=2;
+      if(ISPATHSEP(path2)) end++;
+      }
+#else
+    if(ISPATHSEP(path0)) end++;
+#endif
+    if(beg<end){
+
+      // First path component
+      name=path.mid(beg,end-beg);
+
+      // Find it, if not found, rescan and try again
+      if((item=findChildItem(firstitem,name))==NULL){
+
+        // Relist root items
+        listRootItems(true,notify);
+
+        // Search again
+        item=findChildItem(firstitem,name);
+        }
+
+      // Now search children of this root item
+      if(item){
+
+        // Skip over path separators
+        while(ISPATHSEP(pathend)) end++;
+
+        // Burrow down to closest item to end of path
+        while(end<path.length()){
+          beg=end;
+
+          // Skip to end of path component
+          while(end<path.length() && !ISPATHSEP(pathend)) end++;
+
+          // Next path component
+          name=path.mid(beg,end-beg);
+
+          // Search children of item; if not found, rescan and try again
+          if((it=findChildItem(item->first,name))==NULL){
+
+            // Relist child items
+            listChildItems((FXDirItem*)item,true,notify);
+
+            // If we still don't find it, return closest existing item
+            if((it=findChildItem(item->first,name))==NULL) break;
+            }
+
+          // Skip over path separators
+          while(ISPATHSEP(pathend)) end++;
+
+          // Go deeper
+          item=it;
+          }
+        }
+      }
+    }
+  return item;
+  }
+
+
 // Set current file; return true if success
 FXbool FXDirList::setCurrentFile(const FXString& pathname,FXbool notify){
   FXTRACE((100,"%s::setCurrentFile(%s)\n",getClassName(),pathname.text()));
-  FXString path(FXPath::validPath(FXPath::absolute(pathname)));
-  if(FXStat::exists(path)){
-    FXTreeItem* item=getPathnameItem(path);
-    if(item){
-      setAnchorItem(item);
-      setCurrentItem(item,notify);
-      makeItemVisible(item);
-      return true;
-      }
+  FXTreeItem* item;
+  if((item=expandPath(FXPath::absolute(pathname),notify))!=NULL){
+    setAnchorItem(item);
+    setCurrentItem(item,notify);
+    makeItemVisible(item);
+    return true;
     }
   return false;
   }
@@ -1133,40 +1230,16 @@
   }
 
 
-// Return uri-list of selected files
-FXString FXDirList::getSelectedFiles() const {
-  register FXTreeItem *item=getFirstItem();
-  FXString result;
-  while(item){
-    if(isItemSelected(item)){
-      result.append(FXURL::fileToURL(getItemPathname(item)));
-      result.append("\r\n");
-      }
-    if(item->getFirst()){
-      item=item->getFirst();
-      }
-    else{
-      while(!item->getNext() && item->getParent()) item=item->getParent();
-      item=item->getNext();
-      }
-    }
-  return result;
-  }
-
-
 // Set current directory; return true if success
 FXbool FXDirList::setDirectory(const FXString& pathname,FXbool notify){
   FXTRACE((100,"%s::setDirectory(%s)\n",getClassName(),pathname.text()));
-  FXString path(FXPath::validPath(FXPath::absolute(pathname)));
-  if(FXStat::isDirectory(path)){
-    FXTreeItem* item=getPathnameItem(path);
-    if(item){
-      expandTree(item,notify);
-      setAnchorItem(item);
-      setCurrentItem(item,notify);
-      makeItemVisible(item);
-      return true;
-      }
+  FXTreeItem* item;
+  if((item=expandPath(FXPath::absolute(pathname),notify))!=NULL){
+    expandTree(item,notify);
+    setAnchorItem(item);
+    setCurrentItem(item,notify);
+    makeItemVisible(item);
+    return true;
     }
   return false;
   }
@@ -1174,10 +1247,11 @@
 
 // Return directory part of path to current item
 FXString FXDirList::getDirectory() const {
-  const FXTreeItem* item=currentitem;
-  while(item){
-    if(((const FXDirItem*)item)->isDirectory()) return getItemPathname(item);
-    item=item->parent;
+  if(currentitem){
+    if(((const FXDirItem*)currentitem)->isDirectory()){
+      return getItemPathname(currentitem);
+      }
+    return getItemPathname(currentitem->parent);
     }
   return FXString::null;
   }
@@ -1199,59 +1273,11 @@
   }
 
 
-// Return the item from the absolute pathname
-FXTreeItem* FXDirList::getPathnameItem(const FXString& path){
-  if(!path.empty()){
-    FXint beg=0;
-    FXint end=0;
-#ifdef WIN32
-    if(ISPATHSEP(path0)){
-      end++;
-      if(ISPATHSEP(path1)) end++;
-      }
-    else if(Ascii::isLetter((FXuchar)path0) && path1==':'){
-      end+=2;
-      if(ISPATHSEP(path2)) end++;
-      }
-#else
-    if(ISPATHSEP(path0)) end++;
-#endif
-    if(beg<end){
-      FXString name=path.mid(beg,end-beg);
-      FXTreeItem *item;
-      FXTreeItem *it;
-      if((item=findItemChild(firstitem,name))==NULL){
-        listRootItems();
-        if((item=findItemChild(firstitem,name))==NULL){
-          return NULL;
-          }
-        }
-      while(end<path.length()){
-        beg=end;
-        while(end<path.length() && !ISPATHSEP(pathend)) end++;
-        name=path.mid(beg,end-beg);
-        if(ISPATHSEP(pathend)) end++;
-        FXASSERT(item);
-        if((it=findItemChild(item->first,name))==NULL){
-          listChildItems((FXDirItem*)item,false,true);
-          if((it=findItemChild(item->first,name))==NULL){
-            return item;
-            }
-          }
-        item=it;
-        }
-      FXASSERT(item);
-      return item;
-      }
-    }
-  return NULL;
-  }
-
-
 // Return the (closest) item from the absolute pathname
-FXTreeItem* FXDirList::getPathnameItem__(const FXString& path){
+FXTreeItem* FXDirList::getPathnameItem(const FXString& path) const {
   FXTreeItem* item=NULL;
   if(!path.empty()){
+    FXTreeItem* it;
     FXint beg=0;
     FXint end=0;
 #ifdef WIN32
@@ -1259,7 +1285,7 @@
       end++;
       if(ISPATHSEP(path1)) end++;
       }
-    else if(Ascii::isLetter((FXuchar)path0) && path1==':'){
+    else if(Ascii::isLetter(path0) && path1==':'){
       end+=2;
       if(ISPATHSEP(path2)) end++;
       }
@@ -1269,8 +1295,7 @@
     if(beg<end){
 
       // Search for root part of path
-      if((item=findItemChild(firstitem,path.mid(beg,end-beg)))!=NULL){
-        FXTreeItem* it;
+      if((item=findChildItem(firstitem,path.mid(beg,end-beg)))!=NULL){
 
         // Skip over path separators
         while(ISPATHSEP(pathend)) end++;
@@ -1283,7 +1308,7 @@
           while(end<path.length() && !ISPATHSEP(pathend)) end++;
 
           // Search among children of item
-          if((it=findItemChild(item->first,path.mid(beg,end-beg)))==NULL) break;
+          if((it=findChildItem(item->first,path.mid(beg,end-beg)))==NULL) break;
 
           // Skip over path separators
           while(ISPATHSEP(pathend)) end++;
@@ -1379,7 +1404,7 @@
 void FXDirList::setPattern(const FXString& ptrn,FXbool notify){
   if(!ptrn.empty() && pattern!=ptrn){
     pattern=ptrn;
-    scan(true); // FIXME
+    listItems(true,notify);
     }
   }
 
@@ -1387,7 +1412,7 @@
 void FXDirList::setMatchMode(FXuint mode,FXbool notify){
   if(matchmode!=mode){
     matchmode=mode;
-    scan(true); // FIXME
+    listItems(true,notify);
     }
   }
 
@@ -1403,7 +1428,7 @@
   FXuint opts=(((0-flag)^options)&DIRLIST_SHOWFILES)^options;
   if(options!=opts){
     options=opts;
-    scan(true); // FIXME
+    listItems(true,notify);
     }
   }
 
@@ -1419,7 +1444,7 @@
   FXuint opts=(((0-flag)^options)&DIRLIST_SHOWHIDDEN)^options;
   if(opts!=options){
     options=opts;
-    scan(true); // FIXME
+    listItems(true,notify);
     }
   }
 
@@ -1431,7 +1456,7 @@
   if(associations!=assocs){
     if(!(opts&DIRLIST_NO_OWN_ASSOC)) delete associations;
     associations=assocs;
-    scan(true); // FIXME
+    listItems(true,notify);
     }
   }
 
@@ -1440,7 +1465,7 @@
 void FXDirList::setDraggableFiles(FXbool flag,FXbool notify){
   if(draggable!=flag){
     draggable=flag;
-    scan(true); // FIXME
+    listItems(true,notify);
     }
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDirSelector.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDirSelector.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDirVisitor.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDirVisitor.cpp Changed

@@ -3,7 +3,7 @@
 *                     D i r e c t o r y   V i s i t o r                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2008,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2008,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -55,7 +55,7 @@
 namespace FX {
 
 
-// Keep track of visited directories
+// Keep track of visited directories, avoiding infinite recursion
 struct FXDirVisitor::Seen {
   FXStat  stat;                 // File status
   Seen**  current;              // Current one
@@ -80,28 +80,50 @@
 FXuint FXDirVisitor::traverse(const FXString& path,FXint depth){
   if(0<depth){
     Seen node(&current);
-    if(FXStat::statLink(path,node.stat)){
-      if(node.stat.isDirectory()){              // Directory
+
+    // Stat (target of sym-linked) path
+    if(FXStat::statFile(path,node.stat)){
+
+      // Is directory
+      if(node.stat.isDirectory()){
         FXuint code;
+
+        // Bail if visiting recursive sym-link
         for(Seen *s=node.last; s; s=s->last){
-          if(node.stat.index()==s->stat.index() && node.stat.volume()==s->stat.volume()) return 0;         // Skip if we've been here already
+          if(node.stat.index()==s->stat.index() && node.stat.volume()==s->stat.volume()) return 0;
           }
-        if((code=enter(path))==1){              // Conditionally enter subdirectories
+
+        // Conditionally enter subdirectories
+        if((code=enter(path))==1){
           FXDir directory(path);
           FXString name;
+
+          // Traverse items in directory
           while(directory.next(name)){
+
+            // Non-navigational directory item
             if(!(name0=='.' && (name1=='\0' || (name1=='.' && name2=='\0')))){
+
+              // Traverse sub-item, decreasing recursion depth by one
               if(traverse(path+(ISPATHSEP(path.tail())?"":PATHSEPSTRING)+name,depth-1)==2){
+
+                // Leave directory
                 leave(path);
-                return 2;                       // Bail
+
+                // Return bail code
+                return 2;
                 }
               }
             }
+
+          // Leave directory
           return leave(path);
           }
         return code;
         }
-      return visit(path);                       // Regular file
+
+      // Regular file
+      return visit(path);
       }
     }
   return 0;

gogglesmm-1.2.2.tar.gz/cfox/lib/FXDirWatch.cpp Added

@@ -0,0 +1,308 @@
+/********************************************************************************
+*                                                                               *
+*           W a t c h   D i r e c t o r i e s   f o r   C h a n g e s           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "FXException.h"
+#include "FXArray.h"
+#include "FXHash.h"
+#include "FXMutex.h"
+#include "FXStream.h"
+#include "FXString.h"
+#include "FXSize.h"
+#include "FXPoint.h"
+#include "FXRectangle.h"
+#include "FXEvent.h"
+#include "FXStringDictionary.h"
+#include "FXDictionary.h"
+#include "FXReverseDictionary.h"
+#include "FXSettings.h"
+#include "FXRegistry.h"
+#include "FXPath.h"
+#include "FXWindow.h"
+#include "FXApp.h"
+#include "FXStat.h"
+#include "FXDirWatch.h"
+
+/*
+  Notes:
+  - Make this more elegant.
+  - See also inotify(7) and fanotify(7).
+  - Perhaps only create & add handle to FXApp when first watch is created,
+    and remove it when last watch is removed.
+  - For inotify_event, the following may be of some importance:
+
+      "The name field is only present when an event is returned for a file
+      inside a watched directory; it identifies the file pathname relative
+      to the watched directory. This pathname is null-terminated, and may
+      include further null bytes to align subsequent reads to a suitable
+      address boundary."
+
+  - In other words, if watching a file then there is no name string in the
+    inotify_event!!
+*/
+
+
+// Maximum message size
+#define MAXMESSAGE 8192
+
+// Bad handle value
+#ifdef WIN32
+#define BadHandle  INVALID_HANDLE_VALUE
+#else
+#define BadHandle  -1
+#endif
+
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+
+// Notify struct containing data from directory watch
+#if defined(HAVE_INOTIFY_INIT1)
+struct INotify {
+  union {
+    inotify_event e;
+    FXlong        d(MAXPATHLEN+sizeof(inotify_event))/sizeof(FXlong);
+    } info;
+  };
+#endif
+
+
+// Map
+FXDEFMAP(FXDirWatch) FXDirWatchMap={
+  FXMAPFUNC(SEL_IO_READ,FXDirWatch::ID_IO_READ,FXDirWatch::onMessage)
+  };
+
+
+// Object implementation
+FXIMPLEMENT(FXDirWatch,FXObject,FXDirWatchMap,ARRAYNUMBER(FXDirWatchMap));
+
+
+// Add handler to application
+FXDirWatch::FXDirWatch(FXApp* a,FXObject* tgt,FXSelector sel):app(a),hnd(BadHandle),target(tgt),message(sel){
+  FXTRACE((1,"FXDirWatch::FXDirWatch(%p,%p,%d)\n",a,tgt,sel));
+#if defined(HAVE_INOTIFY_INIT1)
+  hnd=::inotify_init1(IN_CLOEXEC);
+  if(hnd==BadHandle){ throw FXResourceException("unable to create directory watcher."); }
+  FXTRACE((1,"hnd=%d\n",hnd));
+  getApp()->addInput(this,ID_IO_READ,hnd,INPUT_READ);
+#endif
+  }
+
+
+// Add path to watch; return true if added
+FXbool FXDirWatch::addWatch(const FXString& path){
+  FXTRACE((1,"FXDirWatch::addWatch(%s)\n",path.text()));
+  if(!pathToHandle.has(path)){
+#if defined(WIN32)
+    FXuint attrs;
+    HANDLE h;
+#if defined(UNICODE)
+    FXnchar unifileMAXPATHLEN;
+    utf2ncs(unifile,path.text(),MAXPATHLEN);
+    attrs=::GetFileAttributesW(unifile);
+    if((attrs!=INVALID_FILE_ATTRIBUTES) && (attrs&FILE_ATTRIBUTE_DIRECTORY)){
+      h=::FindFirstChangeNotificationW(unifile,false,FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_DIR_NAME|FILE_NOTIFY_CHANGE_ATTRIBUTES|FILE_NOTIFY_CHANGE_SIZE|FILE_NOTIFY_CHANGE_LAST_WRITE);
+      if(h!=BadHandle){
+        app->addInput(this,ID_IO_READ,h,INPUT_READ,(FXptr)h);
+        pathToHandlepath=(FXptr)h;
+        handleToPath(FXptr)h=path;
+        FXTRACE((1,"%s -> %d\n",path.text(),h));
+        return true;
+        }
+      }
+#else
+    attrs=::GetFileAttributesA(path.text());
+    if((attrs!=INVALID_FILE_ATTRIBUTES) && (attrs&FILE_ATTRIBUTE_DIRECTORY)){
+      h=::FindFirstChangeNotificationA(path.text(),false,FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_DIR_NAME|FILE_NOTIFY_CHANGE_ATTRIBUTES|FILE_NOTIFY_CHANGE_SIZE|FILE_NOTIFY_CHANGE_LAST_WRITE);
+      if(h!=BadHandle){
+        app->addInput(this,ID_IO_READ,h,INPUT_READ,(FXptr)h);
+        pathToHandlepath=(FXptr)h;
+        handleToPath(FXptr)h=path;
+        FXTRACE((1,"%s -> %d\n",path.text(),h));
+        return true;
+        }
+      }
+#endif
+#elif defined(HAVE_INOTIFY_INIT1)
+    FXStat stat;
+    if(FXStat::statFile(path,stat)){
+      FXuint flags=stat.isDirectory()?(IN_ATTRIB|IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF):(IN_ATTRIB|IN_MODIFY|IN_MOVE|IN_MOVE_SELF|IN_DELETE_SELF);
+      FXInputHandle h=::inotify_add_watch(hnd,path.text(),flags);
+      if(h!=BadHandle){
+        pathToHandlepath=(FXptr)(FXival)h;
+        handleToPath(FXptr)(FXival)h=path;
+        FXTRACE((1,"%s -> %d\n",path.text(),h));
+        return true;
+        }
+      }
+#endif
+    }
+  return false;
+  }
+
+
+// Remove path to watch; return true if removed
+FXbool FXDirWatch::remWatch(const FXString& path){
+  FXTRACE((1,"FXDirWatch::remWatch(%s)\n",path.text()));
+  if(pathToHandle.has(path)){
+#if defined(WIN32)
+    HANDLE h=(HANDLE)pathToHandlepath;
+    pathToHandle.remove(path);
+    handleToPath.remove((FXptr)h);
+    app->removeInput(h,INPUT_READ);
+    if(FindCloseChangeNotification(h)!=0){
+      FXTRACE((1,"%s -> %d\n",path.text(),h));
+      return true;
+      }
+#elif defined(HAVE_INOTIFY_INIT1)
+    FXInputHandle h=(FXival)pathToHandlepath;
+    pathToHandle.remove(path);
+    handleToPath.remove((FXptr)(FXival)h);
+    if(::inotify_rm_watch(hnd,h)!=BadHandle){
+      FXTRACE((1,"%s -> %d\n",path.text(),h));
+      return true;
+      }
+#endif
+    }
+  return false;
+  }
+
+//BOOL ReadDirectoryChangesW(
+//  HANDLE                          hDirectory,
+//  LPVOID                          lpBuffer,
+//  DWORD                           nBufferLength,
+//  BOOL                            bWatchSubtree,
+//  DWORD                           dwNotifyFilter,
+//  LPDWORD                         lpBytesReturned,
+//  LPOVERLAPPED                    lpOverlapped,
+//  LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine
+//);
+
+
+// Clear all watches
+FXbool FXDirWatch::clearAll(){
+  FXTRACE((1,"FXDirWatch::clearAll\n"));
+#if defined(WIN32)
+  HANDLE h;
+  for(FXint i=0; i<pathToHandle.no(); ++i){
+    if(!pathToHandle.empty(i)){
+      h=(HANDLE)pathToHandle.data(i);
+      app->removeInput(h,INPUT_READ);
+      FindCloseChangeNotification(h);
+      }
+    }
+#elif defined(HAVE_INOTIFY_INIT1)
+  for(FXint i=0; i<pathToHandle.no(); ++i){
+    if(!pathToHandle.empty(i)){
+      ::inotify_rm_watch(hnd,(FXival)pathToHandle.data(i));
+      }
+    }
+#endif
+  pathToHandle.clear();
+  handleToPath.clear();
+  return false;
+  }
+
+
+// Fire signal message to target
+long FXDirWatch::onMessage(FXObject*,FXSelector,void* ptr){
+  FXTRACE((1,"FXDirWatch::onMessage()\n"));
+#if defined(WIN32)
+  FXString pathname;
+  HANDLE h=(HANDLE)ptr;
+  FindNextChangeNotification(h);
+  pathname=handleToPath(FXptr)h;
+  FXTRACE((2,"pathname=\"%s\"\n",pathname.text()));
+#elif defined(HAVE_INOTIFY_INIT1)
+  FXchar *beg,*end,*pne;
+  inotify_event* ne;
+  FXival expect=0,actual=0;
+  FXString path,pathname;
+  ::ioctl(hnd,FIONREAD,&expect);
+  FXTRACE((1,"expect=%ld\n",expect));
+  if(0<expect){
+    if(allocElms(beg,expect)){
+      actual=::read(hnd,beg,expect);
+      FXTRACE((1,"actual=%ld\n",actual));
+      if(0<actual){
+        end=beg+actual;
+        pne=beg;
+        while(pne<end){
+          ne=(inotify_event*)pne;
+          path=handleToPath(FXptr)(FXival)ne->wd;
+          pathname=FXPath::absolute(path,ne->name);
+          FXTRACE((2,"wd=%d mask=%x cookie=%u len=%u name=\"%s\" path=\"%s\" pathname=\"%s\"\n",ne->wd,ne->mask,ne->cookie,ne->len,ne->name,path.text(),pathname.text()));
+          if(ne->mask&IN_ACCESS)        FXTRACE((2,"IN_ACCESS "));
+          if(ne->mask&IN_ATTRIB)        FXTRACE((2,"IN_ATTRIB "));
+          if(ne->mask&IN_CLOSE_NOWRITE) FXTRACE((2,"IN_CLOSE_NOWRITE "));
+          if(ne->mask&IN_CLOSE_WRITE)   FXTRACE((2,"IN_CLOSE_WRITE "));
+          if(ne->mask&IN_CREATE)        FXTRACE((2,"IN_CREATE "));
+          if(ne->mask&IN_DELETE)        FXTRACE((2,"IN_DELETE "));
+          if(ne->mask&IN_DELETE_SELF)   FXTRACE((2,"IN_DELETE_SELF "));
+          if(ne->mask&IN_IGNORED)       FXTRACE((2,"IN_IGNORED "));
+          if(ne->mask&IN_ISDIR)         FXTRACE((2,"IN_ISDIR "));
+          if(ne->mask&IN_MODIFY)        FXTRACE((2,"IN_MODIFY "));
+          if(ne->mask&IN_MOVE_SELF)     FXTRACE((2,"IN_MOVE_SELF "));
+          if(ne->mask&IN_MOVED_FROM)    FXTRACE((2,"IN_MOVED_FROM "));
+          if(ne->mask&IN_MOVED_TO)      FXTRACE((2,"IN_MOVED_TO "));
+          if(ne->mask&IN_OPEN)          FXTRACE((2,"IN_OPEN "));
+          if(ne->mask&IN_Q_OVERFLOW)    FXTRACE((2,"IN_Q_OVERFLOW "));
+          if(ne->mask&IN_UNMOUNT)       FXTRACE((2,"IN_UNMOUNT "));
+          FXTRACE((2,"\n"));
+          if(ne->mask&(IN_MOVED_TO|IN_CREATE)){
+            FXTRACE((1,"SEL_INSERTED \"%s\"\n",pathname.text()));
+            }
+          else if(ne->mask&(IN_DELETE|IN_MOVED_FROM)){
+            FXTRACE((1,"SEL_DELETED \"%s\"\n",pathname.text()));
+            }
+          else if(ne->mask&(IN_ATTRIB)){
+            FXTRACE((1,"SEL_CHANGED \"%s\"\n",pathname.text()));
+            }
+          pne+=sizeof(inotify_event)+ne->len;
+          }
+        }
+      freeElms(beg);
+      }
+    }
+#endif
+  return 1;
+  }
+
+
+// Remove handler from application
+FXDirWatch::~FXDirWatch(){
+  FXTRACE((1,"FXDirWatch::~FXDirWatch\n"));
+  clearAll();
+#if defined(HAVE_INOTIFY_INIT1)
+  if(hnd!=BadHandle){
+    app->removeInput(hnd,INPUT_READ);
+    ::close(hnd);
+    }
+#endif
+  }
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDispatcher.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDispatcher.cpp Changed

@@ -1,747 +1,404 @@
 /********************************************************************************
 *                                                                               *
-*                         E v e n t   D i s p a t c h e r                       *
+*                      C a l l b a c k   D i s p a t c h e r                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
-*********************************************************************************
-* This library is free software; you can redistribute it and/or modify          *
-* it under the terms of the GNU Lesser General Public License as published by   *
-* the Free Software Foundation; either version 3 of the License, or             *
-* (at your option) any later version.                                           *
-*                                                                               *
-* This library is distributed in the hope that it will be useful,               *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
-* GNU Lesser General Public License for more details.                           *
-*                                                                               *
-* You should have received a copy of the GNU Lesser General Public License      *
-* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 ********************************************************************************/
 #include "xincs.h"
 #include "fxver.h"
 #include "fxdefs.h"
 #include "fxmath.h"
-#include "FXArray.h"
 #include "FXAtomic.h"
+#include "FXElement.h"
 #include "FXHash.h"
-#include "FXStream.h"
-#include "FXRectangle.h"
-#include "FXString.h"
-#include "FXEvent.h"
-#include "FXObject.h"
-#include "FXMutex.h"
+#include "FXCallback.h"
 #include "FXAutoThreadStorageKey.h"
 #include "FXThread.h"
-#include "FXElement.h"
-#include "FXDispatcher.h"
 #include "FXException.h"
+#include "FXReactor.h"
+#include "FXDispatcher.h"
 
 /*
   Notes:
 
-  - Special subclass of FXDispatcher for when there is a GUI event source.
-
-  - FXDispatcher does NOT loop; but does maintain set of event sources and raised
-    events; thus, recursive event loops don't lose track.
-
-  - Process IO handles in round-robin fashion so each one gets equal opportunity of being
-    handled; on Windows, the list of handles is simply shuffled.
+  - FXDispatcher extends FXReactor by implementing convenient callbacks for
+    handles, signals, timers, and idle processing performed by FXReactor.
 
-  - A successful handling of a callback causes return from dispatch; an unsuccessful
-    callback causes FXDispatcher::dispatch() to go around to the next event.
+  - The callbacks may connect to member functions of classes, but also global
+    functions.
 
-  - If we allow another thread to add/remove event sources, then we will need a
-    signaling pipe to notify the blocking thread (except when using epoll).
+  - Special handles e.g. wakeup pipe or display connection, may be added by
+    addHandle(hnd,mode) instead of addHandle(cb,hnd,mode,ptr).  In this case,
+    no hash entry will be added, which means when these types of handles are
+    dispatched via overrides of dispatchHandle(), they must be filtered out prior
+    to being processed by this implementation of dispatchHandle(); otherwise, a
+    core dump may result.
 
-  - Use epoll_pwait(() if available; otherwise fall back to pselect().  If neither
-    of these available, we will use select(); on Windows, WaitForMultipleObjects(),
-    or MsgWaitForMultipleObjects.
-
-  - When using WaitForMultipleObjects(), only one handle is dispatched at a time.
-    The list is reshuffled prior to dispatch, thus providing fairness; also, this
-    is reentrant in case a nested event loop returns to FXDispatcher again.
+  - Likewise, addSignal(sig,async) may be used in lieu of addSignal(cb,sig,ptr,async)
+    to establis special ways of handling select signals.  The addSignal(sig,async)
+    will not establish a handler callback, and thus when such a signal is raised,
+    it must be filtered via overrides of dispatchSignal prior to being processed
+    by this implementation of dispatchSignal(); otherwise, a core dump may result.
+*/
 
-  - FXDispatcher (or subclasses thereof) don't loop.  Just block and dispatch.
-    FXInvocation represents a loop.  They're linked, and per-thread.  It calls
-    FXDispatcher::dispatch() repeatedly until some condition calls for it to stop.
+using namespace FX;
 
-  - Each signal is handled by only one single FXDispatcher.  However, there may
-    be multiple FXDispatcher's, each one handling a different, non-overlapping
-    set of signals.
+/*******************************************************************************/
 
-  - FIXME keep track of time we entered event loop; so we can process events for
-    a certain interval only (better than runWhileEvents() currently does).
+namespace FX {
 
-*/
 
+// Handle callback
+struct FXDispatcher::Handle {
+  HandleCallback     cb;          // Callback
+  void              *ptr;         // User data
+  };
 
-// Bad handle value
-#ifdef WIN32
-#define BadHandle INVALID_HANDLE_VALUE
-#else
-#define BadHandle -1
-#endif
 
+// Signal callback
+struct FXDispatcher::Signal {
+  SignalCallback     cb;          // Callback
+  void              *ptr;         // User data
+  };
 
-using namespace FX;
 
-/*******************************************************************************/
+// Timer callback
+struct FXDispatcher::Timer {
+  TimeoutCallback    cb;          // Callback
+  FXTime             due;         // When timer is due (ns)
+  Timer             *next;        // Next timeout in list
+  void              *ptr;         // User data
+  };
 
-namespace FX {
 
-// Handles being watched
-struct FXDispatcher::FXHandles {
-#if defined(WIN32)
-  FXInputHandle      handlesMAXIMUM_WAIT_OBJECTS;     // Handles
-  FXuint             modesMAXIMUM_WAIT_OBJECTS;       // IO Modes each handle
-  FX
-#elif defined(HAVE_EPOLL_CREATE1)
-  struct epoll_event events128;                       // Events
-  FXInputHandle      handle;                            // Poll handle
-#else
-  fd_set             watched3;                        // Watched handles (FD_SETSIZE elements)
-  fd_set             handles3;                        // Known handles
-#endif
+// Idle callback
+struct FXDispatcher::Idle {
+  IdleCallback       cb;          // Callback
+  Idle              *next;        // Next chore in list
+  void              *ptr;         // User data
   };
 
 
 /*******************************************************************************/
 
-
 // Construct dispatcher object
-FXDispatcher::FXDispatcher():handles(NULL),sigreceived(0),numhandles(0),numwatched(0),numraised(0),current(-1),initialized(false){
-  FXTRACE((10,"FXDispatcher::FXDispatcher\n"));
-  clearElms(signotified,ARRAYNUMBER(signotified));
+FXDispatcher::FXDispatcher():signals(NULL),timers(NULL),idles(NULL),timerrecs(NULL),idlerecs(NULL){
   }
 
 
 // Initialize dispatcher
 FXbool FXDispatcher::init(){
-  FXTRACE((10,"FXDispatcher::init()\n"));
-  if(!initialized){
-    if(allocElms(handles,1)){
-#if defined(WIN32)
-      clearElms(handles->handles,ARRAYNUMBER(handles->handles));
-      clearElms(handles->modes,ARRAYNUMBER(handles->modes));
-#elif defined(HAVE_EPOLL_CREATE1)
-      clearElms(handles->events,ARRAYNUMBER(handles->events));
-      handles->handle=epoll_create1(EPOLL_CLOEXEC);
-      if(handles->handle<0){ freeElms(handles); return false; }
-#else
-      FD_ZERO(&handles->handles0);            // No handles
-      FD_ZERO(&handles->handles1);
-      FD_ZERO(&handles->handles2);
-      FD_ZERO(&handles->watched0);
-      FD_ZERO(&handles->watched1);
-      FD_ZERO(&handles->watched2);
-#endif
-      clearElms(signotified,ARRAYNUMBER(signotified));
-      sigreceived=0;
-      numhandles=0;
-      numwatched=0;
-      numraised=0;
-      current=-1;
-      initialized=true;
-      return true;
-      }
+  if(FXReactor::init()){
+    callocElms(signals,64);
+    timers=NULL;
+    idles=NULL;
+    timerrecs=NULL;
+    idlerecs=NULL;
+    return true;
     }
   return false;
   }
 
-
 /*******************************************************************************/
 
-// Which dispatcher responsible for which signal
-FXDispatcher *volatile FXDispatcher::sigmanager64;
-
-
-// Handler for a synchronous managed signal simply sets flag that a signal
-// was raised, and remembers most-recently raised signal.
-void FXDispatcher::signalhandler(FXint sig){
-  sigmanagersig->signotifiedsig=1;
-  sigmanagersig->sigreceived=sig;
-  }
-
-
-// Asynchronous signal handler for managed signal directly dispatches to
-// handling code; this is potentially dangerous, so use at your own risk.
-void FXDispatcher::signalhandlerasync(FXint sig){
-  sigmanagersig->dispatchSignal(sig);
-  }
-
-
-// Return true if dispatcher manages given signal
-FXbool FXDispatcher::hasSignal(FXint sig){
-  return (sigmanagersig==this);
+// Add signal to signal-set observed by the dispatcher
+FXbool FXDispatcher::addSignal(SignalCallback cb,FXint sig,void* ptr,FXbool async){
+  if(FXReactor::addSignal(sig,async)){
+    signalssig=new Signal;
+    signalssig->cb=cb;                                // Set callback
+    signalssig->ptr=ptr;                              // Set pointer
+    return true;
+    }
+  return false;
   }
 
 
-// Append signal to signal-set observed by the dispatcher
+// Add signal to signal-set observed by the dispatcher
 FXbool FXDispatcher::addSignal(FXint sig,FXbool async){
-  if(initialized){
-    if(atomicBoolCas(&sigmanagersig,(FXDispatcher*)NULL,this)){
-      void (CDECL *handler)(int);
-      if(async){
-        handler=FXDispatcher::signalhandlerasync;       // Asynchronous callback
-        }
-      else{
-        handler=FXDispatcher::signalhandler;            // Normal callback
-        }
-      signotifiedsig=0;                               // Set non-raised
-#ifdef WIN32
-      if(signal(sig,handler)==SIG_ERR){                 // Set handler
-        sigmanagersig=NULL;
-        return false;
-        }
-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
-      struct sigaction sigact;
-      sigact.sa_handler=handler;
-      sigact.sa_flags=0;
-      sigfillset(&sigact.sa_mask);
-      if(sigaction(sig,&sigact,NULL)==-1){              // Set handler
-        sigmanagersig=NULL;
-        return false;
-        }
-#else
-      if(signal(sig,handler)==SIG_ERR){                 // Set handler
-        sigmanagersig=NULL;
-        return false;
-        }
-#endif
-      return true;
-      }
-    }
-  return false;
+  return FXReactor::addSignal(sig,async);
   }
 
 
 // Remove signal from signal-set observed by the dispatcher
 FXbool FXDispatcher::remSignal(FXint sig){
-  if(initialized){
-    if(sigmanagersig==this){
-#ifdef WIN32
-      if(signal(sig,SIG_DFL)==SIG_ERR){                 // Unset handler
-        signotifiedsig=0;                             // Set non-raised
-        sigmanagersig=NULL;                           // Now release it
-        return false;
-        }
-#elif (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
-      struct sigaction sigact;
-      sigact.sa_handler=SIG_DFL;
-      sigact.sa_flags=0;
-      sigemptyset(&sigact.sa_mask);
-      if(sigaction(sig,&sigact,NULL)==-1){              // Unset handler
-        sigmanagersig=NULL;                           // Now release it
-        signotifiedsig=0;                             // Set non-raised
-        return false;
-        }
-#else
-      if(signal(sig,SIG_DFL)==SIG_ERR){                 // Unset handler
-        sigmanagersig=NULL;                           // Now release it
-        signotifiedsig=0;                             // Set non-raised
-        return false;
-        }
-#endif
-      sigmanagersig=NULL;                             // Now release it
-      signotifiedsig=0;                               // Set non-raised
-      return true;
-      }
+  if(FXReactor::remSignal(sig)){
+    delete signalssig;
+    signalssig=NULL;
+    return true;
     }
   return false;
   }
 
 
-// Remove all signals
-FXbool FXDispatcher::remAllSignals(){
-  for(FXuint sig=1; sig<ARRAYNUMBER(sigmanager); ++sig){
-    if(!remSignal(sig)) return false;
+// Dispatch when a signal was fired
+FXbool FXDispatcher::dispatchSignal(FXint sig){
+  if(hasSignal(sig)){
+    return signalssig && signalssig->cb(this,sig,signalssig->ptr);
     }
-  return true;
+  return false;
   }
 
 /*******************************************************************************/
 
-// Append new handle hnd to watch-list
-FXbool FXDispatcher::addHandle(FXInputHandle hnd,FXuint mode){
-  FXTRACE((11,"FXDispatcher::addHandle(%d,%d)\n",hnd,mode));
-  if(initialized){
-#if defined(WIN32)
-    if(hnd!=BadHandle && numhandles<MAXIMUM_WAIT_OBJECTS){
-      for(FXint i=numhandles-1; i>=0; --i){
-        if(handles->handlesi==hnd) return false;
+// Add timeout callback cb at time due (ns since Epoch).
+void* FXDispatcher::addTimeout(TimeoutCallback cb,FXTime due,void* ptr){
+  void* res=NULL;
+  if(isInitialized()){
+    Timer **tt=&timers,*t,*x;
+    while((x=*tt)!=NULL){
+      if(x->cb==cb){ 
+        *tt=x->next; 
+        res=x->ptr; 
+        t=x; 
+        goto a; 
         }
-      handles->handlesnumhandles=hnd;
-      handles->modesnumhandles=mode;
-      numhandles++;
-      return true;
+      tt=&x->next;
       }
-#elif defined(HAVE_EPOLL_CREATE1)
-    if(0<=hnd){
-      struct epoll_event ev;
-      ev.events=0;
-      ev.data.fd=hnd;
-      if(mode&InputRead) ev.events|=EPOLLIN;
-      if(mode&InputWrite) ev.events|=EPOLLOUT;
-      if(mode&InputExcept) ev.events|=EPOLLPRI;
-      if(::epoll_ctl(handles->handle,EPOLL_CTL_ADD,hnd,&ev)!=0){ return false; }
-      numhandles++;
-      return true;
-      }
-#else
-    if(0<=hnd && hnd<FD_SETSIZE && !(FD_ISSET(hnd,&handles->handles0) || FD_ISSET(hnd,&handles->handles1) || FD_ISSET(hnd,&handles->handles2))){
-      if(mode&InputRead){ FD_SET(hnd,&handles->handles0); }
-      if(mode&InputWrite){ FD_SET(hnd,&handles->handles1); }
-      if(mode&InputExcept){ FD_SET(hnd,&handles->handles2); }
-      if(numhandles<=hnd){ numhandles=hnd+1; }
-      return true;
-      }
-#endif
-    }
-  return false;
-  }
-
-
-// Remove handle hnd from list
-FXbool FXDispatcher::remHandle(FXInputHandle hnd){
-  FXTRACE((11,"FXDispatcher::remHandle(%d)\n",hnd));
-  if(initialized){
-#if defined(WIN32)
-    if(hnd!=BadHandle){
-      for(FXint i=numhandles-1; i>=0; --i){
-        if(handles->handlesi==hnd){
-          handles->handlesi=handles->handlesnumhandles-1;
-          handles->modesi=handles->modesnumhandles-1;
-          if(current==i) current=-1;                    // Removed a raised handle
-          if(current==numhandles-1) current=i;          // Renumbered a raised handle
-          numhandles--;
-          return true;
-          }
-        }
-      return false;
+    if(timerrecs){
+      t=timerrecs;
+      timerrecs=t->next;
       }
-#elif defined(HAVE_EPOLL_CREATE1)
-    if(0<=hnd){
-      struct epoll_event ev;
-      ev.events=0;              // Doesn't really matter, ignored by kernel
-      ev.data.fd=0;
-      if(::epoll_ctl(handles->handle,EPOLL_CTL_DEL,hnd,&ev)!=0){ return false; }
-      numhandles--;
-      return true;
+    else{
+      t=new Timer;
       }
-#else
-    if(0<=hnd && hnd<numhandles && (FD_ISSET(hnd,&handles->handles0) || FD_ISSET(hnd,&handles->handles1) || FD_ISSET(hnd,&handles->handles2))){
-      if(FD_ISSET(hnd,&handles->watched0)){ FD_CLR(hnd,&handles->watched0); numraised--; }
-      if(FD_ISSET(hnd,&handles->watched1)){ FD_CLR(hnd,&handles->watched1); numraised--; }
-      if(FD_ISSET(hnd,&handles->watched2)){ FD_CLR(hnd,&handles->watched2); numraised--; }
-      FD_CLR(hnd,&handles->handles0);
-      FD_CLR(hnd,&handles->handles1);
-      FD_CLR(hnd,&handles->handles2);
-      if(hnd==numhandles-1){
-        while(0<numhandles && !FD_ISSET(numhandles-1,&handles->handles0) && !FD_ISSET(numhandles-1,&handles->handles1) && !FD_ISSET(numhandles-1,&handles->handles2)){
-          numhandles--;
-          }
-        }
-      return true;
+a:  t->cb=cb;
+    t->due=due;
+    t->next=NULL;
+    t->ptr=ptr;
+    tt=&timers;
+    while((x=*tt) && x->due<t->due){
+      tt=&x->next;
       }
-#endif
+    t->next=*tt;
+    *tt=t;
     }
-  return false;
+  return res;
   }
 
-/*******************************************************************************/
 
-// The dispatch driver determines which events have taken place and calls the
-// appropriate handling routine.
-// Only one event is handled each time through the dispatch() routine, since
-// event sources may be added or removed each time a handler is called.
-// Thus, once a set of events is determined, we need to keep track of this set
-// and only check for new events once all the events from the last check have
-// been dealt with.
-
-#if defined(WIN32) //////////////////////////////////////////////////////////////
-
-// Dispatch driver
-FXbool FXDispatcher::dispatch(FXTime blocking,FXuint flags){
-  FXTRACE((10,"FXDispatcher::dispatch(%lld,%x)\n",blocking,flags));
-  if(initialized){
-    FXInputHandle hnd;
-    FXTime now,due,delay,interval;
-    FXuint sig,nxt,mode;
-
-    // Loop till we got something
-    while(1){
-
-      // Check for timeout
-      delay=forever;
-      due=getTimeout();
-      if(due<forever){
-        now=FXThread::time();
-        delay=due-now;
-        if(delay<FXLONG(1000)){
-          if(dispatchTimeout(due)) return true;
-          continue;
-          }
-        }
+// Add timeout callback cb after time interval (ns).
+void* FXDispatcher::addInterval(TimeoutCallback cb,FXTime interval,void* ptr){
+  return addTimeout(cb,FXThread::time()+interval,ptr);
+  }
 
-      // Check for signal
-      sig=nxt=sigreceived;
-      if(atomicSet(&signotifiedsig,0)){
-        do{ nxt=(nxt+63)&63; }while(nxt!=sig && !signotifiednxt);
-        sigreceived=nxt;
-        if(dispatchSignal(sig)) return true;
-        continue;
-        }
 
-      // Check active handles
-      if(0<=current && current<numhandles){
-        nxt=(current+1)%numhandles;
-        hnd=handles->handlescurrent;                          // Shuffle raised handle up in the list
-        mode=handles->modescurrent;                           // To give all handles equal play time
-        handles->handlescurrent=handles->handlesnxt;
-        handles->modescurrent=handles->modesnxt;
-        handles->handlesnxt=hnd;
-        handles->modesnxt=mode;
-        current=-1;
-        if(dispatchHandle(hnd,mode)) return true;
+// Remove timeout callback cb.
+void* FXDispatcher::remTimeout(TimeoutCallback cb){
+  void* res=NULL;
+  if(isInitialized()){
+    Timer **tt=&timers,*t;
+    while((t=*tt)!=NULL){
+      if(t->cb==cb){
+        *tt=t->next;
+        res=t->ptr;
+        t->next=timerrecs;
+        timerrecs=t;
         continue;
         }
-
-      // Select active handles and check signals; don't block
-      current=WaitForMultipleObjects(numhandles,handles->handles,false,0);
-
-      // Bad stuff happened
-      if(current==WAIT_FAILED || current>=WAIT_ABANDONED_0){
-        throw FXFatalException("FXDispatcher::dispatch: error waiting on handles.");
-        }
-
-      // No active handles yet; need to wait
-      if(current==WAIT_TIMEOUT){
-
-        // Idle callback if we're about to block
-        if(dispatchIdle()) return true;
-
-        // We're not blocking
-        if(blocking<=0) return false;
-
-        // Block this long
-        interval=FXMIN(delay,blocking);
-
-        // Select active handles and check signals, waiting for timeout or maximum block time
-        current=WaitForMultipleObjects(numhandles,handles->handles,false,(interval<forever) ? (FXuint)((interval+FXLONG(500000))/FXLONG(1000000)) : INFINITE);
-
-        // Bad stuff happened
-        if(current==WAIT_FAILED || current>=WAIT_ABANDONED_0){
-          throw FXFatalException("FXDispatcher::dispatch: error waiting on handles.");
-          }
-
-        // Return if there was no timeout within maximum block time
-        if(current==WAIT_TIMEOUT){
-          if(delay>=blocking) return false;             // Nothing happened during blocking period!
-          if(blocking<forever){ blocking-=delay; }      // Next blocking period reduced by time already expired
-          continue;
-          }
-        }
+      tt=&t->next;
       }
     }
-  return false;
+  return res;
   }
 
-#elif defined(HAVE_EPOLL_CREATE1) ///////////////////////////////////////////////
-
-// Dispatch driver
-FXbool FXDispatcher::dispatch(FXTime blocking,FXuint flags){
-  FXTRACE((10,"FXDispatcher::dispatch(%lld,%x)\n",blocking,flags));
-  if(initialized){
-    FXInputHandle hnd;
-    FXTime now,due,delay,interval;
-    FXuint sig,nxt,mode;
-
-    // Loop till we got something
-    while(1){
-
-      // Check for timeout
-      delay=forever;
-      due=getTimeout();
-      if(due<forever){
-        now=FXThread::time();
-        delay=due-now;
-        if(delay<FXLONG(1000)){
-          if(dispatchTimeout(due)) return true;
-          continue;
-          }
-        }
 
-      // Check for signal
-      sig=nxt=sigreceived;
-      if(atomicSet(&signotifiedsig,0)){
-        do{ nxt=(nxt+63)&63; }while(nxt!=sig && !signotifiednxt);
-        sigreceived=nxt;
-        if(dispatchSignal(sig)) return true;
-        continue;
-        }
-
-      // Check active handles
-      if(0<numraised){
-        mode=0;
-        numraised--;
-        current=(current+1)%numwatched;
-        hnd=handles->eventscurrent.data.fd;
-        if(handles->eventscurrent.events&EPOLLIN){ mode|=InputRead; }
-        if(handles->eventscurrent.events&EPOLLOUT){ mode|=InputWrite; }
-        if(handles->eventscurrent.events&EPOLLERR){ mode|=InputExcept; }
-        if(dispatchHandle(hnd,mode)) return true;
-        continue;
-        }
-
-      // Select active handles and check signals; don't block
-      numwatched=epoll_pwait(handles->handle,handles->events,ARRAYNUMBER(handles->events),0,NULL);
-
-      // Bad stuff happened
-      if(numwatched<0){
-        if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXDispatcher::dispatch: error waiting on handles."); }
-        continue;
-        }
-
-      // No active handles yet; need to wait
-      if(numwatched==0){
-
-        // Idle callback if we're about to block
-        if(dispatchIdle()) return true;
-
-        // We're not blocking
-        if(blocking<=0) return false;
+// Return the remaining time, in nanoseconds
+FXTime FXDispatcher::getTimeout(TimeoutCallback cb) const {
+  for(Timer *t=timers; t; t=t->next){
+    if(t->cb==cb) return t->due;
+    }
+  return forever;
+  }
 
-        // Nanoseconds to wait
-        interval=FXMIN(delay,blocking);
 
-        // Select active handles and check signals, waiting for timeout or maximum block time
-        numwatched=epoll_pwait(handles->handle,handles->events,ARRAYNUMBER(handles->events),(interval<forever) ? (FXint)((interval+FXLONG(500000))/FXLONG(1000000)) : -1,NULL);
+// Return timeout when something needs to happen
+FXTime FXDispatcher::nextTimeout(){
+  return timers ? timers->due : forever;
+  }
 
-        // Bad stuff happened
-        if(numwatched<0){
-          if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXDispatcher::dispatch: error waiting on handles."); }
-          continue;
-          }
 
-        // Return if there was no timeout within maximum block time
-        if(numwatched==0){
-          if(delay>=blocking) return false;             // Nothing happened during blocking period!
-          if(blocking<forever){ blocking-=delay; }      // Next blocking period reduced by time already expired
-          continue;
-          }
-        }
-      numraised=numwatched;
-      }
+// Return true if timeout callback cb been set.
+FXbool FXDispatcher::hasTimeout(TimeoutCallback cb) const {
+  for(Timer *t=timers; t; t=t->next){
+    if(t->cb==cb) return true;
     }
   return false;
   }
 
-#else ///////////////////////////////////////////////////////////////////////////
-
-// Helper function
-static FXint sselect(FXint nfds,fd_set* readfds,fd_set* writefds,fd_set* errorfds,FXTime wait,const sigset_t* watchset){
-#if (_POSIX_C_SOURCE >= 200112L) || (_XOPEN_SOURCE >= 600)
-  FXint result;
-  if(wait<forever){
-    struct timespec delta;
-    delta.tv_nsec=wait%1000000000LL;
-    delta.tv_sec=wait/1000000000LL;
-    result=pselect(nfds,readfds,writefds,errorfds,&delta,watchset);
-    }
-  else{
-    result=pselect(nfds,readfds,writefds,errorfds,NULL,watchset);
-    }
-  return result;
-#else
-  FXint result;
-  if(wait<forever){
-    struct timeval delta;
-    wait=(wait+500LL)/1000LL;
-    delta.tv_usec=wait%1000000LL;
-    delta.tv_sec=wait/1000000LL;
-    result=select(nfds,readfds,writefds,errorfds,&delta);
-    }
-  else{
-    result=select(nfds,readfds,writefds,errorfds,NULL);
+
+// Dispatch when timeout expires
+FXbool FXDispatcher::dispatchTimeout(FXTime due){
+  if(timers && timers->due<=due){
+    Timer *t=timers;
+    timers=t->next;
+    t->next=timerrecs;
+    timerrecs=t;
+    return t->cb(this,t->due,t->ptr);
     }
-  return result;
-#endif
+  return false;
   }
 
+/*******************************************************************************/
 
-// Dispatch driver
-FXbool FXDispatcher::dispatch(FXTime blocking,FXuint flags){
-  FXTRACE((10,"FXDispatcher::dispatch(%lld,%x)\n",blocking,flags));
-  if(initialized){
-    FXTime now,due,delay,interval;
-    FXuint sig,nxt,mode;
-
-    // Loop till we got something
-    while(1){
-
-      // Check for timeout
-      delay=forever;
-      due=getTimeout();
-      if(due<forever){
-        now=FXThread::time();
-        delay=due-now;
-        if(delay<FXLONG(1000)){
-          if(dispatchTimeout(due)) return true;
-          continue;
-          }
-        }
-
-      // Check for signal
-      sig=nxt=sigreceived;
-      if(atomicSet(&signotifiedsig,0)){
-        do{ nxt=(nxt+63)&63; }while(nxt!=sig && !signotifiednxt);
-        sigreceived=nxt;
-        if(dispatchSignal(sig)) return true;
-        continue;
-        }
-
-      // Check active handles
-      if(0<numraised){
-        mode=0;
-        do{
-          current=(current+1)%numwatched;
-          if(FD_ISSET(current,&handles->watched0)){
-            FD_CLR(current,&handles->watched0);
-            mode|=InputRead;
-            numraised--;
-            }
-          if(FD_ISSET(current,&handles->watched1)){
-            FD_CLR(current,&handles->watched1);
-            mode|=InputWrite;
-            numraised--;
-            }
-          if(FD_ISSET(current,&handles->watched2)){
-            FD_CLR(current,&handles->watched2);
-            mode|=InputExcept;
-            numraised--;
-            }
-          }
-        while(mode==0);
-        if(dispatchHandle(current,mode)) return true;
-        continue;
+// Add idle callback be executed when dispatch about to block.
+void* FXDispatcher::addIdle(IdleCallback cb,void* ptr){
+  void* res=NULL;
+  if(isInitialized()){
+    Idle **cc=&idles,*c,*x;
+    while((x=*cc)!=NULL){         // Search list for cb
+      if(x->cb==cb){
+        *cc=x->next; 
+        res=x->ptr; 
+        c=x;
+        goto a;
         }
+      cc=&x->next;
+      }
+    if(idlerecs){                 // Recycled chore
+      c=idlerecs;
+      idlerecs=c->next;
+      }
+    else{                         // Fresh chore
+      c=new Idle;
+      }
+a:  c->cb=cb;
+    c->ptr=ptr;
+    c->next=NULL;
+    while((x=*cc)!=NULL){         // Continue to end of list
+      cc=&x->next;
+      }
+    *cc=c;
+    }
+  return res;
+  }
 
-      // Prepare handles to check
-      handles->watched0=handles->handles0;
-      handles->watched1=handles->handles1;
-      handles->watched2=handles->handles2;
-
-      // Select active handles and check signals; don't block
-      numraised=sselect(numhandles,&handles->watched0,&handles->watched1,&handles->watched2,0,NULL);
 
-      // Bad stuff happened
-      if(numraised<0){
-        if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXDispatcher::dispatch: error waiting on handles."); }
+// Remove idle callback cb.
+void* FXDispatcher::remIdle(IdleCallback cb){
+  void *res=NULL;
+  if(isInitialized()){
+    Idle **cc=&idles,*c;
+    while((c=*cc)!=NULL){
+      if(c->cb==cb){
+        *cc=c->next;
+        res=c->ptr;
+        c->next=idlerecs;
+        idlerecs=c;
         continue;
         }
+      cc=&c->next;
+      }
+    }
+  return res;
+  }
 
-      // No handles were active
-      if(numraised==0){
-
-        // Idle callback if we're about to block
-        if(dispatchIdle()) return true;
-
-        // We're not blocking
-        if(blocking<=0) return false;
-
-        // Prepare handles to check
-        handles->watched0=handles->handles0;
-        handles->watched1=handles->handles1;
-        handles->watched2=handles->handles2;
-
-        // Nanoseconds to wait
-        interval=FXMIN(delay,blocking);
-
-        // Select active handles and check signals, waiting for timeout or maximum block time
-        numraised=sselect(numhandles,&handles->watched0,&handles->watched1,&handles->watched2,interval,NULL);
-
-        // Bad stuff happened
-        if(numraised<0){
-          if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXDispatcher::dispatch: error waiting on handles."); }
-          continue;
-          }
 
-        // Return if there was no timeout within maximum block time
-        if(numraised==0){
-          if(delay>=blocking) return false;             // Nothing happened during blocking period!
-          if(blocking<forever){ blocking-=delay; }      // Next blocking period reduced by time already expired
-          continue;
-          }
-        }
-      numwatched=numhandles;
-      }
+// Return true if idle callback cb been set.
+FXbool FXDispatcher::hasIdle(IdleCallback cb) const {
+  for(Idle *c=idles; c; c=c->next){
+    if(c->cb==cb) return true;
     }
   return false;
   }
 
-#endif //////////////////////////////////////////////////////////////////////////
 
-/*******************************************************************************/
-
-// Dispatch when a signal was fired
-FXbool FXDispatcher::dispatchSignal(FXint sig){
-  FXTRACE((10,"FXDispatcher::dispatchSignal(%d)\n",sig));
+// Dispatch one idle callback.
+FXbool FXDispatcher::dispatchIdle(){
+  if(idles){
+    Idle *c=idles;
+    idles=c->next;
+    c->next=idlerecs;
+    idlerecs=c;
+    return c->cb(this,c->ptr);
+    }
   return false;
   }
 
 /*******************************************************************************/
 
-// Dispatch when when handle hnd is signaled with mode
-FXbool FXDispatcher::dispatchHandle(FXInputHandle hnd,FXuint mode){
-  FXTRACE((10,"FXDispatcher::dispatchHandle(%d,%x)\n",hnd,mode));
+// Add callback cb with new handle hnd to watch-list
+FXbool FXDispatcher::addHandle(HandleCallback cb,FXInputHandle hnd,FXuint mode,void* ptr){
+  if(FXReactor::addHandle(hnd,mode)){
+    Handle *handle=new Handle();
+    handle->cb=cb;
+    handle->ptr=ptr;
+    handles.insert((FXptr)(FXuval)hnd,handle);
+    return true;
+    }
   return false;
   }
 
-/*******************************************************************************/
 
-// Return timeout when something needs to happen
-FXTime FXDispatcher::getTimeout(){
-  return forever;
+// Add new handle hnd to watch-list
+FXbool FXDispatcher::addHandle(FXInputHandle hnd,FXuint mode){
+  return FXReactor::addHandle(hnd,mode);
   }
 
 
-// Dispatch when timeout expires
-FXbool FXDispatcher::dispatchTimeout(FXTime due){
-  FXTRACE((10,"FXDispatcher::dispatchTimeout(%lld)\n",due));
+// Remove handle hnd from list
+FXbool FXDispatcher::remHandle(FXInputHandle hnd){
+  if(FXReactor::remHandle(hnd)){
+    Handle *handle=static_cast<Handle*>(handles.remove((FXptr)(FXuval)hnd));
+    delete handle;
+    return true;
+    }
   return false;
   }
 
-/*******************************************************************************/
-
 
-// Dispatch when idle
-FXbool FXDispatcher::dispatchIdle(){
-  FXTRACE((10,"FXDispatcher::dispatchIdle()\n"));
+// Return true if handle has been set.
+FXbool FXDispatcher::hasHandle(FXInputHandle hnd) const {
+  if(isInitialized()){
+    return 0<=handles.find((FXptr)(FXuval)hnd);
+    }
   return false;
   }
 
+
+// Dispatch when when handle hnd is signaled with mode
+FXbool FXDispatcher::dispatchHandle(FXInputHandle hnd,FXuint mode,FXuint){
+  Handle *handle=static_cast<Handle*>(handles(FXptr)(FXuval)hnd);
+  return handle && handle->cb(this,hnd,mode,handle->ptr);
+  }
+
 /*******************************************************************************/
 
 // Exit dispatcher
 FXbool FXDispatcher::exit(){
-  if(initialized){
-    remAllSignals();
-#if defined(WIN32)
-    ///////////////
-#elif defined(HAVE_EPOLL_CREATE1)
-    close(handles->handle);
-#else
-    ///////////////
-#endif
-    freeElms(handles);
-    clearElms(signotified,ARRAYNUMBER(signotified));
-    sigreceived=0;
-    numhandles=0;
-    numwatched=0;
-    numraised=0;
-    current=-1;
-    initialized=false;
+  if(FXReactor::exit()){
+    Idle  *c;
+    Timer *t;
+    FXival i;
+    for(i=0; i<handles.no(); ++i){
+      if(handles.empty(i)) continue;
+      delete static_cast<Handle*>(handles.data(i));
+      }
+    while((t=timers)!=NULL){
+      timers=t->next;
+      delete t;
+      }
+    while((t=timerrecs)!=NULL){
+      timerrecs=t->next;
+      delete t;
+      }
+    while((c=idles)!=NULL){
+      idles=c->next;
+      delete c;
+      }
+    while((c=idlerecs)!=NULL){
+      idlerecs=c->next;
+      delete c;
+      }
+    for(i=0; i<64; ++i){
+      delete signalsi;
+      }
+    freeElms(signals);
+    handles.clear();
+    timers=NULL;
+    idles=NULL;
+    timerrecs=NULL;
+    idlerecs=NULL;
     return true;
     }
   return false;

gogglesmm-1.2.2.tar.gz/cfox/lib/FXDisplay.cpp Added

@@ -0,0 +1,43 @@
+/********************************************************************************
+*                                                                               *
+*                           D i s p l a y   C l a s s                           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "FXDisplay.h"
+
+/*
+  Notes:
+
+*/
+
+using namespace FX;
+
+namespace FX {
+
+/*******************************************************************************/
+
+FXDisplay::FXDisplay(){
+  }
+
+FXDisplay::~FXDisplay(){
+  }
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDockBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDockBar.cpp Changed

@@ -3,7 +3,7 @@
 *                         D o c k S i t e   W i d g e t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -331,8 +331,8 @@
 
 // Search siblings of drydock for first dock opportunity
 FXDockSite* FXDockBar::findDockAtSide(FXuint side){
-  register FXDockSite* docksite;
-  register FXWindow *child;
+  FXDockSite* docksite;
+  FXWindow *child;
   if(drydock){
     child=drydock->getParent()->getFirst();
     while(child){
@@ -352,8 +352,8 @@
   if(docksite){
 
     // Bar size
-    register FXint barw=getWidth();
-    register FXint barh=getHeight();
+    FXint barw=getWidth();
+    FXint barh=getHeight();
 
     // Vertically oriented dock
     if(docksite->getLayoutHints()&LAYOUT_SIDE_LEFT){
@@ -399,8 +399,8 @@
 
 // Search siblings of drydock for dock opportunity near given coordinates
 FXDockSite* FXDockBar::findDockNear(FXint rootx,FXint rooty){
-  register FXDockSite *docksite;
-  register FXWindow *child;
+  FXDockSite *docksite;
+  FXWindow *child;
   FXint barx,bary;
   if(drydock){
 
@@ -663,7 +663,7 @@
 
 // Pressed LEFT button
 long FXDockBar::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -701,7 +701,7 @@
 
 // Moved the mouse
 long FXDockBar::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   if(mode!=DRAG_NONE){
     FXDockSite *toolbardock=dynamic_cast<FXDockSite*>(getParent());
     FXint mousex,mousey;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDockHandler.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDockHandler.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDockSite.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDockSite.cpp Changed

@@ -3,7 +3,7 @@
 *                         D o c k   S i t e   W i d g e t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -135,9 +135,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXDockSite::getDefaultWidth(){
-  register FXint total=0,galw=0,w;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint total=0,galw=0,w;
+  FXWindow *child;
+  FXuint hints;
 
   // Vertically oriented
   if(options&LAYOUT_SIDE_LEFT){
@@ -182,9 +182,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXDockSite::getDefaultHeight(){
-  register FXint total=0,galh=0,h;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint total=0,galh=0,h;
+  FXWindow *child;
+  FXuint hints;
 
   // Vertically oriented
   if(options&LAYOUT_SIDE_LEFT){
@@ -229,9 +229,9 @@
 
 // Return width for given height (vertical orientation)
 FXint FXDockSite::getWidthForHeight(FXint givenheight){
-  register FXint total=0,galh=0,galw=0,w,h;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint total=0,galh=0,galw=0,w,h;
+  FXWindow *child;
+  FXuint hints;
   givenheight-=padtop+padbottom+border+border;
   for(child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
@@ -257,9 +257,9 @@
 
 // Return height for given width (horizontal orientation)
 FXint FXDockSite::getHeightForWidth(FXint givenwidth){
-  register FXint total=0,galh=0,galw=0,w,h;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint total=0,galh=0,galw=0,w,h;
+  FXWindow *child;
+  FXuint hints;
   givenwidth-=padleft+padright+border+border;
   for(child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
@@ -285,8 +285,8 @@
 
 // Find begin and end of galley containing bar on horizontal dock site
 void FXDockSite::galleyOfHorzBar(FXWindow *bar,FXWindow*& begin,FXWindow*& end) const {
-  register FXint space=width-padleft-padright-border-border,ss=0,w;
-  register FXWindow *child;
+  FXint space=width-padleft-padright-border-border,ss=0,w;
+  FXWindow *child;
   for(child=bar; child->getPrev(); child=child->getPrev()){
     if(child->shown() && (child->getLayoutHints()&LAYOUT_DOCK_NEXT)) break;
     }
@@ -312,8 +312,8 @@
 
 // Find begin and end of galley containing bar on vertical dock site
 void FXDockSite::galleyOfVertBar(FXWindow *bar,FXWindow*& begin,FXWindow*& end) const {
-  register FXint space=height-padtop-padbottom-border-border,ss=0,h;
-  register FXWindow *child;
+  FXint space=height-padtop-padbottom-border-border,ss=0,h;
+  FXWindow *child;
   for(child=bar; child->getPrev(); child=child->getPrev()){
     if(child->shown() && (child->getLayoutHints()&LAYOUT_DOCK_NEXT)) break;
     }
@@ -342,9 +342,9 @@
 
 // Determine vertical galley size
 FXint FXDockSite::galleyWidth(FXWindow *begin,FXWindow*& end,FXint space,FXint& require,FXint& expand) const {
-  register FXint galley,any,w,h;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint galley,any,w,h;
+  FXWindow *child;
+  FXuint hints;
   require=expand=galley=any=0;
   for(child=end=begin; child; end=child,child=child->getNext()){
     if(child->shown()){
@@ -373,9 +373,9 @@
 
 // Determine horizontal galley size
 FXint FXDockSite::galleyHeight(FXWindow *begin,FXWindow*& end,FXint space,FXint& require,FXint& expand) const {
-  register FXint galley,any,w,h;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint galley,any,w,h;
+  FXWindow *child;
+  FXuint hints;
   require=expand=galley=any=0;
   for(child=end=begin; child; end=child,child=child->getNext()){
     if(child->shown()){
@@ -1268,7 +1268,7 @@
 
 // Pressed LEFT button
 long FXDockSite::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -1306,7 +1306,7 @@
 
 // Moved the mouse
 long FXDockSite::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   if(mode!=DRAG_NONE){
     FXDockSite *toolbardock=dynamic_cast<FXDockSite*>(getParent());
     FXint mousex,mousey;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDockTitle.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDockTitle.cpp Changed

@@ -3,7 +3,7 @@
 *                         D o c k T i t l e   W i d g e t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -100,7 +100,7 @@
 
 // Get default width
 FXint FXDockTitle::getDefaultWidth(){
-  register FXint w=0;
+  FXint w=0;
   if(!caption.empty()) w=font->getTextWidth(caption.text(),caption.length());
   return padleft+padright+(border<<1)+w;
   }
@@ -108,7 +108,7 @@
 
 // Get default height
 FXint FXDockTitle::getDefaultHeight(){
-  register FXint h=0;
+  FXint h=0;
   if(!caption.empty()) h=font->getFontHeight();
   return padtop+padbottom+(border<<1)+h;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDocument.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDocument.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDragCorner.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDragCorner.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDrawable.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDrawable.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXDriveBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXDriveBox.cpp Changed

@@ -3,7 +3,7 @@
 *                         D r i v e   B o x   O b j e c t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -68,6 +68,7 @@
 #include "FXListBox.h"
 #include "FXDriveBox.h"
 #include "FXDictionary.h"
+#include "FXDictionaryOf.h"
 #include "FXIconCache.h"
 #include "FXFileAssociations.h"
 #include "icons.h"
@@ -182,8 +183,8 @@
 
 // Fill list with names of available drives
 void FXDriveBox::listDrives(){
-  register FXFileAssoc *fileassoc;
-  register FXIcon *icon;
+  FXFileAssoc *fileassoc;
+  FXIcon *icon;
   FXchar drivename10;
   FXuint drivemask;
 
@@ -232,8 +233,8 @@
 
 // Fill list with names of available drives
 void FXDriveBox::listDrives(){
-  register FXFileAssoc *fileassoc;
-  register FXIcon *icon;
+  FXFileAssoc *fileassoc;
+  FXIcon *icon;
 
   // Remove old items first
   clearItems();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXEXEIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXEXEIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXEXEImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXEXEImage.cpp Changed

gogglesmm-1.2.2.tar.gz/cfox/lib/FXEventDispatcher.cpp Added

@@ -0,0 +1,454 @@
+/********************************************************************************
+*                                                                               *
+*                          E v e n t   D i s p a t c h e r                      *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "FXAtomic.h"
+#include "FXElement.h"
+#include "FXHash.h"
+#include "FXCallback.h"
+#include "FXAutoThreadStorageKey.h"
+#include "FXThread.h"
+#include "FXException.h"
+#include "FXReactor.h"
+#include "FXReactorCore.h"
+#include "FXDispatcher.h"
+#include "FXEventDispatcher.h"
+
+/*
+  Notes:
+
+  - FXEventDispatcher processes I/O handles, timers, signals, and idle activities
+    just like FXDispatcher, but also processes messages/events from the display
+    connection.
+
+  - FXRawEvents from display connection are passed to dispatchEvent().
+
+  - FXEventDispatcher::dispatch() must re-implement FXReactor::dispatch() because
+    display connection is special in some sense having to do with message queue
+    management.
+
+*/
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+
+// Construct event dispatcher object
+FXEventDispatcher::FXEventDispatcher():display(NULL){
+  }
+
+
+#if defined(_WIN32) /////////////////////////////////////////////////////////////
+
+// Dispatch driver
+FXbool FXEventDispatcher::dispatch(FXTime blocking,FXuint flags){
+  if(internals){
+    FXTime now,due,delay,interval;
+    FXuint sig,nxt,mode,ms;
+    FXInputHandle hnd;
+    FXRawEvent event;
+
+    // Loop till we got something
+    while(1){
+
+      // Check for timeout
+      delay=forever;
+      if(flags&DispatchTimers){
+        due=nextTimeout();
+        if(due<forever){
+          now=FXThread::time();
+          delay=due-now;
+          if(delay<FXLONG(1000)){
+            if(dispatchTimeout(due)) return true;       // Timer activity
+            continue;
+            }
+          }
+        }
+
+      // Check for signal
+      if(flags&DispatchSignals){
+        sig=nxt=sigreceived;
+        if(atomicSet(&internals->signotifiedsig,0)){
+          do{ nxt=(nxt+63)&63; }while(!internals->signotifiednxt && nxt!=sig);
+          sigreceived=nxt;
+          if(dispatchSignal(sig)) return true;          // Signal activity
+          continue;
+          }
+        }
+
+      // Peek for messages.  This marks the message queue as unsignalled, so that
+      // MsgWaitForMultipleObjects() would block even if there are unhandled messages.
+      // The fix is to call MsgWaitForMultipleObjects() only AFTER having ascertained
+      // that there are NO unhandled messages queued up.
+      if(flags&DispatchEvents){
+        if(PeekMessage(&event,NULL,0,0,PM_REMOVE)){
+          if(dispatchEvent(event)) return true;         // Event activity
+          continue;
+          }
+        }
+
+      // Check active handles
+      if(0<=current && current<numhandles){
+        hnd=internals->handlescurrent;                // Shuffle raised handle up in the list
+        mode=internals->modescurrent;                 // To give all handles equal play time
+        nxt=(current+1)%numhandles;
+        swap(internals->handlescurrent,internals->handlesnxt);
+        swap(internals->modescurrent,internals->modesnxt);
+        current=-1;
+        if(dispatchHandle(hnd,mode,flags)) return true; // IO activity
+        continue;
+        }
+
+      // Select active handles or events; don't block
+      if(flags&DispatchEvents){
+        current=MsgWaitForMultipleObjectsEx(numhandles,internals->handles,0,QS_ALLINPUT,MWMO_ALERTABLE);
+        }
+      else{
+        current=WaitForMultipleObjectsEx(numhandles,internals->handles,false,0,true);
+        }
+
+      // No handles were active
+      if(current==WAIT_TIMEOUT){
+
+        // Idle callback if we're about to block
+        if(flags&DispatchIdle){
+          if(dispatchIdle()) return true;               // Idle activity
+          }
+
+        // We're not blocking
+        if(blocking<=0) return false;
+
+        // One more call to PeekMessage() here because the preceding idle processing
+        // may have caused some more messages to be posted to the message queue.
+        // A call to MsgWaitForMultipleObjects() when there are messages already in
+        // the queue would block until the next message comes in.
+        if(flags&DispatchEvents){
+          if(PeekMessage(&event,NULL,0,0,PM_REMOVE)){
+           if(dispatchEvent(event)) return true;        // Event activity
+           continue;
+           }
+         }
+
+        // Indefinite wait
+        ms=INFINITE;
+
+        // If not blocking indefinitely, don't exceed maxwait time interval.
+        interval=Math::imin(delay,blocking);
+        if(interval<forever){
+          interval=Math::imin(interval,maxwait);
+          ms=(FXuint)(interval/1000000);
+          }
+
+        // Select active handles or events; wait for timeout or maximum block time
+        if(flags&DispatchEvents){
+          current=MsgWaitForMultipleObjectsEx(numhandles,internals->handles,ms,QS_ALLINPUT,MWMO_ALERTABLE);
+          }
+        else{
+          current=WaitForMultipleObjectsEx(numhandles,internals->handles,false,ms,true);
+          }
+
+        // Return if there was no timeout within maximum block time
+        if(current==WAIT_TIMEOUT){
+          if(blocking<forever){                         // Next blocking period reduced by time already expired
+            blocking-=interval;
+            if(blocking<=0) return false;               // Nothing happened during blocking period!
+            }
+          continue;
+          }
+        }
+
+      // I/O completion took place; maybe some i/o took place, causing
+      // somestuff to have been changed; we must leave loop.
+      if(current==WAIT_IO_COMPLETION) return false;
+
+      // Bad stuff happened
+      if(current==WAIT_FAILED || current>=WAIT_ABANDONED_0){
+        throw FXFatalException("FXReactor::dispatch: error waiting on handles.");
+        }
+      }
+    }
+  return false;
+  }
+
+#elif defined(HAVE_EPOLL_CREATE1) ///////////////////////////////////////////////
+
+// Dispatch driver
+FXbool FXEventDispatcher::dispatch(FXTime blocking,FXuint flags){
+  if(internals){
+    FXTime now,due,delay,interval;
+    FXuint sig,nxt,mode,ms;
+    FXInputHandle hnd;
+    FXRawEvent event;
+
+    // Loop till we got something
+    while(1){
+
+      // Check for timeout
+      delay=forever;
+      if(flags&DispatchTimers){
+        due=nextTimeout();
+        if(due<forever){
+          now=FXThread::time();
+          delay=due-now;
+          if(delay<FXLONG(1000)){
+            if(dispatchTimeout(due)) return true;       // Timer activity
+            continue;
+            }
+          }
+        }
+
+      // Check for signal
+      if(flags&DispatchSignals){
+        sig=nxt=sigreceived;
+        if(atomicSet(&internals->signotifiedsig,0)){
+          do{ nxt=(nxt+63)&63; }while(!internals->signotifiednxt && nxt!=sig);
+          sigreceived=nxt;
+          if(dispatchSignal(sig)) return true;          // Signal activity
+          continue;
+          }
+        }
+
+      // Handle messages
+      if(flags&DispatchEvents){
+        if(XEventsQueued((Display*)display,QueuedAfterFlush)){
+          XNextEvent((Display*)display,&event);
+          if(dispatchEvent(event)) return true;         // Event activity
+          continue;
+          }
+        }
+
+      // Check active handles
+      if(0<numraised){
+        mode=0;
+        numraised--;
+        current=(current+1)%numwatched;
+        hnd=internals->eventscurrent.data.fd;
+        if(internals->eventscurrent.events&EPOLLIN){ mode|=InputRead; }
+        if(internals->eventscurrent.events&EPOLLOUT){ mode|=InputWrite; }
+        if(internals->eventscurrent.events&EPOLLERR){ mode|=InputExcept; }
+
+        // Display connection became active
+        if(ConnectionNumber((Display*)display)==hnd) continue;
+
+        // Regular handle became active
+        if(dispatchHandle(hnd,mode,flags)) return true;
+        continue;
+        }
+
+      // Select active handles and check signals; don't block
+      numwatched=epoll_pwait(internals->handle,internals->events,ARRAYNUMBER(internals->events),0,NULL);
+
+      // No active handles yet; need to wait
+      if(numwatched==0){
+
+        // Idle callback if we're about to block
+        if(flags&DispatchIdle){
+          if(dispatchIdle()) return true;               // Idle activity
+          }
+
+        // We're not blocking
+        if(blocking<=0) return false;
+
+        // Indefinite wait
+        ms=-1;
+
+        // If not blocking indefinitely, don't exceed maxwait time interval.
+        interval=Math::imin(delay,blocking);
+        if(interval<forever){
+          interval=Math::imin(interval,maxwait);
+          ms=(FXuint)(interval/1000000);
+          }
+
+        // Select active handles and check signals, waiting for timeout or maximum block time
+        numwatched=epoll_pwait(internals->handle,internals->events,ARRAYNUMBER(internals->events),ms,NULL);
+
+        // Return if there was no timeout within maximum block time
+        if(numwatched==0){
+          if(blocking<forever){                         // Next blocking period reduced by time already expired
+            blocking-=interval;
+            if(blocking<=0) return false;               // Nothing happened during blocking period!
+            }
+          continue;
+          }
+        }
+
+      // Bad stuff happened
+      if(numwatched<0){
+        if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXReactor::dispatch: error waiting on handles."); }
+        continue;
+        }
+
+      // Keep track of original set
+      numraised=numwatched;
+      }
+    }
+  return false;
+  }
+
+#else ///////////////////////////////////////////////////////////////////////////
+
+// Wait for file descriptors
+extern FXint sselect(FXint nfds,fd_set* readfds,fd_set* writefds,fd_set* errorfds,FXTime interval);
+
+// FIXME Somewhere else...
+//      FXReactor::addHandle(ConnectionNumber((Display*)display),InputRead);
+//      FXReactor::remHandle(ConnectionNumber((Display*)display);
+// FIXME
+
+// Dispatch driver
+FXbool FXEventDispatcher::dispatch(FXTime blocking,FXuint flags){
+  if(internals){
+    FXTime now,due,delay,interval;
+    FXuint sig,nxt,mode;
+    FXRawEvent event;
+
+    // Loop till we got something
+    while(1){
+
+      // Check for timeout
+      delay=forever;
+      if(flags&DispatchTimers){
+        due=nextTimeout();
+        if(due<forever){
+          now=FXThread::time();
+          delay=due-now;
+          if(delay<FXLONG(1000)){
+            if(dispatchTimeout(due)) return true;       // Timer activity
+            continue;
+            }
+          }
+        }
+
+      // Check for signal
+      if(flags&DispatchSignals){
+        sig=nxt=sigreceived;
+        if(atomicSet(&internals->signotifiedsig,0)){
+          do{ nxt=(nxt+63)&63; }while(!internals->signotifiednxt && nxt!=sig);
+          sigreceived=nxt;
+          if(dispatchSignal(sig)) return true;          // Signal activity
+          continue;
+          }
+        }
+
+      // Handle messages
+      if(flags&DispatchEvents){
+        if(XEventsQueued((Display*)display,QueuedAfterFlush)){
+          XNextEvent((Display*)display,&event);
+          if(dispatchEvent(event)) return true;         // Event activity
+          continue;
+          }
+        }
+
+      // Check active handles
+      if(0<numraised){
+        mode=0;
+        do{
+          current=(current+1)%numwatched;
+          if(FD_ISSET(current,&internals->watched0)){
+            FD_CLR(current,&internals->watched0);
+            numraised--;
+            mode|=InputRead;
+            }
+          if(FD_ISSET(current,&internals->watched1)){
+            FD_CLR(current,&internals->watched1);
+            numraised--;
+            mode|=InputWrite;
+            }
+          if(FD_ISSET(current,&internals->watched2)){
+            FD_CLR(current,&internals->watched2);
+            numraised--;
+            mode|=InputExcept;
+            }
+          }
+        while(mode==0);
+
+        // Display connection became active
+        if(ConnectionNumber((Display*)display)==current) continue;
+
+        // Regular handle became active
+        if(dispatchHandle(current,mode,flags)) return true;     // IO activity
+        continue;
+        }
+
+      // Prepare handles to check
+      internals->watched0=internals->handles0;
+      internals->watched1=internals->handles1;
+      internals->watched2=internals->handles2;
+
+      // Select active handles and check signals; don't block
+      numraised=sselect(numhandles,&internals->watched0,&internals->watched1,&internals->watched2,0);
+
+      // No handles were active
+      if(numraised==0){
+
+        // Idle callback if we're about to block
+        if(flags&DispatchIdle){
+          if(dispatchIdle()) return true;               // Idle activity
+          }
+
+        // We're not blocking
+        if(blocking<=0) return false;
+
+        // Prepare handles to check
+        internals->watched0=internals->handles0;
+        internals->watched1=internals->handles1;
+        internals->watched2=internals->handles2;
+
+        // Nanoseconds to wait
+        interval=Math::imin(delay,blocking);
+        if(interval<forever){
+          interval=Math::imin(interval,maxwait);
+          }
+
+        // Select active handles and check signals, waiting for timeout or maximum block time
+        numraised=sselect(numhandles,&internals->watched0,&internals->watched1,&internals->watched2,interval);
+
+        // Return if there was no timeout within maximum block time
+        if(numraised==0){
+          if(blocking<forever){                         // Next blocking period reduced by time already expired
+            blocking-=interval;
+            if(blocking<=0) return false;               // Nothing happened during blocking period!
+            }
+          continue;
+          }
+        }
+
+      // Bad stuff happened
+      if(numraised<0){
+        if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXReactor::dispatch: error waiting on handles."); }
+        continue;
+        }
+
+      // Keep track of original set
+      numwatched=numhandles;
+      }
+    }
+  return false;
+  }
+
+#endif //////////////////////////////////////////////////////////////////////////
+
+
+// Dispatch platform-dependent event
+FXbool FXEventDispatcher::dispatchEvent(FXRawEvent& event){
+  return true;
+  }
+
+/*******************************************************************************/
+
+// Destroy event dispatcher object
+FXEventDispatcher::~FXEventDispatcher(){
+  exit();
+  }
+
+}

gogglesmm-1.2.2.tar.gz/cfox/lib/FXEventLoop.cpp Added

@@ -0,0 +1,213 @@
+/********************************************************************************
+*                                                                               *
+*                         F O X   E v e n t   L o o p                           *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "FXAtomic.h"
+#include "FXElement.h"
+#include "FXHash.h"
+#include "FXCallback.h"
+#include "FXReactor.h"
+#include "FXReactorCore.h"
+#include "FXDispatcher.h"
+#include "FXEventDispatcher.h"
+#include "FXEventLoop.h"
+
+/*
+  Notes:
+
+  - Manage nested event loops.
+
+  - Exceptions will unroll through event loops.
+
+*/
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+
+
+// Enter modal loop
+FXEventLoop::FXEventLoop(FXEventLoop** inv,FXWindow* win,FXuint mode):dispatcher(NULL),invocation(inv),upper(*inv),window(win),modality(mode),code(0),done(false){
+  *invocation=this;
+  }
+
+
+// Test if the window is involved in a modal invocation
+FXbool FXEventLoop::isModal(FXWindow *win) const {
+  for(const FXEventLoop* eventloop=this; eventloop; eventloop=eventloop->upper){
+    if(eventloop->window==win && eventloop->modality) return true;
+    }
+  return false;
+  }
+
+
+// Break out of topmost event loop, closing all nested loops also
+void FXEventLoop::stop(FXint value){
+  for(FXEventLoop* eventloop=this; eventloop; eventloop=eventloop->upper){
+    eventloop->done=true;
+    eventloop->code=0;
+    if(eventloop->upper==NULL){
+      eventloop->code=value;
+      return;
+      }
+    }
+  }
+
+
+// Break out of modal loop matching window, and all deeper ones
+void FXEventLoop::stopModal(FXWindow* win,FXint value){
+  if(isModal(window)){
+    for(FXEventLoop* eventloop=this; eventloop; eventloop=eventloop->upper){
+      eventloop->done=true;
+      eventloop->code=0;
+      if(eventloop->window==win && eventloop->modality){
+        eventloop->code=value;
+        return;
+        }
+      }
+    }
+  }
+
+
+// Break out of innermost modal loop, and all deeper non-modal ones
+void FXEventLoop::stopModal(FXint value){
+  for(FXEventLoop* eventloop=this; eventloop; eventloop=eventloop->upper){
+    eventloop->done=true;
+    eventloop->code=0;
+    if(eventloop->modality){
+      eventloop->code=value;
+      return;
+      }
+    }
+  }
+
+
+// Exit modal loop
+FXEventLoop::~FXEventLoop(){
+  *invocation=upper;
+  }
+
+
+
+
+
+
+
+
+#if 0
+
+
+
+// Run application
+FXint FXEventLoop::run(){
+  FXEventLoop inv(&invocation);
+  while(!inv.done){
+    runOneEvent();
+    }
+  return inv.code;
+  }
+
+
+// Run till some flag becomes non-zero
+FXint FXEventLoop::runUntil(FXuint& condition){
+  FXEventLoop inv(&invocation);
+  while(!inv.done && condition==0){
+    runOneEvent();
+    }
+  return condition;
+  }
+
+
+// Run event loop while events are available
+FXint FXEventLoop::runWhileEvents(FXTime blocking){
+  FXEventLoop inv(&invocation,);
+  while(!inv.done && runOneEvent(blocking)) blocking=1000;
+  return !inv.done;
+  }
+
+
+// Run event loop while events are available
+FXint FXEventLoop::runModalWhileEvents(FXWindow* window,FXTime blocking){
+  FXEventLoop inv(&invocation,window,MODAL_FOR_WINDOW);
+  while(!inv.done && runOneEvent(blocking)) blocking=1000;
+  return !inv.done;
+  }
+
+
+// Perform one event dispatch
+FXbool FXEventLoop::runOneEvent(FXTime blocking){
+  FXRawEvent ev;
+  if(getNextEvent(ev,blocking)){
+    dispatchEvent(ev);
+    return true;
+    }
+  return false;
+  }
+
+
+// Run modal event loop, blocking events to all windows, until stopModal is called.
+FXint FXEventLoop::runModal(){
+  FXEventLoop inv(&invocation);
+  while(!inv.done){
+    runOneEvent();
+    }
+  return inv.code;
+  }
+
+
+// Run modal for window
+FXint FXEventLoop::runModalFor(FXWindow* window){
+  FXEventLoop inv(&invocation,window,MODAL_FOR_WINDOW);
+  while(!inv.done){
+    runOneEvent();
+    }
+  return inv.code;
+  }
+
+
+// Run modal while window is shown, or until stopModal is called
+FXint FXEventLoop::runModalWhileShown(FXWindow* window){
+  FXEventLoop inv(&invocation,window,MODAL_FOR_WINDOW);
+  while(!inv.done && window->shown()){
+    runOneEvent();
+    }
+  return inv.code;
+  }
+
+
+// Run popup menu
+FXint FXEventLoop::runPopup(FXWindow* window){
+  FXEventLoop inv(&invocation,window,MODAL_FOR_POPUP);
+  while(!inv.done && window->shown()){
+    runOneEvent();
+    }
+  return inv.code;
+  }
+
+#endif
+
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXException.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXException.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXExpression.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXExpression.cpp Changed

@@ -3,7 +3,7 @@
 *                      E x p r e s s i o n   E v a l u a t o r                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -122,7 +122,12 @@
   TK_LOG10      = 124204261U,
   TK_SIN        = 124308U,
   TK_SINH       = 4102268U,
-  TK_SQRT       = 4076772,
+  TK_SQR        = 123536U,
+  TK_CUB        = 107284U,
+  TK_SQRT       = 4076772U,
+  TK_CBRT       = 3520359U,
+  TK_ROUND      = 136616002U,
+  TK_TRUNC      = 133596670U,
   TK_TAN        = 123227U,
   TK_TANH       = 4066515U,
   TK_MAX        = 121748U,
@@ -179,7 +184,12 @@
   OP_LOG10,
   OP_SIN,
   OP_SINH,
+  OP_SQR,
+  OP_CUB,
   OP_SQRT,
+  OP_CBRT,
+  OP_ROUND,
+  OP_TRUNC,
   OP_TAN,
   OP_TANH,
 
@@ -540,9 +550,24 @@
     case TK_SINH:
       op=OP_SINH;
       goto mono;
+    case TK_SQR:
+      op=OP_SQR;
+      goto mono;
+    case TK_CUB:
+      op=OP_CUB;
+      goto mono;
     case TK_SQRT:
       op=OP_SQRT;
       goto mono;
+    case TK_CBRT:
+      op=OP_CBRT;
+      goto mono;
+    case TK_ROUND:
+      op=OP_ROUND;
+      goto mono;
+    case TK_TRUNC:
+      op=OP_TRUNC;
+      goto mono;
     case TK_TAN:
       op=OP_TAN;
       goto mono;
@@ -608,7 +633,7 @@
 
 // Obtain next token from input
 void FXCompile::gettok(){
-  register FXchar c;
+  FXchar c;
   head=tail;
   while((c=*tail)!='\0'){
     switch(c){
@@ -739,14 +764,67 @@
           while(Ascii::isDigit(*tail)) tail++;
           }
         return;
+      case 'a':
+      case 'b':
+      case 'c':
+      case 'd':
+      case 'e':
+      case 'f':
+      case 'g':
+      case 'h':
+      case 'i':
+      case 'j':
+      case 'k':
+      case 'l':
+      case 'm':
+      case 'n':
+      case 'o':
+      case 'p':
+      case 'q':
+      case 'r':
+      case 's':
+      case 't':
+      case 'u':
+      case 'v':
+      case 'w':
+      case 'x':
+      case 'y':
+      case 'z':
+      case 'A':
+      case 'B':
+      case 'C':
+      case 'D':
+      case 'E':
+      case 'F':
+      case 'G':
+      case 'H':
+      case 'I':
+      case 'J':
+      case 'K':
+      case 'L':
+      case 'M':
+      case 'N':
+      case 'O':
+      case 'P':
+      case 'Q':
+      case 'R':
+      case 'S':
+      case 'T':
+      case 'U':
+      case 'V':
+      case 'W':
+      case 'X':
+      case 'Y':
+      case 'Z':
+      case '_':
+        token=(FXuchar)*tail++;
+        while(Ascii::isWord(*tail)){
+          token=((token<<5)+token) ^ (FXuchar)*tail++;
+          }
+        //FXTRACE((1,"token=%u\n",token));
+        return;
       default:
         token=TK_ERROR;
-        if(Ascii::isLetter(*tail)){
-          token=(FXuchar)*tail++;
-          while(Ascii::isAlphaNumeric(*tail)){
-            token=((token<<5)+token) ^ (FXuchar)*tail++;
-            }
-          }
         return;
       }
     }
@@ -756,7 +834,7 @@
 
 // Emit opcode
 FXuchar* FXCompile::opcode(FXuchar op){
-  register FXuchar* result=pc;
+  FXuchar* result=pc;
   if(code){
     pc0=op;
     }
@@ -767,7 +845,7 @@
 
 // Emit offset
 FXuchar* FXCompile::offset(FXshort n){
-  register FXuchar* result=pc;
+  FXuchar* result=pc;
   if(code){
     SETARG(pc,n);
     }
@@ -778,7 +856,7 @@
 
 // Emit double
 FXuchar* FXCompile::number(FXdouble n){
-  register FXuchar* result=pc;
+  FXuchar* result=pc;
   if(code){
 #if defined(__i386__) || defined(__x86_64__)
     ((FXdouble*)pc)0=n;
@@ -932,8 +1010,8 @@
 // Evaluate expression
 FXdouble FXExpression::evaluate(const FXdouble *args) const {
   FXdouble stackMAXSTACKDEPTH;
-  register const FXuchar *pc=code+2;
-  register FXdouble *sp=stack;
+  const FXuchar *pc=code+2;
+  FXdouble *sp=stack;
   stack0=0.0;
   while(1){
     switch(*pc++){
@@ -961,7 +1039,12 @@
       case OP_ASINH: *sp=Math::asinh(*sp); break;
       case OP_ACOSH: *sp=Math::acosh(*sp); break;
       case OP_ATANH: *sp=Math::atanh(*sp); break;
+      case OP_SQR:   *sp=Math::sqr(*sp); break;
+      case OP_CUB:   *sp=Math::cub(*sp); break;
       case OP_SQRT:  *sp=Math::sqrt(*sp); break;
+      case OP_CBRT:  *sp=Math::cbrt(*sp); break;
+      case OP_ROUND: *sp=Math::round(*sp); break;
+      case OP_TRUNC: *sp=Math::trunc(*sp); break;
       case OP_ABS:   *sp=Math::fabs(*sp); break;
       case OP_CEIL:  *sp=Math::ceil(*sp); break;
       case OP_FLOOR: *sp=Math::floor(*sp); break;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXExtentd.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXExtentd.cpp Changed

@@ -3,7 +3,7 @@
 *           D o u b l e - P r e c i s i o n    E x t e n t    C l a s s         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -41,24 +41,24 @@
 
 // Longest side
 FXdouble FXExtentd::longest() const {
-  register FXdouble x=upper.x-lower.x;
-  register FXdouble y=upper.y-lower.y;
+  FXdouble x=upper.x-lower.x;
+  FXdouble y=upper.y-lower.y;
   return Math::fmax(x,y);
   }
 
 
 // Shortest side
 FXdouble FXExtentd::shortest() const {
-  register FXdouble x=upper.x-lower.x;
-  register FXdouble y=upper.y-lower.y;
+  FXdouble x=upper.x-lower.x;
+  FXdouble y=upper.y-lower.y;
   return Math::fmin(x,y);
   }
 
 
 // Length of diagonal
 FXdouble FXExtentd::diameter() const {
-  register FXdouble x=upper.x-lower.x;
-  register FXdouble y=upper.y-lower.y;
+  FXdouble x=upper.x-lower.x;
+  FXdouble y=upper.y-lower.y;
   return Math::sqrt(x*x+y*y);
   }
 
@@ -139,9 +139,9 @@
 
 // Intersect box with ray p+lambda*d, returning true if hit
 FXbool FXExtentd::intersect(const FXVec2d& pos,const FXVec2d& dir,FXdouble hit) const {
-  register FXdouble f= DBL_MAX;
-  register FXdouble n=-DBL_MAX;
-  register FXdouble ni,fi;
+  FXdouble f= DBL_MAX;
+  FXdouble n=-DBL_MAX;
+  FXdouble ni,fi;
   if(__likely(dir.x!=0.0)){
     if(0.0<dir.x){
       ni=(lower.x-pos.x)/dir.x;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXExtentf.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXExtentf.cpp Changed

@@ -3,7 +3,7 @@
 *          S i n g l e - P r e c i s i o n    E x t e n t    C l a s s          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -41,24 +41,24 @@
 
 // Longest side
 FXfloat FXExtentf::longest() const {
-  register FXfloat x=upper.x-lower.x;
-  register FXfloat y=upper.y-lower.y;
+  FXfloat x=upper.x-lower.x;
+  FXfloat y=upper.y-lower.y;
   return Math::fmax(x,y);
   }
 
 
 // Shortest side
 FXfloat FXExtentf::shortest() const {
-  register FXfloat x=upper.x-lower.x;
-  register FXfloat y=upper.y-lower.y;
+  FXfloat x=upper.x-lower.x;
+  FXfloat y=upper.y-lower.y;
   return Math::fmin(x,y);
   }
 
 
 // Length of diagonal
 FXfloat FXExtentf::diameter() const {
-  register FXfloat x=upper.x-lower.x;
-  register FXfloat y=upper.y-lower.y;
+  FXfloat x=upper.x-lower.x;
+  FXfloat y=upper.y-lower.y;
   return Math::sqrt(x*x+y*y);
   }
 
@@ -139,9 +139,9 @@
 
 // Intersect box with ray pos+lambda*dir, returning true if hit
 FXbool FXExtentf::intersect(const FXVec2f& pos,const FXVec2f& dir,FXfloat hit) const {
-  register FXfloat f= FLT_MAX;
-  register FXfloat n=-FLT_MAX;
-  register FXfloat ni,fi;
+  FXfloat f= FLT_MAX;
+  FXfloat n=-FLT_MAX;
+  FXfloat ni,fi;
   if(__likely(dir.x!=0.0f)){
     if(0.0f<dir.x){
       ni=(lower.x-pos.x)/dir.x;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFile.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFile.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFileAssociations.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFileAssociations.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFileDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFileDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFileList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFileList.cpp Changed

@@ -3,7 +3,7 @@
 *                        F i l e    L i s t   O b j e c t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -61,6 +61,7 @@
 #include "FXMenuCheck.h"
 #include "FXMenuSeparator.h"
 #include "FXDictionary.h"
+#include "FXDictionaryOf.h"
 #include "FXIconCache.h"
 #include "FXFileAssociations.h"
 #include "FXHeader.h"
@@ -89,7 +90,7 @@
 
 #define OPENDIRDELAY        700000000   // Delay before opening directory
 #define REFRESHINTERVAL     1000000000  // Interval between refreshes
-#define REFRESHFREQUENCY    30          // File systems not supporting mod-time, refresh every nth time
+#define REFRESHCOUNT        30          // Refresh every REFRESHCOUNT-th time
 
 using namespace FX;
 
@@ -297,7 +298,7 @@
 
 // Compare file names
 FXint FXFileList::ascending(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(a->label.text(),b->label.text(),0);
     }
@@ -307,7 +308,7 @@
 
 // Reversed compare file name
 FXint FXFileList::descending(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(b->label.text(),a->label.text(),0);
     }
@@ -317,7 +318,7 @@
 
 // Compare file names, case insensitive
 FXint FXFileList::ascendingCase(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSectionCase(a->label.text(),b->label.text(),0);
     }
@@ -327,7 +328,7 @@
 
 // Reversed compare file name, case insensitive
 FXint FXFileList::descendingCase(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSectionCase(b->label.text(),a->label.text(),0);
     }
@@ -337,7 +338,7 @@
 
 // Compare file types
 FXint FXFileList::ascendingType(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(a->label.text(),b->label.text(),1);
     if(diff==0){
@@ -350,7 +351,7 @@
 
 // Reversed compare file type
 FXint FXFileList::descendingType(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(b->label.text(),a->label.text(),1);
     if(diff==0){
@@ -363,7 +364,7 @@
 
 // Compare file size
 FXint FXFileList::ascendingSize(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=FXSGNZ(static_cast<const FXFileItem*>(a)->size - static_cast<const FXFileItem*>(b)->size);
     if(diff==0){
@@ -376,7 +377,7 @@
 
 // Reversed compare file size
 FXint FXFileList::descendingSize(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=FXSGNZ(static_cast<const FXFileItem*>(b)->size - static_cast<const FXFileItem*>(a)->size);
     if(diff==0){
@@ -389,7 +390,7 @@
 
 // Compare file time
 FXint FXFileList::ascendingTime(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=(FXint)((FXFileItem*)b)->isDirectory() - (FXint)((FXFileItem*)a)->isDirectory();
+  FXint diff=(FXint)((FXFileItem*)b)->isDirectory() - (FXint)((FXFileItem*)a)->isDirectory();
   if(diff==0){
     diff=FXSGNZ(static_cast<const FXFileItem*>(a)->date - static_cast<const FXFileItem*>(b)->date);
     if(diff==0){
@@ -402,7 +403,7 @@
 
 // Reversed compare file time
 FXint FXFileList::descendingTime(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=(FXint)((FXFileItem*)b)->isDirectory() - (FXint)((FXFileItem*)a)->isDirectory();
+  FXint diff=(FXint)((FXFileItem*)b)->isDirectory() - (FXint)((FXFileItem*)a)->isDirectory();
   if(diff==0){
     diff=FXSGNZ(static_cast<const FXFileItem*>(b)->date - static_cast<const FXFileItem*>(a)->date);
     if(diff==0){
@@ -415,7 +416,7 @@
 
 // Compare file user
 FXint FXFileList::ascendingUser(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(a->label.text(),b->label.text(),4);
     if(diff==0){
@@ -428,7 +429,7 @@
 
 // Reversed compare file user
 FXint FXFileList::descendingUser(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(b->label.text(),a->label.text(),4);
     if(diff==0){
@@ -441,7 +442,7 @@
 
 // Compare file group
 FXint FXFileList::ascendingGroup(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(a->label.text(),b->label.text(),5);
     if(diff==0){
@@ -454,7 +455,7 @@
 
 // Reversed compare file group
 FXint FXFileList::descendingGroup(const FXIconItem* a,const FXIconItem* b){
-  register FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
+  FXint diff=static_cast<const FXFileItem*>(b)->isDirectory() - static_cast<const FXFileItem*>(a)->isDirectory();
   if(diff==0){
     diff=compareSection(b->label.text(),a->label.text(),5);
     if(diff==0){
@@ -464,6 +465,32 @@
   return diff;
   }
 
+/*******************************************************************************/
+
+// Return uri-list of selected files
+FXString FXFileList::getSelectedFiles() const {
+  FXString result;
+  for(FXint i=0; i<getNumItems(); i++){
+    if(isItemSelected(i) && !isItemNavigational(i)){
+      result.append(FXURL::fileToURL(getItemPathname(i)));
+      result.append("\r\n");
+      }
+    }
+  return result;
+  }
+
+
+// Update if we have selection
+long FXFileList::onUpdHaveSel(FXObject* sender,FXSelector,void*){
+  for(FXint i=0; i<getNumItems(); i++){
+    if(isItemSelected(i) && !isItemNavigational(i)){
+      sender->handle(this,FXSEL(SEL_COMMAND,ID_ENABLE),NULL);
+      return 1;
+      }
+    }
+  sender->handle(this,FXSEL(SEL_COMMAND,ID_DISABLE),NULL);
+  return 1;
+  }
 
 /*******************************************************************************/
 
@@ -480,7 +507,7 @@
   FXString files,action;
   if(getDNDData(FROM_CLIPBOARD,urilistType,files)){
     if(getDNDData(FROM_CLIPBOARD,actionType,action)){
-      FXTRACE((1,"%s::onCmdPasteSel(): Action: %s Files: %s\n",getClassName(),action.text(),files.text()));
+      FXTRACE((100,"%s::onCmdPasteSel(): Action: %s Files: %s\n",getClassName(),action.text(),files.text()));
       if(action0=='1'){
         move_files(directory,files);
         }
@@ -521,23 +548,10 @@
   }
 
 
-// Update if we have selection
-long FXFileList::onUpdHaveSel(FXObject* sender,FXSelector,void*){
-  for(FXint i=0; i<getNumItems(); i++){
-    if(isItemSelected(i) && !isItemNavigational(i)){
-      sender->handle(this,FXSEL(SEL_COMMAND,ID_ENABLE),NULL);
-      return 1;
-      }
-    }
-  sender->handle(this,FXSEL(SEL_COMMAND,ID_DISABLE),NULL);
-  return 1;
-  }
-
-
 // We lost the selection somehow
 long FXFileList::onClipboardLost(FXObject* sender,FXSelector sel,void* ptr){
   FXIconList::onClipboardLost(sender,sel,ptr);
-  FXTRACE((1,"deleting clipfiles\n"));
+  FXTRACE((100,"deleting clipfiles\n"));
   clipfiles=FXString::null;
   clipcut=false;
   return 1;
@@ -547,21 +561,19 @@
 // Somebody wants our selection
 long FXFileList::onClipboardRequest(FXObject* sender,FXSelector sel,void* ptr){
 
-  FXTRACE((1,"FXFileList::onClipboardRequest: requested: %lu\n",((FXEvent*)ptr)->target));
-
   // Try base class first
   if(FXIconList::onClipboardRequest(sender,sel,ptr)) return 1;
 
   // Return list of filenames as a uri-list
   if(((FXEvent*)ptr)->target==urilistType){
-    FXTRACE((1,"Returning urilistType\n"));
+    FXTRACE((100,"Returning urilistType\n"));
     setDNDData(FROM_CLIPBOARD,urilistType,clipfiles);
     return 1;
     }
 
   // Return type of clipboard action
   if(((FXEvent*)ptr)->target==actionType){
-    FXTRACE((1,"Returning actionType\n"));
+    FXTRACE((100,"Returning actionType\n"));
     setDNDData(FROM_CLIPBOARD,actionType,clipcut?"1":"0");
     return 1;
     }
@@ -818,7 +830,7 @@
       }
 
     // See if dropdirectory is writable
-    if(FXStat::isWritable(dropdirectory)){
+    if(FXStat::isAccessible(dropdirectory,FXIO::ReadOnly|FXIO::WriteOnly)){
       acceptDrop(DRAG_ACCEPT);
       }
     return 1;
@@ -1261,9 +1273,8 @@
 // Periodically check to see if directory was changed, and update the list if it was.
 long FXFileList::onRefreshTimer(FXObject*,FXSelector,void*){
   if(flags&FLAG_UPDATE){
-    counter=(counter+1)%REFRESHFREQUENCY;
-//    if(!listItems((counter==0),true)){
-    if(!listItems(false,true)){
+    counter+=1;
+    if(!listItems((counter==REFRESHCOUNT),true)){
       setDirectory(FXPath::validPath(directory),true);
       }
     }
@@ -1281,7 +1292,7 @@
 
 // Compare till '\t' or '\0'
 static FXbool fileequal(const FXchar* p1,const FXchar* p2){
-  register FXint c1,c2;
+  FXint c1,c2;
   do{
     c1=*p1++;
     c2=*p2++;
@@ -1299,6 +1310,8 @@
 FXbool FXFileList::listItems(FXbool force,FXbool notify){
   FXStat info;
 
+  FXTRACE((100,"%s::listItems(%d,%d)\n",getClassName(),force,notify));
+
   // See if directory still there
   if(FXStat::statFile(directory,info)){
 
@@ -1336,16 +1349,13 @@
         // Loop over directory entries
         while(dir.next(name)){
 
-          // Hidden files of the form ".xxx" are normally not shown, but ".." is so we can
-          // navigate up as well as down.  However, at the root level we can't go up any
-          // further so we show "." but not ".."; this allows us to explicitly select "/."
-          // as a directory when we're in directory selection mode.
+          // Suppress '.' if not showing navigational items or not at top directory
           if(name0=='.'){
             if(name1=='\0'){
-              if((options&FILELIST_NO_PARENT) || !istop) continue;
+              if(!istop || (options&FILELIST_NO_PARENT)) continue;
               }
             else if(name1=='.' && name2=='\0'){
-              if((options&FILELIST_NO_PARENT) || istop) continue;
+              if(istop || (options&FILELIST_NO_PARENT)) continue;
               }
             else{
               if(!(options&FILELIST_SHOWHIDDEN)) continue;
@@ -1364,7 +1374,7 @@
 
           mode=info.mode();
 
-          // Hidden file or directory normally not shown
+          // Suppress hidden files or directories
           if((mode&FXIO::Hidden) && !(options&FILELIST_SHOWHIDDEN)) continue;
 #else
 
@@ -1414,7 +1424,7 @@
             attrs=FXSystem::modeString(mode);
 
             // Mod time
-            modtm=FXSystem::localTime(timeformat.text(),info.modified());
+            modtm=FXSystem::localTime(info.modified(),timeformat.text());
 
             // Link name, if any
             lnknm=FXString::null;
@@ -1500,8 +1510,10 @@
       // Update sort order
       sortItems();
 
-      // Update timestamp and reset counter
+      // Update timestamp
       timestamp=time;
+
+      // Reset counter
       counter=0;
       }
     return true;
@@ -1517,10 +1529,10 @@
   if(setDirectory(FXPath::directory(file),notify)){
     FXint index=findItem(FXPath::name(file));
     if(0<=index){
+      makeItemVisible(index);
       setAnchorItem(index);
       setCurrentItem(index,notify);
       selectItem(index,notify);
-      makeItemVisible(index);
       return true;
       }
     }
@@ -1537,31 +1549,19 @@
   }
 
 
-// Return uri-list of selected files
-FXString FXFileList::getSelectedFiles() const {
-  FXString result;
-  for(FXint i=0; i<getNumItems(); i++){
-    if(isItemSelected(i) && !isItemNavigational(i)){
-      result.append(FXURL::fileToURL(getItemPathname(i)));
-      result.append("\r\n");
-      }
-    }
-  return result;
-  }
-
-
 // Set current directory; return true if success
 FXbool FXFileList::setDirectory(const FXString& pathname,FXbool notify){
   FXTRACE((100,"%s::setDirectory(%s)\n",getClassName(),pathname.text()));
   FXString path(FXPath::absolute(directory,pathname));
-  if(directory==path) return true;
   if(FXStat::isDirectory(path)){
+    if(directory==path) return true;
     clearItems(notify);
     directory=path;
     list=NULL;
     if(listItems(true,notify)){
       if(getNumItems()){
         makeItemVisible(0);
+        setAnchorItem(0);
         setCurrentItem(0,notify);
         }
       return true;
@@ -1570,7 +1570,6 @@
   return false;
   }
 
-
 /*******************************************************************************/
 
 // Get file name from item

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFileProgressDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFileProgressDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFileSelector.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFileSelector.cpp Changed

@@ -3,7 +3,7 @@
 *                  F i l e   S e l e c t i o n   W i d g e t                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -268,6 +268,11 @@
   new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_13);
   new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_14);
   new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_15);
+  new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_16);
+  new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_17);
+  new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_18);
+  new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_19);
+  new FXMenuCommand(bookmarkmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_20);
   new FXFrame(navbuttons,LAYOUT_FIX_WIDTH,0,0,4,1);
   new FXButton(navbuttons,tr("\tGo up one directory\tMove up to higher directory."),updiricon,this,ID_DIRECTORY_UP,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
   new FXButton(navbuttons,tr("\tGo to home directory\tBack to home directory."),homeicon,this,ID_HOME,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
@@ -297,7 +302,7 @@
     }
 
   // Now use up to 15 bookmarked directories
-  bookmarks.setMaxFiles(15);
+  bookmarks.setMaxFiles(20);
   bookmarks.setTarget(this);
   bookmarks.setSelector(ID_VISIT);
 
@@ -349,7 +354,7 @@
 // Return the empty string if n exceeds the number of filenames present, or if
 // unmatching quotes are encountered.
 FXString FXFileSelector::decodeFilename(const FXString& string,FXint n){
-  register FXint pp,p,q;
+  FXint pp,p,q;
   FXString result;
   pp=p=q=0;
   while(p<string.length()){
@@ -415,8 +420,8 @@
 // Leave normal filenames consisting of uninterrupted sequence of printable
 // characters unchanged.
 FXString FXFileSelector::encodeFilename(const FXString& string){
-  register FXint p,q,e;
-  register FXuchar c;
+  FXint p,q,e;
+  FXuchar c;
   FXString result;
   p=q=e=0;
   while(p<string.length()){
@@ -443,8 +448,8 @@
 
 // Change in items which are selected
 long FXFileSelector::onCmdItemSelected(FXObject*,FXSelector,void* ptr){
-  register FXint index=(FXint)(FXival)ptr;
-  register FXint i;
+  FXint index=(FXint)(FXival)ptr;
+  FXint i;
   FXString text;
   if(selectmode==SELECTFILE_MULTIPLE){
     for(i=0; i<filebox->getNumItems(); i++){
@@ -482,7 +487,7 @@
 
 // Change in items which are selected
 long FXFileSelector::onCmdItemDeselected(FXObject*,FXSelector,void*){
-  register FXint i;
+  FXint i;
   FXString text;
   if(selectmode==SELECTFILE_MULTIPLE){
     for(i=0; i<filebox->getNumItems(); i++){
@@ -620,8 +625,9 @@
 // a quick jump back into the original directory in case we went up too far.
 long FXFileSelector::onCmdDirectoryUp(FXObject*,FXSelector,void*){
   if(allowNavigation()){
-    setDirectory(FXPath::upLevel(getDirectory()));
-//  if(allowNavigation()) setFilename(getDirectory()); // FIXME
+    FXString dir(getDirectory());
+    setDirectory(FXPath::upLevel(dir));
+    filebox->setCurrentFile(dir);
     return 1;
     }
   getApp()->beep();
@@ -933,6 +939,11 @@
     new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_13);
     new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_14);
     new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_15);
+    new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_16);
+    new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_17);
+    new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_18);
+    new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_19);
+    new FXMenuCommand(&bookmenu,FXString::null,NULL,&bookmarks,FXRecentFiles::ID_FILE_20);
 
     FXMenuPane sortmenu(this);
     new FXMenuCascade(&filemenu,tr("Sort by"),sortingicon,&sortmenu);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFileStream.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFileStream.cpp Changed

@@ -3,7 +3,7 @@
 *                       F i l e   S t r e a m   C l a s s                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -57,7 +57,7 @@
 
 // Write at least count bytes from the buffer
 FXuval FXFileStream::writeBuffer(FXuval){
-  register FXival m,n;
+  FXival m,n;
   if(dir!=FXStreamSave){fxerror("FXFileStream::writeBuffer: wrong stream direction.\n");}
   FXASSERT(begptr<=rdptr);
   FXASSERT(rdptr<=wrptr);
@@ -76,7 +76,7 @@
 
 // Read at least count bytes into the buffer
 FXuval FXFileStream::readBuffer(FXuval){
-  register FXival m,n;
+  FXival m,n;
   if(dir!=FXStreamLoad){fxerror("FXFileStream::readBuffer: wrong stream direction.\n");}
   FXASSERT(begptr<=rdptr);
   FXASSERT(rdptr<=wrptr);
@@ -128,7 +128,7 @@
 
 // Move to position
 FXbool FXFileStream::position(FXlong offset,FXWhence whence){
-  register FXlong p;
+  FXlong p;
   if(dir==FXStreamDead){ fxerror("FXFileStream::position: stream is not open.\n"); }
   if(code==FXStreamOK){
     FXASSERT(FXFromStart==SEEK_SET);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFoldingList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFoldingList.cpp Changed

@@ -3,7 +3,7 @@
 *                    F o l d i n g   L i s t   W i d g e t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -94,10 +94,10 @@
 
 // Draw item
 void FXFoldingItem::draw(const FXFoldingList* list,FXDC& dc,FXint xx,FXint yy,FXint,FXint hh) const {
-  register FXFont *font=list->getFont();
-  register FXHeader *header=list->getHeader();
-  register FXIcon *icon=(state&OPENED)?openIcon:closedIcon;
-  register FXint th=0,tw=0,ih=0,iw=0,yt,xb,beg,end,hi,drw,space,used,dw;
+  FXFont *font=list->getFont();
+  FXHeader *header=list->getHeader();
+  FXIcon *icon=(state&OPENED)?openIcon:closedIcon;
+  FXint th=0,tw=0,ih=0,iw=0,yt,xb,beg,end,hi,drw,space,used,dw;
   if(header->getNumItems()==0) return;
   xx+=SIDE_SPACING/2;
   if(icon){
@@ -157,8 +157,8 @@
 
 // See if item got hit, and where:- 1 is icon, 2 is text
 FXint FXFoldingItem::hitItem(const FXFoldingList* list,FXint xx,FXint yy) const {
-  register FXFont *font=list->getFont();
-  register FXint oiw=0,ciw=0,oih=0,cih=0,tw=0,th=0,iw,ih,ix,iy,tx,ty,hh;
+  FXFont *font=list->getFont();
+  FXint oiw=0,ciw=0,oih=0,cih=0,tw=0,th=0,iw,ih,ix,iy,tx,ty,hh;
   if(openIcon){
     oiw=openIcon->getWidth();
     oih=openIcon->getHeight();
@@ -286,8 +286,8 @@
 
 // Get number of child items
 FXint FXFoldingItem::getNumChildren() const {
-  register FXFoldingItem *item=first;
-  register FXint n=0;
+  FXFoldingItem *item=first;
+  FXint n=0;
   while(item){item=item->next;n++;}
   return n;
   }
@@ -295,7 +295,7 @@
 
 // Get item (logically) below this one
 FXFoldingItem* FXFoldingItem::getBelow() const {
-  register FXFoldingItem* item=(FXFoldingItem*)this;
+  FXFoldingItem* item=(FXFoldingItem*)this;
   if(first) return first;
   while(!item->next && item->parent) item=item->parent;
   return item->next;
@@ -304,7 +304,7 @@
 
 // Get item (logically) above this one
 FXFoldingItem* FXFoldingItem::getAbove() const {
-  register FXFoldingItem* item=prev;
+  FXFoldingItem* item=prev;
   if(!item) return parent;
   while(item->last) item=item->last;
   return item;
@@ -313,7 +313,7 @@
 
 // Return true if child of parent item
 FXbool FXFoldingItem::isChildOf(const FXFoldingItem* item) const {
-  register const FXFoldingItem* child=this;
+  const FXFoldingItem* child=this;
   while(child){ child=child->parent; if(child==item) return true; }
   return false;
   }
@@ -321,7 +321,7 @@
 
 // Return true if parent of child item
 FXbool FXFoldingItem::isParentOf(const FXFoldingItem* item) const {
-  register const FXFoldingItem* child=item;
+  const FXFoldingItem* child=item;
   while(child){ child=child->parent; if(child==this) return true; }
   return false;
   }
@@ -341,7 +341,7 @@
 
 // Get item height
 FXint FXFoldingItem::getHeight(const FXFoldingList* list) const {
-  register FXint th=0,oih=0,cih=0;
+  FXint th=0,oih=0,cih=0;
   if(openIcon) oih=openIcon->getHeight();
   if(closedIcon) cih=closedIcon->getHeight();
   if(!label.empty()) th=4+list->getFont()->getFontHeight();
@@ -486,7 +486,7 @@
 
 // Create window
 void FXFoldingList::create(){
-  register FXFoldingItem *item=firstitem;
+  FXFoldingItem *item=firstitem;
   FXScrollArea::create();
   while(item){
     item->create();
@@ -500,7 +500,7 @@
 
 // Detach window
 void FXFoldingList::detach(){
-  register FXFoldingItem *item=firstitem;
+  FXFoldingItem *item=firstitem;
   FXScrollArea::detach();
   while(item){
     item->detach();
@@ -570,8 +570,8 @@
 
 // Recompute interior
 void FXFoldingList::recompute(){
-  register FXFoldingItem* item;
-  register FXint x,y,h;
+  FXFoldingItem* item;
+  FXint x,y,h;
   x=y=0;
   treeWidth=0;
   treeHeight=0;
@@ -644,8 +644,8 @@
 
 // Get number of toplevel items
 FXint FXFoldingList::getNumItems() const {
-  register FXFoldingItem *item=firstitem;
-  register FXint n=0;
+  FXFoldingItem *item=firstitem;
+  FXint n=0;
   while(item){
     item=item->next;
     n++;
@@ -853,7 +853,7 @@
 
 // Make item fully visible
 void FXFoldingList::makeItemVisible(FXFoldingItem* item){
-  register FXint vh,py,y,h;
+  FXint vh,py,y,h;
   if(item){
 
     // Remember for later
@@ -891,9 +891,9 @@
 
 // Get item at position x,y
 FXFoldingItem* FXFoldingList::getItemAt(FXint,FXint y) const {
-  register FXint hh=header->getHeight();
-  register FXFoldingItem* item=firstitem;
-  register FXint ix,iy,ih;
+  FXint hh=header->getHeight();
+  FXFoldingItem* item=firstitem;
+  FXint ix,iy,ih;
   ix=pos_x;
   iy=pos_y+hh;
   if(options&FOLDINGLIST_ROOT_BOXES) ix+=(4+indent);
@@ -918,8 +918,8 @@
 
 // Did we hit the item, and which part of it did we hit (0=outside, 1=icon, 2=text, 3=box)
 FXint FXFoldingList::hitItem(const FXFoldingItem* item,FXint x,FXint y) const {
-  register FXint hh=header->getHeight();
-  register FXint ix,iy,ih,xh,yh,hit=0;
+  FXint hh=header->getHeight();
+  FXint ix,iy,ih,xh,yh,hit=0;
   if(item){
     x-=pos_x;
     y-=pos_y;
@@ -1055,8 +1055,8 @@
 
 // Extend selection
 FXbool FXFoldingList::extendSelection(FXFoldingItem* item,FXbool notify){
-  register FXFoldingItem *it,*i1,*i2,*i3;
-  register FXbool changes=false;
+  FXFoldingItem *it,*i1,*i2,*i3;
+  FXbool changes=false;
   if(item && anchoritem && extentitem){
     it=firstitem;
     i1=i2=i3=NULL;
@@ -1134,8 +1134,8 @@
 
 // Select all items
 FXbool FXFoldingList::selectAll(FXbool notify){
-  register FXFoldingItem *item=firstitem;
-  register FXbool changes=false;
+  FXFoldingItem *item=firstitem;
+  FXbool changes=false;
   while(item){
     if(!item->isSelected()){
       item->setSelected(true);
@@ -1151,8 +1151,8 @@
 
 // Kill selection
 FXbool FXFoldingList::killSelection(FXbool notify){
-  register FXFoldingItem *item=firstitem;
-  register FXbool changes=false;
+  FXFoldingItem *item=firstitem;
+  FXbool changes=false;
   while(item){
     if(item->isSelected()){
       item->setSelected(false);
@@ -1985,7 +1985,7 @@
 
 // Compare sectioned strings
 FXint FXFoldingList::compareSection(const FXchar *p,const FXchar* q,FXint s){
-  register FXint c1,c2,x;
+  FXint c1,c2,x;
   for(x=s; x && *p; x-=(*p++=='\t')){}
   for(x=s; x && *q; x-=(*q++=='\t')){}
   do{
@@ -1999,7 +1999,7 @@
 
 // Compare sectioned strings, case-insensitive
 FXint FXFoldingList::compareSectionCase(const FXchar *p,const FXchar* q,FXint s){
-  register FXint c1,c2,x;
+  FXint c1,c2,x;
   for(x=s; x && *p; x-=(*p++=='\t')){}
   for(x=s; x && *q; x-=(*q++=='\t')){}
   do{
@@ -2135,7 +2135,7 @@
 
 // Sort all items recursively
 void FXFoldingList::sortItems(){
-  register FXFoldingItem *item;
+  FXFoldingItem *item;
   if(sortfunc){
     sortRootItems();
     item=firstitem;
@@ -2210,12 +2210,12 @@
 FXFoldingItem* FXFoldingList::setItem(FXFoldingItem* orig,FXFoldingItem* item,FXbool notify){
   if(!orig || !item){ fxerror("%s::setItem: NULL argument.\n",getClassName()); }
   if(orig!=item){
-    register FXFoldingItem *par=orig->parent;
-    register FXFoldingItem *fst=orig->first;
-    register FXFoldingItem *lst=orig->last;
-    register FXFoldingItem *nxt=orig->next;
-    register FXFoldingItem *prv=orig->prev;
-    register FXFoldingItem *ch;
+    FXFoldingItem *par=orig->parent;
+    FXFoldingItem *fst=orig->first;
+    FXFoldingItem *lst=orig->last;
+    FXFoldingItem *nxt=orig->next;
+    FXFoldingItem *prv=orig->prev;
+    FXFoldingItem *ch;
 
     // Notify old item will be deleted
     if(notify && target){
@@ -2270,7 +2270,7 @@
 
 // Insert item under father before other item
 FXFoldingItem* FXFoldingList::insertItem(FXFoldingItem* other,FXFoldingItem* father,FXFoldingItem* item,FXbool notify){
-  register FXFoldingItem* olditem=currentitem;
+  FXFoldingItem* olditem=currentitem;
 
   // Verify correctness of arguments
   if(!item){ fxerror("%s::insertItem: NULL item argument.\n",getClassName()); }
@@ -2367,7 +2367,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXFoldingList::fillItems(FXFoldingItem* father,const FXchar *const *strings,FXIcon* oi,FXIcon* ci,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(stringsn){
       appendItem(father,stringsn++,oi,ci,ptr,notify);
@@ -2379,7 +2379,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXFoldingList::fillItems(FXFoldingItem* father,const FXString* strings,FXIcon* oi,FXIcon* ci,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(!stringsn.empty()){
       appendItem(father,stringsn++,oi,ci,ptr,notify);
@@ -2391,7 +2391,7 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXFoldingList::fillItems(FXFoldingItem* father,const FXString& strings,FXIcon* oi,FXIcon* ci,FXptr ptr,FXbool notify){
-  register FXint beg=0,end=0,n=0;
+  FXint beg=0,end=0,n=0;
   while(end<strings.length()){
     beg=end;
     while(end<strings.length() && stringsend!='\n' && stringsend!='\r') end++;
@@ -2457,11 +2457,11 @@
 
 // Extract node from list
 FXFoldingItem* FXFoldingList::extractItem(FXFoldingItem* item,FXbool notify){
-  register FXFoldingItem *olditem=currentitem;
-  register FXFoldingItem *result=item;
-  register FXFoldingItem *prv;
-  register FXFoldingItem *nxt;
-  register FXFoldingItem *par;
+  FXFoldingItem *olditem=currentitem;
+  FXFoldingItem *result=item;
+  FXFoldingItem *prv;
+  FXFoldingItem *nxt;
+  FXFoldingItem *par;
   if(item){
 
     // Remember hookups
@@ -2526,10 +2526,10 @@
 void FXFoldingList::removeItems(FXFoldingItem* fm,FXFoldingItem* to,FXbool notify){
   if(fm && to){
     if(fm->parent!=to->parent){ fxerror("%s::removeItems: arguments have different parent.\n",getClassName()); }
-    register FXFoldingItem *old;
-    register FXFoldingItem *prv;
-    register FXFoldingItem *nxt;
-    register FXFoldingItem *par;
+    FXFoldingItem *old;
+    FXFoldingItem *prv;
+    FXFoldingItem *nxt;
+    FXFoldingItem *par;
 
     old=currentitem;
 
@@ -2606,9 +2606,9 @@
 
 // Get item by name
 FXFoldingItem* FXFoldingList::findItem(const FXString& text,FXFoldingItem* start,FXuint flgs) const {
-  register FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)comparecase : (FXCompareFunc)compare;
-  register FXFoldingItem *item;
-  register FXint len;
+  FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)comparecase : (FXCompareFunc)compare;
+  FXFoldingItem *item;
+  FXint len;
   if(firstitem){
     len=(flgs&SEARCH_PREFIX)?text.length():2147483647;
     if(flgs&SEARCH_BACKWARD){
@@ -2644,7 +2644,7 @@
 
 // Get item by data
 FXFoldingItem* FXFoldingList::findItemByData(FXptr ptr,FXFoldingItem* start,FXuint flgs) const {
-  register FXFoldingItem *item;
+  FXFoldingItem *item;
   if(firstitem){
     if(flgs&SEARCH_BACKWARD){
       item=start;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFont.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFont.cpp Changed

@@ -3,7 +3,7 @@
 *                               F o n t   O b j e c t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -141,9 +141,6 @@
 static const FXint TAIL_OFFSET=0xDC00;
 
 
-// Absolute value
-static inline FXint fxabs(FXint a){ return a<0?-a:a; }
-
 extern FXAPI FXint __snprintf(FXchar* string,FXint length,const FXchar* format,...);
 
 #if defined(WIN32) /////////////////////////// WIN32 ////////////////////////////
@@ -600,8 +597,8 @@
 
 // Convert text to font weight
 static FXuint xlfdWeight(const FXchar* text){
-  register FXchar c1=Ascii::toLower(text0);
-  register FXchar c2=Ascii::toLower(text1);
+  FXchar c1=Ascii::toLower(text0);
+  FXchar c2=Ascii::toLower(text1);
   if(c1=='l' && c2=='i') return FXFont::Light;
   if(c1=='o' && c2=='u') return FXFont::Light;
   if(c1=='s' && c2=='h') return FXFont::Light;
@@ -618,8 +615,8 @@
 
 // Convert text to slant
 static FXuint xlfdSlant(const FXchar* text){
-  register FXchar c1=Ascii::toLower(text0);
-  register FXchar c2=Ascii::toLower(text1);
+  FXchar c1=Ascii::toLower(text0);
+  FXchar c2=Ascii::toLower(text1);
   if(c1=='i') return FXFont::Italic;
   if(c1=='o') return FXFont::Oblique;
   if(c1=='r' && c2=='i') return FXFont::ReverseItalic;
@@ -662,7 +659,7 @@
 
 // Convert pitch to flags
 static FXuint xlfdPitch(const FXchar* text){
-  register FXchar c=Ascii::toLower(text0);
+  FXchar c=Ascii::toLower(text0);
   if(c=='p') return FXFont::Variable;
   if(c=='m' || c=='c') return FXFont::Fixed;
   return 0;
@@ -832,26 +829,26 @@
 
       // Weight
       if(wantweight){
-        dweight=fxabs(weight-wantweight);
+        dweight=Math::iabs(weight-wantweight);
         }
       else{
-        dweight=fxabs(weight-FXFont::Normal);
+        dweight=Math::iabs(weight-FXFont::Normal);
         }
 
       // Slant
       if(wantslant){
-        dslant=fxabs(slant-wantslant);
+        dslant=Math::iabs(slant-wantslant);
         }
       else{
-        dslant=fxabs(slant-FXFont::Straight);
+        dslant=Math::iabs(slant-FXFont::Straight);
         }
 
       // Set width
       if(wantsetwidth){
-        dsetwidth=fxabs(setwidth-wantsetwidth);
+        dsetwidth=Math::iabs(setwidth-wantsetwidth);
         }
       else{
-        dsetwidth=fxabs(setwidth-FXFont::NonExpanded);
+        dsetwidth=Math::iabs(setwidth-FXFont::NonExpanded);
         }
 
       // Pitch
@@ -903,7 +900,7 @@
       // should be multiplied by (100/90).
       else{
         size=(yres*points)/res;
-        dsize=fxabs(size-wantsize);
+        dsize=Math::iabs(size-wantsize);
         }
 
       FXTRACE((160,"%4d: dweight=%-3d dsize=%3d dslant=%d dsetwidth=%d dscalable=%d dpolymorph=%d xres=%-3d yres=%-3d xlfd=\"%s\"\n",f,dweight,dsize,dslant,dsetwidth,dscalable,dpolymorph,xres,yres,fontnamesf));
@@ -1438,10 +1435,10 @@
 #elif defined(HAVE_XFT_H)       ///// XFT /////
     return XftCharExists(DISPLAY(getApp()),(XftFont*)font,ch);
 #else                           ///// XLFD /////
-    register const XFontStruct *fs=(XFontStruct*)font;
-    register const XCharStruct *cm;
-    register FXuchar row=ch>>8;
-    register FXuchar col=ch&255;
+    const XFontStruct *fs=(XFontStruct*)font;
+    const XCharStruct *cm;
+    FXuchar row=ch>>8;
+    FXuchar col=ch&255;
     if(fs->min_char_or_byte2<=col && col<=fs->max_char_or_byte2 && fs->min_byte1<=row && row<=fs->max_byte1){
       if(!fs->per_char) return true;
       cm=fs->per_char+((row-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1))+(col-fs->min_char_or_byte2);
@@ -1521,12 +1518,12 @@
 #elif defined(HAVE_XFT_H)       ///// XFT /////
     return 0;                                           // FIXME
 #else                           ///// XLFD /////
-    register const XFontStruct *fs=(XFontStruct*)font;
+    const XFontStruct *fs=(XFontStruct*)font;
     if(fs->per_char){
-      register FXuchar row=ch>>8;
-      register FXuchar col=ch&255;
+      FXuchar row=ch>>8;
+      FXuchar col=ch&255;
       if(fs->min_char_or_byte2<=col && col<=fs->max_char_or_byte2 && fs->min_byte1<=row && row<=fs->max_byte1){
-        register const XCharStruct *cm=fs->per_char+((row-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1))+(col-fs->min_char_or_byte2);
+        const XCharStruct *cm=fs->per_char+((row-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1))+(col-fs->min_char_or_byte2);
         if(cm->width || cm->ascent || cm->descent) return cm->lbearing;
         }
       return fs->per_char((fs->default_char>>8)-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1)+((fs->default_char&255)-fs->min_char_or_byte2).lbearing;
@@ -1546,12 +1543,12 @@
 #elif defined(HAVE_XFT_H)       ///// XFT /////
     return 0;                                           // FIXME
 #else                           ///// XLFD /////
-    register const XFontStruct *fs=(XFontStruct*)font;
+    const XFontStruct *fs=(XFontStruct*)font;
     if(fs->per_char){
-      register FXuchar row=ch>>8;
-      register FXuchar col=ch&255;
+      FXuchar row=ch>>8;
+      FXuchar col=ch&255;
       if(fs->min_char_or_byte2<=col && col<=fs->max_char_or_byte2 && fs->min_byte1<=row && row<=fs->max_byte1){
-        register const XCharStruct *cm=fs->per_char+((row-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1))+(col-fs->min_char_or_byte2);
+        const XCharStruct *cm=fs->per_char+((row-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1))+(col-fs->min_char_or_byte2);
         if(cm->width || cm->ascent || cm->descent) return cm->rbearing;
         }
       return fs->per_char((fs->default_char>>8)-fs->min_byte1)*(fs->max_char_or_byte2-fs->min_char_or_byte2+1)+((fs->default_char&255)-fs->min_char_or_byte2).rbearing;
@@ -1661,9 +1658,9 @@
     XftTextExtents32(DISPLAY(getApp()),(XftFont*)font,(const FcChar32*)&ch,1,&extents);
     return extents.xOff;
 #else                           ///// XLFD /////
-    register const XFontStruct *fs=(XFontStruct*)font;
-    register FXint width,size;
-    register FXuchar r,c;
+    const XFontStruct *fs=(XFontStruct*)font;
+    FXint width,size;
+    FXuchar r,c;
     if(fs->per_char){
       r=ch>>8;
       c=ch&255;
@@ -1691,7 +1688,7 @@
   if(font){
 #if defined(WIN32)              ///// WIN32 /////
     FXnchar sbuffer4096;
-    FXint count=utf2ncs(sbuffer,string,4096,length);
+    FXint count=utf2ncs(sbuffer,string,ARRAYNUMBER(sbuffer),length);
     SIZE size;
     GetTextExtentPoint32W((HDC)dc,sbuffer,count,&size);
     return size.cx;
@@ -1704,14 +1701,14 @@
     if(angle){ return (FXint)(0.5+Math::sqrt((FXdouble)(extents.xOff*extents.xOff+extents.yOff*extents.yOff))); }
     return extents.xOff;
 #else                           ///// XLFD /////
-    register const XFontStruct *fs=(XFontStruct*)font;
-    register FXint defwidth=fs->min_bounds.width;
-    register FXint width=0,ww;
-    register FXuint p=0;
-    register FXuint s;
-    register FXuchar r;
-    register FXuchar c;
-    register FXwchar w;
+    const XFontStruct *fs=(XFontStruct*)font;
+    FXint defwidth=fs->min_bounds.width;
+    FXint width=0,ww;
+    FXuint p=0;
+    FXuint s;
+    FXuchar r;
+    FXuchar c;
+    FXwchar w;
     if(fs->per_char){
       r=fs->default_char>>8;
       c=fs->default_char&255;
@@ -1845,7 +1842,7 @@
 void FXFont::drawText(FXDC* dc,FXint x,FXint y,const FXchar* string,FXuint length) const {
   FXnchar sbuffer4096;
   FXint iBkMode=SetBkMode((HDC)dc->ctx,TRANSPARENT);
-  FXint count=utf2ncs(sbuffer,4096,string,FXMIN(length,4096));
+  FXint count=utf2ncs(sbuffer,string,ARRAYNUMBER(sbuffer),FXMIN(length,4096));
   FXASSERT(count<=length);
   TextOutW((HDC)dc->ctx,x,y,sbuffer,count);
   SetBkMode((HDC)dc->ctx,iBkMode);
@@ -1867,8 +1864,8 @@
 #else                           ///// XLFD /////
 
 static FXint utf2db(XChar2b *dst,const FXchar *src,FXint n){
-  register FXint len,p;
-  register FXwchar w;
+  FXint len,p;
+  FXwchar w;
   for(p=len=0; p<n; p+=wclen(src+p),len++){
     w=wc(src+p);
     dstlen.byte1=(w>>8);
@@ -1880,10 +1877,10 @@
 
 // Draw text starting at x,y
 void FXFont::drawText(FXDC* dc,FXint x,FXint y,const FXchar* string,FXuint length) const {
-  register const XFontStruct *fs=(XFontStruct*)font;
-  register FXint count,escapement,defwidth,ww,size,i;
-  register FXdouble ang,ux,uy;
-  register FXuchar r,c;
+  const XFontStruct *fs=(XFontStruct*)font;
+  FXint count,escapement,defwidth,ww,size,i;
+  FXdouble ang,ux,uy;
+  FXuchar r,c;
   XChar2b sbuffer4096;
   count=utf2db(sbuffer,string,FXMIN(length,4096));
   FXASSERT(count<=length);
@@ -1950,9 +1947,9 @@
 
 // Function to sort by name, weight, slant, and size
 static int CDECL comparefont(const void *a,const void *b){
-  register const FXFontDesc *fa=(const FXFontDesc*)a;
-  register const FXFontDesc *fb=(const FXFontDesc*)b;
-  register FXint cmp=strcmp(fa->face,fb->face);
+  const FXFontDesc *fa=(const FXFontDesc*)a;
+  const FXFontDesc *fb=(const FXFontDesc*)b;
+  FXint cmp=strcmp(fa->face,fb->face);
   return cmp ? cmp : (fa->weight!=fb->weight) ? fa->weight-fb->weight : (fa->slant!=fb->slant) ? fa->slant-fb->slant : fa->size-fb->size;
   }
 
@@ -1972,7 +1969,7 @@
 
 // Callback function for EnumFontFamiliesEx()
 static int CALLBACK EnumFontFamExProc(const LOGFONTA *lf,const TEXTMETRICA *lptm,DWORD FontType,LPARAM lParam){
-  register FXFontStore *pFontStore=(FXFontStore*)lParam;
+  FXFontStore *pFontStore=(FXFontStore*)lParam;
   FXASSERT(lf);
   FXASSERT(lptm);
   FXASSERT(pFontStore);
@@ -2084,7 +2081,7 @@
 
 // List all fonts matching hints
 FXbool FXFont::listFonts(FXFontDesc*& fonts,FXuint& numfonts,const FXString& face,FXuint wt,FXuint sl,FXuint sw,FXuint en,FXuint h){
-  register FXuint i,j;
+  FXuint i,j;
 
   // Initialize return values
   fonts=NULL;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFontDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFontDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFontSelector.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFontSelector.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXFrame.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXFrame.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGIFCursor.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGIFCursor.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGIFIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGIFIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGIFImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGIFImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGLCanvas.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGLCanvas.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGLContext.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGLContext.cpp Changed

@@ -3,7 +3,7 @@
 *                     G L  R e n d e r i n g   C o n t e x t                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2000,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2000,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -702,8 +702,7 @@
     HFONT oldfont=(HFONT)SelectObject(hdc,(HFONT)font->id());
     // Replace wglUseFontBitmaps() with wglUseFontBitmapsW()
     // Change glCallLists() parameter:
-    //   len=utf2ncs(sbuffer,text.text(),text.length());
-    //   glCallLists(len,GL_UNSIGNED_SHORT,(GLushort*)sbuffer);
+    //   glCallLists(len,GL_UNSIGNED_SHORT,(GLushort*)unicodebuffer);
     // Figure out better values for "first" and "count".
     result=wglUseFontBitmaps(hdc,first,count,list);
     SelectObject(hdc,oldfont);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGLObject.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGLObject.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGLViewer.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGLViewer.cpp Changed

@@ -3,7 +3,7 @@
 *                           O p e n G L   V i e w e r                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -514,7 +514,6 @@
 
     // Vertex colors change both diffuse and ambient
     glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
-    glDisable(GL_COLOR_MATERIAL);
 
     // Simplest and fastest drawing is default
     glShadeModel(GL_FLAT);
@@ -663,7 +662,7 @@
 #ifdef HAVE_GL_H
   FXViewport jt=wv;
   FXdouble d=0.5*worldpx;
-  register FXuint i;
+  FXuint i;
   glClearAccum(0.0f,0.0f,0.0f,0.0f);
   glClear(GL_ACCUM_BUFFER_BIT);
   for(i=0; i<ARRAYNUMBER(jitter); i++){
@@ -682,8 +681,8 @@
 // Fill select buffer with hits in rectangle
 FXint FXGLViewer::selectHits(FXuint*& hits,FXint& nhits,FXint x,FXint y,FXint w,FXint h){
 #ifdef HAVE_GL_H
-  register FXfloat pickx,picky,pickw,pickh;
-  register FXint mh=maxhits;
+  FXfloat pickx,picky,pickw,pickh;
+  FXint mh=maxhits;
   hits=NULL;
   nhits=0;
   if(makeCurrent()){
@@ -1080,7 +1079,7 @@
 
 // Get screen point from eye coordinate
 void FXGLViewer::eyeToScreen(FXint& sx,FXint& sy,FXVec3f e){
-  register FXdouble xp,yp;
+  FXdouble xp,yp;
   if(projection==PERSPECTIVE){
     if(e.z==0.0f){ fxerror("%s::eyeToScreen: cannot transform point.\n",getClassName()); }
     xp=-distance*e.x/e.z;
@@ -1097,7 +1096,7 @@
 
 // Convert screen point to eye coords
 FXVec3f FXGLViewer::screenToEye(FXint sx,FXint sy,FXfloat eyez){
-  register FXfloat xp,yp;
+  FXfloat xp,yp;
   FXVec3f e;
   xp=(FXfloat)(worldpx*sx+ax);
   yp=(FXfloat)(ay-worldpx*sy);
@@ -2375,7 +2374,7 @@
 #ifdef HAVE_GL_H
   if(1<=w && 1<=h){
     GLint swapbytes,lsbfirst,rowlength,skiprows,skippixels,alignment,oldbuf;
-    register FXColor *p,*q,*pp,*qq,t;
+    FXColor *p,*q,*pp,*qq,t;
 
     // Try allocate buffer
     if(allocElms(buffer,w*h)){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGLVisual.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGLVisual.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGZFileStream.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGZFileStream.cpp Changed

@@ -3,7 +3,7 @@
 *                     G Z F i l e S t r e a m   C l a s s e s                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Sander Jansen.   All Rights Reserved.              *
+* Copyright (C) 2002,2020 by Sander Jansen.   All Rights Reserved.              *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -69,7 +69,7 @@
 
 // Save to a file
 FXuval FXGZFileStream::writeBuffer(FXuval){
-  register FXival m,n; int zerror;
+  FXival m,n; int zerror;
   if(dir!=FXStreamSave){fxerror("FXGZFileStream::writeBuffer: wrong stream direction.\n");}
   FXASSERT(begptr<=rdptr);
   FXASSERT(rdptr<=wrptr);
@@ -96,7 +96,7 @@
 
 // Load from file
 FXuval FXGZFileStream::readBuffer(FXuval){
-  register FXival n; int zerror;
+  FXival n; int zerror;
   if(dir!=FXStreamLoad){fxerror("FXGZFileStream::readBuffer: wrong stream direction.\n");}
   FXASSERT(begptr<=rdptr);
   FXASSERT(rdptr<=wrptr);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGauge.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGauge.cpp Changed

@@ -3,7 +3,7 @@
 *                             G a u g e   W i d g e t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2010,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2010,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -339,8 +339,8 @@
 
 // Draw dial face
 void FXGauge::drawGauge(FXDCWindow& dc,FXint xx,FXint yy,FXint ww,FXint hh,FXint cx,FXint cy,FXint rx,FXint ry) const {
-  register FXint rrx=(FXint)(rx*innerRadius);
-  register FXint rry=(FXint)(ry*innerRadius);
+  FXint rrx=(FXint)(rx*innerRadius);
+  FXint rry=(FXint)(ry*innerRadius);
   FXdouble sa=startAngle*DTOR;
   FXdouble ea=(startAngle+sweepAngle)*DTOR;
   FXdouble ma=(sa+ea)*0.5;
@@ -449,7 +449,7 @@
       sa=(720+sa)%360-360;
       ea=sa+sw;
 
-      //FXTRACE((1,"sa=%d ea=%d sw=%d\n",sa,ea,sw));
+      //FXTRACE((100,"sa=%d ea=%d sw=%d\n",sa,ea,sw));
 
       // Include endpoints of arc
       csa=Math::cos(DTOR*sa);
@@ -480,18 +480,18 @@
       FXASSERT(-1.0<=xmin && xmin<xmax && xmax<=1.0);
       FXASSERT(-1.0<=ymin && ymin<ymax && ymax<=1.0);
 
-      FXTRACE((1,"xmin=%.3lf xmax=%.3lf ymin=%.3lf ymax=%.3lf\n",xmin,xmax,ymin,ymax));
+      FXTRACE((100,"xmin=%.3lf xmax=%.3lf ymin=%.3lf ymax=%.3lf\n",xmin,xmax,ymin,ymax));
 
       W=xmax-xmin;
       H=ymax-ymin;
 
-      FXTRACE((1,"was W=%lf H=%lf\n",W,H));
+      FXTRACE((100,"was W=%lf H=%lf\n",W,H));
 
       // Keep circular
       if(!(options&GAUGE_ELLIPTICAL)){
         abox=H/W;
         if(abox*ww<hh){                                   // Box aspect wider than window
-          FXTRACE((1,"Box aspect wider than window\n"));
+          FXTRACE((100,"Box aspect wider than window\n"));
           E=-H;
           H=hh*(W/ww);                                      // New box height
           E+=H;
@@ -513,12 +513,12 @@
           ymax+=0.5*E;
           }
         else{                                             // Box aspect taller than window
-          FXTRACE((1,"Box aspect taller than window\n"));
+          FXTRACE((100,"Box aspect taller than window\n"));
           E=-W;
           W=ww*H/hh;                                      // New box width
           E+=W;
 
-          FXTRACE((1,"E=%.3lf\n",E));
+          FXTRACE((100,"E=%.3lf\n",E));
 
           // Pivot right of box
           if(0.0>xmax){
@@ -534,10 +534,10 @@
           xmin-=0.5*E;
           xmax+=0.5*E;
           }
-        FXTRACE((1,"xmin=%.3lf xmax=%.3lf ymin=%.3lf ymax=%.3lf\n",xmin,xmax,ymin,ymax));
+        FXTRACE((100,"xmin=%.3lf xmax=%.3lf ymin=%.3lf ymax=%.3lf\n",xmin,xmax,ymin,ymax));
         }
 
-      FXTRACE((1,"now W=%lf H=%lf\n",W,H));
+      FXTRACE((100,"now W=%lf H=%lf\n",W,H));
 
       FXASSERT(0.0<W && 0.0<H);
 
@@ -550,11 +550,11 @@
       cy=ceny+(FXint)(0.5+0.5*(ymax+ymin)*ry);
       }
 
-    FXTRACE((1,"width=%d height=%d\n",width,height));
-    FXTRACE((1,"xx=%d yy=%d ww=%d hh=%d\n",xx,yy,ww,hh));
-    FXTRACE((1,"cx=%d cy=%d\n",cx,cy));
-    FXTRACE((1,"rx=%d ry=%d\n",rx,ry));
-    FXTRACE((1,"\n"));
+    FXTRACE((100,"width=%d height=%d\n",width,height));
+    FXTRACE((100,"xx=%d yy=%d ww=%d hh=%d\n",xx,yy,ww,hh));
+    FXTRACE((100,"cx=%d cy=%d\n",cx,cy));
+    FXTRACE((100,"rx=%d ry=%d\n",rx,ry));
+    FXTRACE((100,"\n"));
 
     // Don't draw over borders
     dc.setClipRectangle(border,border,width-(border<<1),height-(border<<1));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGradientBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGradientBar.cpp Changed

@@ -3,7 +3,7 @@
 *                      G r a d i e n t B a r   W i d g e t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -219,7 +219,7 @@
 
 // Get default width
 FXint FXGradientBar::getDefaultWidth(){
-  register FXint w=BAR_WIDTH;
+  FXint w=BAR_WIDTH;
   if(options&GRADIENTBAR_VERTICAL){
     w=barsize;
     if(options&GRADIENTBAR_CONTROLS_LEFT) w+=controlsize+1;
@@ -231,7 +231,7 @@
 
 // Get default height
 FXint FXGradientBar::getDefaultHeight(){
-  register FXint h=BAR_WIDTH;
+  FXint h=BAR_WIDTH;
   if(!(options&GRADIENTBAR_VERTICAL)){
     h=barsize;
     if(options&GRADIENTBAR_CONTROLS_TOP) h+=controlsize+1;
@@ -243,7 +243,7 @@
 
 // Resize the bar
 void FXGradientBar::layout(){
-  register FXint ww,hh;
+  FXint ww,hh;
   ww=width-padleft-padright-(border<<1)-4;
   hh=height-padtop-padbottom-(border<<1)-4;
   if(options&GRADIENTBAR_VERTICAL){
@@ -273,7 +273,7 @@
 
 // Linear blend
 FXdouble FXGradientBar::blendlinear(FXdouble middle,FXdouble pos){
-  register FXdouble factor;
+  FXdouble factor;
   if(pos<=middle){
     factor=(middle<EPSILON) ? 0.0 : 0.5*pos/middle;
     }
@@ -316,11 +316,11 @@
 
 // Fill with gradient ramp
 void FXGradientBar::gradient(FXColor *ramp,FXint nramp) const {
-  register FXint s,lr,lg,lb,la,ur,ug,ub,ua,d,l,h,m,i;
-  register FXdouble len=segnsegs-1.upper-seg0.lower;
-  register FXdouble del=nramp-1;
-  register BLENDFUNC blend=NULL;
-  register FXdouble f,t;
+  FXint s,lr,lg,lb,la,ur,ug,ub,ua,d,l,h,m,i;
+  FXdouble len=segnsegs-1.upper-seg0.lower;
+  FXdouble del=nramp-1;
+  BLENDFUNC blend=NULL;
+  FXdouble f,t;
 
   FXASSERT(len>0.0);
 
@@ -372,10 +372,10 @@
 
 // Update bar
 void FXGradientBar::updatebar(){
-  register FXint barw=bar->getWidth();
-  register FXint barh=bar->getHeight();
-  register FXint x,y,r,g,b,a;
-  register FXColor clr;
+  FXint barw=bar->getWidth();
+  FXint barh=bar->getHeight();
+  FXint x,y,r,g,b,a;
+  FXColor clr;
   FXColor *ramp=NULL;
 
   // Vertical
@@ -497,8 +497,8 @@
 
 // Draw top arrows
 void FXGradientBar::drawTopArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){
-  register FXdouble len=segnsegs-1.upper-seg0.lower;
-  register FXint s,l,m,r;
+  FXdouble len=segnsegs-1.upper-seg0.lower;
+  FXint s,l,m,r;
   FXASSERT(len>0.0);
   for(s=0; s<nsegs; s++){
     l=(FXint)(0.5+((w-1)*(segs.lower-seg0.lower))/len);
@@ -516,8 +516,8 @@
 
 // Draw bottom arrows
 void FXGradientBar::drawBottomArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){
-  register FXdouble len=segnsegs-1.upper-seg0.lower;
-  register FXint s,l,m,r;
+  FXdouble len=segnsegs-1.upper-seg0.lower;
+  FXint s,l,m,r;
   FXASSERT(len>0.0);
   for(s=0; s<nsegs; s++){
     l=(FXint)(0.5+((w-1)*(segs.lower-seg0.lower))/len);
@@ -535,8 +535,8 @@
 
 // Draw left arrows
 void FXGradientBar::drawLeftArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){
-  register FXdouble len=segnsegs-1.upper-seg0.lower;
-  register FXint s,t,m,b;
+  FXdouble len=segnsegs-1.upper-seg0.lower;
+  FXint s,t,m,b;
   FXASSERT(len>0.0);
   for(s=0; s<nsegs; s++){
     t=(FXint)(0.5+((h-1)*(segs.upper-seg0.lower))/len);
@@ -554,8 +554,8 @@
 
 // Draw right arrows
 void FXGradientBar::drawRightArrows(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){
-  register FXdouble len=segnsegs-1.upper-seg0.lower;
-  register FXint s,t,m,b;
+  FXdouble len=segnsegs-1.upper-seg0.lower;
+  FXint s,t,m,b;
   FXASSERT(len>0.0);
   for(s=0; s<nsegs; s++){
     t=(FXint)(0.5+((h-1)*(segs.upper-seg0.lower))/len);
@@ -770,8 +770,8 @@
 
 // Move segments
 void FXGradientBar::moveSegments(FXint sglo,FXint sghi,FXdouble val,FXbool notify){
-  register FXdouble delta, below,above,room;
-  register FXint i;
+  FXdouble delta, below,above,room;
+  FXint i;
   if(0<=sglo && sghi<nsegs && sglo<=sghi){
     below=segsglo.middle-segsglo.lower;
     above=segsghi.upper-segsglo.middle;
@@ -810,8 +810,8 @@
 
 // Split segment at the midpoint
 void FXGradientBar::splitSegments(FXint sglo,FXint sghi,FXbool notify){
-  register FXint n=sghi-sglo+1;
-  register FXint i,j;
+  FXint n=sghi-sglo+1;
+  FXint i,j;
   if(0<=sglo && sghi<nsegs && 0<n){
     resizeElms(seg,nsegs+n);
     memmove(&segsghi+n,&segsghi,sizeof(FXGradient)*(nsegs-sghi));
@@ -838,7 +838,7 @@
 
 // Merge segments
 void FXGradientBar::mergeSegments(FXint sglo,FXint sghi,FXbool notify){
-  register FXint n=sghi-sglo;
+  FXint n=sghi-sglo;
   if(0<=sglo && sghi<nsegs && 0<n){
     segsglo.middle=(n&1)?seg(sghi+sglo)/2.upper:seg(sghi+sglo)/2.middle;
     segsglo.upper=segsghi.upper;
@@ -858,8 +858,8 @@
 
 // Make segments uniformly distributed
 void FXGradientBar::uniformSegments(FXint sglo,FXint sghi,FXbool notify){
-  register FXdouble m,d,a;
-  register FXint s;
+  FXdouble m,d,a;
+  FXint s;
   if(0<=sglo && sghi<nsegs && sglo<=sghi){
     d=sghi-sglo+1;
     m=segsghi.upper-segsglo.lower;
@@ -877,7 +877,7 @@
 
 // Change blend curve of segment
 void FXGradientBar::blendSegments(FXint sglo,FXint sghi,FXuint blend,FXbool notify){
-  register FXint s;
+  FXint s;
   if(0<=sglo && sghi<nsegs && sglo<=sghi){
     for(s=sglo; s<=sghi; s++){
       segs.blend=blend;
@@ -890,11 +890,11 @@
 
 // Determine which segment got hit
 FXint FXGradientBar::getSegment(FXint x,FXint y) const {
-  register FXdouble shi=segnsegs-1.upper;
-  register FXdouble slo=seg0.lower;
-  register FXdouble len=shi-slo;
-  register FXdouble del;
-  register FXint lo,hi,v,s;
+  FXdouble shi=segnsegs-1.upper;
+  FXdouble slo=seg0.lower;
+  FXdouble len=shi-slo;
+  FXdouble del;
+  FXint lo,hi,v,s;
   FXASSERT(len>0.0);
   if(options&GRADIENTBAR_VERTICAL){
     if(y<border+padtop+2) return nsegs-1;
@@ -920,11 +920,11 @@
 // Get grip in segment
 FXint FXGradientBar::getGrip(FXint sg,FXint x,FXint y) const {
   if(0<=sg && sg<nsegs){
-    register FXdouble shi=segnsegs-1.upper;
-    register FXdouble slo=seg0.lower;
-    register FXdouble len=shi-slo;
-    register FXdouble del;
-    register FXint lo,hi,md,v;
+    FXdouble shi=segnsegs-1.upper;
+    FXdouble slo=seg0.lower;
+    FXdouble len=shi-slo;
+    FXdouble del;
+    FXint lo,hi,md,v;
     FXASSERT(len>0.0);
     if(options&GRADIENTBAR_VERTICAL){
       v=height-border-padbottom-y-3;
@@ -951,9 +951,9 @@
 
 // Get value given position x,y
 FXdouble FXGradientBar::getValue(FXint x,FXint y) const {
-  register FXdouble slo=seg0.lower;
-  register FXdouble shi=segnsegs-1.upper;
-  register FXdouble val;
+  FXdouble slo=seg0.lower;
+  FXdouble shi=segnsegs-1.upper;
+  FXdouble val;
   if(options&GRADIENTBAR_VERTICAL)
     val=slo+(height-padbottom-border-3-y)*(shi-slo)/(bar->getHeight()-1);
   else
@@ -964,10 +964,10 @@
 
 // Get position of lower edge of segment
 FXint FXGradientBar::getSegmentLowerPos(FXint sg) const {
-  register FXdouble shi=segnsegs-1.upper;
-  register FXdouble slo=seg0.lower;
-  register FXdouble len=shi-slo;
-  register FXint pos;
+  FXdouble shi=segnsegs-1.upper;
+  FXdouble slo=seg0.lower;
+  FXdouble len=shi-slo;
+  FXint pos;
   FXASSERT(0<=sg && sg<nsegs);
   FXASSERT(0<len);
   if(options&GRADIENTBAR_VERTICAL){
@@ -982,10 +982,10 @@
 
 // Get position of upper edge of segment
 FXint FXGradientBar::getSegmentUpperPos(FXint sg) const {
-  register FXdouble shi=segnsegs-1.upper;
-  register FXdouble slo=seg0.lower;
-  register FXdouble len=shi-slo;
-  register FXint pos;
+  FXdouble shi=segnsegs-1.upper;
+  FXdouble slo=seg0.lower;
+  FXdouble len=shi-slo;
+  FXint pos;
   FXASSERT(0<=sg && sg<nsegs);
   FXASSERT(0<len);
   if(options&GRADIENTBAR_VERTICAL){
@@ -1000,10 +1000,10 @@
 
 // Get position of middle of segment
 FXint FXGradientBar::getSegmentMiddlePos(FXint sg) const {
-  register FXdouble shi=segnsegs-1.upper;
-  register FXdouble slo=seg0.lower;
-  register FXdouble len=shi-slo;
-  register FXint pos;
+  FXdouble shi=segnsegs-1.upper;
+  FXdouble slo=seg0.lower;
+  FXdouble len=shi-slo;
+  FXint pos;
   FXASSERT(0<=sg && sg<nsegs);
   FXASSERT(0<len);
   if(options&GRADIENTBAR_VERTICAL){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXGroupBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXGroupBox.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXHash.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXHash.cpp Changed

@@ -3,7 +3,7 @@
 *                       H a s h   T a b l e   C l a s s                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -113,9 +113,9 @@
 
 // Adjust the size of the table
 FXbool FXHash::no(FXival n){
-  register FXival m=no();
+  FXival m=no();
   if(__likely(m!=n)){
-    register Entry *elbat;
+    Entry *elbat;
 
     // Release old table
     if(1<m){
@@ -145,19 +145,19 @@
   FXASSERT((n-used())>0);       // At least one free slot
   if(elbat.no(n)){
     if(1<elbat.no() && 1<no()){
-      register FXptr name,data;
-      register FXuval p,b,x;
-      register FXival i;
-      for(i=0; i<no(); ++i){                  // Hash existing entries into new table
-        name=tablei.name;
+      FXptr key,data;
+      FXuval p,b,x;
+      FXival i;
+      for(i=0; i<no(); ++i){    // Hash existing entries into new table
+        key=tablei.key;
         data=tablei.data;
-        if(LEGAL(name)){
-          p=b=HASH(name);
-          while(elbat.tablex=p&(n-1).name){ // Locate slot
+        if(LEGAL(key)){
+          p=b=HASH(key);
+          while(elbat.tablex=p&(n-1).key){    // Locate slot
             p=(p<<2)+p+b+1;
             b>>=BSHIFT;
             }
-          elbat.tablex.name=name;
+          elbat.tablex.key=key;
           elbat.tablex.data=data;
           }
         }
@@ -193,12 +193,12 @@
 
 
 // Find position of given key
-FXival FXHash::find(FXptr name) const {
-  if(__likely(LEGAL(name))){
-    register FXuval p,b,x;
-    p=b=HASH(name);
-    while(__likely(tablex=p&(no()-1).name)){
-      if(__likely(tablex.name==name)) return x;
+FXival FXHash::find(FXptr ky) const {
+  if(__likely(LEGAL(ky))){
+    FXuval p,b,x;
+    p=b=HASH(ky);
+    while(__likely(tablex=p&(no()-1).key)){
+      if(__likely(tablex.key==ky)) return x;
       p=(p<<2)+p+b+1;
       b>>=BSHIFT;
       }
@@ -208,25 +208,25 @@
 
 
 // Return reference to slot assocated with given key
-FXptr& FXHash::at(FXptr name){
-  if(__likely(LEGAL(name))){
-    register FXuval p,b,h,x;
-    p=b=h=HASH(name);
-    while(tablex=p&(no()-1).name){
-      if(tablex.name==name) goto x;           // Replace existing slot
+FXptr& FXHash::at(FXptr ky){
+  if(__likely(LEGAL(ky))){
+    FXuval p,b,h,x;
+    p=b=h=HASH(ky);
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==ky) goto x;           // Replace existing slot
       p=(p<<2)+p+b+1;
       b>>=BSHIFT;
       }
     if(__unlikely(free()<=1+(no()>>2)) && __unlikely(!resize(no()<<1))){ throw FXMemoryException("FXHash::at: out of memory\n"); }
     p=b=h;
-    while(tablex=p&(no()-1).name){
-      if(tablex.name==VOID) goto y;           // Put into voided slot
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==VOID) goto y;           // Put into voided slot
       p=(p<<2)+p+b+1;
       b>>=BSHIFT;
       }
     free(free()-1);                             // Put into empty slot
 y:  used(used()+1);
-    tablex.name=name;
+    tablex.key=ky;
 x:  return tablex.data;
     }
   return *((FXptr*)NULL);               // Can NOT be referenced; will generate segfault!
@@ -234,12 +234,12 @@
 
 
 // Return constant reference to slot assocated with given key
-const FXptr& FXHash::at(FXptr name) const {
-  if(__likely(LEGAL(name))){
-    register FXuval p,b,x;
-    p=b=HASH(name);
-    while(tablex=p&(no()-1).name){
-      if(tablex.name==name) return tablex.data;     // Return existing slot
+const FXptr& FXHash::at(FXptr ky) const {
+  if(__likely(LEGAL(ky))){
+    FXuval p,b,x;
+    p=b=HASH(ky);
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==ky) return tablex.data;        // Return existing slot
       p=(p<<2)+p+b+1;
       b>>=BSHIFT;
       }
@@ -249,18 +249,18 @@
 
 
 // Remove association from the table
-FXptr FXHash::remove(FXptr name){
-  register FXptr old=NULL;
-  if(__likely(LEGAL(name))){
-    register FXuval p,b,x;
-    p=b=HASH(name);
-    while(tablex=p&(no()-1).name!=name){
-      if(tablex.name==NULL) return NULL;
+FXptr FXHash::remove(FXptr ky){
+  FXptr old=NULL;
+  if(__likely(LEGAL(ky))){
+    FXuval p,b,x;
+    p=b=HASH(ky);
+    while(tablex=p&(no()-1).key!=ky){
+      if(tablex.key==NULL) return NULL;
       p=(p<<2)+p+b+1;
       b>>=BSHIFT;
       }
     old=tablex.data;
-    tablex.name=VOID;                         // Void the slot (not empty!)
+    tablex.key=VOID;                         // Void the slot (not empty!)
     tablex.data=NULL;
     used(used()-1);
     if(__unlikely(used()<=(no()>>2))) resize(no()>>1);
@@ -271,11 +271,11 @@
 
 // Erase data at pos in the table, returning old pointer
 FXptr FXHash::erase(FXival pos){
-  register FXptr old=NULL;
+  FXptr old=NULL;
   if(__unlikely(pos<0 || no()<=pos)){ throw FXRangeException("FXHash::erase: argument out of range\n"); }
-  if(__likely(LEGAL(tablepos.name))){
+  if(__likely(LEGAL(tablepos.key))){
     old=tablepos.data;
-    tablepos.name=VOID;                       // Void the slot (not empty!)
+    tablepos.key=VOID;                        // Void the slot (not empty!)
     tablepos.data=NULL;
     used(used()-1);
     if(__unlikely(used()<=(no()>>2))) resize(no()>>1);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXHeader.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXHeader.cpp Changed

@@ -3,7 +3,7 @@
 *                               H e a d e r   O b j e c t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -84,8 +84,8 @@
 
 // Draw item
 void FXHeaderItem::draw(const FXHeader* header,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXint tx,ty,tw,th,ix,iy,iw,ih,s,ml,mr,mt,mb,beg,end,t,xx,yy,bb,aa,ax,ay;
-  register FXFont *font=header->getFont();
+  FXint tx,ty,tw,th,ix,iy,iw,ih,s,ml,mr,mt,mb,beg,end,t,xx,yy,bb,aa,ax,ay;
+  FXFont *font=header->getFont();
 
   // Get border width and padding
   bb=header->getBorderWidth();
@@ -303,10 +303,10 @@
 
 // Get width of item
 FXint FXHeaderItem::getWidth(const FXHeader* header) const {
-  register FXint ml=header->getPadLeft()+header->getBorderWidth();
-  register FXint mr=header->getPadRight()+header->getBorderWidth();
-  register FXFont *font=header->getFont();
-  register FXint beg,end,tw,iw,s,t,w;
+  FXint ml=header->getPadLeft()+header->getBorderWidth();
+  FXint mr=header->getPadRight()+header->getBorderWidth();
+  FXFont *font=header->getFont();
+  FXint beg,end,tw,iw,s,t,w;
   tw=iw=beg=s=0;
   if(icon) iw=icon->getWidth();
   do{
@@ -327,10 +327,10 @@
 
 // Get height of item
 FXint FXHeaderItem::getHeight(const FXHeader* header) const {
-  register FXint mt=header->getPadTop()+header->getBorderWidth();
-  register FXint mb=header->getPadBottom()+header->getBorderWidth();
-  register FXFont *font=header->getFont();
-  register FXint beg,end,th,ih,h;
+  FXint mt=header->getPadTop()+header->getBorderWidth();
+  FXint mb=header->getPadBottom()+header->getBorderWidth();
+  FXFont *font=header->getFont();
+  FXint beg,end,th,ih,h;
   th=ih=beg=0;
   if(icon) ih=icon->getHeight();
   do{
@@ -449,7 +449,7 @@
 
 // Create window
 void FXHeader::create(){
-  register FXint i;
+  FXint i;
   FXFrame::create();
   for(i=0; i<items.no(); i++){itemsi->create();}
   font->create();
@@ -458,7 +458,7 @@
 
 // Detach window
 void FXHeader::detach(){
-  register FXint i;
+  FXint i;
   FXFrame::detach();
   for(i=0; i<items.no(); i++){itemsi->detach();}
   font->detach();
@@ -467,7 +467,7 @@
 
 // Get default width
 FXint FXHeader::getDefaultWidth(){
-  register FXint i,t,w=0;
+  FXint i,t,w=0;
   if(options&HEADER_VERTICAL){
     for(i=0; i<items.no(); i++){
       if((t=itemsi->getWidth(this))>w) w=t;
@@ -484,7 +484,7 @@
 
 // Get default height
 FXint FXHeader::getDefaultHeight(){
-  register FXint i,t,h=0;
+  FXint i,t,h=0;
   if(options&HEADER_VERTICAL){
     for(i=0; i<items.no(); i++){
       h+=itemsi->getSize();
@@ -592,7 +592,7 @@
 
 // Insert item
 FXint FXHeader::insertItem(FXint index,FXHeaderItem* item,FXbool notify){
-  register FXint i,d;
+  FXint i,d;
 
   // Must have item
   if(!item){ fxerror("%s::insertItem: item is NULL.\n",getClassName()); }
@@ -653,7 +653,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXHeader::fillItems(const FXchar *const *strings,FXIcon *icon,FXint size,void* ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(stringsn){
       appendItem(stringsn++,icon,size,ptr,notify);
@@ -665,7 +665,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXHeader::fillItems(const FXString* strings,FXIcon *icon,FXint size,void* ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(!stringsn.empty()){
       appendItem(stringsn++,icon,size,ptr,notify);
@@ -677,7 +677,7 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXHeader::fillItems(const FXString& strings,FXIcon *icon,FXint size,void* ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   FXString text;
   while(!(text=strings.section('\n',n)).empty()){
     appendItem(text,icon,size,ptr,notify);
@@ -689,8 +689,8 @@
 
 // Extract node from list
 FXHeaderItem* FXHeader::extractItem(FXint index,FXbool notify){
-  register FXHeaderItem *result;
-  register FXint i,d;
+  FXHeaderItem *result;
+  FXint i,d;
 
   // Must be in range
   if(index<0 || items.no()<=index){ fxerror("%s::extractItem: index out of range.\n",getClassName()); }
@@ -720,7 +720,7 @@
 
 // Remove node from list
 void FXHeader::removeItem(FXint index,FXbool notify){
-  register FXint i,d;
+  FXint i,d;
 
   // Must be in range
   if(index<0 || items.no()<=index){ fxerror("%s::removeItem: index out of range.\n",getClassName()); }
@@ -815,7 +815,7 @@
 
 // Change item's size
 void FXHeader::setItemSize(FXint index,FXint size){
-  register FXint i,d;
+  FXint i,d;
   if(index<0 || items.no()<=index){ fxerror("%s::setItemSize: index out of range.\n",getClassName()); }
   if(size<0) size=0;
   d=size-itemsindex->getSize();
@@ -843,7 +843,7 @@
 
 // Get index of item at offset
 FXint FXHeader::getItemAt(FXint coord) const {
-  register FXint h=items.no()-1,l=0,p=coord-pos,m;
+  FXint h=items.no()-1,l=0,p=coord-pos,m;
   if(l<=h){
     if(p<itemsl->getPos()) return -1;
     if(p>=itemsh->getPos()+itemsh->getSize()) return items.no();
@@ -944,7 +944,7 @@
 
 // Scroll to make given item visible
 void FXHeader::makeItemVisible(FXint index){
-  register FXint newpos,ioffset,isize,space;
+  FXint newpos,ioffset,isize,space;
   if(xid){
     newpos=pos;
     if(0<=index && index<items.no()){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXHorizontalFrame.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXHorizontalFrame.cpp Changed

@@ -3,7 +3,7 @@
 *              H o r i z o n t a l   C o n t a i n e r   O b j e c t            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -72,9 +72,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXHorizontalFrame::getDefaultWidth(){
-  register FXint w,wcum,wmax,mw;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint w,wcum,wmax,mw;
+  FXWindow* child;
+  FXuint hints;
   wcum=wmax=mw=0;
   if(options&PACK_UNIFORM_WIDTH) mw=maxChildWidth();
   for(child=getFirst(); child; child=child->getNext()){
@@ -100,9 +100,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXHorizontalFrame::getDefaultHeight(){
-  register FXint h,hmax,hcum,mh;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint h,hmax,hcum,mh;
+  FXWindow* child;
+  FXuint hints;
   hmax=hcum=mh=0;
   if(options&PACK_UNIFORM_HEIGHT) mh=maxChildHeight();
   for(child=getFirst(); child; child=child->getNext()){
@@ -127,14 +127,14 @@
 
 // Recalculate layout
 void FXHorizontalFrame::layout(){
-  register FXint left,right,top,bottom,remain,extra_space,total_space,t,x,y,w,h;
-  register FXWindow* child;
-  register FXint sumexpand=0;
-  register FXint numexpand=0;
-  register FXint mw=0;
-  register FXint mh=0;
-  register FXint e=0;
-  register FXuint hints;
+  FXint left,right,top,bottom,remain,extra_space,total_space,t,x,y,w,h;
+  FXWindow* child;
+  FXint sumexpand=0;
+  FXint numexpand=0;
+  FXint mw=0;
+  FXint mh=0;
+  FXint e=0;
+  FXuint hints;
 
   // Placement rectangle; right/bottom non-inclusive
   left=border+padleft;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXICOIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXICOIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXICOImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXICOImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIFFIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIFFIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIFFImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIFFImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIO.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIO.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIOBuffer.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIOBuffer.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIODevice.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIODevice.cpp Changed

@@ -3,7 +3,7 @@
 *                        I / O   D e v i c e   C l a s s                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -70,11 +70,43 @@
   DWORD flags;
   return GetHandleInformation(h,&flags)!=0;
 #else
-  return (fcntl(h,F_GETFD)!=-1) || (errno!=EBADF);
+//  return (fcntl(h,F_GETFD)!=-1) || (errno!=EBADF);
+  return (fcntl(h,F_GETFD,0)!=-1) || (errno!=EBADF);
 #endif
   }
 
 
+#if 0
+#if defined(WIN32)
+  DWORD flags;
+  FXuint mm=0;
+  if(GetHandleInformation(h,&flags)==0){ return false }
+  if(flags&HANDLE_FLAG_INHERIT){ mm|=FXIO::Inheritable; }
+//  FILE_ATTRIBUTE_TAG_INFO attribs;
+//  if(GetFileInformationByHandleEx(h,FileAttributeTagInfo,&attribs,sizeof(attribs))==0){ return false; }
+  // FIXME //
+  //https://stackoverflow.com/questions/9442436/windows-how-do-i-get-the-mode-access-rights-of-an-already-opened-file
+#else
+  FXint flags=::fcntl(h,F_GETFD,0);
+  FXuint mm=0;
+  if(flags==-1){ return false; }
+  if(flags&O_RDONLY){ mm|=FXIO::ReadOnly; }
+  if(flags&O_WRONLY){ mm|=FXIO::WriteOnly; }
+  if(flags&O_RDWR){ mm|=FXIO::ReadWrite; }
+  if(flags&O_APPEND){ mm|=FXIO::Append; }
+  if(flags&O_TRUNC){ mm|=FXIO::Truncate; }
+  if(flags&O_NONBLOCK){ mm|=FXIO::NonBlocking; }
+#if defined(O_NOATIME)
+  if(flags&O_NOATIME){ mm|=FXIO::NoAccessTime; }
+#endif
+#if defined(O_CLOEXEC)
+  if(!(flags&O_CLOEXEC)){ mm|=FXIO::Inheritable; }
+#endif
+  if(flags&O_CREAT){ mm|=FXIO::Create; }
+  if(flags&O_EXCL){ mm|=FXIO::Exclusive; }
+#endif
+#endif
+
 // Open device with access mode m and existing handle h
 FXbool FXIODevice::open(FXInputHandle h,FXuint m){
   if(__likely(h!=BadHandle && isvalid(h))){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIcon.cpp Changed

@@ -3,7 +3,7 @@
 *                               I c o n - O b j e c t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -81,8 +81,8 @@
 
 // Guess alpha color based on corners; the initial guess is standard GUI color
 FXColor FXIcon::guesstransp() const {
-  register FXColor guess=FXRGB(192,192,192);
-  register FXint best,t;
+  FXColor guess=FXRGB(192,192,192);
+  FXint best,t;
   FXColor color4;
   if(data && 0<width && 0<height){
     best=-1;
@@ -101,10 +101,10 @@
 
 // Determine threshold for etch mask
 FXshort FXIcon::guessthresh() const {
-  register FXshort guess=382;
+  FXshort guess=382;
   if(data && 0<width && 0<height){
-    register FXint med=(width*height)>>1;
-    register FXint i,j,cum;
+    FXint med=(width*height)>>1;
+    FXint i,j,cum;
     FXint frequency766;
     memset(frequency,0,sizeof(frequency));
     for(i=0; i<width*height; ++i){
@@ -216,9 +216,9 @@
 // Render Icon MS-Windows
 void FXIcon::render(){
   if(xid){
-    register FXint bytes_per_line,x,y;
-    register FXuchar *msk,*ets;
-    register FXColor *img;
+    FXint bytes_per_line,x,y;
+    FXuchar *msk,*ets;
+    FXColor *img;
     FXuchar *maskdata;
     FXuchar *etchdata;
     BITMAPINFO2 bmi;
@@ -339,10 +339,10 @@
 // Render icon X Windows
 void FXIcon::render(){
   if(xid){
-    register XImage *xim=NULL;
-    register FXbool shmi=false;
-    register FXColor *img;
-    register FXint x,y;
+    XImage *xim=NULL;
+    FXbool shmi=false;
+    FXColor *img;
+    FXint x,y;
     XGCValues values;
     GC gc;
 #ifdef HAVE_XSHM_H

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIconCache.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIconCache.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIconList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIconList.cpp Changed

@@ -3,7 +3,7 @@
 *                          I c o n L i s t   O b j e c t                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -108,7 +108,7 @@
 
 // Draw item
 void FXIconItem::draw(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXuint options=list->getListStyle();
+  FXuint options=list->getListStyle();
   if(options&ICONLIST_BIG_ICONS) drawBigIcon(list,dc,x,y,w,h);
   else if(options&ICONLIST_MINI_ICONS) drawMiniIcon(list,dc,x,y,w,h);
   else drawDetails(list,dc,x,y,w,h);
@@ -117,8 +117,8 @@
 
 // Draw big icon
 void FXIconItem::drawBigIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXint iw=0,ih=0,tw=0,th=0,ss=0,len,dw,s,space,xt,yt,xi,yi;
-  register FXFont *font=list->getFont();
+  FXint iw=0,ih=0,tw=0,th=0,ss=0,len,dw,s,space,xt,yt,xi,yi;
+  FXFont *font=list->getFont();
   dc.fillRectangle(x,y,w,h);
   space=w-SIDE_SPACING;
   if(!label.empty()){
@@ -170,8 +170,8 @@
 
 // Draw mini icon
 void FXIconItem::drawMiniIcon(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXint iw=0,ih=0,tw=0,th=0,len,dw,s,space;
-  register FXFont *font=list->getFont();
+  FXint iw=0,ih=0,tw=0,th=0,len,dw,s,space;
+  FXFont *font=list->getFont();
   dc.fillRectangle(x,y,w,h);
   x+=SIDE_SPACING/2;
   space=w-SIDE_SPACING;
@@ -223,9 +223,9 @@
 
 // Draw detail
 void FXIconItem::drawDetails(const FXIconList* list,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXint iw=0,ih=0,tw=0,th=0,yt,beg,end,hi,drw,space,used,dw,xx;
-  register FXHeader *header=list->getHeader();
-  register FXFont *font=list->getFont();
+  FXint iw=0,ih=0,tw=0,th=0,yt,beg,end,hi,drw,space,used,dw,xx;
+  FXHeader *header=list->getHeader();
+  FXFont *font=list->getFont();
   if(header->getNumItems()==0) return;
   if(isSelected()){
     dc.setForeground(list->getSelBackColor());
@@ -283,9 +283,9 @@
 
 // See if item got hit and where: 0 is outside, 1 is icon, 2 is text
 FXint FXIconItem::hitItem(const FXIconList* list,FXint rx,FXint ry,FXint rw,FXint rh) const {
-  register FXFont *font=list->getFont();
-  register FXuint options=list->getListStyle();
-  register FXint iw=0,tw=0,ih=0,th=0,ss=0,ix,iy,tx,ty,w,h,sp,tlen;
+  FXFont *font=list->getFont();
+  FXuint options=list->getListStyle();
+  FXint iw=0,tw=0,ih=0,th=0,ss=0,ix,iy,tx,ty,w,h,sp,tlen;
   for(tlen=0; tlen<label.length() && labeltlen!='\t'; tlen++){}
   if(options&ICONLIST_BIG_ICONS){
     w=list->getItemWidth();
@@ -435,9 +435,9 @@
 
 // Get item width
 FXint FXIconItem::getWidth(const FXIconList* list) const {
-  register FXFont *font=list->getFont();
-  register FXuint options=list->getListStyle();
-  register FXint iw=0,tw=0,w=0,tlen;
+  FXFont *font=list->getFont();
+  FXuint options=list->getListStyle();
+  FXint iw=0,tw=0,w=0,tlen;
   for(tlen=0; tlen<label.length() && labeltlen!='\t'; tlen++){}
   if(options&ICONLIST_BIG_ICONS){
     if(bigIcon) iw=bigIcon->getWidth();
@@ -459,9 +459,9 @@
 
 // Get item height
 FXint FXIconItem::getHeight(const FXIconList* list) const {
-  register FXFont *font=list->getFont();
-  register FXuint options=list->getListStyle();
-  register FXint ih=0,th=0,h=0;
+  FXFont *font=list->getFont();
+  FXuint options=list->getListStyle();
+  FXint ih=0,th=0,h=0;
   if(options&ICONLIST_BIG_ICONS){
     if(bigIcon) ih=bigIcon->getHeight();
     if(!label.empty()) th=4+font->getFontHeight();
@@ -624,7 +624,7 @@
 
 // Create window
 void FXIconList::create(){
-  register FXint i;
+  FXint i;
   FXScrollArea::create();
   for(i=0; i<items.no(); i++){itemsi->create();}
   font->create();
@@ -633,7 +633,7 @@
 
 // Detach window
 void FXIconList::detach(){
-  register FXint i;
+  FXint i;
   FXScrollArea::detach();
   for(i=0; i<items.no(); i++){itemsi->detach();}
   font->detach();
@@ -721,7 +721,7 @@
 
 // Recompute interior
 void FXIconList::recompute(){
-  register FXint w,h,i;
+  FXint w,h,i;
 
   itemWidth=1;
   itemHeight=1;
@@ -831,8 +831,8 @@
 // we want to set the width of the header column
 // to that of the widest item.
 long FXIconList::onClkHeader(FXObject*,FXSelector,void* ptr){
-  register FXint hi=(FXint)(FXival)ptr;
-  register FXint i,iw,tw,w,nw=0;
+  FXint hi=(FXint)(FXival)ptr;
+  FXint i,iw,tw,w,nw=0;
   FXString text;
 
   // For detailed icon list
@@ -1028,8 +1028,8 @@
 
 // True if item (partially) visible
 FXbool FXIconList::isItemVisible(FXint index) const {
-  register FXbool vis=false;
-  register FXint x,y,hh;
+  FXbool vis=false;
+  FXint x,y,hh;
   if(index<0 || items.no()<=index){ fxerror("%s::isItemVisible: index out of range.\n",getClassName()); }
   if(options&(ICONLIST_BIG_ICONS|ICONLIST_MINI_ICONS)){
     if(options&ICONLIST_COLUMNS){
@@ -1111,8 +1111,8 @@
 
 // Get item at position x,y
 FXint FXIconList::getItemAt(FXint x,FXint y) const {
-  register FXint ix,iy;
-  register FXint r,c,index;
+  FXint ix,iy;
+  FXint r,c,index;
   y-=pos_y;
   x-=pos_x;
   if(options&(ICONLIST_BIG_ICONS|ICONLIST_MINI_ICONS)){
@@ -1137,9 +1137,9 @@
 
 // Compare strings up to n
 static FXint comp(const FXString& s1,const FXString& s2,FXint n){
-  register const FXuchar *p1=(const FXuchar *)s1.text();
-  register const FXuchar *p2=(const FXuchar *)s2.text();
-  register FXint c1,c2;
+  const FXuchar *p1=(const FXuchar *)s1.text();
+  const FXuchar *p2=(const FXuchar *)s2.text();
+  FXint c1,c2;
   if(0<n){
     do{
       c1=*p1++; if(c1=='\t') c1=0;
@@ -1154,9 +1154,9 @@
 
 // Compare strings case insensitive up to n
 static FXint compcase(const FXString& s1,const FXString& s2,FXint n){
-  register const FXuchar *p1=(const FXuchar *)s1.text();
-  register const FXuchar *p2=(const FXuchar *)s2.text();
-  register FXint c1,c2;
+  const FXuchar *p1=(const FXuchar *)s1.text();
+  const FXuchar *p2=(const FXuchar *)s2.text();
+  FXint c1,c2;
   if(0<n){
     do{
       c1=Ascii::toLower(*p1++); if(c1=='\t') c1=0;      // FIXME UTF8 version
@@ -1174,8 +1174,8 @@
 
 // Get item by name
 FXint FXIconList::findItem(const FXString& text,FXint start,FXuint flgs) const {
-  register FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)compcase : (FXCompareFunc)comp;
-  register FXint index,len;
+  FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)compcase : (FXCompareFunc)comp;
+  FXint index,len;
   if(0<items.no()){
     len=(flgs&SEARCH_PREFIX)?text.length():2147483647;
     if(flgs&SEARCH_BACKWARD){
@@ -1205,7 +1205,7 @@
 
 // Get item by data
 FXint FXIconList::findItemByData(FXptr ptr,FXint start,FXuint flgs) const {
-  register FXint index;
+  FXint index;
   if(0<items.no()){
     if(flgs&SEARCH_BACKWARD){
       if(start<0) start=items.no()-1;
@@ -1390,8 +1390,8 @@
 
 // Select items in rectangle
 FXbool FXIconList::selectInRectangle(FXint x,FXint y,FXint w,FXint h,FXbool notify){
-  register FXint r,c,index;
-  register FXbool changed=false;
+  FXint r,c,index;
+  FXbool changed=false;
   if(options&(ICONLIST_BIG_ICONS|ICONLIST_MINI_ICONS)){
     for(r=0; r<nrows; r++){
       for(c=0; c<ncols; c++){
@@ -1417,7 +1417,7 @@
 
 // Extend selection
 FXbool FXIconList::extendSelection(FXint index,FXbool notify){
-  register FXbool changes=false;
+  FXbool changes=false;
   if(0<=index && 0<=anchor && 0<=extent){
     FXint i1,i2,i3,i;
 
@@ -1488,7 +1488,7 @@
 
 // Select all items
 FXbool FXIconList::selectAll(FXbool notify){
-  register FXbool changes=false;
+  FXbool changes=false;
   for(FXint i=0; i<items.no(); i++){
     if(!itemsi->isSelected()){
       itemsi->setSelected(true);
@@ -1503,7 +1503,7 @@
 
 // Kill selection
 FXbool FXIconList::killSelection(FXbool notify){
-  register FXbool changes=false;
+  FXbool changes=false;
   for(FXint i=0; i<items.no(); i++){
     if(itemsi->isSelected()){
       itemsi->setSelected(false);
@@ -1671,7 +1671,7 @@
 
 // Draw item list
 long FXIconList::onPaint(FXObject*,FXSelector,void* ptr){
-  register FXint rlo,rhi,clo,chi,x,y,w,h,r,c,index;
+  FXint rlo,rhi,clo,chi,x,y,w,h,r,c,index;
   FXEvent* event=(FXEvent*)ptr;
   FXDCWindow dc(this,event);
 
@@ -1914,7 +1914,7 @@
 
 // Compare sectioned strings
 FXint FXIconList::compareSection(const FXchar *p,const FXchar* q,FXint s){
-  register FXint c1,c2,x;
+  FXint c1,c2,x;
   for(x=s; x && *p; x-=(*p++=='\t')){}
   for(x=s; x && *q; x-=(*q++=='\t')){}
   do{
@@ -1928,7 +1928,7 @@
 
 // Compare sectioned strings, case-insensitive
 FXint FXIconList::compareSectionCase(const FXchar *p,const FXchar* q,FXint s){
-  register FXint c1,c2,x;
+  FXint c1,c2,x;
   for(x=s; x && *p; x-=(*p++=='\t')){}
   for(x=s; x && *q; x-=(*q++=='\t')){}
   do{
@@ -1966,9 +1966,9 @@
 
 // Sort the items based on the sort function
 void FXIconList::sortItems(){
-  register FXIconItem *v,*c=0;
-  register FXbool exch=false;
-  register FXint i,j,h;
+  FXIconItem *v,*c=0;
+  FXbool exch=false;
+  FXint i,j,h;
   if(sortfunc){
     if(0<=current){
       c=itemscurrent;
@@ -2592,7 +2592,7 @@
 
 // Insert item
 FXint FXIconList::insertItem(FXint index,FXIconItem* item,FXbool notify){
-  register FXint old=current;
+  FXint old=current;
 
   // Must have item
   if(!item){ fxerror("%s::insertItem: item is NULL.\n",getClassName()); }
@@ -2664,7 +2664,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXIconList::fillItems(const FXchar** strings,FXIcon *big,FXIcon* mini,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(stringsn){
       appendItem(stringsn++,big,mini,ptr,notify);
@@ -2676,7 +2676,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXIconList::fillItems(const FXString* strings,FXIcon *big,FXIcon* mini,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(!stringsn.empty()){
       appendItem(stringsn++,big,mini,ptr,notify);
@@ -2688,7 +2688,7 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXIconList::fillItems(const FXString& strings,FXIcon *big,FXIcon* mini,FXptr ptr,FXbool notify){
-  register FXint beg=0,end=0,n=0;
+  FXint beg=0,end=0,n=0;
   while(end<strings.length()){
     beg=end;
     while(end<strings.length() && stringsend!='\n' && stringsend!='\r') end++;
@@ -2702,8 +2702,8 @@
 
 // Move item from oldindex to newindex
 FXint FXIconList::moveItem(FXint newindex,FXint oldindex,FXbool notify){
-  register FXint old=current;
-  register FXIconItem *item;
+  FXint old=current;
+  FXIconItem *item;
 
   // Must be in range
   if(newindex<0 || oldindex<0 || items.no()<=newindex || items.no()<=oldindex){ fxerror("%s::moveItem: index out of range.\n",getClassName()); }
@@ -2752,8 +2752,8 @@
 
 // Extract node from list
 FXIconItem* FXIconList::extractItem(FXint index,FXbool notify){
-  register FXIconItem *result;
-  register FXint old=current;
+  FXIconItem *result;
+  FXint old=current;
 
   // Must be in range
   if(index<0 || items.no()<=index){ fxerror("%s::extractItem: index out of range.\n",getClassName()); }
@@ -2796,7 +2796,7 @@
 
 // Remove node from list
 void FXIconList::removeItem(FXint index,FXbool notify){
-  register FXint old=current;
+  FXint old=current;
 
   // Must be in range
   if(index<0 || items.no()<=index){ fxerror("%s::removeItem: index out of range.\n",getClassName()); }
@@ -2838,7 +2838,7 @@
 
 // Remove all items
 void FXIconList::clearItems(FXbool notify){
-  register FXint old=current;
+  FXint old=current;
 
   // Delete items
   for(FXint index=items.no()-1; 0<=index; index--){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXIconSource.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXIconSource.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXId.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXId.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXImage.cpp Changed

@@ -3,7 +3,7 @@
 *                             I m a g e    O b j e c t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -275,7 +275,7 @@
 // Scan the image and return false if fully opaque
 FXbool FXImage::hasAlpha() const {
   if(data){
-    register FXint i=width*height-1;
+    FXint i=width*height-1;
     do{
       if(((const FXuchar*)(data+i))3<255) return true;
       }
@@ -371,8 +371,8 @@
 // Restore client-side pixel buffer from image
 void FXImage::restore(){
   if(xid){
-    register FXint size,bytes_per_line,skip,x,y;
-    register FXuchar *pix,*img;
+    FXint size,bytes_per_line,skip,x,y;
+    FXuchar *pix,*img;
     FXuchar *pixels;
     BITMAPINFO bmi;
     HDC hdcmem;
@@ -442,7 +442,7 @@
 
 // Find shift amount
 static inline FXuint findshift(FXPixel mask){
-  register FXuint sh=0;
+  FXuint sh=0;
   while(!(mask&(1UL<<sh))) sh++;
   return sh;
   }
@@ -457,18 +457,18 @@
 // Restore client-side pixel buffer from image
 void FXImage::restore(){
   if(xid){
-    register FXPixel red,green,blue;
-    register FXPixel red1,green1,blue1;
-    register FXPixel pixel;
-    register FXuint  redshift,greenshift,blueshift;
-    register FXPixel redmask,greenmask,bluemask;
-    register int size,i;
-    register FXbool shmi=false;
-    register XImage *xim=NULL;
-    register Visual *vis;
-    register FXint x,y;
-    register FXuchar *img;
-    register FXuint r,g,b;
+    FXPixel red,green,blue;
+    FXPixel red1,green1,blue1;
+    FXPixel pixel;
+    FXuint  redshift,greenshift,blueshift;
+    FXPixel redmask,greenmask,bluemask;
+    int size,i;
+    FXbool shmi=false;
+    XImage *xim=NULL;
+    Visual *vis;
+    FXint x,y;
+    FXuchar *img;
+    FXuint r,g,b;
     FXuchar rtabMAX_MAPSIZE;
     FXuchar gtabMAX_MAPSIZE;
     FXuchar btabMAX_MAPSIZE;
@@ -656,8 +656,8 @@
 // Render into pixmap
 void FXImage::render(){
   if(xid){
-    register FXint bytes_per_line,skip,h,w;
-    register FXuchar *src,*dst;
+    FXint bytes_per_line,skip,h,w;
+    FXuchar *src,*dst;
     BITMAPINFO bmi;
     FXuchar *pixels;
     HDC hdcmem;
@@ -725,7 +725,7 @@
 
 // True generic mode
 void FXImage::render_true_N_fast(void *xim,FXuchar *img){
-  register FXint x,y;
+  FXint x,y;
   FXTRACE((150,"True MSB/LSB N bpp render nearest\n"));
   y=0;
   do{
@@ -742,7 +742,7 @@
 
 // True generic mode
 void FXImage::render_true_N_dither(void *xim,FXuchar *img){
-  register FXint x,y,d;
+  FXint x,y,d;
   FXTRACE((150,"True MSB/LSB N bpp render dither\n"));
   y=0;
   do{
@@ -760,10 +760,10 @@
 
 // True 24 bit color
 void FXImage::render_true_24(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-(width*3);
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXPixel val;
-  register FXint w,h;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-(width*3);
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXPixel val;
+  FXint w,h;
   if(((XImage*)xim)->byte_order==MSBFirst){    // MSB
     FXTRACE((150,"True MSB 24bpp render\n"));
     h=height-1;
@@ -805,10 +805,10 @@
 
 // True 32 bit color
 void FXImage::render_true_32(void *xim,FXuchar *img){
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-(width<<2);
-  register FXPixel val;
-  register FXint w,h;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-(width<<2);
+  FXPixel val;
+  FXint w,h;
 
   // Byte order matches
   if(((XImage*)xim)->byte_order == FOX_BIGENDIAN){
@@ -873,10 +873,10 @@
 
 // True 16 bit color
 void FXImage::render_true_16_fast(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-(width<<1);
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXPixel val;
-  register FXint w,h;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-(width<<1);
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXPixel val;
+  FXint w,h;
 
   // Byte order matches
   if(((XImage*)xim)->byte_order == FOX_BIGENDIAN){
@@ -937,10 +937,10 @@
 
 // True 16 bit color, dithered
 void FXImage::render_true_16_dither(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-(width<<1);
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXPixel val;
-  register FXint w,h,d;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-(width<<1);
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXPixel val;
+  FXint w,h,d;
 
   // Byte order matches
   if(((XImage*)xim)->byte_order == FOX_BIGENDIAN){
@@ -1004,9 +1004,9 @@
 
 // True 8 bit color
 void FXImage::render_true_8_fast(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXint w,h;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXint w,h;
   FXTRACE((150,"True MSB/LSB 8bpp render nearest\n"));
   h=height-1;
   do{
@@ -1025,9 +1025,9 @@
 
 // True 8 bit color, dithered
 void FXImage::render_true_8_dither(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXint w,h,d;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXint w,h,d;
   FXTRACE((150,"True MSB/LSB 8bpp render dither\n"));
   h=height-1;
   do{
@@ -1047,10 +1047,10 @@
 
 // Render 4 bit index color mode
 void FXImage::render_index_4_fast(void *xim,FXuchar *img){
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXuint val,half;
-  register FXint w,h;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXuint val,half;
+  FXint w,h;
   if(((XImage*)xim)->byte_order==MSBFirst){    // MSB
     FXTRACE((150,"Index MSB 4bpp render nearest\n"));
     h=height-1;
@@ -1092,10 +1092,10 @@
 
 // Render 4 bit index color mode
 void FXImage::render_index_4_dither(void *xim,FXuchar *img){
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXuint val,half,d;
-  register FXint w,h;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXuint val,half,d;
+  FXint w,h;
   if(((XImage*)xim)->byte_order==MSBFirst){    // MSB
     FXTRACE((150,"Index MSB 4bpp render dither\n"));
     h=height-1;
@@ -1139,9 +1139,9 @@
 
 // Render 8 bit index color mode
 void FXImage::render_index_8_fast(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXint w,h;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXint w,h;
   FXTRACE((150,"Index MSB/LSB 8bpp render nearest\n"));
   h=height-1;
   do{
@@ -1160,9 +1160,9 @@
 
 // Render 8 bit index color mode
 void FXImage::render_index_8_dither(void *xim,FXuchar *img){
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXint w,h,d;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXint w,h,d;
   FXTRACE((150,"Index MSB/LSB 8bpp render dither\n"));
   h=height-1;
   do{
@@ -1182,7 +1182,7 @@
 
 // Render generic N bit index color mode
 void FXImage::render_index_N_fast(void *xim,FXuchar *img){
-  register FXint x,y;
+  FXint x,y;
   FXTRACE((150,"Index MSB/LSB N bpp render nearest\n"));
   y=0;
   do{
@@ -1199,7 +1199,7 @@
 
 // Render generic N bit index color mode
 void FXImage::render_index_N_dither(void *xim,FXuchar *img){
-  register FXint x,y,d;
+  FXint x,y,d;
   FXTRACE((150,"Index MSB/LSB N bpp render dither\n"));
   y=0;
   do{
@@ -1217,9 +1217,9 @@
 
 // Render 8 bit gray mode
 void FXImage::render_gray_8_fast(void *xim,FXuchar *img){
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXint w,h;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXint w,h;
   FXTRACE((150,"Gray MSB/LSB 8bpp render nearest\n"));
   h=height-1;
   do{
@@ -1238,9 +1238,9 @@
 
 // Render 8 bit gray mode
 void FXImage::render_gray_8_dither(void *xim,FXuchar *img){
-  register FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
-  register FXuint jmp=((XImage*)xim)->bytes_per_line-width;
-  register FXint w,h;
+  FXuchar *pix=(FXuchar*)((XImage*)xim)->data;
+  FXuint jmp=((XImage*)xim)->bytes_per_line-width;
+  FXint w,h;
   FXTRACE((150,"Gray MSB/LSB 8bpp render dither\n"));
   h=height-1;
   do{
@@ -1259,7 +1259,7 @@
 
 // Render generic N bit gray mode
 void FXImage::render_gray_N_fast(void *xim,FXuchar *img){
-  register FXint x,y;
+  FXint x,y;
   FXTRACE((150,"Gray MSB/LSB N bpp render nearest\n"));
   y=0;
   do{
@@ -1276,7 +1276,7 @@
 
 // Render generic N bit gray mode
 void FXImage::render_gray_N_dither(void *xim,FXuchar *img){
-  register FXint x,y;
+  FXint x,y;
   FXTRACE((150,"Gray MSB/LSB N bpp render dither\n"));
   y=0;
   do{
@@ -1293,7 +1293,7 @@
 
 // Render monochrome mode
 void FXImage::render_mono_1_fast(void *xim,FXuchar *img){
-  register FXint x,y;
+  FXint x,y;
   FXTRACE((150,"Monochrome MSB/LSB 1bpp render nearest\n"));
   y=0;
   do{
@@ -1310,7 +1310,7 @@
 
 // Render monochrome mode
 void FXImage::render_mono_1_dither(void *xim,FXuchar *img){
-  register FXint x,y;
+  FXint x,y;
   FXTRACE((150,"Monochrome MSB/LSB 1bpp render dither\n"));
   y=0;
   do{
@@ -1328,8 +1328,8 @@
 // Render into pixmap
 void FXImage::render(){
   if(xid){
-    register FXbool shmi=false;
-    register XImage *xim=NULL;
+    FXbool shmi=false;
+    XImage *xim=NULL;
     XGCValues values;
     GC gc;
 #ifdef HAVE_XSHM_H
@@ -1610,7 +1610,7 @@
 
 #if 0
 static FXuint gammaInvertLookup(FXuint val){    // New
-  register FXint m,l=0,h=255;
+  FXint m,l=0,h=255;
   while(l<(m=(h+l)>>1)){
     if(gammatablem<=val) l=m; else h=m;
     }
@@ -1619,7 +1619,7 @@
 #endif
 
 static FXuint gammaInvertLookup(FXuint val){
-  register FXint mid,low=0,high=255;
+  FXint mid,low=0,high=255;
   while((high-low)>1){
     mid=low+(high-low)/2;
     if(val<gammatablemid)
@@ -1633,12 +1633,12 @@
 
 // Horizontal box-filtered, gamma-corrected
 static void hscalergbagamma(FXuchar *dst,const FXuchar* src,FXint dw,FXint dh,FXint sw,FXint ){
-  register FXint fin,fout,ar,ag,ab,aa;
-  register FXint ss=4*sw;
-  register FXint ds=4*dw;
-  register FXuchar *end=dst+ds*dh;
-  register FXuchar *d;
-  register const FXuchar *s;
+  FXint fin,fout,ar,ag,ab,aa;
+  FXint ss=4*sw;
+  FXint ds=4*dw;
+  FXuchar *end=dst+ds*dh;
+  FXuchar *d;
+  const FXuchar *s;
   do{
     s=src; src+=ss;
     d=dst; dst+=ds;
@@ -1674,13 +1674,13 @@
 
 // Vertical box-filtered, gamma-corrected
 static void vscalergbagamma(FXuchar *dst,const FXuchar* src,FXint dw,FXint dh,FXint sw,FXint sh){
-  register FXint fin,fout,ar,ag,ab,aa;
-  register FXint ss=4*sw;
-  register FXint ds=4*dw;
-  register FXint dss=ds*dh;
-  register FXuchar *end=dst+ds;
-  register FXuchar *d,*dd;
-  register const FXuchar *s;
+  FXint fin,fout,ar,ag,ab,aa;
+  FXint ss=4*sw;
+  FXint ds=4*dw;
+  FXint dss=ds*dh;
+  FXuchar *end=dst+ds;
+  FXuchar *d,*dd;
+  const FXuchar *s;
   do{
     s=src; src+=4;
     d=dst; dst+=4;
@@ -1717,12 +1717,12 @@
 
 // Horizontal box-filtered
 static void hscalergba(FXuchar *dst,const FXuchar* src,FXint dw,FXint dh,FXint sw,FXint ){
-  register FXint fin,fout,ar,ag,ab,aa;
-  register FXint ss=4*sw;
-  register FXint ds=4*dw;
-  register FXuchar *end=dst+ds*dh;
-  register FXuchar *d;
-  register const FXuchar *s;
+  FXint fin,fout,ar,ag,ab,aa;
+  FXint ss=4*sw;
+  FXint ds=4*dw;
+  FXuchar *end=dst+ds*dh;
+  FXuchar *d;
+  const FXuchar *s;
   do{
     s=src; src+=ss;
     d=dst; dst+=ds;
@@ -1757,13 +1757,13 @@
 
 // Vertical box-filtered
 static void vscalergba(FXuchar *dst,const FXuchar* src,FXint dw,FXint dh,FXint sw,FXint sh){
-  register FXint fin,fout,ar,ag,ab,aa;
-  register FXint ss=4*sw;
-  register FXint ds=4*dw;
-  register FXint dss=ds*dh;
-  register FXuchar *end=dst+ds;
-  register FXuchar *d,*dd;
-  register const FXuchar *s;
+  FXint fin,fout,ar,ag,ab,aa;
+  FXint ss=4*sw;
+  FXint ds=4*dw;
+  FXint dss=ds*dh;
+  FXuchar *end=dst+ds;
+  FXuchar *d,*dd;
+  const FXuchar *s;
   do{
     s=src; src+=4;
     d=dst; dst+=4;
@@ -1799,11 +1799,11 @@
 
 // Simple nearest neighbor scaling; fast but ugly
 static void scalenearest(FXColor *dst,const FXColor* src,FXint dw,FXint dh,FXint sw,FXint sh){
-  register FXint xs=(sw<<16)/dw;
-  register FXint ys=(sh<<16)/dh;
-  register FXint i,j,x,y;
-  register const FXColor *q;
-  register FXColor *p;
+  FXint xs=(sw<<16)/dw;
+  FXint ys=(sh<<16)/dh;
+  FXint i,j,x,y;
+  const FXColor *q;
+  FXColor *p;
   i=0;
   y=ys>>1;
   p=dst;
@@ -1830,8 +1830,8 @@
   FXTRACE((100,"%s::scale(%d,%d)\n",getClassName(),w,h));
   if(w!=width || h!=height){
     if(data){
-      register FXint ow=width;
-      register FXint oh=height;
+      FXint ow=width;
+      FXint oh=height;
       FXColor *interim;
 
       switch(quality){
@@ -1919,7 +1919,7 @@
   FXTRACE((100,"%s::mirror(%d,%d)\n",getClassName(),horizontal,vertical));
   if(horizontal || vertical){
     if(data){
-      register FXColor *paa,*pa,*pbb,*pb,t;
+      FXColor *paa,*pa,*pbb,*pb,t;
       if(vertical && height>1){     // Mirror vertically
         paa=data;
         pbb=data+width*(height-1);
@@ -1958,8 +1958,8 @@
   degrees=(degrees+360)%360;
   if(degrees!=0 && width>1 && height>1){
     if(data){
-      register FXColor *paa,*pbb,*end,*pa,*pb;
-      register FXint size=width*height;
+      FXColor *paa,*pbb,*end,*pa,*pb;
+      FXint size=width*height;
       FXColor *olddata;
       if(!dupElms(olddata,data,size)){ throw FXMemoryException("unable to rotate image"); }
       switch(degrees){
@@ -2047,13 +2047,13 @@
   if(x>=width || y>=height || x+w<=0 || y+h<=0){ fxerror("%s::crop: bad arguments.\n",getClassName()); }
   FXTRACE((100,"%s::crop(%d,%d,%d,%d)\n",getClassName(),x,y,w,h));
   if(data){
-    register FXColor *pnn,*poo,*yyy,*pn,*po,*xx;
-    register FXint ow=width;
-    register FXint oh=height;
-    register FXint nw=w;
-    register FXint nh=h;
-    register FXint cw;
-    register FXint ch;
+    FXColor *pnn,*poo,*yyy,*pn,*po,*xx;
+    FXint ow=width;
+    FXint oh=height;
+    FXint nw=w;
+    FXint nh=h;
+    FXint cw;
+    FXint ch;
     FXColor *olddata;
     if(!dupElms(olddata,data,width*height)){ throw FXMemoryException("unable to crop image"); }
     resize(nw,nh);
@@ -2116,12 +2116,12 @@
 
 
 /*
-    register FXuint r=FXREDVAL(color);
-    register FXuint g=FXGREENVAL(color);
-    register FXuint b=FXBLUEVAL(color);
-    register FXuint a=FXALPHAVAL(color);
-    register FXuchar *pix=data;
-    register FXuchar *end=pix+height*width*channels;
+    FXuint r=FXREDVAL(color);
+    FXuint g=FXGREENVAL(color);
+    FXuint b=FXBLUEVAL(color);
+    FXuint a=FXALPHAVAL(color);
+    FXuchar *pix=data;
+    FXuchar *end=pix+height*width*channels;
     FXuchar  tbl512;
 
     // Fill table
@@ -2154,7 +2154,7 @@
 */
 
   // FXColor ____blend(FXColor fg,FXColor bg){
-//   register FXuint r,g,b,s,t,tmp;
+//   FXuint r,g,b,s,t,tmp;
 //   s=FXALPHAVAL(fg);
 //   t=~s;
 //   tmp=FXREDVAL(fg)*s+FXREDVAL(bg)*t+127;     r=(tmp+(tmp>>8))>>8;
@@ -2176,8 +2176,8 @@
 // Fill image with color
 void FXImage::fill(FXColor color){
   if(data){
-    register FXColor *pix=data;
-    register FXColor *end=pix+height*width;
+    FXColor *pix=data;
+    FXColor *end=pix+height*width;
     do{ *pix++=color; }while(pix<end);
     }
   }
@@ -2187,15 +2187,15 @@
 // Fade image to uniform color
 void FXImage::fade(FXColor color,FXint factor){
   if(data){
-    register FXuint s=factor;
-    register FXuint t=~factor;
-    register FXuint r=FXREDVAL(color)*t;
-    register FXuint g=FXGREENVAL(color)*t;
-    register FXuint b=FXBLUEVAL(color)*t;
-    register FXuint a=FXALPHAVAL(color)*t;
-    register FXuint w;
-    register FXuchar *pix=(FXuchar*)data;
-    register FXuchar *end=pix+height*width*4;
+    FXuint s=factor;
+    FXuint t=~factor;
+    FXuint r=FXREDVAL(color)*t;
+    FXuint g=FXGREENVAL(color)*t;
+    FXuint b=FXBLUEVAL(color)*t;
+    FXuint a=FXALPHAVAL(color)*t;
+    FXuint w;
+    FXuchar *pix=(FXuchar*)data;
+    FXuchar *end=pix+height*width*4;
     do{
       w=pix3*s+a; pix3=(w+(w>>8))>>8;
       w=pix2*s+r; pix2=(w+(w>>8))>>8;
@@ -2210,14 +2210,14 @@
 
 // Shear in X
 static void shearx(FXuchar *out,FXuchar* in,FXint nwidth,FXint owidth,FXint height,FXint shear,FXColor clr){
-  register FXuchar *ppp,*pp,*qq,*p,*q,*k;
-  register FXuint r=FXREDVAL(clr);
-  register FXuint g=FXGREENVAL(clr);
-  register FXuint b=FXBLUEVAL(clr);
-  register FXuint a=FXALPHAVAL(clr);
-  register FXint dp=owidth<<2;
-  register FXint dq=nwidth<<2;
-  register FXint s,z,y,d;
+  FXuchar *ppp,*pp,*qq,*p,*q,*k;
+  FXuint r=FXREDVAL(clr);
+  FXuint g=FXGREENVAL(clr);
+  FXuint b=FXBLUEVAL(clr);
+  FXuint a=FXALPHAVAL(clr);
+  FXint dp=owidth<<2;
+  FXint dq=nwidth<<2;
+  FXint s,z,y,d;
   if(shear){
     if(shear>0){ y=height-1; d=-1; } else { shear=-shear; y=0; d=1; }
     pp=in;
@@ -2273,13 +2273,13 @@
 
 // Shear in Y
 static void sheary(FXuchar *out,FXuchar* in,FXint width,FXint nheight,FXint oheight,FXint shear,FXColor clr){
-  register FXuchar *ppp,*pp,*qq,*p,*q,*k;
-  register FXuint r=FXREDVAL(clr);
-  register FXuint g=FXGREENVAL(clr);
-  register FXuint b=FXBLUEVAL(clr);
-  register FXuint a=FXALPHAVAL(clr);
-  register FXint dp=width<<2;
-  register FXint s,z,x,d;
+  FXuchar *ppp,*pp,*qq,*p,*q,*k;
+  FXuint r=FXREDVAL(clr);
+  FXuint g=FXGREENVAL(clr);
+  FXuint b=FXBLUEVAL(clr);
+  FXuint a=FXALPHAVAL(clr);
+  FXint dp=width<<2;
+  FXint s,z,x,d;
   if(shear){
     if(shear>0){ x=width-1; d=-1; } else { shear=-shear; x=0; d=1; }
     pp=in+dp*oheight;
@@ -2375,9 +2375,9 @@
 
 // Fill horizontal gradient
 void FXImage::hgradient(FXColor left,FXColor right){
-  register FXint rr,gg,bb,aa,dr,dg,db,da,r1,g1,b1,a1,r2,g2,b2,a2,x;
-  register FXuchar *ptr=(FXuchar*)data;
-  register FXuchar *prv=(FXuchar*)data;
+  FXint rr,gg,bb,aa,dr,dg,db,da,r1,g1,b1,a1,r2,g2,b2,a2,x;
+  FXuchar *ptr=(FXuchar*)data;
+  FXuchar *prv=(FXuchar*)data;
   if(ptr && width>1 && height>1){
     r1=FXREDVAL(left);
     r2=FXREDVAL(right);
@@ -2420,8 +2420,8 @@
 
 // Fill vertical gradient
 void FXImage::vgradient(FXColor top,FXColor bottom){
-  register FXint rr,gg,bb,aa,dr,dg,db,da,r1,g1,b1,a1,r2,g2,b2,a2,x,y;
-  register FXuchar *ptr=(FXuchar*)data;
+  FXint rr,gg,bb,aa,dr,dg,db,da,r1,g1,b1,a1,r2,g2,b2,a2,x,y;
+  FXuchar *ptr=(FXuchar*)data;
   if(ptr && width>1 && height>1){
     r1=FXREDVAL(top);
     r2=FXREDVAL(bottom);
@@ -2462,9 +2462,9 @@
 
 // Fill with gradient
 void FXImage::gradient(FXColor topleft,FXColor topright,FXColor bottomleft,FXColor bottomright){
-  register FXint rl,gl,bl,al,rr,gr,br,ar,drl,dgl,dbl,dal,drr,dgr,dbr,dar,r,g,b,a,dr,dg,db,da,x,y;
-  register FXint rtl,gtl,btl,atl,rtr,gtr,btr,atr,rbl,gbl,bbl,abl,rbr,gbr,bbr,abr;
-  register FXuchar *ptr=(FXuchar*)data;
+  FXint rl,gl,bl,al,rr,gr,br,ar,drl,dgl,dbl,dal,drr,dgr,dbr,dar,r,g,b,a,dr,dg,db,da,x,y;
+  FXint rtl,gtl,btl,atl,rtr,gtr,btr,atr,rbl,gbl,bbl,abl,rbr,gbr,bbr,abr;
+  FXuchar *ptr=(FXuchar*)data;
   if(ptr && width>1 && height>1){
 
     rtl=FXREDVAL(topleft);
@@ -2531,12 +2531,12 @@
 // Blend image over uniform color
 void FXImage::blend(FXColor color){
   if(data){
-    register FXuchar *pix=(FXuchar*)data;
-    register FXuchar *end=pix+height*width*4;
-    register FXint r=FXREDVAL(color);
-    register FXint g=FXGREENVAL(color);
-    register FXint b=FXBLUEVAL(color);
-    register FXint s,w;
+    FXuchar *pix=(FXuchar*)data;
+    FXuchar *end=pix+height*width*4;
+    FXint r=FXREDVAL(color);
+    FXint g=FXGREENVAL(color);
+    FXint b=FXBLUEVAL(color);
+    FXint s,w;
     do{
       s=pix3;
       w=(pix2-r)*s; pix2=r+((w+(w>>8)+128)>>8);
@@ -2552,8 +2552,8 @@
 // Invert colors of an image
 void FXImage::invert(){
   if(data){
-    register FXuchar *pix=(FXuchar*)data;
-    register FXuchar *end=pix+height*width*4;
+    FXuchar *pix=(FXuchar*)data;
+    FXuchar *end=pix+height*width*4;
     do{
       pix1=255-pix1;
       pix2=255-pix2;
@@ -2568,12 +2568,12 @@
 // Colorize image based on luminance
 void FXImage::colorize(FXColor color){
   if(data){
-    register FXuchar *pix=(FXuchar*)data;
-    register FXuchar *end=pix+height*width*4;
-    register FXint r=FXREDVAL(color);
-    register FXint g=FXGREENVAL(color);
-    register FXint b=FXBLUEVAL(color);
-    register FXint lum,w;
+    FXuchar *pix=(FXuchar*)data;
+    FXuchar *end=pix+height*width*4;
+    FXint r=FXREDVAL(color);
+    FXint g=FXGREENVAL(color);
+    FXint b=FXBLUEVAL(color);
+    FXint lum,w;
     do{
       if(pix3){
         lum=(77*pix2+151*pix1+29*pix0)>>8;
@@ -2592,8 +2592,8 @@
 
 // Fill with diagonal gradient RGB
 static void dgradientrgba(FXuchar *dst,FXint w,FXint h,FXint r1,FXint g1,FXint b1,FXint a1,FXint r2,FXint g2,FXint b2,FXint a2){
-  register FXint rr,gg,bb,aa,drx,dgx,dbx,dax,dry,dgy,dby,day,x,y;
-  register FXuchar *ptr=dst;
+  FXint rr,gg,bb,aa,drx,dgx,dbx,dax,dry,dgy,dby,day,x,y;
+  FXuchar *ptr=dst;
   FXuchar xtable42048;
   FXuchar ytable42048;
   FXASSERT(w>0 && h>0);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXImageFrame.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXImageFrame.cpp Changed

@@ -3,7 +3,7 @@
 *                       I m a g e   F r a m e   W i d g e t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2001,2018 by H. J. Daniel III. All Rights Reserved.             *
+* Copyright (C) 2001,2020 by H. J. Daniel III. All Rights Reserved.             *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -90,7 +90,7 @@
 
 // Get default width
 FXint FXImageFrame::getDefaultWidth(){
-  register FXint w=0;
+  FXint w=0;
   if(image) w=image->getWidth();
   return w+padleft+padright+(border<<1);
   }
@@ -98,7 +98,7 @@
 
 // Get default height
 FXint FXImageFrame::getDefaultHeight(){
-  register FXint h=0;
+  FXint h=0;
   if(image) h=image->getHeight();
   return h+padtop+padbottom+(border<<1);
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXImageView.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXImageView.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXInputDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXInputDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXJP2Icon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXJP2Icon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXJP2Image.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXJP2Image.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXJPGIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXJPGIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXJPGImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXJPGImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXJSON.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXJSON.cpp Changed

@@ -3,7 +3,7 @@
 *                      J S O N   R e a d e r  &  W r i t e r                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2013,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2013,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -23,6 +23,7 @@
 #include "fxdefs.h"
 #include "fxmath.h"
 #include "fxascii.h"
+#include "fxunicode.h"
 #include "FXElement.h"
 #include "FXArray.h"
 #include "FXString.h"
@@ -39,54 +40,130 @@
 /*
   Notes:
 
-  - Load and save FXVariant object from/to JSON format files.
+  - Load and save FXVariant object from/to JSON5 format files.
 
-  - We read over C and C++-style comment; yes, this is not in the spec;
-    but it was, once.  Plus, its convenient.
+  - We read over C and C++-style comments; this implementation supports nested
+    comments, which is an extension to the JSON5 standard. However, its very
+    convenient to comment out blocks of input.
 
   - Closing the file does not reset comment and line number (in case of error, this
     point to the problem).
 
-  - JSON syntax is very simple:
+  - JSON5 syntax is very simple:
 
-         value     : object | array | string | number | 'true' | 'false' | 'null' ;
+         value     : object | array | string | number | 'null' | 'true' | 'false'
+                   ;
 
-         object    : '{'   '}' | '{' members '}' ;
+         object    : '{' '}'
+                   | '{' members  ','  '}'
+                   ;
 
-         members   : pair | pair ',' members ;
+         members   : pair
+                   | pair ',' members
+                   ;
 
-         pair      : string ':' value ;
+         pair      : name ':' value
+                   ;
 
-         array     : '' '' | '' elements '' ;
+         name      : string
+                   | ident
+                   ;
 
-         elements  : value | value ',' elements ;
+         array     : '' ''
+                   | '' elements  ','  ''
+                   ;
+
+         elements  : value
+                   | value ',' elements
+                   ;
 
-         string    : '"' '"' | '"' chars '"' ;
+         string    : '"' dq-chars '"'
+                   | '\'' sq-chars '\''
+                   ;
+
+         dq-chars  : dq-char  dq-chars 
+                   ;
+
+         sq-chars  : sq-char  sq-chars 
+                   ;
+
+         dq-char   : any-character-except-double-quotes
+                   | '\\"' | '\\\\' | '\\/' | '\\b' | '\\f' | '\\n' | '\\r' | '\\t'
+                   | '\\x' hxdigit hxdigit
+                   | '\\u' hxdigit hxdigit hxdigit hxdigit
+                   | '\\' newline
+                   ;
+
+         sq-char   : any-character-except-single-quotes
+                   | '\\\'' | '\\\\' | '\\/' | '\\b' | '\\f' | '\\n' | '\\r' | '\\t'
+                   | '\\x' hxdigit hxdigit
+                   | '\\u' hxdigit hxdigit hxdigit hxdigit
+                   | '\\' newline
+                   ;
+
+         newline   : '\n'
+                   | '\r\n'
+                   | '\r'
+                   ;
+
+         ident     : alpha
+                   | alpha alphanums
+                   ;
+
+         alpha     : 'a'...'z' | 'A'...'Z' | '_' | '$'
+                   | unicode-categories in { Lu, Ll, Lt, Lm, Lo, Nl }
+                   ;
+
+         alphanums : alphanum
+                   | alphanum alphanums
+                   ;
+
+         alphanum  : 'a'...'z' | 'A'...'Z' | '0'...'9'  | '_' | '$'
+                   | unicode-categories in { Lu, Ll, Lt, Lm, Lo, Nl, Mn, Mc, Nd, Pc }
+                   ;
+
+         number    :  '+' | '-'  literal
+                   ;
+
+         literal   : decimal
+                   | hex
+                   | ('n' | 'N') ('a' | 'A') ('n' | 'N')
+                   | ('i' | 'I') ('n' | 'N') ('f' | 'F')
+                   | ('i' | 'I') ('n' | 'N') ('f' | 'F') ('i' | 'I') ('n' | 'N') ('i' | 'I') ('t' | 'T') ('y' | 'Y')
+                   ;
+
+         decimal   : digits
+                   | digits '.'  digits   exponent 
+                   | '.' digits  exponent 
+                   ;
 
-         chars     : char | char chars ;
+         exponent  : ('e' | 'E')  '+' | '-'  digits
+                   ;
 
-         char      : unicode_except_esc_or_quotes
-                   | '\"' | '\\' | '\/' | '\b' | '\f' | '\n' | '\r' | '\t'
-                   | '\' octdigit octdigit octdigit
-                   | '\x' hxdigit hxdigit
-                   | '\u' hxdigit hxdigit hxdigit hxdigit
+         digits    : digit
+                   | digit digits
                    ;
 
-         number    : int
-                   | int frac
-                   | int exp
-                   | int frac exp
+         hex       : '0' ('x' | 'X') hexdigits
                    ;
 
-         int       : digit | nzdigit digits | "-" digit | "-" nzdigit digits ;
+         hexdigits : hexdigit
+                   | hexdigit hexdigits
+                   ;
 
-         digits    : digit | digit digits ;
+         digit     : '0'...'9'
+                   ;
 
-         frac      : "." digits ;
+         hexdigit  : '0'...'9' | 'a'...'f' | 'A'...'F'
+                   ;
 
-         exp       : e digits ;
+  - Our version accepts 'Inf' in lieu of 'Infinity' for infinite float values; also, it
+    relaxes capitalization; this is for compatibility with various C-libraries
+    implementations, which have minor differences in the way these numbers are printed.
 
-         e         : "e" | "e+" | "e-" | "E" | "E-" | "E+" ;
+  - Our implementation __vsnprintf() produces either INF or inf for infinity, and NAN
+    or nan for not-a-number, while our __vsscanf() implementation accepts any
+    capitalization if nan, inf, or infinity.
 
   - Flow controls the looks of the output.  The current values supported are:
 
@@ -98,22 +175,40 @@
 
       Pretty  Nicely indented and pretty printed, but fluffy, output.
 
-  - Need to differentiate between opening a non-owned populated buffer
-    for reading or an owned empty buffer; in case one wants to read JSON
-    from a string, lets say.
+  - Escape controls the escaping of unsafe characters when writing data; there are
+    three levels:
+
+      0       Don't encode UTF8 multi-byte characters.  This may impair viewing
+              the output with editors that don't support UTF8.
+      1       Encode UTF8 characters, as well as other unsafe characters, as
+              hex escape sequences of the form '\xXX'.
+      2       Encode unicode characters as '\uXXXX' or '\uXXXX\uXXXX', the latter
+              is used to implement surrogate pairs, i.e. code points exceeding
+              16 bits.
 
-  - Need to split off parse buffer into its own class; we now have several parsers,
-    all using similar logic.  New parse buffer should have better way of managing
-    exact state at which fill() or flush() would be called.  (Possibly, end-of-file
-    signaled in-band?).
+    Quotes will be escaped; output will be written to JSON standard; in future,
+    we may support JSON5 output as an option.
+
+  - Feature: if FXVariant not initialized to empty, a 2nd call to FXJSON::load() may
+    be issued, overwriting only thoses keys present in the original file.  This is
+    because we can recurse through the same structure multiple times, as long as the
+    structure is the same.
+
+  - Technically, column counts UTF8 characters, not spacing columns.  This may be
+    changed in the future.
+
+  - Parsing is done in a way that things will likely work if input is NOT UTF8, as long
+    as those character sequences are not actually equal to those few UTF8 sequences
+    we care about!
 */
 
 
-#define MINBUFFER 1024          // Minimum buffer size
 #define MAXTOKEN  256           // Maximum token size
 
 using namespace FX;
 
+/*******************************************************************************/
+
 namespace FX {
 
 enum {
@@ -124,18 +219,21 @@
   TK_NULL    = 4,       // NULL value
   TK_FALSE   = 5,       // False value
   TK_TRUE    = 6,       // True value
-  TK_INT     = 7,       // Integer value
-  TK_REAL    = 8,       // Real value
-  TK_QUOTES  = 9,       // Quotes
-  TK_LBRACK  = 10,      // Start of array
-  TK_LBRACE  = 11,      // Start of map
-  TK_RBRACK  = 12,      // End of array
-  TK_RBRACE  = 13       // End of map
+  TK_INT     = 7,       // Integer value (decimal)
+  TK_HEX     = 8,       // Integer value (hexadecimal)
+  TK_REAL    = 9,       // Real value
+  TK_INF     = 10,      // Infinity
+  TK_NAN     = 11,      // NaN
+  TK_QUOTES  = 12,      // Quotes
+  TK_QUOTE   = 13,      // Single quote
+  TK_LBRACK  = 14,      // Start of array
+  TK_LBRACE  = 15,      // Start of map
+  TK_RBRACK  = 16,      // End of array
+  TK_RBRACE  = 17,      // End of map
+  TK_IDENT   = 18       // Identifier
   };
 
 
-/*******************************************************************************/
-
 // Error messages
 const FXchar *const FXJSON::errors={
   "OK",
@@ -147,81 +245,64 @@
   "Unmatched ''",
   "Unmatched '}'",
   "Unmatched '\"'",
+  "Unmatched '\''",
   "Bad number",
   "Unexpected end of file"
   };
 
 
+// Special IEEE-754 floating-point standard constants
+static const union{ FXulong u; FXdouble f; } inf={FXULONG(0x7ff0000000000000)};
+static const union{ FXulong u; FXdouble f; } nan={FXULONG(0x7fffffffffffffff)};
+
+
 // Construct JSON serializer
-FXJSON::FXJSON():begptr(NULL),endptr(NULL),sptr(NULL),rptr(NULL),wptr(NULL),token(TK_EOF),column(0),indent(0),line(1),wrap(80),dir(Stop),flow(Compact),prec(15),fmt(2),dent(2),owns(false){
-  FXTRACE((1,"FXJSON::FXJSON\n"));
+FXJSON::FXJSON():begptr(NULL),endptr(NULL),wptr(NULL),rptr(NULL),sptr(NULL),offset(0),column(0),indent(0),line(1),dir(Stop),token(TK_EOF),wrap(80),flow(Compact),prec(15),fmt(2),esc(0),dent(2){
+  FXTRACE((100,"FXJSON::FXJSON\n"));
   }
 
 
 // Construct and open for loading
-FXJSON::FXJSON(FXchar* data,FXuval sz,Direction d):begptr(NULL),endptr(NULL),sptr(NULL),rptr(NULL),wptr(NULL),token(TK_EOF),column(0),indent(0),line(1),wrap(80),dir(Stop),flow(Compact),prec(16),fmt(2),dent(2),owns(false){
-  FXTRACE((1,"FXJSON::FXJSON(%p,%lu,%s)\n",data,sz,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
-  open(data,sz,d);
+FXJSON::FXJSON(FXchar* buffer,FXuval sz,Direction d):begptr(NULL),endptr(NULL),wptr(NULL),rptr(NULL),sptr(NULL),offset(0),column(0),indent(0),line(1),dir(Stop),token(TK_EOF),wrap(80),flow(Compact),prec(16),fmt(2),esc(0),dent(2){
+  FXTRACE((100,"FXJSON::FXJSON(%p,%lu,%s)\n",buffer,sz,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  open(buffer,sz,d);
   }
 
 
-// Open FXJSON stream for given direction and set its buffer
-FXbool FXJSON::open(FXchar* data,FXuval sz,Direction d){
-  FXTRACE((2,"FXJSON::open(%p,%lu,%s)\n",data,sz,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
-  if((dir==Stop) && (d!=Stop)){
-    if(data){                   // External buffer
-      begptr=data;
-      endptr=begptr+sz;
-      if(d==Save){              // Saving
-        sptr=begptr;
-        rptr=begptr;
-        wptr=begptr;
-        }
-      else{                     // Loading
-        sptr=begptr;
-        rptr=begptr;
-        wptr=endptr;            // Assume passed in buffer with existing json data
-        }
-      owns=false;
-      }
-    else{                       // Internal buffer
-      if(sz<MINBUFFER) sz=MINBUFFER;
-      if(!allocElms(begptr,sz)) return false;
-      endptr=begptr+sz;
-      if(d==Save){              // Saving
-        sptr=begptr;
-        rptr=begptr;
-        wptr=begptr;
-        }
-      else{                     // Loading
-        sptr=endptr;
-        rptr=endptr;
-        wptr=endptr;
-        }
-      owns=true;
-      }
+// Open JSON stream for given direction and set its buffer
+FXbool FXJSON::open(FXchar* buffer,FXuval sz,Direction d){
+  FXTRACE((101,"FXJSON::open(%p,%lu,%s)\n",buffer,sz,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  FXASSERT(dir==Stop);
+  if((dir==Stop) && (d!=Stop) && (0<sz) && buffer){
+    begptr=buffer;
+    endptr=buffer+sz;
+    wptr=(d==Load)?endptr:begptr;
+    rptr=begptr;
+    sptr=begptr;
     token=TK_ERROR;
+    offset=0;
     column=0;
-    indent=0;
     line=1;
+    indent=0;
     dir=d;
     return true;
     }
   return false;
   }
 
-
 /*******************************************************************************/
 
-// Fill buffer from file
-FXbool FXJSON::fill(){
-  return rptr<wptr;     // Bytes left to read
+// Read at least count bytes into buffer; return bytes available, or -1 for error
+FXival FXJSON::fill(FXival){
+  FXASSERT(dir==Load);
+  return wptr-sptr;
   }
 
 
-// Flush buffer to file
-FXbool FXJSON::flush(){
-  return wptr<endptr;   // Space left to write
+// Write at least count bytes from buffer; return space available, or -1 for error
+FXival FXJSON::flush(FXival){
+  FXASSERT(dir==Save);
+  return endptr-wptr;
   }
 
 
@@ -229,103 +310,183 @@
 // to load additional data into the buffer if needed.
 // Near the end of the file, there may be fewer than n bytes in the buffer
 // even after fill() is called.
-FXbool FXJSON::need(FXival n){
-  if(wptr<rptr+n){
+FXbool FXJSON::need(FXival count){
+  FXASSERT(dir==Load);
+  if(sptr+count>wptr){
     if(wptr==endptr){
-      fill();
+      if(fill(count)<0) return false;
+      }
+    return sptr<wptr;
+    }
+  return true;
+  }
+
+
+// Emit characters to buffer
+FXbool FXJSON::emit(FXchar ch,FXival count){
+  FXival num;
+  FXASSERT(dir==Save);
+  while(0<count){
+    if(wptr>=endptr){
+      if(flush(count)<=0) return false;
+      }
+    FXASSERT(wptr<endptr);
+    num=FXMIN(count,endptr-wptr);
+    fillElms(wptr,ch,num);
+    wptr+=num;
+    count-=num;
+    }
+  return true;
+  }
+
+
+// Emit text to buffer
+FXbool FXJSON::emit(const FXchar* str,FXival count){
+  FXival num;
+  FXASSERT(dir==Save);
+  while(0<count){
+    if(wptr>=endptr){
+      if(flush(count)<=0) return false;
       }
-    return rptr<wptr;
+    FXASSERT(wptr<endptr);
+    num=FXMIN(count,endptr-wptr);
+    copyElms(wptr,str,num);
+    wptr+=num;
+    str+=num;
+    count-=num;
     }
   return true;
   }
 
+/*******************************************************************************/
 
 // Get next token
 FXint FXJSON::next(){
   FXint comment=0;
   FXint tok;
+  FXuchar c,cc;
+
+  FXASSERT(dir==Load);
 
   // While more data
   while(need(MAXTOKEN)){
 
     // Start new token
-    sptr=rptr;
+    rptr=sptr;
 
-    FXASSERT(rptr<wptr);
+    FXASSERT(sptr<wptr);
 
     // Process characters
-    switch(rptr0){
-      case '\t':                // Tab hops to next tabstop
+    c=sptr0;
+    switch(c){
+      case '\t':                                // Tab hops to next tabstop
         column+=(8-column%8);
-        rptr++;
+        offset++;
+        sptr++;
+        continue;
+      case ' ':                                 // Space
+        column++;
+      case '\v':                                // Vertical tab
+      case '\f':                                // Form feed
+        offset++;
+        sptr++;
         continue;
-      case '\n':                // Newline increases line number, resets column
+      case '\r':                                // Carriage return
+        if(sptr+1<wptr && sptr1=='\n'){
+          offset++;
+          sptr++;
+          }
+      case '\n':                                // Newline
+        if(comment<0) comment=0;                // End single-line comment
         column=0;
+        offset++;
+        sptr++;
         line++;
-        rptr++;
-        if(comment<0) comment=0;
         continue;
-      case ' ':                 // Space
+      case '/':                                 // Possible start of comment
+        if(sptr+1<wptr && sptr1=='*' && comment>=0){
+          column+=2;
+          offset+=2;
+          sptr+=2;
+          comment+=1;                           // Increase comment nesting level
+          continue;
+          }
+        if(sptr+1<wptr && sptr1=='/' && comment==0){
+          column+=2;
+          offset+=2;
+          sptr+=2;
+          comment=-1;                           // Comment till end of line
+          continue;
+          }
+        if(!comment) return TK_ERROR;           // Illegal character outside of comment or string
         column++;
-      case '\v':                // Other white space not incrementing column
-      case '\f':
-      case '\r':
-        rptr++;
+        offset++;
+        sptr++;                                 // Comment
         continue;
-      case '\xef':              // BOM (byte order mark) should behave as spaces
-        if(rptr+2<wptr && rptr1=='\xbb' && rptr2=='\xbf'){ rptr+=3; continue; }
-        if(comment){ column++; rptr=wcinc(rptr); continue; }
-        return TK_ERROR;
-      case '/':                 // Possible start of comment
+      case '*':                                 // Possible end of comment
+        if(sptr+1<wptr && sptr1=='/' && comment>=1){
+          comment-=1;                           // Decrease comment nesting level
+          column+=2;
+          offset+=2;
+          sptr+=2;
+          continue;
+          }
+        if(!comment) return TK_ERROR;           // Illegal character outside of comment or string
         column++;
-        rptr++;
-        if(rptr<wptr && rptr0=='*' && comment>=0){ comment+=1; column++; rptr++; continue; }
-        if(rptr<wptr && rptr0=='/' && comment==0){ comment-=1; column++; rptr++; continue; }
-        if(comment) continue;
-        return TK_ERROR;
-      case '*':                 // Possible end of comment
+        offset++;
+        sptr++;                                 // Comment
+        continue;
+      case '{':                                 // Begin of map
         column++;
-        rptr++;
-        if(rptr<wptr && rptr0=='/' && comment>=1){ comment-=1; column++; rptr++; continue; }
-        if(comment) continue;
-        return TK_ERROR;
-      case '{':                 // Begin of map
+        offset++;
+        sptr++;
+        if(!comment) return TK_LBRACE;
+        continue;
+      case '}':                                 // End of map
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_LBRACE;
-      case '}':                 // End of map
+        offset++;
+        sptr++;
+        if(!comment) return TK_RBRACE;
+        continue;
+      case '':                                 // Begin of array
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_RBRACE;
-      case '':                 // Begin of array
+        offset++;
+        sptr++;
+        if(!comment) return TK_LBRACK;
+        continue;
+      case '':                                 // End of array
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_LBRACK;
-      case '':                 // End of array
+        offset++;
+        sptr++;
+        if(!comment) return TK_RBRACK;
+        continue;
+      case ',':                                 // Element separator
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_RBRACK;
-      case ',':                 // Element separator
+        offset++;
+        sptr++;
+        if(!comment) return TK_COMMA;
+        continue;
+      case ':':                                 // Key:value separator
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_COMMA;
-      case ':':                 // Key:value separator
+        offset++;
+        sptr++;
+        if(!comment) return TK_COLON;
+        continue;
+      case '"':                                 // String double quotes
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_COLON;
-      case '"':                 // String delimiters
+        offset++;
+        sptr++;
+        if(!comment) return TK_QUOTES;
+        continue;
+      case '\'':                                // String single quote
         column++;
-        rptr++;
-        if(comment) continue;
-        return TK_QUOTES;
-      case '+':                 // Number value
+        offset++;
+        sptr++;
+        if(!comment) return TK_QUOTE;
+        continue;
+      case '+':                                 // Number value
       case '-':
+      case '.':                                 // Leading period is allowed
       case '0':
       case '1':
       case '2':
@@ -336,62 +497,410 @@
       case '7':
       case '8':
       case '9':
-        if(comment){ column++; rptr++; continue; }
-        tok=TK_INT;
-        if(rptr0=='-' || rptr0=='+'){
-          column++;
-          rptr++;
-          }
-        while(rptr<wptr && Ascii::isDigit(rptr0)){
-          column++;
-          rptr++;
-          }
-        if(rptr<wptr && rptr0=='.'){
-          tok=TK_REAL;
-          column++;
-          rptr++;
-          while(rptr<wptr && Ascii::isDigit(rptr0)){
+        if(!comment){
+          tok=TK_ERROR;
+          if(sptr0=='-' || sptr0=='+'){                     // Both '+' and '-' sign may appear
             column++;
-            rptr++;
+            offset++;
+            sptr++;
             }
-          }
-        if(rptr<wptr && (rptr0=='e' || rptr0=='E')){
-          tok=TK_REAL;
-          column++;
-          rptr++;
-          if(rptr<wptr && (rptr0=='-' || rptr0=='+')){
+          if(sptr+2<wptr && (sptr0|0x20)=='i' && (sptr1|0x20)=='n' && (sptr2|0x20)=='f'){
+            column+=3;
+            offset+=3;
+            sptr+=3;
+            if(sptr+4<wptr && (sptr0|0x20)=='i' && (sptr1|0x20)=='n' && (sptr2|0x20)=='i' && (sptr3|0x20)=='t' && (sptr4|0x20)=='y'){
+              column+=5;
+              offset+=5;
+              sptr+=5;
+              }
+            return TK_INF;
+            }
+          if(sptr+2<wptr && (sptr0|0x20)=='n' && (sptr1|0x20)=='a' && (sptr2|0x20)=='n'){
+            column+=3;
+            offset+=3;
+            sptr+=3;
+            return TK_NAN;
+            }
+          if(sptr<wptr && sptr0=='0'){                        // Support for hexadecimal as in 0xHHHHH
+            column++;
+            offset++;
+            sptr++;
+            tok=TK_INT;
+            if(sptr+1<wptr && (sptr0=='x' || sptr0=='X') && Ascii::isHexDigit(sptr1)){
+              column+=2;
+              offset+=2;
+              sptr+=2;
+              while(sptr<wptr && Ascii::isHexDigit(sptr0)){   // Eat hex digits
+                column++;
+                offset++;
+                sptr++;
+                }
+              return TK_HEX;
+              }
+            }
+          while(sptr<wptr && Ascii::isDigit(sptr0)){          // Eat integer digits
+            tok=TK_INT;
             column++;
-            rptr++;
+            offset++;
+            sptr++;
             }
-          while(rptr<wptr && Ascii::isDigit(rptr0)){
+          if(sptr<wptr && sptr0=='.'){                        // Fraction part
             column++;
-            rptr++;
+            offset++;
+            sptr++;
+            if(tok==TK_INT) tok=TK_REAL;
+            while(sptr<wptr && Ascii::isDigit(sptr0)){        // Eat fraction digits
+              tok=TK_REAL;
+              column++;
+              offset++;
+              sptr++;
+              }
+            }
+          if(tok!=TK_ERROR){
+            if(sptr<wptr && (sptr0|0x20)=='e'){               // Exponent part
+              column++;
+              offset++;
+              sptr++;
+              if(sptr<wptr && (sptr0=='-' || sptr0=='+')){  // Both '+' and '-' exponent sign may appear
+                column++;
+                offset++;
+                sptr++;
+                }
+              tok=TK_ERROR;
+              while(sptr<wptr && Ascii::isDigit(sptr0)){      // Eat exponent digits
+                tok=TK_REAL;
+                column++;
+                offset++;
+                sptr++;
+                }
+              }
             }
+          return tok;
           }
-        return tok;
-      case 'n':                 // Null value
         column++;
-        rptr++;
-        if(comment) continue;
-        if(rptr+2<wptr && rptr0=='u' && rptr1=='l' && rptr2=='l'){ column+=3; rptr+=3; return TK_NULL; }
-        return TK_ERROR;
-      case 't':                 // True value
+        offset++;
+        sptr++;                                 // Comment
+        continue;
+      case 'a':
+      case 'b':
+      case 'c':
+      case 'd':
+      case 'e':
+      case 'f':
+      case 'g':
+      case 'h':
+      case 'i':
+      case 'j':
+      case 'k':
+      case 'l':
+      case 'm':
+      case 'n':
+      case 'o':
+      case 'p':
+      case 'q':
+      case 'r':
+      case 's':
+      case 't':
+      case 'u':
+      case 'v':
+      case 'w':
+      case 'x':
+      case 'y':
+      case 'z':
+      case 'A':
+      case 'B':
+      case 'C':
+      case 'D':
+      case 'E':
+      case 'F':
+      case 'G':
+      case 'H':
+      case 'I':
+      case 'J':
+      case 'K':
+      case 'L':
+      case 'M':
+      case 'N':
+      case 'O':
+      case 'P':
+      case 'Q':
+      case 'R':
+      case 'S':
+      case 'T':
+      case 'U':
+      case 'V':
+      case 'W':
+      case 'X':
+      case 'Y':
+      case 'Z':
+      case '_':
+      case '$':
+        if(!comment){
+          if(sptr+3<wptr && sptr0=='n' && sptr1=='u' && sptr2=='l' && sptr3=='l'){
+            column+=4;
+            offset+=4;
+            sptr+=4;
+            return TK_NULL;                     // Null
+            }
+          if(sptr+3<wptr && sptr0=='t' && sptr1=='r' && sptr2=='u' && sptr3=='e'){
+            column+=4;
+            offset+=4;
+            sptr+=4;
+            return TK_TRUE;                     // True
+            }
+          if(sptr+4<wptr && sptr0=='f' && sptr1=='a' && sptr2=='l' && sptr3=='s' && sptr4=='e'){
+            column+=5;
+            offset+=5;
+            sptr+=5;
+            return TK_FALSE;                    // False
+            }
+          if(sptr+2<wptr && (sptr0|0x20)=='i' && (sptr1|0x20)=='n' && (sptr2|0x20)=='f'){
+            column+=3;
+            offset+=3;
+            sptr+=3;
+            if(sptr+4<wptr && (sptr0|0x20)=='i' && (sptr1|0x20)=='n' && (sptr2|0x20)=='i' && (sptr3|0x20)=='t' && (sptr4|0x20)=='y'){
+              column+=5;
+              offset+=5;
+              sptr+=5;
+              }
+            return TK_INF;                      // Infinity
+            }
+          if(sptr+2<wptr && (sptr0|0x20)=='n' && (sptr1|0x20)=='a' && (sptr2|0x20)=='n'){
+            column+=3;
+            offset+=3;
+            sptr+=3;
+            return TK_NAN;                      // NaN
+            }
+          column++;
+          offset++;
+          sptr++;
+          return TK_IDENT;                      // Identifier
+          }
+        column++;
+        offset++;
+        sptr++;                                 // Comment
+        continue;
+      case 0x00:                                // Non-special control characters
+      case 0x01:
+      case 0x02:
+      case 0x03:
+      case 0x04:
+      case 0x05:
+      case 0x06:
+      case 0x07:
+      case 0x08:
+      case 0x0E:
+      case 0x0F:
+      case 0x10:
+      case 0x11:
+      case 0x12:
+      case 0x13:
+      case 0x14:
+      case 0x15:
+      case 0x16:
+      case 0x17:
+      case 0x18:
+      case 0x19:
+      case 0x1A:
+      case 0x1B:
+      case 0x1C:
+      case 0x1D:
+      case 0x1E:
+      case 0x1F:
+      case 0x7F:                                // DEL
+      case 0x80:                                // UTF8 followers
+      case 0x81:
+      case 0x82:
+      case 0x83:
+      case 0x84:
+      case 0x85:
+      case 0x86:
+      case 0x87:
+      case 0x88:
+      case 0x89:
+      case 0x8A:
+      case 0x8B:
+      case 0x8C:
+      case 0x8D:
+      case 0x8E:
+      case 0x8F:
+      case 0x90:
+      case 0x91:
+      case 0x92:
+      case 0x93:
+      case 0x94:
+      case 0x95:
+      case 0x96:
+      case 0x97:
+      case 0x98:
+      case 0x99:
+      case 0x9A:
+      case 0x9B:
+      case 0x9C:
+      case 0x9D:
+      case 0x9E:
+      case 0x9F:
+      case 0xA0:
+      case 0xA1:
+      case 0xA2:
+      case 0xA3:
+      case 0xA4:
+      case 0xA5:
+      case 0xA6:
+      case 0xA7:
+      case 0xA8:
+      case 0xA9:
+      case 0xAA:
+      case 0xAB:
+      case 0xAC:
+      case 0xAD:
+      case 0xAE:
+      case 0xAF:
+      case 0xB0:
+      case 0xB1:
+      case 0xB2:
+      case 0xB3:
+      case 0xB4:
+      case 0xB5:
+      case 0xB6:
+      case 0xB7:
+      case 0xB8:
+      case 0xB9:
+      case 0xBA:
+      case 0xBB:
+      case 0xBC:
+      case 0xBD:
+      case 0xBE:
+      case 0xBF:
+        return ErrToken;                        // Bad token
+      case 0xC0:                                // 2-byte UTF8 sequences
+      case 0xC1:
+      case 0xC2:
+      case 0xC3:
+      case 0xC4:
+      case 0xC5:
+      case 0xC6:
+      case 0xC7:
+      case 0xC8:
+      case 0xC9:
+      case 0xCA:
+      case 0xCB:
+      case 0xCC:
+      case 0xCD:
+      case 0xCE:
+      case 0xCF:
+      case 0xD0:
+      case 0xD1:
+      case 0xD2:
+      case 0xD3:
+      case 0xD4:
+      case 0xD5:
+      case 0xD6:
+      case 0xD7:
+      case 0xD8:
+      case 0xD9:
+      case 0xDA:
+      case 0xDB:
+      case 0xDC:
+      case 0xDD:
+      case 0xDE:
+      case 0xDF:
+        if(sptr+1>=wptr) return TK_EOF;         // Premature EOF
+        if(sptr0=='\xC2' && sptr1=='\xA0'){
+          column++;
+          offset+=2;
+          sptr+=2;                              // Non Breakable Space
+          continue;
+          }
+        if(!comment){
+          cc=Unicode::charCategory(wc(sptr));
+          if(!(CatLetterUpper<=cc && cc<=CatNumberLetter)) return TK_ERROR;
+          column++;
+          offset+=2;
+          sptr+=2;
+          return TK_IDENT;                      // Identifier
+          }
+        column++;
+        offset+=2;
+        sptr+=2;                                // Comment
+        continue;
+      case 0xE0:                                // 3-byte UTF8 sequences
+      case 0xE1:
+      case 0xE2:
+      case 0xE3:
+      case 0xE4:
+      case 0xE5:
+      case 0xE6:
+      case 0xE7:
+      case 0xE8:
+      case 0xE9:
+      case 0xEA:
+      case 0xEB:
+      case 0xEC:
+      case 0xED:
+      case 0xEE:
+      case 0xEF:
+        if(sptr+2>=wptr) return TK_EOF;         // Premature EOF
+        if(sptr0=='\xEF' && sptr1=='\xBB' && sptr2=='\xBF'){
+          offset+=3;
+          sptr+=3;                              // Byte order mark
+          continue;
+          }
+        if(sptr0=='\xE2' && sptr1=='\x80' && (sptr2=='\xA8' || sptr2=='\xA9')){
+          if(comment<0) comment=0;              // End single-line comment
+          column=0;
+          offset+=3;
+          sptr+=3;                              // Line Separator or Paragraph Separator
+          line++;
+          continue;
+          }
+        if(!comment){
+          cc=Unicode::charCategory(wc(sptr));
+          if(!(CatLetterUpper<=cc && cc<=CatNumberLetter)) return TK_ERROR;
+          column++;
+          offset+=3;
+          sptr+=3;
+          return TK_IDENT;                      // Identifier
+          }
         column++;
-        rptr++;
-        if(comment) continue;
-        if(rptr+2<wptr && rptr0=='r' && rptr1=='u' && rptr2=='e'){ column+=3; rptr+=3; return TK_TRUE; }
-        return TK_ERROR;
-      case 'f':                 // False value
+        offset+=3;
+        sptr+=3;                                // Comment
+        continue;
+      case 0xF0:                                // 4-byte UTF8 sequences
+      case 0xF1:
+      case 0xF2:
+      case 0xF3:
+      case 0xF4:
+      case 0xF5:
+      case 0xF6:
+      case 0xF7:
+        if(sptr+3>=wptr) return TK_EOF;         // Premature EOF
+        if(!comment){
+          cc=Unicode::charCategory(wc(sptr));
+          if(!(CatLetterUpper<=cc && cc<=CatNumberLetter)) return TK_ERROR;
+          column++;
+          offset+=4;
+          sptr+=4;
+          return TK_IDENT;                      // Identifier
+          }
         column++;
-        rptr++;
-        if(comment) continue;
-        if(rptr+3<wptr && rptr0=='a' && rptr1=='l' && rptr2=='s' && rptr3=='e'){ column+=4; rptr+=4; return TK_FALSE; }
-        return TK_ERROR;
-      default:                  // Other characters
+        offset+=4;
+        sptr+=4;
+        continue;                               // Comment
+      case 0xF8:                                // Bad UTF8 leaders
+      case 0xF9:
+      case 0xFA:
+      case 0xFB:
+      case 0xFC:
+      case 0xFD:
+      case 0xFF:
+        return ErrToken;                        // Bad token
+      default:                                  // Normal characters
+        if(!comment) return TK_ERROR;           // Illegal character outside of comment or string
         column++;
-        rptr=wcinc(rptr);       // Next wide character
-        if(comment) continue;
-        return TK_ERROR;
+        offset++;
+        sptr++;                                 // Comment
+        continue;
       }
     }
   return TK_EOF;
@@ -399,25 +908,440 @@
 
 
 // Load characters into string
+// Parse single- or double-quoted string, and after matching the terminating
+// quote, eat the final quote, leaving sptr at the start of the next token.
+// We keep track of columns even inside the string, so error reporting remains
+// useful for sensible input.
 FXJSON::Error FXJSON::loadString(FXString& str){
+  FXuchar quote=rptr0;
   FXString string;
-  while(need(MAXTOKEN) && rptr0!='"'){
-    if((wptr==endptr) && (wptr<=rptr+MAXTOKEN)){
-      string.append(sptr,rptr-sptr);
-      sptr=rptr;
+  FXuchar c;
+
+  // Nothing yet
+  str=FXString::null;
+
+  // Process string
+  while(need(MAXTOKEN)){
+
+    // Allows for strings to exceed buffer length
+    if((wptr==endptr) && (wptr<=sptr+MAXTOKEN)){
+      string.append(rptr,sptr-rptr);
+      rptr=sptr;
       }
-    if(rptr0=='\\' && rptr+1<wptr){
-      column++;
-      rptr++;
+
+    FXASSERT(sptr<wptr);
+
+    // Process characters
+    c=sptr0;
+    switch(c){
+      case '\t':                                // Tab hops to next tabstop
+        column+=(8-column%8);
+        offset++;
+        sptr++;
+        continue;
+      case ' ':                                 // Space
+        column++;
+      case '\v':                                // Vertical tab
+      case '\f':                                // Form feed
+        offset++;
+        sptr++;
+        continue;
+      case '\r':                                // Carriage return
+      case '\n':                                // Newline
+        return ErrQuotes;                       // Missing quotes
+      case '"':                                 // End of string
+      case '\'':
+        column++;
+        offset++;
+        sptr++;
+        if(quote!=c) continue;
+        string.append(rptr,sptr-rptr);
+        rptr=sptr;
+        str=FXString::unescape(string,quote,quote);       // Of course
+        return ErrOK;
+      case 0x00:                                // Non-special control characters
+      case 0x01:
+      case 0x02:
+      case 0x03:
+      case 0x04:
+      case 0x05:
+      case 0x06:
+      case 0x07:
+      case 0x08:
+      case 0x0E:
+      case 0x0F:
+      case 0x10:
+      case 0x11:
+      case 0x12:
+      case 0x13:
+      case 0x14:
+      case 0x15:
+      case 0x16:
+      case 0x17:
+      case 0x18:
+      case 0x19:
+      case 0x1A:
+      case 0x1B:
+      case 0x1C:
+      case 0x1D:
+      case 0x1E:
+      case 0x1F:
+      case 0x7F:                                // DEL
+      case 0x80:                                // UTF8 followers
+      case 0x81:
+      case 0x82:
+      case 0x83:
+      case 0x84:
+      case 0x85:
+      case 0x86:
+      case 0x87:
+      case 0x88:
+      case 0x89:
+      case 0x8A:
+      case 0x8B:
+      case 0x8C:
+      case 0x8D:
+      case 0x8E:
+      case 0x8F:
+      case 0x90:
+      case 0x91:
+      case 0x92:
+      case 0x93:
+      case 0x94:
+      case 0x95:
+      case 0x96:
+      case 0x97:
+      case 0x98:
+      case 0x99:
+      case 0x9A:
+      case 0x9B:
+      case 0x9C:
+      case 0x9D:
+      case 0x9E:
+      case 0x9F:
+      case 0xA0:
+      case 0xA1:
+      case 0xA2:
+      case 0xA3:
+      case 0xA4:
+      case 0xA5:
+      case 0xA6:
+      case 0xA7:
+      case 0xA8:
+      case 0xA9:
+      case 0xAA:
+      case 0xAB:
+      case 0xAC:
+      case 0xAD:
+      case 0xAE:
+      case 0xAF:
+      case 0xB0:
+      case 0xB1:
+      case 0xB2:
+      case 0xB3:
+      case 0xB4:
+      case 0xB5:
+      case 0xB6:
+      case 0xB7:
+      case 0xB8:
+      case 0xB9:
+      case 0xBA:
+      case 0xBB:
+      case 0xBC:
+      case 0xBD:
+      case 0xBE:
+      case 0xBF:
+        return ErrToken;                        // Bad token
+      case 0xC0:                                // 2-byte UTF8 sequences
+      case 0xC1:
+      case 0xC2:
+      case 0xC3:
+      case 0xC4:
+      case 0xC5:
+      case 0xC6:
+      case 0xC7:
+      case 0xC8:
+      case 0xC9:
+      case 0xCA:
+      case 0xCB:
+      case 0xCC:
+      case 0xCD:
+      case 0xCE:
+      case 0xCF:
+      case 0xD0:
+      case 0xD1:
+      case 0xD2:
+      case 0xD3:
+      case 0xD4:
+      case 0xD5:
+      case 0xD6:
+      case 0xD7:
+      case 0xD8:
+      case 0xD9:
+      case 0xDA:
+      case 0xDB:
+      case 0xDC:
+      case 0xDD:
+      case 0xDE:
+      case 0xDF:
+        if(sptr+1>=wptr) return ErrEnd;         // Premature EOF
+        column++;
+        offset+=2;
+        sptr+=2;
+        continue;
+      case 0xE0:                                // 3-byte UTF8 sequences
+      case 0xE1:
+      case 0xE2:
+      case 0xE3:
+      case 0xE4:
+      case 0xE5:
+      case 0xE6:
+      case 0xE7:
+      case 0xE8:
+      case 0xE9:
+      case 0xEA:
+      case 0xEB:
+      case 0xEC:
+      case 0xED:
+      case 0xEE:
+      case 0xEF:
+        if(sptr+2>=wptr) return ErrEnd;         // Premature EOF
+        if(sptr0=='\xE2' && sptr1=='\x80' && (sptr2=='\xA8' || sptr2=='\xA9')){
+          column=0;
+          offset+=3;
+          sptr+=3;                              // Line Separator or Paragraph Separator
+          line++;
+          continue;
+          }
+        column++;
+        offset+=3;
+        sptr+=3;
+        continue;
+      case 0xF0:                                // 4-byte UTF8 sequences
+      case 0xF1:
+      case 0xF2:
+      case 0xF3:
+      case 0xF4:
+      case 0xF5:
+      case 0xF6:
+      case 0xF7:
+        if(sptr+3>=wptr) return ErrEnd;         // Premature EOF
+        column++;
+        offset+=4;
+        sptr+=4;
+        continue;
+      case 0xF8:                                // Bad UTF8 leaders
+      case 0xF9:
+      case 0xFA:
+      case 0xFB:
+      case 0xFC:
+      case 0xFD:
+      case 0xFF:
+        return ErrToken;                        // Bad token
+      case '\\':                                // Escape next character
+        column++;
+        offset++;
+        sptr++;
+        if(sptr>=wptr) return ErrEnd;           // Premature EOF
+        if(sptr0=='\r' || sptr0=='\n'){     // Check line-continuation
+          if(sptr0=='\r' && sptr+1<wptr && sptr1=='\n'){
+            offset++;
+            sptr++;
+            }
+          column=0;                             // Reset to line start
+          line++;                               // Add line
+          offset++;
+          sptr++;
+          continue;
+          }
+        column++;                               // Advance over escaped character
+        offset++;
+        sptr++;
+        continue;
+      default:                                  // Normal characters
+        column++;
+        offset++;
+        sptr++;
+        continue;
       }
-    column++;
-    rptr=wcinc(rptr);                   // Next wide character
     }
-  if(rptr>=wptr) return ErrEnd;         // Found closing quotes, not end of file
-  string.append(sptr,rptr-sptr);
-  sptr=rptr;
-  str=unescape(string,'"','"');
-  return ErrOK;
+  return ErrEnd;
+  }
+
+
+// Load identifier
+FXJSON::Error FXJSON::loadIdent(FXString& str){
+  FXuchar c,cc;
+
+  // Empty
+  str=FXString::null;
+
+  // Process identifier
+  while(need(MAXTOKEN)){
+
+    // Allows for strings to exceed buffer length
+    if((wptr==endptr) && (wptr<=sptr+MAXTOKEN)){
+      str.append(rptr,sptr-rptr);
+      rptr=sptr;
+      }
+
+    FXASSERT(sptr<wptr);
+
+    // Process characters
+    c=sptr0;
+    switch(c){
+      case 'a':                                 // Identifier characters
+      case 'b':
+      case 'c':
+      case 'd':
+      case 'e':
+      case 'f':
+      case 'g':
+      case 'h':
+      case 'i':
+      case 'j':
+      case 'k':
+      case 'l':
+      case 'm':
+      case 'n':
+      case 'o':
+      case 'p':
+      case 'q':
+      case 'r':
+      case 's':
+      case 't':
+      case 'u':
+      case 'v':
+      case 'w':
+      case 'x':
+      case 'y':
+      case 'z':
+      case 'A':
+      case 'B':
+      case 'C':
+      case 'D':
+      case 'E':
+      case 'F':
+      case 'G':
+      case 'H':
+      case 'I':
+      case 'J':
+      case 'K':
+      case 'L':
+      case 'M':
+      case 'N':
+      case 'O':
+      case 'P':
+      case 'Q':
+      case 'R':
+      case 'S':
+      case 'T':
+      case 'U':
+      case 'V':
+      case 'W':
+      case 'X':
+      case 'Y':
+      case 'Z':
+      case '_':
+      case '$':
+      case '0':
+      case '1':
+      case '2':
+      case '3':
+      case '4':
+      case '5':
+      case '6':
+      case '7':
+      case '8':
+      case '9':
+        column++;
+        offset++;
+        sptr++;
+        continue;
+      case 0xC0:                                // 2-byte UTF8 sequences
+      case 0xC1:
+      case 0xC2:
+      case 0xC3:
+      case 0xC4:
+      case 0xC5:
+      case 0xC6:
+      case 0xC7:
+      case 0xC8:
+      case 0xC9:
+      case 0xCA:
+      case 0xCB:
+      case 0xCC:
+      case 0xCD:
+      case 0xCE:
+      case 0xCF:
+      case 0xD0:
+      case 0xD1:
+      case 0xD2:
+      case 0xD3:
+      case 0xD4:
+      case 0xD5:
+      case 0xD6:
+      case 0xD7:
+      case 0xD8:
+      case 0xD9:
+      case 0xDA:
+      case 0xDB:
+      case 0xDC:
+      case 0xDD:
+      case 0xDE:
+      case 0xDF:
+        if(sptr+1>=wptr) return ErrEnd;         // Premature EOF
+        cc=Unicode::charCategory(wc(sptr));
+        if(!(CatLetterUpper<=cc && cc<=CatPunctConnector) && !(CatMarkNonSpacing<=cc && cc<=CatMarkSpacingCombining)) goto eot;
+        column++;
+        offset+=2;
+        sptr+=2;
+        continue;
+      case 0xE0:                                // 3-byte UTF8 sequences
+      case 0xE1:
+      case 0xE2:
+      case 0xE3:
+      case 0xE4:
+      case 0xE5:
+      case 0xE6:
+      case 0xE7:
+      case 0xE8:
+      case 0xE9:
+      case 0xEA:
+      case 0xEB:
+      case 0xEC:
+      case 0xED:
+      case 0xEE:
+      case 0xEF:
+        if(sptr+2>=wptr) return ErrEnd;         // Premature EOF
+        cc=Unicode::charCategory(wc(sptr));
+        if(!(CatLetterUpper<=cc && cc<=CatPunctConnector) && !(CatMarkNonSpacing<=cc && cc<=CatMarkSpacingCombining)) goto eot;
+        column++;
+        offset+=3;
+        sptr+=3;
+        continue;
+      case 0xF0:                                // 4-byte UTF8 sequences
+      case 0xF1:
+      case 0xF2:
+      case 0xF3:
+      case 0xF4:
+      case 0xF5:
+      case 0xF6:
+      case 0xF7:
+        if(sptr+3>=wptr) return ErrEnd;         // Premature EOF
+        cc=Unicode::charCategory(wc(sptr));
+        if(!(CatLetterUpper<=cc && cc<=CatPunctConnector) && !(CatMarkNonSpacing<=cc && cc<=CatMarkSpacingCombining)) goto eot;
+        column++;
+        offset+=4;
+        sptr+=4;
+        continue;
+      default:                                  // Not part of identifier
+eot:    str.append(rptr,sptr-rptr);
+        rptr=sptr;
+        return ErrOK;
+      }
+    }
+  return ErrEnd;
   }
 
 
@@ -430,18 +1354,17 @@
   var.setType(FXVariant::VMap);
 
   // While more keys
-  while(token==TK_QUOTES){
-
-    // Load string
-    if((err=loadString(key))!=ErrOK) return err;
-
-    // Eat the quotes
-    token=next();
+  while(token==TK_QUOTES || token==TK_QUOTE || token==TK_IDENT){
 
-    // Expect closing quotes
-    if(token!=TK_QUOTES) return ErrQuotes;
+    // Load key
+    if(token==TK_IDENT){
+      if((err=loadIdent(key))!=ErrOK) return err;
+      }
+    else{
+      if((err=loadString(key))!=ErrOK) return err;
+      }
 
-    // Eat the quotes
+    // Token following the string
     token=next();
 
     // Expect colon
@@ -492,7 +1415,7 @@
 
 // Load variant
 FXJSON::Error FXJSON::loadVariant(FXVariant& var){
-  FXString value(sptr,rptr-sptr);
+  FXString value(rptr,sptr-rptr);
   FXbool ok=false;
   Error err;
   switch(token){
@@ -512,7 +1435,12 @@
     token=next();
     return ErrOK;
   case TK_INT:
-    var=value.toLong(0,&ok);
+    var=value.toLong(10,&ok);
+    if(!ok) return ErrNumber;                   // Numeric conversion error
+    token=next();
+    return ErrOK;
+  case TK_HEX:
+    var=value.toLong(16,&ok);
     if(!ok) return ErrNumber;                   // Numeric conversion error
     token=next();
     return ErrOK;
@@ -521,6 +1449,14 @@
     if(!ok) return ErrNumber;                   // Numeric conversion error
     token=next();
     return ErrOK;
+  case TK_INF:                                  // To infinity...
+    var=(rptr0=='-')?-inf.f:inf.f;
+    token=next();
+    return ErrOK;
+  case TK_NAN:                                  // ...and beyond!
+    var=(rptr0=='-')?-nan.f:nan.f;
+    token=next();
+    return ErrOK;
   case TK_LBRACK:                               // Array
     token=next();
     if((err=loadArray(var))!=ErrOK) return err;
@@ -533,10 +1469,13 @@
     if(token!=TK_RBRACE) return ErrBrace;       // Expected closing brace
     token=next();
     return ErrOK;
-  case TK_QUOTES:                               // String
+  case TK_QUOTES:                               // Double quoted string
     if((err=loadString(value))!=ErrOK) return err;
     token=next();
-    if(token!=TK_QUOTES) return ErrQuotes;
+    var=value;
+    return ErrOK;
+  case TK_QUOTE:                                // Single quoted string
+    if((err=loadString(value))!=ErrOK) return err;
     token=next();
     var=value;
     return ErrOK;
@@ -547,47 +1486,36 @@
   return ErrToken;
   }
 
-/*******************************************************************************/
 
-// Emit text to buffer
-FXJSON::Error FXJSON::emit(const FXchar* str,FXint count){
-  FXival num;
-  while(0<count){
-    if(wptr>=endptr && !flush()){ FXTRACE((2,"%s:%d: flush() failed!\n",__FILE__,__LINE__)); return ErrSave; }
-    FXASSERT(wptr<endptr);
-    num=FXMIN(count,endptr-wptr);
-    memcpy(wptr,str,num);
-    wptr+=num;
-    str+=num;
-    count-=num;
+// Load a variant
+FXJSON::Error FXJSON::load(FXVariant& variant){
+  FXTRACE((101,"FXJSON::load(variant)\n"));
+  Error err=ErrLoad;
+  if(dir==Load){
+    token=next();
+    err=loadVariant(variant);
     }
-  return ErrOK;
+  return err;
   }
 
+/*******************************************************************************/
 
-// Emit characters to buffer
-FXJSON::Error FXJSON::emit(FXchar ch,FXint count){
-  FXival num;
-  while(0<count){
-    if(wptr>=endptr && !flush()){ FXTRACE((2,"%s:%d: flush() failed!\n",__FILE__,__LINE__)); return ErrSave; }
-    FXASSERT(wptr<endptr);
-    num=FXMIN(count,endptr-wptr);
-    memset(wptr,ch,num);
-    wptr+=num;
-    count-=num;
-    }
+// Save string after escaping it
+FXJSON::Error FXJSON::saveString(const FXString& str){
+  FXString string=FXString::escape(str,'"','"',esc);
+  if(!emit(string.text(),string.length())) return ErrSave;
+  column+=string.count();
+  offset+=string.length();
   return ErrOK;
   }
 
 
-// Save string after escaping it
-FXJSON::Error FXJSON::saveString(const FXString& str){
-  FXString string=escape(str,'"','"',2);
-  if(emit(string.text(),string.length())==ErrOK){
-    column+=string.length();
-    return ErrOK;
-    }
-  return ErrSave;
+// Save identifier, no escaping
+FXJSON::Error FXJSON::saveIdent(const FXString& str){
+  if(!emit(str.text(),str.length())) return ErrSave;
+  column+=str.count();
+  offset+=str.length();
+  return ErrOK;
   }
 
 
@@ -598,8 +1526,9 @@
   FXASSERT(var.getType()==FXVariant::VMap);
 
   // Object start
-  if(emit("{",1)!=ErrOK) return ErrSave;
+  if(!emit("{",1)) return ErrSave;
   column+=1;
+  offset+=1;
 
   // Skip the whole thing if no items
   if(count){
@@ -610,10 +1539,13 @@
 
     // Write indent
     if(flow==Pretty){
-      if(emit(ENDLINE,strlen(ENDLINE))!=ErrOK) return ErrSave;
-      if(emit(' ',indent)!=ErrOK) return ErrSave;
-      column=indent;
+      if(!emit(ENDLINE,strlen(ENDLINE))) return ErrSave;
+      column=0;
+      offset+=strlen(ENDLINE);
       line++;
+      if(!emit(' ',indent)) return ErrSave;
+      column+=indent;
+      offset+=indent;
       }
 
     // Loop over the items
@@ -627,12 +1559,14 @@
 
       // Write separator
       if(flow==Stream){
-        if(emit(":",1)!=ErrOK) return ErrSave;
+        if(!emit(":",1)) return ErrSave;
         column+=1;
+        offset+=1;
         }
       else{
-        if(emit(" : ",3)!=ErrOK) return ErrSave;
+        if(!emit(" : ",3)) return ErrSave;
         column+=3;
+        offset+=3;
         }
 
       // Write variant
@@ -642,15 +1576,19 @@
       if(--count>0){
 
         // Write comma
-        if(emit(",",1)!=ErrOK) return ErrSave;
+        if(!emit(",",1)) return ErrSave;
         column+=1;
+        offset+=1;
 
         // Write newline and indent
         if(flow || wrap<column){
-          if(emit(ENDLINE,strlen(ENDLINE))!=ErrOK) return ErrSave;
-          if(emit(' ',indent)!=ErrOK) return ErrSave;
-          column=indent;
+          if(!emit(ENDLINE,strlen(ENDLINE))) return ErrSave;
+          column=0;
+          offset+=strlen(ENDLINE);
           line++;
+          if(!emit(' ',indent)) return ErrSave;
+          column+=indent;
+          offset+=indent;
           }
         }
       }
@@ -659,16 +1597,20 @@
 
     // Write indent
     if(flow==Pretty){
-      if(emit(ENDLINE,strlen(ENDLINE))!=ErrOK) return ErrSave;
-      if(emit(' ',indent)!=ErrOK) return ErrSave;
-      column=indent;
+      if(!emit(ENDLINE,strlen(ENDLINE))) return ErrSave;
+      column=0;
+      offset+=strlen(ENDLINE);
       line++;
+      if(!emit(' ',indent)) return ErrSave;
+      column+=indent;
+      offset+=indent;
       }
     }
 
   // Object end
-  if(emit("}",1)!=ErrOK) return ErrSave;
+  if(!emit("}",1)) return ErrSave;
   column+=1;
+  offset+=1;
 
   return ErrOK;
   }
@@ -680,8 +1622,9 @@
   FXASSERT(var.getType()==FXVariant::VArray);
 
   // Array start
-  if(emit("",1)!=ErrOK) return ErrSave;
+  if(!emit("",1)) return ErrSave;
   column+=1;
+  offset+=1;
 
   // Skip the whole thing if no items
   if(var.asArray().no()){
@@ -692,10 +1635,13 @@
 
     // Write indent
     if(flow==Pretty){
-      if(emit(ENDLINE,strlen(ENDLINE))!=ErrOK) return ErrSave;
-      if(emit(' ',indent)!=ErrOK) return ErrSave;
-      column=indent;
+      if(!emit(ENDLINE,strlen(ENDLINE))) return ErrSave;
+      column=0;
+      offset+=strlen(ENDLINE);
       line++;
+      if(!emit(' ',indent)) return ErrSave;
+      column+=indent;
+      offset+=indent;
       }
 
     // Loop over the items
@@ -708,19 +1654,24 @@
       if(i+1<var.asArray().no()){
 
         // Write comma
-        if(emit(",",1)!=ErrOK) return ErrSave;
+        if(!emit(",",1)) return ErrSave;
         column+=1;
+        offset+=1;
 
         // Write space or newline and indent
         if(flow==Pretty || wrap<column || (flow==Compact && FXVariant::VMap==var.asArray().at(i).getType())){
-          if(emit(ENDLINE,strlen(ENDLINE))!=ErrOK) return ErrSave;
-          if(emit(' ',indent)!=ErrOK) return ErrSave;
-          column=indent;
+          if(!emit(ENDLINE,strlen(ENDLINE))) return ErrSave;
+          column=0;
+          offset+=strlen(ENDLINE);
           line++;
+          if(!emit(' ',indent)) return ErrSave;
+          column+=indent;
+          offset+=indent;
           }
         else if(flow){
-          if(emit(" ",1)!=ErrOK) return ErrSave;
+          if(!emit(" ",1)) return ErrSave;
           column+=1;
+          offset+=1;
           }
         }
       }
@@ -729,62 +1680,77 @@
 
     // Write indent
     if(flow==Pretty){
-      if(emit(ENDLINE,strlen(ENDLINE))!=ErrOK) return ErrSave;
-      if(emit(' ',indent)!=ErrOK) return ErrSave;
-      column=indent;
+      if(!emit(ENDLINE,strlen(ENDLINE))) return ErrSave;
+      column=0;
+      offset+=strlen(ENDLINE);
       line++;
+      if(!emit(' ',indent)) return ErrSave;
+      column+=indent;
+      offset+=indent;
       }
     }
 
   // Array end
-  if(emit("",1)!=ErrOK) return ErrSave;
+  if(!emit("",1)) return ErrSave;
   column+=1;
+  offset+=1;
   return ErrOK;
   }
 
 
 // Recursively save variant var
 FXJSON::Error FXJSON::saveVariant(const FXVariant& var){
-  const FXchar truth26={"false","true"};
   FXString string;
-  FXbool flag;
   switch(var.getType()){
   case FXVariant::VNull:
-    if(emit("null",4)!=ErrOK) return ErrSave;
+    if(!emit("null",4)) return ErrSave;
     column+=4;
+    offset+=4;
     break;
   case FXVariant::VBool:
-    flag=(FXbool)var.asULong();
-    emit(truthflag,strlen(truthflag));
-    column+=strlen(truthflag);
+    if(var.asULong()){
+      if(!emit("true",4)) return ErrSave;
+      column+=4;
+      offset+=4;
+      }
+    else{
+      if(!emit("false",5)) return ErrSave;
+      column+=5;
+      offset+=5;
+      }
     break;
   case FXVariant::VChar:
     string.fromULong(var.asULong());
-    if(emit(string.text(),string.length())!=ErrOK) return ErrSave;
+    if(!emit(string.text(),string.length())) return ErrSave;
     column+=string.length();
+    offset+=string.length();
     break;
   case FXVariant::VInt:
   case FXVariant::VLong:
     string.fromLong(var.asLong());
-    if(emit(string.text(),string.length())!=ErrOK) return ErrSave;
+    if(!emit(string.text(),string.length())) return ErrSave;
     column+=string.length();
+    offset+=string.length();
     break;
   case FXVariant::VUInt:
   case FXVariant::VULong:
     string.fromULong(var.asULong());
-    if(emit(string.text(),string.length())!=ErrOK) return ErrSave;
+    if(!emit(string.text(),string.length())) return ErrSave;
     column+=string.length();
+    offset+=string.length();
     break;
   case FXVariant::VFloat:
   case FXVariant::VDouble:
     string.fromDouble(var.asDouble(),prec,fmt);
-    if(emit(string.text(),string.length())!=ErrOK) return ErrSave;
+    if(!emit(string.text(),string.length())) return ErrSave;
     column+=string.length();
+    offset+=string.length();
     break;
   case FXVariant::VPointer:
     string.format("%p",var.asPtr());
-    if(emit(string.text(),string.length())!=ErrOK) return ErrSave;
+    if(!emit(string.text(),string.length())) return ErrSave;
     column+=string.length();
+    offset+=string.length();
     break;
   case FXVariant::VString:
     if(saveString(var.asString())!=ErrOK) return ErrSave;
@@ -800,46 +1766,38 @@
   }
 
 
-/*******************************************************************************/
-
-// Load a variant
-FXJSON::Error FXJSON::load(FXVariant& variant){
-  FXTRACE((2,"FXJSON::load(variant)\n"));
-  Error err=ErrLoad;
-  if(dir==Load){
-    token=next();
-    err=loadVariant(variant);
-    }
-  return err;
-  }
-
-
 // Save a variant
 FXJSON::Error FXJSON::save(const FXVariant& variant){
-  FXTRACE((2,"FXJSON::save(variant)\n"));
+  FXTRACE((101,"FXJSON::save(variant)\n"));
   Error err=ErrSave;
   if(dir==Save){
     err=saveVariant(variant);
+    if(flush(0)<0) err=ErrSave;
     }
   return err;
   }
 
+/*******************************************************************************/
 
 // Close stream and delete buffers
 FXbool FXJSON::close(){
-  FXTRACE((2,"FXJSON::close()\n"));
+  FXTRACE((101,"FXJSON::close()\n"));
   if(dir!=Stop){
-    if((dir==Load) || flush()){
-      if(owns){ freeElms(begptr); }
+    if((dir==Load) || 0<=flush(0)){             // Error during final flush is possible
       begptr=NULL;
       endptr=NULL;
-      sptr=NULL;
-      rptr=NULL;
       wptr=NULL;
-      token=TK_ERROR;
+      rptr=NULL;
+      sptr=NULL;
       dir=Stop;
       return true;
       }
+    begptr=NULL;
+    endptr=NULL;
+    wptr=NULL;
+    rptr=NULL;
+    sptr=NULL;
+    dir=Stop;
     }
   return false;
   }
@@ -847,7 +1805,7 @@
 
 // Close stream and clean up
 FXJSON::~FXJSON(){
-  FXTRACE((1,"FXJSON::~FXJSON\n"));
+  FXTRACE((100,"FXJSON::~FXJSON\n"));
   close();
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXJSONFile.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXJSONFile.cpp Changed

@@ -3,7 +3,7 @@
 *                            J S O N   F i l e   I / O                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2013,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2013,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -51,25 +51,33 @@
 
 // Create JSON file i/o object
 FXJSONFile::FXJSONFile(){
-  FXTRACE((1,"FXJSONFile::FXJSONFile\n"));
+  FXTRACE((100,"FXJSONFile::FXJSONFile\n"));
   }
 
 
 // Create JSON file i/o object and open it
 FXJSONFile::FXJSONFile(const FXString& filename,Direction d,FXuval sz){
-  FXTRACE((1,"FXJSONFile::FXJSONFile(\"%s\",%s,%ld)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
+  FXTRACE((100,"FXJSONFile::FXJSONFile(\"%s\",%s,%ld)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
   open(filename,d,sz);
   }
 
 
 // Open archive for operation
 FXbool FXJSONFile::open(FXInputHandle h,Direction d,FXuval sz){
-  FXTRACE((1,"FXJSONFile::open(%lx,%s,%ld)\n",h,(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
-  if(FXJSON::open(NULL,sz,d)){
+  FXTRACE((101,"FXJSONFile::open(%lx,%s,%ld)\n",h,(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
+  FXchar *buffer;
+  FXASSERT(dir==Stop);
+  if(allocElms(buffer,sz)){
     if(file.open(h,(d==Save)?FXIO::Writing:FXIO::Reading)){
-      return true;
+      if(FXJSON::open(buffer,sz,d)){
+        rptr=endptr;
+        sptr=endptr;
+        wptr=endptr;
+        return true;
+        }
+      file.close();
       }
-    close();
+    freeElms(buffer);
     }
   return false;
   }
@@ -77,59 +85,71 @@
 
 // Open archive for operation
 FXbool FXJSONFile::open(const FXString& filename,Direction d,FXuval sz){
-  FXTRACE((1,"FXJSONFile::open(\"%s\",%s,%ld)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
-  if(FXJSON::open(NULL,sz,d)){
+  FXTRACE((101,"FXJSONFile::open(\"%s\",%s,%ld)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
+  FXchar *buffer;
+  FXASSERT(dir==Stop);
+  if(allocElms(buffer,sz)){
     if(file.open(filename,(d==Save)?FXIO::Writing:FXIO::Reading,FXIO::AllReadWrite)){
-      return true;
+      if(FXJSON::open(buffer,sz,d)){
+        rptr=endptr;
+        sptr=endptr;
+        wptr=endptr;
+        return true;
+        }
+      file.close();
       }
-    close();
+    freeElms(buffer);
     }
   return false;
   }
 
 
-// Fill buffer from file
-FXbool FXJSONFile::fill(){
-  register FXival n;
+// Read at least count bytes into buffer; return bytes available, or -1 for error
+FXival FXJSONFile::fill(FXival){
+  FXival nbytes;
+  FXASSERT(dir==Load);
   if(file.isReadable()){
-    if(sptr<wptr){ moveElms(begptr,sptr,wptr-sptr); }
-    wptr=begptr+(wptr-sptr);
-    rptr=begptr+(rptr-sptr);
-    sptr=begptr;
-    n=file.readBlock(wptr,endptr-wptr);
-    FXTRACE((2,"FXJSONFile::fill() = %ld\n",n));
-    if(0<=n){
-      wptr+=n;
+    moveElms(begptr,rptr,wptr-rptr);
+    wptr=begptr+(wptr-rptr);
+    sptr=begptr+(sptr-rptr);
+    rptr=begptr;
+    nbytes=file.readBlock(wptr,endptr-wptr);
+    FXTRACE((104,"FXJSONFile::fill() = %ld\n",nbytes));
+    if(0<=nbytes){
+      wptr+=nbytes;
       if(wptr<endptr){ wptr0='\0'; }
-      return rptr<wptr;         // Input left to read
+      return wptr-sptr;                         // Input left to read
       }
     }
-  return false;
+  return -1;
   }
 
 
-// Flush buffer to file
-FXbool FXJSONFile::flush(){
-  register FXival n;
+// Write at least count bytes from buffer; return space available, or -1 for error
+FXival FXJSONFile::flush(FXival){
+  FXival nbytes;
+  FXASSERT(dir==Save);
   if(file.isWritable()){
-    n=file.writeBlock(rptr,wptr-rptr);
-    FXTRACE((2,"FXJSONFile::flush() = %ld\n",n));
-    if(0<=n){
-      rptr+=n;
-      if(rptr<wptr){ moveElms(begptr,rptr,wptr-rptr); }
+    nbytes=file.writeBlock(rptr,wptr-rptr);
+    FXTRACE((104,"FXJSONFile::flush() = %ld\n",nbytes));
+    if(0<=nbytes){
+      rptr+=nbytes;
+      moveElms(begptr,rptr,wptr-rptr);
       wptr=begptr+(wptr-rptr);
       rptr=begptr;
-      return wptr<endptr;       // Space left to write
+      return endptr-wptr;                       // Space left to write
       }
     }
-  return false;
+  return -1;
   }
 
 
 // Close stream and delete buffers
 FXbool FXJSONFile::close(){
-  FXTRACE((2,"FXJSONFile::close()\n"));
+  FXTRACE((101,"FXJSONFile::close()\n"));
+  FXchar *buffer=begptr;
   if(FXJSON::close()){
+    freeElms(buffer);
     return file.close();
     }
   return false;
@@ -138,7 +158,7 @@
 
 // Close JSON file
 FXJSONFile::~FXJSONFile(){
-  FXTRACE((1,"FXJSONFile::~FXJSONFile\n"));
+  FXTRACE((100,"FXJSONFile::~FXJSONFile\n"));
   close();
   }

gogglesmm-1.2.2.tar.gz/cfox/lib/FXJSONString.cpp Added

@@ -0,0 +1,140 @@
+/********************************************************************************
+*                                                                               *
+*                            J S O N   S t r i n g   I / O                      *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "FXElement.h"
+#include "FXArray.h"
+#include "FXString.h"
+#include "FXIO.h"
+#include "FXIODevice.h"
+#include "FXStat.h"
+#include "FXFile.h"
+#include "FXException.h"
+#include "FXVariant.h"
+#include "FXVariantArray.h"
+#include "FXVariantMap.h"
+#include "FXJSON.h"
+#include "FXJSONString.h"
+
+/*
+  Notes:
+
+  - JSON Serialization to a string.
+  - Should default behaviour be to append to the given string instead of overwriting
+    it (if writing)?
+*/
+
+using namespace FX;
+
+namespace FX {
+
+/*******************************************************************************/
+
+// Create JSON file i/o object
+FXJSONString::FXJSONString(){
+  FXTRACE((100,"FXJSONString::FXJSONString\n"));
+  }
+
+
+// Create JSON string i/o object and open it
+FXJSONString::FXJSONString(const FXString& string,Direction d){
+  FXTRACE((100,"FXJSONString::FXJSONString(\"%.*s\",%s)\n",FXMIN(string.length(),16),string.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  open(string,d);
+  }
+
+
+// Create JSON string i/o object and open it
+FXJSONString::FXJSONString(const FXchar* string,FXuval length,Direction d){
+  FXTRACE((100,"FXJSONString::FXJSONString(\"%.*s\",%lu,%s)\n",FXMIN(length,16),string,length,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  open(string,length,d);
+  }
+
+
+// Open archive for operation
+FXbool FXJSONString::open(const FXString& string,Direction d){
+  FXTRACE((101,"FXJSONString::open(\"%.*s\",%s)\n",FXMIN(string.length(),16),string.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  FXASSERT(dir==Stop);
+  buffer=string;
+  if(FXJSON::open(buffer.text(),buffer.length(),d)){
+    // wptr=endptr;             // Append to end of buffer
+    return true;
+    }
+  return false;
+  }
+
+
+// Open archive for operation
+FXbool FXJSONString::open(const FXchar* string,FXuval length,Direction d){
+  FXTRACE((101,"FXJSONString::open(\"%.*s\",%lu,%s)\n",FXMIN(length,16),string,length,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  FXASSERT(dir==Stop);
+  buffer.assign(string,length);
+  if(FXJSON::open(buffer.text(),buffer.length(),d)){
+    // wptr=endptr;             // Append to end of buffer
+    return true;
+    }
+  return false;
+  }
+
+
+// Read at least count bytes into buffer; return bytes available, or -1 for error
+FXival FXJSONString::fill(FXival){
+  FXASSERT(dir==Load);
+  if(dir==Load){
+    return wptr-sptr;
+    }
+  return -1;
+  }
+
+
+// Write at least count bytes from buffer; return space available, or -1 for error
+FXival FXJSONString::flush(FXival count){
+  FXASSERT(dir==Save);
+  if(dir==Save){
+    FXchar *oldptr=begptr;
+    buffer.length(buffer.length()+count);
+    begptr=buffer.text();
+    endptr=buffer.text()+buffer.length();
+    rptr=begptr+(rptr-oldptr);
+    sptr=begptr+(sptr-oldptr);
+    wptr=begptr+(wptr-oldptr);
+    return endptr-wptr;
+    }
+  return -1;
+  }
+
+
+// Close stream and delete buffers
+FXbool FXJSONString::close(){
+  FXTRACE((101,"FXJSONString::close()\n"));
+  return FXJSON::close();
+  }
+
+
+// Close JSON file
+FXJSONString::~FXJSONString(){
+  FXTRACE((100,"FXJSONString::~FXJSONString\n"));
+  close();
+  }
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXKnob.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXKnob.cpp Changed

@@ -3,7 +3,7 @@
 *                             K n o b   W i d g e t                             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Leandro Nini.   All Rights Reserved.               *
+* Copyright (C) 2005,2020 by Leandro Nini.   All Rights Reserved.               *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -179,14 +179,14 @@
 
 // Get default size
 FXint FXKnob::getDefaultWidth(){
-  register FXint w=KNOBSIZE;
+  FXint w=KNOBSIZE;
   if(options&KNOB_TICKS) w+=4;
   return w+padleft+padright+(border<<1);
   }
 
 
 FXint FXKnob::getDefaultHeight(){
-  register FXint h=KNOBSIZE;
+  FXint h=KNOBSIZE;
   if(options&KNOB_TICKS) h+=4;
   return h+padtop+padbottom+(border<<1);
   }
@@ -346,8 +346,8 @@
 
 // Pressed LEFT button
 long FXKnob::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p,tol;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p,tol;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   flags&=~FLAG_TIP;
   if(isEnabled()){
@@ -381,7 +381,7 @@
 
 // Released Left button
 long FXKnob::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     setValue(pos);
@@ -401,8 +401,8 @@
 
 // Moving
 long FXKnob::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p;
   if(!isEnabled()) return 0;
   if(flags&FLAG_PRESSED){
     p=calcValue(event->win_x,event->win_y);
@@ -419,8 +419,8 @@
 
 // Pressed middle button
 long FXKnob::onMiddleBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   flags&=~FLAG_TIP;
   if(isEnabled()){
@@ -442,7 +442,7 @@
 
 // Released middle button
 long FXKnob::onMiddleBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -462,8 +462,8 @@
 
 // Mouse wheel
 long FXKnob::onMouseWheel(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p=pos+(event->code*incr)/120;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p=pos+(event->code*incr)/120;
   setValue(p,true);
   return 1;
   }
@@ -482,8 +482,8 @@
 
 // Automatically move knob while holding down mouse
 long FXKnob::onAutoSlide(FXObject*,FXSelector,void* ptr){
-  register FXint inc=(FXint)(FXival)ptr;
-  register FXint p=pos+inc;
+  FXint inc=(FXint)(FXival)ptr;
+  FXint p=pos+inc;
   if(p<=range0){
     p=range0;
     }
@@ -668,7 +668,7 @@
 
 // Set knob style
 void FXKnob::setKnobStyle(FXuint style){
-  register FXuint opts=(options&~KNOB_MASK) | (style&KNOB_MASK);
+  FXuint opts=(options&~KNOB_MASK) | (style&KNOB_MASK);
   if(options!=opts){
     options=opts;
     update();
@@ -687,9 +687,9 @@
 
 // Calculate value from position relative to center
 FXint FXKnob::calcValue(FXint x,FXint y){
-  register FXint cx=(width+padleft-padright)>>1;
-  register FXint cy=(height+padtop-padbottom)>>1;
-  register FXdouble angle=Math::atan2((FXdouble)(cy-y),(FXdouble)(x-cx))/PI;
+  FXint cx=(width+padleft-padright)>>1;
+  FXint cy=(height+padtop-padbottom)>>1;
+  FXdouble angle=Math::atan2((FXdouble)(cy-y),(FXdouble)(x-cx))/PI;
   if(angle<-0.5) angle+=2.0;
   angle=(1.0-angle-limits0)/(limits1-limits0);
   return (FXint)(angle*(range1-range0)+0.5)+range0;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXLFQueue.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXLFQueue.cpp Changed

@@ -3,7 +3,7 @@
 *                          L o c k - F r e e   Q u e u e                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2012,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2012,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -94,8 +94,8 @@
 
 // Add item to queue, return true if success
 FXbool FXLFQueue::push(FXptr ptr){
-  register FXuint mask=getSize()-1;
-  register FXuint w;
+  FXuint mask=getSize()-1;
+  FXuint w;
 x:w=whead;
   if(__likely((w-rtail)<=mask)){
     if(__unlikely(!atomicBoolCas(&whead,w,w+1))) goto x;
@@ -110,8 +110,8 @@
 
 // Remove item from queue, return true if success
 FXbool FXLFQueue::pop(FXptr& ptr){
-  register FXuint mask=getSize()-1;
-  register FXuint r;
+  FXuint mask=getSize()-1;
+  FXuint r;
 x:r=rhead;
   if(__likely((wtail-r)>=1)){
     if(__unlikely(!atomicBoolCas(&rhead,r,r+1))) goto x;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXLabel.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXLabel.cpp Changed

@@ -3,7 +3,7 @@
 *                            L a b e l   W i d g e t                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -102,16 +102,16 @@
 // Make a label
 FXLabel::FXLabel(FXComposite* p,const FXString& text,FXIcon* ic,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb):FXFrame(p,opts,x,y,w,h,pl,pr,pt,pb){
   FXString string=text.section('\t',0);
-  flags|=FLAG_ENABLED;
+  hotkey=parseHotKey(string);
   label=stripHotKey(string);
-  icon=ic;
+  hotoff=findHotKey(string);
   font=getApp()->getNormalFont();
   help=text.section('\t',2);
   tip=text.section('\t',1);
   textColor=getApp()->getForeColor();
-  hotkey=parseHotKey(string);
-  hotoff=findHotKey(string);
+  icon=ic;
   addHotKey(hotkey);
+  flags|=FLAG_ENABLED;
   }
 
 
@@ -151,8 +151,8 @@
 
 // Get height of multi-line label
 FXint FXLabel::labelHeight(const FXString& text) const {
-  register FXint beg,end;
-  register FXint th=0;
+  FXint beg,end;
+  FXint th=0;
   beg=0;
   do{
     end=beg;
@@ -167,8 +167,8 @@
 
 // Get width of multi-line label
 FXint FXLabel::labelWidth(const FXString& text) const {
-  register FXint beg,end;
-  register FXint w,tw=0;
+  FXint beg,end;
+  FXint w,tw=0;
   beg=0;
   do{
     end=beg;
@@ -237,8 +237,8 @@
 
 // Draw multi-line label, with underline for hotkey
 void FXLabel::drawLabel(FXDCWindow& dc,const FXString& text,FXint hot,FXint tx,FXint ty,FXint tw,FXint){
-  register FXint beg,end;
-  register FXint xx,yy;
+  FXint beg,end;
+  FXint xx,yy;
   yy=ty+font->getFontAscent();
   beg=0;
   do{
@@ -437,8 +437,8 @@
 
 // Change text
 void FXLabel::setText(const FXString& text){
-  FXString string=stripHotKey(text);
   FXHotKey hkey=parseHotKey(text);
+  FXString string=stripHotKey(text);
   FXint hoff=findHotKey(text);
   if(label!=string || hkey!=hotkey || hotoff!=hoff){
     label.adopt(string);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXList.cpp Changed

@@ -3,7 +3,7 @@
 *                            L i s t   O b j e c t                              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -108,6 +108,9 @@
 
 namespace FX {
 
+// Explicit template instantiation
+//template class  FXObjectListOf<FXListItem>;
+
 
 // Object implementation
 FXIMPLEMENT(FXListItem,FXObject,NULL,0)
@@ -115,8 +118,8 @@
 
 // Draw item
 void FXListItem::draw(const FXList* list,FXDC& dc,FXint xx,FXint yy,FXint ww,FXint hh) const {
-  register FXFont *font=list->getFont();
-  register FXint ih=0,th=0;
+  FXFont *font=list->getFont();
+  FXint ih=0,th=0;
   if(icon) ih=icon->getHeight();
   if(!label.empty()) th=font->getFontHeight();
   if(isSelected())
@@ -149,8 +152,8 @@
 
 // See if item got hit, and where: 0 is outside, 1 is icon, 2 is text
 FXint FXListItem::hitItem(const FXList* list,FXint xx,FXint yy) const {
-  register FXFont *font=list->getFont();
-  register FXint iw=0,ih=0,tw=0,th=0,ix,iy,tx,ty,h;
+  FXFont *font=list->getFont();
+  FXint iw=0,ih=0,tw=0,th=0,ix,iy,tx,ty,h;
   if(icon){
     iw=icon->getWidth();
     ih=icon->getHeight();
@@ -246,8 +249,8 @@
 
 // Get width of item
 FXint FXListItem::getWidth(const FXList* list) const {
-  register FXFont *font=list->getFont();
-  register FXint w=0;
+  FXFont *font=list->getFont();
+  FXint w=0;
   if(icon){
     w=icon->getWidth();
     }
@@ -261,8 +264,8 @@
 
 // Get height of item
 FXint FXListItem::getHeight(const FXList* list) const {
-  register FXFont *font=list->getFont();
-  register FXint th=0,ih=0;
+  FXFont *font=list->getFont();
+  FXint th=0,ih=0;
   if(icon){
     ih=icon->getHeight();
     }
@@ -381,7 +384,7 @@
 
 // Create window
 void FXList::create(){
-  register FXint i;
+  FXint i;
   FXScrollArea::create();
   for(i=0; i<items.no(); i++){itemsi->create();}
   font->create();
@@ -390,7 +393,7 @@
 
 // Detach window
 void FXList::detach(){
-  register FXint i;
+  FXint i;
   FXScrollArea::detach();
   for(i=0; i<items.no(); i++){itemsi->detach();}
   font->detach();
@@ -436,7 +439,7 @@
 
 // Recompute interior
 void FXList::recompute(){
-  register FXint x,y,w,h,i;
+  FXint x,y,w,h,i;
   x=0;
   y=0;
   listWidth=0;
@@ -568,7 +571,7 @@
 
 // Make item fully visible
 void FXList::makeItemVisible(FXint index){
-  register FXint y,h,vh;
+  FXint y,h,vh;
   if(0<=index && index<items.no()){
 
     // Remember for later
@@ -612,7 +615,7 @@
 
 // Get item at position x,y
 FXint FXList::getItemAt(FXint,FXint y) const {
-  register FXint index;
+  FXint index;
   y-=pos_y;
   for(index=0; index<items.no(); index++){
     if(itemsindex->y<=y && y<itemsindex->y+itemsindex->getHeight(this)){
@@ -754,9 +757,9 @@
 
 // Extend selection
 FXbool FXList::extendSelection(FXint index,FXbool notify){
-  register FXbool changes=false;
+  FXbool changes=false;
   if(0<=index && 0<=anchor && 0<=extent){
-    register FXint i1,i2,i3,i;
+    FXint i1,i2,i3,i;
 
     // Find segments
     i1=index;
@@ -825,7 +828,7 @@
 
 // Select all items
 FXbool FXList::selectAll(FXbool notify){
-  register FXbool changes=false;
+  FXbool changes=false;
   for(FXint i=0; i<items.no(); i++){
     if(!itemsi->isSelected()){
       itemsi->setSelected(true);
@@ -840,7 +843,7 @@
 
 // Kill selection
 FXbool FXList::killSelection(FXbool notify){
-  register FXbool changes=false;
+  FXbool changes=false;
   for(FXint i=0; i<items.no(); i++){
     if(itemsi->isSelected()){
       itemsi->setSelected(false);
@@ -1484,9 +1487,9 @@
 
 // Sort the items based on the sort function.
 void FXList::sortItems(){
-  register FXListItem *v,*c=0;
-  register FXbool exch=false;
-  register FXint i,j,h;
+  FXListItem *v,*c=0;
+  FXbool exch=false;
+  FXint i,j,h;
   if(sortfunc){
     if(0<=current){
       c=itemscurrent;
@@ -1622,7 +1625,7 @@
 
 // Insert item
 FXint FXList::insertItem(FXint index,FXListItem* item,FXbool notify){
-  register FXint old=current;
+  FXint old=current;
 
   // Must have item
   if(!item){ fxerror("%s::insertItem: item is NULL.\n",getClassName()); }
@@ -1694,7 +1697,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXList::fillItems(const FXchar *const *strings,FXIcon *icon,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(stringsn){
       appendItem(stringsn++,icon,ptr,notify);
@@ -1706,7 +1709,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXList::fillItems(const FXString* strings,FXIcon *icon,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(!stringsn.empty()){
       appendItem(stringsn++,icon,ptr,notify);
@@ -1718,7 +1721,7 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXList::fillItems(const FXString& strings,FXIcon *icon,FXptr ptr,FXbool notify){
-  register FXint beg=0,end=0,n=0;
+  FXint beg=0,end=0,n=0;
   while(end<strings.length()){
     beg=end;
     while(end<strings.length() && stringsend!='\n' && stringsend!='\r') end++;
@@ -1732,8 +1735,8 @@
 
 // Move item from oldindex to newindex
 FXint FXList::moveItem(FXint newindex,FXint oldindex,FXbool notify){
-  register FXint old=current;
-  register FXListItem *item;
+  FXint old=current;
+  FXListItem *item;
 
   // Must be in range
   if(newindex<0 || oldindex<0 || items.no()<=newindex || items.no()<=oldindex){ fxerror("%s::moveItem: index out of range.\n",getClassName()); }
@@ -1782,8 +1785,8 @@
 
 // Extract node from list
 FXListItem* FXList::extractItem(FXint index,FXbool notify){
-  register FXListItem *result;
-  register FXint old=current;
+  FXListItem *result;
+  FXint old=current;
 
   // Must be in range
   if(index<0 || items.no()<=index){ fxerror("%s::extractItem: index out of range.\n",getClassName()); }
@@ -1828,7 +1831,7 @@
 
 // Remove node from list
 void FXList::removeItem(FXint index,FXbool notify){
-  register FXint old=current;
+  FXint old=current;
 
   // Must be in range
   if(index<0 || items.no()<=index){ fxerror("%s::removeItem: index out of range.\n",getClassName()); }
@@ -1868,7 +1871,7 @@
 
 // Remove all items
 void FXList::clearItems(FXbool notify){
-  register FXint old=current;
+  FXint old=current;
 
   // Delete items
   for(FXint index=items.no()-1; 0<=index; index--){
@@ -1900,8 +1903,8 @@
 
 // Get item by name
 FXint FXList::findItem(const FXString& string,FXint start,FXuint flgs) const {
-  register FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)comparecase : (FXCompareFunc)compare;
-  register FXint index,len;
+  FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)comparecase : (FXCompareFunc)compare;
+  FXint index,len;
   if(0<items.no()){
     len=(flgs&SEARCH_PREFIX)?string.length():2147483647;
     if(flgs&SEARCH_BACKWARD){
@@ -1931,7 +1934,7 @@
 
 // Get item by data
 FXint FXList::findItemByData(FXptr ptr,FXint start,FXuint flgs) const {
-  register FXint index;
+  FXint index;
   if(0<items.no()){
     if(flgs&SEARCH_BACKWARD){
       if(start<0) start=items.no()-1;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXListBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXListBox.cpp Changed

@@ -3,7 +3,7 @@
 *                        L i s t   B o x   O b j e c t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -373,8 +373,8 @@
 
 // Fill list by appending items from array of strings
 FXint FXListBox::fillItems(const FXchar *const *strings,FXIcon* icon,FXptr ptr,FXbool notify){
-  register FXint numberofitems=list->getNumItems();
-  register FXint n=list->fillItems(strings,icon,ptr,notify);
+  FXint numberofitems=list->getNumItems();
+  FXint n=list->fillItems(strings,icon,ptr,notify);
   if(numberofitems<=list->getCurrentItem()){
     field->setIcon(list->getItemIcon(list->getCurrentItem()));
     field->setText(list->getItemText(list->getCurrentItem()));
@@ -386,8 +386,8 @@
 
 // Fill list by appending items from array of strings
 FXint FXListBox::fillItems(const FXString* strings,FXIcon* icon,FXptr ptr,FXbool notify){
-  register FXint numberofitems=list->getNumItems();
-  register FXint n=list->fillItems(strings,icon,ptr,notify);
+  FXint numberofitems=list->getNumItems();
+  FXint n=list->fillItems(strings,icon,ptr,notify);
   if(numberofitems<=list->getCurrentItem()){
     field->setIcon(list->getItemIcon(list->getCurrentItem()));
     field->setText(list->getItemText(list->getCurrentItem()));
@@ -399,8 +399,8 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXListBox::fillItems(const FXString& strings,FXIcon* icon,FXptr ptr,FXbool notify){
-  register FXint numberofitems=list->getNumItems();
-  register FXint n=list->fillItems(strings,icon,ptr,notify);
+  FXint numberofitems=list->getNumItems();
+  FXint n=list->fillItems(strings,icon,ptr,notify);
   if(numberofitems<=list->getCurrentItem()){
     field->setIcon(list->getItemIcon(list->getCurrentItem()));
     field->setText(list->getItemText(list->getCurrentItem()));
@@ -469,8 +469,8 @@
 
 // Extract item from list
 FXListItem* FXListBox::extractItem(FXint index,FXbool notify){
-  register FXint current=list->getCurrentItem();
-  register FXListItem *result=list->extractItem(index,notify);
+  FXint current=list->getCurrentItem();
+  FXListItem *result=list->extractItem(index,notify);
   if(index==current){
     current=list->getCurrentItem();
     if(0<=current){
@@ -489,7 +489,7 @@
 
 // Remove given item
 void FXListBox::removeItem(FXint index,FXbool notify){
-  register FXint current=list->getCurrentItem();
+  FXint current=list->getCurrentItem();
   list->removeItem(index,notify);
   if(index==current){
     current=list->getCurrentItem();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXLocale.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXLocale.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMDIButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMDIButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMDIChild.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMDIChild.cpp Changed

@@ -3,7 +3,7 @@
 *          M u l t i p l e   D o c u m e n t   C h i l d   W i n d o w          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -717,7 +717,7 @@
 
 // Pressed LEFT button
 long FXMDIChild::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -752,7 +752,7 @@
 
 // Released LEFT button
 long FXMDIChild::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   if(isEnabled()){
     ungrab();
     if(target && target->tryHandle(this,FXSEL(SEL_LEFTBUTTONRELEASE,message),ptr)) return 1;
@@ -788,9 +788,9 @@
 
 // Moved
 long FXMDIChild::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint tmp,mousex,mousey;
-  register FXint oldx,oldy,oldw,oldh;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint tmp,mousex,mousey;
+  FXint oldx,oldy,oldw,oldh;
   if(mode!=DRAG_NONE){
 
     // Mouse in FXMDIClient's coordinates

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMDIClient.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMDIClient.cpp Changed

@@ -3,7 +3,7 @@
 *          M u l t i p l e   D o c u m e n t   C l i e n t   W i n d o w        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -178,8 +178,8 @@
 
 // Recalculate layout
 void FXMDIClient::layout(){
-  register FXMDIChild* child;
-  register FXint xx,yy,ww,hh;
+  FXMDIChild* child;
+  FXint xx,yy,ww,hh;
 
   // Place children
   for(child=(FXMDIChild*)getFirst(); child; child=(FXMDIChild*)child->getNext()){
@@ -233,7 +233,7 @@
 // Pass message to all MDI windows; the crufty loop is because
 // it is possible for the child receiving the message to be deleted
 long FXMDIClient::forallWindows(FXObject* sender,FXSelector sel,void* ptr){
-  register FXWindow *child,*nextchild;
+  FXWindow *child,*nextchild;
   for(child=getFirst(); child; child=nextchild){
     nextchild=child->getNext();
     if(!child->handle(sender,sel,ptr)) return 0;
@@ -247,7 +247,7 @@
 // document may be deleted; also, we want to send only ONE of the
 // document-sharing children a message.
 long FXMDIClient::forallDocuments(FXObject* sender,FXSelector sel,void* ptr){
-  register FXWindow *child,*nextchild,*ch;
+  FXWindow *child,*nextchild,*ch;
   for(child=getFirst(); child; child=nextchild){
     nextchild=child->getNext();
 x:  if(nextchild && nextchild->getTarget()){
@@ -267,7 +267,7 @@
 // Pass message to all MDI windows whose target is document;
 // note that the child may be deleted as a result of the message.
 long FXMDIClient::forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr){
-  register FXWindow *child,*nextchild;
+  FXWindow *child,*nextchild;
   for(child=getFirst(); child; child=nextchild){
     nextchild=child->getNext();
     if(child->getTarget()==document){
@@ -341,7 +341,7 @@
 
 // Cascade windows
 void FXMDIClient::cascade(FXbool notify){
-  register FXMDIChild* child;
+  FXMDIChild* child;
   FXint childx,childy,childw,childh;
   childx=5;
   childy=5;
@@ -369,8 +369,8 @@
 
 // Layout horizontally
 void FXMDIClient::horizontal(FXbool notify){
-  register FXMDIChild* child;
-  register FXint n,nr,nc,hroom,vroom,r,c;
+  FXMDIChild* child;
+  FXint n,nr,nc,hroom,vroom,r,c;
   for(n=0,child=(FXMDIChild*)getFirst(); child; child=(FXMDIChild*)child->getNext()){
     if(child->shown() && !child->isMinimized()) n++;
     }
@@ -399,8 +399,8 @@
 
 // Layout vertically
 void FXMDIClient::vertical(FXbool notify){
-  register FXMDIChild* child;
-  register FXint n,nr,nc,hroom,vroom,r,c;
+  FXMDIChild* child;
+  FXint n,nr,nc,hroom,vroom,r,c;
   for(n=0,child=(FXMDIChild*)getFirst(); child; child=(FXMDIChild*)child->getNext()){
     if(child->shown() && !child->isMinimized()) n++;
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMainWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMainWindow.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMat2d.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMat2d.cpp Changed

@@ -3,7 +3,7 @@
 *            D o u b l e - P r e c i s i o n   2 x 2   M a t r i x              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -46,7 +46,9 @@
 
 // Initialize matrix from scalar
 FXMat2d::FXMat2d(FXdouble s){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set1_pd(s));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set1_pd(s));
   _mm_storeu_pd(&m10,_mm_set1_pd(s));
 #else
@@ -124,7 +126,9 @@
 
 // Assign from scalar
 FXMat2d& FXMat2d::operator=(FXdouble s){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set1_pd(s));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set1_pd(s));
   _mm_storeu_pd(&m10,_mm_set1_pd(s));
 #else
@@ -180,7 +184,9 @@
 
 // Set value from scalar
 FXMat2d& FXMat2d::set(FXdouble s){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set1_pd(s));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set1_pd(s));
   _mm_storeu_pd(&m10,_mm_set1_pd(s));
 #else
@@ -311,12 +317,12 @@
 // Multiply matrix by matrix
 FXMat2d& FXMat2d::operator*=(const FXMat2d& s){
 #if defined(FOX_HAS_SSE2)
-  register __m128d s0=_mm_loadu_pd(&s00);
-  register __m128d s1=_mm_loadu_pd(&s10);
+  __m128d s0=_mm_loadu_pd(&s00);
+  __m128d s1=_mm_loadu_pd(&s10);
   _mm_storeu_pd(&m00,_mm_add_pd(_mm_mul_pd(_mm_set1_pd(m00),s0),_mm_mul_pd(_mm_set1_pd(m01),s1)));
   _mm_storeu_pd(&m10,_mm_add_pd(_mm_mul_pd(_mm_set1_pd(m10),s0),_mm_mul_pd(_mm_set1_pd(m11),s1)));
 #else
-  register FXdouble m00=m00,m01=m01,m10=m10,m11=m11;
+  FXdouble m00=m00,m01=m01,m10=m10,m11=m11;
   m00=m00*s00+m01*s10;
   m01=m00*s01+m01*s11;
   m10=m10*s00+m11*s10;
@@ -382,14 +388,14 @@
 // Rotate by cosine, sine
 FXMat2d& FXMat2d::rot(FXdouble c,FXdouble s){
 #if defined(FOX_HAS_SSE2)
-  register __m128d cc=_mm_set1_pd(c);
-  register __m128d ss=_mm_set1_pd(s);
-  register __m128d uu=_mm_loadu_pd(&m00);
-  register __m128d vv=_mm_loadu_pd(&m10);
+  __m128d cc=_mm_set1_pd(c);
+  __m128d ss=_mm_set1_pd(s);
+  __m128d uu=_mm_loadu_pd(&m00);
+  __m128d vv=_mm_loadu_pd(&m10);
   _mm_storeu_pd(&m00,_mm_add_pd(_mm_mul_pd(cc,uu),_mm_mul_pd(ss,vv)));
   _mm_storeu_pd(&m10,_mm_sub_pd(_mm_mul_pd(cc,vv),_mm_mul_pd(ss,uu)));
 #else
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m00; v=m10; m00=c*u+s*v; m10=c*v-s*u;
   u=m01; v=m11; m01=c*u+s*v; m11=c*v-s*u;
 #endif
@@ -447,7 +453,7 @@
 
 // Invert matrix
 FXMat2d FXMat2d::invert() const {
-  register FXdouble dd=m00*m11-m01*m10;
+  FXdouble dd=m00*m11-m01*m10;
   return FXMat2d(m11/dd,-m01/dd,-m10/dd,m00/dd);
   }
 
@@ -455,9 +461,9 @@
 // Matrix times vector
 FXVec2d operator*(const FXMat2d& m,const FXVec2d& v){
 #if defined(FOX_HAS_SSE3)
-  register __m128d vv=_mm_loadu_pd(v);
-  register __m128d r0=_mm_mul_pd(_mm_loadu_pd(&m00),vv);
-  register __m128d r1=_mm_mul_pd(_mm_loadu_pd(&m10),vv);
+  __m128d vv=_mm_loadu_pd(v);
+  __m128d r0=_mm_mul_pd(_mm_loadu_pd(&m00),vv);
+  __m128d r1=_mm_mul_pd(_mm_loadu_pd(&m10),vv);
   FXVec2d r;
   _mm_storeu_pd(&r0,_mm_hadd_pd(r0,r1));
   return r;
@@ -471,8 +477,8 @@
 FXVec2d operator*(const FXVec2d& v,const FXMat2d& m){
 #if defined(FOX_HAS_SSE2)
   FXVec2d r;
-  register __m128d r0=_mm_mul_pd(_mm_set1_pd(v0),_mm_loadu_pd(&m00));
-  register __m128d r1=_mm_mul_pd(_mm_set1_pd(v1),_mm_loadu_pd(&m10));
+  __m128d r0=_mm_mul_pd(_mm_set1_pd(v0),_mm_loadu_pd(&m00));
+  __m128d r1=_mm_mul_pd(_mm_set1_pd(v1),_mm_loadu_pd(&m10));
   _mm_storeu_pd(&r0,_mm_add_pd(r0,r1));
   return r;
 #else
@@ -518,8 +524,8 @@
 // Matrix and matrix multiply
 FXMat2d operator*(const FXMat2d& a,const FXMat2d& b){
 #if defined(FOX_HAS_SSE2)
-  register __m128d b0=_mm_loadu_pd(&b00);
-  register __m128d b1=_mm_loadu_pd(&b10);
+  __m128d b0=_mm_loadu_pd(&b00);
+  __m128d b1=_mm_loadu_pd(&b10);
   FXMat2d r;
   _mm_storeu_pd(&r00,_mm_add_pd(_mm_mul_pd(_mm_set1_pd(a00),b0),_mm_mul_pd(_mm_set1_pd(a01),b1)));
   _mm_storeu_pd(&r10,_mm_add_pd(_mm_mul_pd(_mm_set1_pd(a10),b0),_mm_mul_pd(_mm_set1_pd(a11),b1)));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMat2f.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMat2f.cpp Changed

@@ -3,7 +3,7 @@
 *            S i n g l e - P r e c i s i o n   2 x 2   M a t r i x              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -71,8 +71,8 @@
 
 // Initialize from rotation and scaling part of 3x3 matrix
 FXMat2f::FXMat2f(const FXMat3f& s){
-#if defined(FOX_HAS_SSE2)
-  _mm_storeu_si128((__m128i*)&m00,_mm_set_epi64(*((const __m64*)&s10),*((const __m64*)&s00)));
+#if defined(FOX_HAS_SSE)
+  _mm_storeu_ps(&m00,_mm_set_ps(s11,s10,s01,s00));
 #else
   m00=s00; m01=s01;
   m10=s10; m11=s11;
@@ -100,15 +100,19 @@
 
 // Initialize matrix from components
 FXMat2f::FXMat2f(FXfloat a00,FXfloat a01,FXfloat a10,FXfloat a11){
+#if defined(FOX_HAS_SSE)
+  _mm_storeu_ps(&m00,_mm_set_ps(a11,a10,a01,a00));
+#else
   m00=a00; m01=a01;
   m10=a10; m11=a11;
+#endif
   }
 
 
 // Initialize matrix from two vectors
 FXMat2f::FXMat2f(const FXVec2f& a,const FXVec2f& b){
-#if defined(FOX_HAS_SSE2)
-  _mm_storeu_si128((__m128i*)&m00,_mm_set_epi64(*((const __m64*)&b0),*((const __m64*)&a0)));
+#if defined(FOX_HAS_SSE)
+  _mm_storeu_ps(&m00,_mm_set_ps(b1,b0,a1,a0));
 #else
   m0=a;
   m1=b;
@@ -142,8 +146,8 @@
 
 // Assign from rotation and scaling part of 3x3 matrix
 FXMat2f& FXMat2f::operator=(const FXMat3f& s){
-#if defined(FOX_HAS_SSE2)
-  _mm_storeu_si128((__m128i*)&m00,_mm_set_epi64(*((const __m64*)&s10),*((const __m64*)&s00)));
+#if defined(FOX_HAS_SSE)
+  _mm_storeu_ps(&m00,_mm_set_ps(s11,s10,s01,s00));
 #else
   m00=s00; m01=s01;
   m10=s10; m11=s11;
@@ -190,8 +194,8 @@
 
 // Set from rotation and scaling part of 3x3 matrix
 FXMat2f& FXMat2f::set(const FXMat3f& s){
-#if defined(FOX_HAS_SSE2)
-  _mm_storeu_si128((__m128i*)&m00,_mm_set_epi64(*((const __m64*)&s10),*((const __m64*)&s00)));
+#if defined(FOX_HAS_SSE)
+  _mm_storeu_ps(&m00,_mm_set_ps(s11,s10,s01,s00));
 #else
   m00=s00; m01=s01;
   m10=s10; m11=s11;
@@ -230,8 +234,8 @@
 
 // Set value from two vectors
 FXMat2f& FXMat2f::set(const FXVec2f& a,const FXVec2f& b){
-#if defined(FOX_HAS_SSE2)
-  _mm_storeu_si128((__m128i*)&m00,_mm_set_epi64(*((const __m64*)&b0),*((const __m64*)&a0)));
+#if defined(FOX_HAS_SSE)
+  _mm_storeu_ps(&m00,_mm_set_ps(b1,b0,a1,a0));
 #else
   m0=a;
   m1=b;
@@ -279,14 +283,14 @@
 // Multiply matrix by matrix
 FXMat2f& FXMat2f::operator*=(const FXMat2f& s){
 #if defined(FOX_HAS_SSE2)
-  register __m128 m0=_mm_loadu_ps(&m00);
-  register __m128 ss=_mm_loadu_ps(&s00);
-  register __m128 m1=_mm_shufd_ps(m0,_MM_SHUFFLE(2,3,0,1));
-  register __m128 s0=_mm_shufd_ps(ss,_MM_SHUFFLE(3,0,3,0));
-  register __m128 s1=_mm_shufd_ps(ss,_MM_SHUFFLE(1,2,1,2));
+  __m128 m0=_mm_loadu_ps(&m00);
+  __m128 ss=_mm_loadu_ps(&s00);
+  __m128 m1=_mm_shufd_ps(m0,_MM_SHUFFLE(2,3,0,1));
+  __m128 s0=_mm_shufd_ps(ss,_MM_SHUFFLE(3,0,3,0));
+  __m128 s1=_mm_shufd_ps(ss,_MM_SHUFFLE(1,2,1,2));
   _mm_storeu_ps(&m00,_mm_add_ps(_mm_mul_ps(m0,s0),_mm_mul_ps(m1,s1)));
 #else
-  register FXfloat m00=m00,m01=m01,m10=m10,m11=m11;
+  FXfloat m00=m00,m01=m01,m10=m10,m11=m11;
   m00=m00*s00+m01*s10;
   m01=m00*s01+m01*s11;
   m10=m10*s00+m11*s10;
@@ -341,13 +345,13 @@
 // Rotate by cosine, sine
 FXMat2f& FXMat2f::rot(FXfloat c,FXfloat s){
 #if defined(FOX_HAS_SSE2)
-  register __m128 cc=_mm_set1_ps(c);
-  register __m128 ss=_mm_set1_ps(s);
-  register __m128 uv=_mm_loadu_ps(&m00);
-  register __m128 vu=_mm_shufd_ps(uv,_MM_SHUFFLE(1,0,3,2));
+  __m128 cc=_mm_set1_ps(c);
+  __m128 ss=_mm_set1_ps(s);
+  __m128 uv=_mm_loadu_ps(&m00);
+  __m128 vu=_mm_shufd_ps(uv,_MM_SHUFFLE(1,0,3,2));
   _mm_storeu_ps(&m00,_mm_add_ps(_mm_mul_ps(cc,uv),_mm_xor_ps(_mm_mul_ps(ss,vu),_mm_castsi128_ps(_mm_set_epi32(0x80000000,0x80000000,0,0)))));
 #else
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m00; v=m10; m00=c*u+s*v; m10=c*v-s*u;
   u=m01; v=m11; m01=c*u+s*v; m11=c*v-s*u;
 #endif
@@ -395,7 +399,7 @@
 FXMat2f FXMat2f::transpose() const {
 #if defined(FOX_HAS_SSE2)
   FXMat2f r;
-  register __m128 mm=_mm_loadu_ps(&m00);
+  __m128 mm=_mm_loadu_ps(&m00);
   _mm_storeu_ps(&r00,_mm_shufd_ps(mm,_MM_SHUFFLE(3,1,2,0)));
   return r;
 #else
@@ -406,7 +410,7 @@
 
 // Invert matrix
 FXMat2f FXMat2f::invert() const {
-  register FXfloat dd=m00*m11-m01*m10;
+  FXfloat dd=m00*m11-m01*m10;
   return FXMat2f(m11/dd,-m01/dd,-m10/dd,m00/dd);
   }
 
@@ -414,9 +418,9 @@
 // Matrix times vector
 FXVec2f operator*(const FXMat2f& m,const FXVec2f& v){
 #if defined(FOX_HAS_SSE3)
-  register __m128 mm=_mm_loadu_ps(&m00);
-  register __m128 vv=_mm_castsi128_ps(_mm_set1_epi64(*((const __m64*)&v0)));
-  register __m128 rr=_mm_mul_ps(mm,vv);
+  __m128 mm=_mm_loadu_ps(&m00);
+  __m128 vv=_mm_castsi128_ps(_mm_set1_epi64(*((const __m64*)&v0)));
+  __m128 rr=_mm_mul_ps(mm,vv);
   FXVec2f r;
   _mm_storel_pi((__m64*)&r0,_mm_hadd_ps(rr,rr));
   return r;
@@ -429,9 +433,9 @@
 // Vector times matrix
 FXVec2f operator*(const FXVec2f& v,const FXMat2f& m){
 #if defined(FOX_HAS_SSE3)
-  register __m128 mm=_mm_loadu_ps(&m00);
-  register __m128 vv=_mm_castsi128_ps(_mm_set1_epi64(*((const __m64*)&v0)));
-  register __m128 rr=_mm_mul_ps(_mm_shufd_ps(mm,_MM_SHUFFLE(3,1,2,0)),vv);
+  __m128 mm=_mm_loadu_ps(&m00);
+  __m128 vv=_mm_castsi128_ps(_mm_set1_epi64(*((const __m64*)&v0)));
+  __m128 rr=_mm_mul_ps(_mm_shufd_ps(mm,_MM_SHUFFLE(3,1,2,0)),vv);
   FXVec2f r;
   _mm_storel_pi((__m64*)&r0,_mm_hadd_ps(rr,rr));
   return r;
@@ -468,11 +472,11 @@
 // Matrix and matrix multiply
 FXMat2f operator*(const FXMat2f& a,const FXMat2f& b){
 #if defined(FOX_HAS_SSE2)
-  register __m128 m0=_mm_loadu_ps(&a00);
-  register __m128 ww=_mm_loadu_ps(&b00);
-  register __m128 m1=_mm_shufd_ps(m0,_MM_SHUFFLE(2,3,0,1));
-  register __m128 w0=_mm_shufd_ps(ww,_MM_SHUFFLE(3,0,3,0));
-  register __m128 w1=_mm_shufd_ps(ww,_MM_SHUFFLE(1,2,1,2));
+  __m128 m0=_mm_loadu_ps(&a00);
+  __m128 ww=_mm_loadu_ps(&b00);
+  __m128 m1=_mm_shufd_ps(m0,_MM_SHUFFLE(2,3,0,1));
+  __m128 w0=_mm_shufd_ps(ww,_MM_SHUFFLE(3,0,3,0));
+  __m128 w1=_mm_shufd_ps(ww,_MM_SHUFFLE(1,2,1,2));
   FXMat2f r;
   _mm_storeu_ps(&r00,_mm_add_ps(_mm_mul_ps(m0,w0),_mm_mul_ps(m1,w1)));
   return r;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMat3d.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMat3d.cpp Changed

@@ -3,7 +3,7 @@
 *            D o u b l e - P r e c i s i o n   3 x 3   M a t r i x              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -51,15 +51,33 @@
 // Mask bottom 3 elements
 #define MMM _mm256_set_epi64x(0,~0,~0,~0)
 
+// More palatable syntax
+#define _mm256_storeu_sd(p,x) _mm_storel_pd(p,_mm256_castpd256_pd128(x))
+#define _mm256_loadu_sd(p)    _mm256_castpd128_pd256(_mm_load_sd(p))
+
+#define _mm256_store_sd(p,x)  _mm_storel_pd(p,_mm256_castpd256_pd128(x))
+#define _mm256_load_sd(p)     _mm256_castpd128_pd256(_mm_load_sd(p))
+
+#define _mm256_div_sd(a,b)    _mm256_castpd128_pd256(_mm_div_sd(_mm256_castpd256_pd128(a),_mm256_castpd256_pd128(b)))
+#define _mm256_mul_sd(a,b)    _mm256_castpd128_pd256(_mm_mul_sd(_mm256_castpd256_pd128(a),_mm256_castpd256_pd128(b)))
+#define _mm256_add_sd(a,b)    _mm256_castpd128_pd256(_mm_add_sd(_mm256_castpd256_pd128(a),_mm256_castpd256_pd128(b)))
+#define _mm256_sub_sd(a,b)    _mm256_castpd128_pd256(_mm_sub_sd(_mm256_castpd256_pd128(a),_mm256_castpd256_pd128(b)))
+
+#define _mm_storeu_sd(p,x)    _mm_store_sd(p,x)
+#define _mm_loadu_sd(p)       _mm_load_sd(p)
 
 // Initialize matrix from scalar
 FXMat3d::FXMat3d(FXdouble s){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set1_pd(s));
+  _mm256_storeu_pd(&m11,_mm256_set1_pd(s));
+  _mm256_storeu_sd(&m11,_mm256_set1_pd(s));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set1_pd(s));
   _mm_storeu_pd(&m02,_mm_set1_pd(s));
   _mm_storeu_pd(&m11,_mm_set1_pd(s));
   _mm_storeu_pd(&m20,_mm_set1_pd(s));
-  _mm_store_sd(&m22,_mm_set1_pd(s));
+  _mm_storeu_sd(&m22,_mm_set1_pd(s));
 #else
   m00=s; m01=s; m02=s;
   m10=s; m11=s; m12=s;
@@ -81,13 +99,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_loadu_pd(&s00));
   _mm256_storeu_pd(&m11,_mm256_loadu_pd(&s11));
-  _mm_store_sd(&m22,_mm_load_sd(&s22));
+  _mm256_storeu_sd(&m22,_mm256_loadu_sd(&s22));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_loadu_pd(&s00));
   _mm_storeu_pd(&m02,_mm_loadu_pd(&s02));
   _mm_storeu_pd(&m11,_mm_loadu_pd(&s11));
   _mm_storeu_pd(&m20,_mm_loadu_pd(&s20));
-  _mm_store_sd(&m22,_mm_load_sd(&s22));
+  _mm_storeu_sd(&m22,_mm_loadu_sd(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -98,10 +116,10 @@
 
 // Initialize from rotation and scaling part of 4x4 matrix
 FXMat3d::FXMat3d(const FXMat4d& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_maskstore_pd(&m00,MMM,_mm256_loadu_pd(&s00));
-  _mm256_maskstore_pd(&m10,MMM,_mm256_loadu_pd(&s10));
-  _mm256_maskstore_pd(&m20,MMM,_mm256_loadu_pd(&s20));
+#if defined(FOX_HAS_SSE2)
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&s00)); _mm_store_sd(&m02,_mm_load_sd(&s02));
+  _mm_storeu_pd(&m10,_mm_loadu_pd(&s10)); _mm_store_sd(&m12,_mm_load_sd(&s12));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&s20)); _mm_store_sd(&m22,_mm_load_sd(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -113,15 +131,15 @@
 // Initialize matrix from array
 FXMat3d::FXMat3d(const FXdouble s){
 #if defined(FOX_HAS_AVX)
-  _mm256_storeu_pd(&m00,_mm256_loadu_pd(s+0));
-  _mm256_storeu_pd(&m11,_mm256_loadu_pd(s+4));
-  _mm_store_sd(&m22,_mm_load_sd(s+8));
+  _mm256_storeu_pd(&m00,_mm256_loadu_pd(&s0));
+  _mm256_storeu_pd(&m11,_mm256_loadu_pd(&s4));
+  _mm256_storeu_sd(&m22,_mm256_loadu_sd(&s8));
 #elif defined(FOX_HAS_SSE2)
-  _mm_storeu_pd(&m00,_mm_loadu_pd(s+0));
-  _mm_storeu_pd(&m02,_mm_loadu_pd(s+2));
-  _mm_storeu_pd(&m11,_mm_loadu_pd(s+4));
-  _mm_storeu_pd(&m20,_mm_loadu_pd(s+6));
-  _mm_store_sd(&m22,_mm_load_sd(s+8));
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&s0));
+  _mm_storeu_pd(&m02,_mm_loadu_pd(&s2));
+  _mm_storeu_pd(&m11,_mm_loadu_pd(&s4));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&s6));
+  _mm_storeu_sd(&m22,_mm_loadu_sd(&s8));
 #else
   m00=s0; m01=s1; m02=s2;
   m10=s3; m11=s4; m12=s5;
@@ -148,10 +166,10 @@
 
 // Initialize matrix from three vectors
 FXMat3d::FXMat3d(const FXVec3d& a,const FXVec3d& b,const FXVec3d& c){
-#if defined(FOX_HAS_AVX)
-  _mm256_maskstore_pd(&m00,MMM,_mm256_maskload_pd(a,MMM));
-  _mm256_maskstore_pd(&m10,MMM,_mm256_maskload_pd(b,MMM));
-  _mm256_maskstore_pd(&m20,MMM,_mm256_maskload_pd(c,MMM));
+#if defined(FOX_HAS_SSE2)
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&a0)); _mm_store_sd(&m02,_mm_load_sd(&a2));
+  _mm_storeu_pd(&m10,_mm_loadu_pd(&b0)); _mm_store_sd(&m12,_mm_load_sd(&b2));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&c0)); _mm_store_sd(&m22,_mm_load_sd(&c2));
 #else
   m0=a;
   m1=b;
@@ -168,12 +186,16 @@
 
 // Assign from scalar
 FXMat3d& FXMat3d::operator=(FXdouble s){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set1_pd(s));
+  _mm256_storeu_pd(&m11,_mm256_set1_pd(s));
+  _mm256_storeu_sd(&m11,_mm256_set1_pd(s));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set1_pd(s));
   _mm_storeu_pd(&m02,_mm_set1_pd(s));
   _mm_storeu_pd(&m11,_mm_set1_pd(s));
   _mm_storeu_pd(&m20,_mm_set1_pd(s));
-  _mm_store_sd(&m22,_mm_set1_pd(s));
+  _mm_storeu_sd(&m22,_mm_set1_pd(s));
 #else
   m00=s; m01=s; m02=s;
   m10=s; m11=s; m12=s;
@@ -197,13 +219,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_loadu_pd(&s00));
   _mm256_storeu_pd(&m11,_mm256_loadu_pd(&s11));
-  _mm_store_sd(&m22,_mm_load_sd(&s22));
+  _mm256_storeu_sd(&m22,_mm256_loadu_sd(&s22));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_loadu_pd(&s00));
   _mm_storeu_pd(&m02,_mm_loadu_pd(&s02));
   _mm_storeu_pd(&m11,_mm_loadu_pd(&s11));
   _mm_storeu_pd(&m20,_mm_loadu_pd(&s20));
-  _mm_store_sd(&m22,_mm_load_sd(&s22));
+  _mm_storeu_sd(&m22,_mm_loadu_sd(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -215,10 +237,10 @@
 
 // Assign from rotation and scaling part of 4x4 matrix
 FXMat3d& FXMat3d::operator=(const FXMat4d& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_maskstore_pd(&m00,MMM,_mm256_loadu_pd(&s00));
-  _mm256_maskstore_pd(&m10,MMM,_mm256_loadu_pd(&s10));
-  _mm256_maskstore_pd(&m20,MMM,_mm256_loadu_pd(&s20));
+#if defined(FOX_HAS_SSE2)
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&s00)); _mm_store_sd(&m02,_mm_load_sd(&s02));
+  _mm_storeu_pd(&m10,_mm_loadu_pd(&s10)); _mm_store_sd(&m12,_mm_load_sd(&s12));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&s20)); _mm_store_sd(&m22,_mm_load_sd(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -238,15 +260,15 @@
 // Assignment from array
 FXMat3d& FXMat3d::operator=(const FXdouble s){
 #if defined(FOX_HAS_AVX)
-  _mm256_storeu_pd(&m00,_mm256_loadu_pd(s+0));
-  _mm256_storeu_pd(&m11,_mm256_loadu_pd(s+4));
-  _mm_store_sd(&m22,_mm_load_sd(s+8));
+  _mm256_storeu_pd(&m00,_mm256_loadu_pd(&s0));
+  _mm256_storeu_pd(&m11,_mm256_loadu_pd(&s4));
+  _mm256_storeu_sd(&m22,_mm256_loadu_sd(&s8));
 #elif defined(FOX_HAS_SSE2)
-  _mm_storeu_pd(&m00,_mm_loadu_pd(s+0));
-  _mm_storeu_pd(&m02,_mm_loadu_pd(s+2));
-  _mm_storeu_pd(&m11,_mm_loadu_pd(s+4));
-  _mm_storeu_pd(&m20,_mm_loadu_pd(s+6));
-  _mm_store_sd(&m22,_mm_load_sd(s+8));
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&s0));
+  _mm_storeu_pd(&m02,_mm_loadu_pd(&s2));
+  _mm_storeu_pd(&m11,_mm_loadu_pd(&s4));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&s6));
+  _mm_storeu_sd(&m22,_mm_loadu_sd(&s8));
 #else
   m00=s0; m01=s1; m02=s2;
   m10=s3; m11=s4; m12=s5;
@@ -258,12 +280,16 @@
 
 // Set value from scalar
 FXMat3d& FXMat3d::set(FXdouble s){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set1_pd(s));
+  _mm256_storeu_pd(&m11,_mm256_set1_pd(s));
+  _mm256_storeu_sd(&m11,_mm256_set1_pd(s));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set1_pd(s));
   _mm_storeu_pd(&m02,_mm_set1_pd(s));
   _mm_storeu_pd(&m11,_mm_set1_pd(s));
   _mm_storeu_pd(&m20,_mm_set1_pd(s));
-  _mm_store_sd(&m22,_mm_set1_pd(s));
+  _mm_storeu_sd(&m22,_mm_set1_pd(s));
 #else
   m00=s; m01=s; m02=s;
   m10=s; m11=s; m12=s;
@@ -287,13 +313,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_loadu_pd(&s00));
   _mm256_storeu_pd(&m11,_mm256_loadu_pd(&s11));
-  _mm_store_sd(&m22,_mm_load_sd(&s22));
+  _mm256_storeu_sd(&m22,_mm256_loadu_sd(&s22));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_loadu_pd(&s00));
   _mm_storeu_pd(&m02,_mm_loadu_pd(&s02));
   _mm_storeu_pd(&m11,_mm_loadu_pd(&s11));
   _mm_storeu_pd(&m20,_mm_loadu_pd(&s20));
-  _mm_store_sd(&m22,_mm_load_sd(&s22));
+  _mm_storeu_sd(&m22,_mm_loadu_sd(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -305,10 +331,10 @@
 
 // Set from rotation and scaling part of 4x4 matrix
 FXMat3d& FXMat3d::set(const FXMat4d& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_maskstore_pd(&m00,MMM,_mm256_loadu_pd(&s00));
-  _mm256_maskstore_pd(&m10,MMM,_mm256_loadu_pd(&s10));
-  _mm256_maskstore_pd(&m20,MMM,_mm256_loadu_pd(&s20));
+#if defined(FOX_HAS_SSE2)
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&s00)); _mm_store_sd(&m02,_mm_load_sd(&s02));
+  _mm_storeu_pd(&m10,_mm_loadu_pd(&s10)); _mm_store_sd(&m12,_mm_load_sd(&s12));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&s20)); _mm_store_sd(&m22,_mm_load_sd(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -321,15 +347,15 @@
 // Set value from array
 FXMat3d& FXMat3d::set(const FXdouble s){
 #if defined(FOX_HAS_AVX)
-  _mm256_storeu_pd(&m00,_mm256_loadu_pd(s+0));
-  _mm256_storeu_pd(&m11,_mm256_loadu_pd(s+4));
-  _mm_store_sd(&m22,_mm_load_sd(s+8));
+  _mm256_storeu_pd(&m00,_mm256_loadu_pd(&s0));
+  _mm256_storeu_pd(&m11,_mm256_loadu_pd(&s4));
+  _mm256_storeu_sd(&m22,_mm256_loadu_sd(&s8));
 #elif defined(FOX_HAS_SSE2)
-  _mm_storeu_pd(&m00,_mm_loadu_pd(s+0));
-  _mm_storeu_pd(&m02,_mm_loadu_pd(s+2));
-  _mm_storeu_pd(&m11,_mm_loadu_pd(s+4));
-  _mm_storeu_pd(&m20,_mm_loadu_pd(s+6));
-  _mm_store_sd(&m22,_mm_load_sd(s+8));
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&s0));
+  _mm_storeu_pd(&m02,_mm_loadu_pd(&s2));
+  _mm_storeu_pd(&m11,_mm_loadu_pd(&s4));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&s6));
+  _mm_storeu_sd(&m22,_mm_loadu_sd(&s8));
 #else
   m00=s0; m01=s1; m02=s2;
   m10=s3; m11=s4; m12=s5;
@@ -359,10 +385,10 @@
 
 // Set value from three vectors
 FXMat3d& FXMat3d::set(const FXVec3d& a,const FXVec3d& b,const FXVec3d& c){
-#if defined(FOX_HAS_AVX)
-  _mm256_maskstore_pd(&m00,MMM,_mm256_maskload_pd(a,MMM));
-  _mm256_maskstore_pd(&m10,MMM,_mm256_maskload_pd(b,MMM));
-  _mm256_maskstore_pd(&m20,MMM,_mm256_maskload_pd(c,MMM));
+#if defined(FOX_HAS_SSE2)
+  _mm_storeu_pd(&m00,_mm_loadu_pd(&a0)); _mm_store_sd(&m02,_mm_load_sd(&a2));
+  _mm_storeu_pd(&m10,_mm_loadu_pd(&b0)); _mm_store_sd(&m12,_mm_load_sd(&b2));
+  _mm_storeu_pd(&m20,_mm_loadu_pd(&c0)); _mm_store_sd(&m22,_mm_load_sd(&c2));
 #else
   m0=a;
   m1=b;
@@ -384,13 +410,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_add_pd(_mm256_loadu_pd(&m00),_mm256_loadu_pd(&w00)));
   _mm256_storeu_pd(&m11,_mm256_add_pd(_mm256_loadu_pd(&m11),_mm256_loadu_pd(&w11)));
-  _mm_store_sd(&m22,_mm_add_sd(_mm_load_sd(&m22),_mm_load_sd(&w22)));
+  _mm256_storeu_sd(&m22,_mm256_add_sd(_mm256_loadu_sd(&m22),_mm256_loadu_sd(&w22)));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_add_pd(_mm_loadu_pd(&m00),_mm_loadu_pd(&w00)));
   _mm_storeu_pd(&m02,_mm_add_pd(_mm_loadu_pd(&m02),_mm_loadu_pd(&w02)));
   _mm_storeu_pd(&m11,_mm_add_pd(_mm_loadu_pd(&m11),_mm_loadu_pd(&w11)));
   _mm_storeu_pd(&m20,_mm_add_pd(_mm_loadu_pd(&m20),_mm_loadu_pd(&w20)));
-  _mm_store_sd(&m22,_mm_add_sd(_mm_load_sd(&m22),_mm_load_sd(&w22)));
+  _mm_storeu_sd(&m22,_mm_add_sd(_mm_loadu_sd(&m22),_mm_loadu_sd(&w22)));
 #else
   m00+=w00; m01+=w01; m02+=w02;
   m10+=w10; m11+=w11; m12+=w12;
@@ -405,13 +431,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_sub_pd(_mm256_loadu_pd(&m00),_mm256_loadu_pd(&w00)));
   _mm256_storeu_pd(&m11,_mm256_sub_pd(_mm256_loadu_pd(&m11),_mm256_loadu_pd(&w11)));
-  _mm_store_sd(&m22,_mm_sub_sd(_mm_load_sd(&m22),_mm_load_sd(&w22)));
+  _mm256_storeu_sd(&m22,_mm256_sub_sd(_mm256_loadu_sd(&m22),_mm256_loadu_sd(&w22)));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_sub_pd(_mm_loadu_pd(&m00),_mm_loadu_pd(&w00)));
   _mm_storeu_pd(&m02,_mm_sub_pd(_mm_loadu_pd(&m02),_mm_loadu_pd(&w02)));
   _mm_storeu_pd(&m11,_mm_sub_pd(_mm_loadu_pd(&m11),_mm_loadu_pd(&w11)));
   _mm_storeu_pd(&m20,_mm_sub_pd(_mm_loadu_pd(&m20),_mm_loadu_pd(&w20)));
-  _mm_store_sd(&m22,_mm_sub_sd(_mm_load_sd(&m22),_mm_load_sd(&w22)));
+  _mm_storeu_sd(&m22,_mm_sub_sd(_mm_loadu_sd(&m22),_mm_loadu_sd(&w22)));
 #else
   m00-=w00; m01-=w01; m02-=w02;
   m10-=w10; m11-=w11; m12-=w12;
@@ -426,13 +452,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_mul_pd(_mm256_loadu_pd(&m00),_mm256_set1_pd(s)));
   _mm256_storeu_pd(&m11,_mm256_mul_pd(_mm256_loadu_pd(&m11),_mm256_set1_pd(s)));
-  _mm_store_sd(&m22,_mm_mul_sd(_mm_load_sd(&m22),_mm_set1_pd(s)));
+  _mm256_storeu_sd(&m22,_mm256_mul_sd(_mm256_loadu_sd(&m22),_mm256_set1_pd(s)));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_mul_pd(_mm_loadu_pd(&m00),_mm_set1_pd(s)));
   _mm_storeu_pd(&m02,_mm_mul_pd(_mm_loadu_pd(&m02),_mm_set1_pd(s)));
   _mm_storeu_pd(&m11,_mm_mul_pd(_mm_loadu_pd(&m11),_mm_set1_pd(s)));
   _mm_storeu_pd(&m20,_mm_mul_pd(_mm_loadu_pd(&m20),_mm_set1_pd(s)));
-  _mm_store_sd(&m22,_mm_mul_sd(_mm_load_sd(&m22),_mm_set1_pd(s)));
+  _mm_storeu_sd(&m22,_mm_mul_sd(_mm_loadu_sd(&m22),_mm_set1_pd(s)));
 #else
   m00*=s; m01*=s; m02*=s;
   m10*=s; m11*=s; m12*=s;
@@ -445,10 +471,10 @@
 // Multiply matrix by matrix
 FXMat3d& FXMat3d::operator*=(const FXMat3d& s){
 #if defined(FOX_HAS_AVX)
-  register __m256d b0=_mm256_maskload_pd(s0,MMM);
-  register __m256d b1=_mm256_maskload_pd(s1,MMM);
-  register __m256d b2=_mm256_maskload_pd(s2,MMM);
-  register __m256d xx,yy,zz;
+  __m256d b0=_mm256_maskload_pd(s0,MMM);
+  __m256d b1=_mm256_maskload_pd(s1,MMM);
+  __m256d b2=_mm256_maskload_pd(s2,MMM);
+  __m256d xx,yy,zz;
   xx=_mm256_set1_pd(m00);
   yy=_mm256_set1_pd(m01);
   zz=_mm256_set1_pd(m02);
@@ -456,20 +482,20 @@
   xx=_mm256_set1_pd(m10);
   yy=_mm256_set1_pd(m11);
   zz=_mm256_set1_pd(m12);
-  _mm256_maskstore_pd(m0,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
+  _mm256_maskstore_pd(m1,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
   xx=_mm256_set1_pd(m20);
   yy=_mm256_set1_pd(m21);
   zz=_mm256_set1_pd(m22);
-  _mm256_maskstore_pd(m0,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
+  _mm256_maskstore_pd(m2,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
   return *this;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d b00=_mm_loadu_pd(&s00);
-  register __m128d b02=_mm_load_sd(&s02);
-  register __m128d b10=_mm_loadu_pd(&s10);
-  register __m128d b12=_mm_load_sd(&s12);
-  register __m128d b20=_mm_loadu_pd(&s20);
-  register __m128d b22=_mm_load_sd(&s22);
-  register __m128d xx,yy,zz;
+  __m128d b00=_mm_loadu_pd(&s00);
+  __m128d b02=_mm_load_sd(&s02);
+  __m128d b10=_mm_loadu_pd(&s10);
+  __m128d b12=_mm_load_sd(&s12);
+  __m128d b20=_mm_loadu_pd(&s20);
+  __m128d b22=_mm_load_sd(&s22);
+  __m128d xx,yy,zz;
   xx=_mm_set1_pd(m00);
   yy=_mm_set1_pd(m01);
   zz=_mm_set1_pd(m02);
@@ -487,7 +513,7 @@
   _mm_store_sd(&m22,_mm_add_sd(_mm_add_sd(_mm_mul_sd(b02,xx),_mm_mul_sd(b12,yy)),_mm_mul_sd(b22,zz)));
   return *this;
 #else
-  register FXdouble x,y,z;
+  FXdouble x,y,z;
   x=m00; y=m01; z=m02;
   m00=x*s00+y*s10+z*s20;
   m01=x*s01+y*s11+z*s21;
@@ -510,13 +536,13 @@
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_pd(&m00,_mm256_div_pd(_mm256_loadu_pd(&m00),_mm256_set1_pd(s)));
   _mm256_storeu_pd(&m11,_mm256_div_pd(_mm256_loadu_pd(&m11),_mm256_set1_pd(s)));
-  _mm_store_sd(&m22,_mm_div_sd(_mm_load_sd(&m22),_mm_set1_pd(s)));
+  _mm256_storeu_sd(&m22,_mm256_div_sd(_mm256_loadu_sd(&m22),_mm256_set1_pd(s)));
 #elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_div_pd(_mm_loadu_pd(&m00),_mm_set1_pd(s)));
   _mm_storeu_pd(&m02,_mm_div_pd(_mm_loadu_pd(&m02),_mm_set1_pd(s)));
   _mm_storeu_pd(&m11,_mm_div_pd(_mm_loadu_pd(&m11),_mm_set1_pd(s)));
   _mm_storeu_pd(&m20,_mm_div_pd(_mm_loadu_pd(&m20),_mm_set1_pd(s)));
-  _mm_store_sd(&m22,_mm_div_sd(_mm_load_sd(&m22),_mm_set1_pd(s)));
+  _mm_storeu_sd(&m22,_mm_div_sd(_mm_loadu_sd(&m22),_mm_set1_pd(s)));
 #else
   m00/=s; m01/=s; m02/=s;
   m10/=s; m11/=s; m12/=s;
@@ -532,7 +558,7 @@
   FXMat3d r;
   _mm256_storeu_pd(&r00,_mm256_sub_pd(_mm256_set1_pd(0.0),_mm256_loadu_pd(&m00)));
   _mm256_storeu_pd(&r11,_mm256_sub_pd(_mm256_set1_pd(0.0),_mm256_loadu_pd(&m11)));
-  _mm_store_sd(&r22,_mm_sub_sd(_mm_set1_pd(0.0),_mm_load_sd(&m22)));
+  _mm256_storeu_sd(&r22,_mm256_sub_sd(_mm256_set1_pd(0.0),_mm256_loadu_sd(&m22)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -540,7 +566,7 @@
   _mm_storeu_pd(&r02,_mm_sub_pd(_mm_set1_pd(0.0),_mm_loadu_pd(&m02)));
   _mm_storeu_pd(&r11,_mm_sub_pd(_mm_set1_pd(0.0),_mm_loadu_pd(&m11)));
   _mm_storeu_pd(&r20,_mm_sub_pd(_mm_set1_pd(0.0),_mm_loadu_pd(&m20)));
-  _mm_store_sd(&r22,_mm_sub_sd(_mm_set1_pd(0.0),_mm_load_sd(&m22)));
+  _mm_storeu_sd(&r22,_mm_sub_sd(_mm_set1_pd(0.0),_mm_loadu_sd(&m22)));
   return r;
 #else
   return FXMat3d(-m00,-m01,-m02,
@@ -552,12 +578,16 @@
 
 // Set to identity matrix
 FXMat3d& FXMat3d::identity(){
-#if defined(FOX_HAS_SSE2)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_pd(&m00,_mm256_set_pd(0.0,0.0,0.0,1.0));
+  _mm256_storeu_pd(&m11,_mm256_set_pd(0.0,0.0,0.0,1.0));
+  _mm256_storeu_sd(&m22,_mm256_set_pd(0.0,0.0,0.0,1.0));
+#elif defined(FOX_HAS_SSE2)
   _mm_storeu_pd(&m00,_mm_set_pd(0.0,1.0));
   _mm_storeu_pd(&m02,_mm_set_pd(0.0,0.0));
   _mm_storeu_pd(&m11,_mm_set_pd(0.0,1.0));
   _mm_storeu_pd(&m20,_mm_set_pd(0.0,0.0));
-  _mm_store_sd(&m22,_mm_set_pd(0.0,1.0));
+  _mm_storeu_sd(&m22,_mm_set_pd(0.0,1.0));
 #else
   m00=1.0; m01=0.0; m02=0.0;
   m10=0.0; m11=1.0; m12=0.0;
@@ -583,16 +613,16 @@
 
 // Multiply by rotation c,s about unit axis
 FXMat3d& FXMat3d::rot(const FXVec3d& v,FXdouble c,FXdouble s){
-  register FXdouble xx=v.x*v.x;
-  register FXdouble yy=v.y*v.y;
-  register FXdouble zz=v.z*v.z;
-  register FXdouble xy=v.x*v.y;
-  register FXdouble yz=v.y*v.z;
-  register FXdouble zx=v.z*v.x;
-  register FXdouble xs=v.x*s;
-  register FXdouble ys=v.y*s;
-  register FXdouble zs=v.z*s;
-  register FXdouble t=1.0-c;
+  FXdouble xx=v.x*v.x;
+  FXdouble yy=v.y*v.y;
+  FXdouble zz=v.z*v.z;
+  FXdouble xy=v.x*v.y;
+  FXdouble yz=v.y*v.z;
+  FXdouble zx=v.z*v.x;
+  FXdouble xs=v.x*s;
+  FXdouble ys=v.y*s;
+  FXdouble zs=v.z*s;
+  FXdouble t=1.0-c;
   return *this*=FXMat3d(t*xx+c,t*xy+zs,t*zx-ys,t*xy-zs,t*yy+c,t*yz+xs,t*zx+ys,t*yz-xs,t*zz+c);
   }
 
@@ -605,7 +635,7 @@
 
 // Rotate about x-axis
 FXMat3d& FXMat3d::xrot(FXdouble c,FXdouble s){
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m10; v=m20; m10=c*u+s*v; m20=c*v-s*u;
   u=m11; v=m21; m11=c*u+s*v; m21=c*v-s*u;
   u=m12; v=m22; m12=c*u+s*v; m22=c*v-s*u;
@@ -621,7 +651,7 @@
 
 // Rotate about y-axis
 FXMat3d& FXMat3d::yrot(FXdouble c,FXdouble s){
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m00; v=m20; m00=c*u-s*v; m20=c*v+s*u;
   u=m01; v=m21; m01=c*u-s*v; m21=c*v+s*u;
   u=m02; v=m22; m02=c*u-s*v; m22=c*v+s*u;
@@ -637,7 +667,7 @@
 
 // Rotate about z-axis
 FXMat3d& FXMat3d::zrot(FXdouble c,FXdouble s){
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m00; v=m10; m00=c*u+s*v; m10=c*v-s*u;
   u=m01; v=m11; m01=c*u+s*v; m11=c*v-s*u;
   u=m02; v=m12; m02=c*u+s*v; m12=c*v-s*u;
@@ -690,7 +720,7 @@
 
 // Invert matrix
 FXMat3d FXMat3d::invert() const {
-  register FXdouble dd;
+  FXdouble dd;
   FXMat3d res;
   res00=m11*m22-m12*m21;
   res01=m02*m21-m01*m22;
@@ -720,11 +750,11 @@
 // Matrix times vector
 FXVec2d operator*(const FXMat3d& m,const FXVec2d& v){
 #if defined(FOX_HAS_SSE3)
-  register __m128d vv=_mm_loadu_pd(&v0);
-  register __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),vv);   // m01*v1  m00*v0
-  register __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),vv);   // m11*v1  m10*v0
-  register __m128d r02=_mm_load_sd(&m02);                   // 0       m02
-  register __m128d r12=_mm_load_sd(&m12);                   // 0       m12
+  __m128d vv=_mm_loadu_pd(&v0);
+  __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),vv);   // m01*v1  m00*v0
+  __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),vv);   // m11*v1  m10*v0
+  __m128d r02=_mm_load_sd(&m02);                   // 0       m02
+  __m128d r12=_mm_load_sd(&m12);                   // 0       m12
   FXVec2d r;
   r00=_mm_hadd_pd(r00,r02);     // m02  m01*v1+m00*v0
   r10=_mm_hadd_pd(r10,r12);     // m12  m11*v1+m10*v0
@@ -740,14 +770,14 @@
 // Matrix times vector
 FXVec3d operator*(const FXMat3d& m,const FXVec3d& v){
 #if defined(FOX_HAS_SSE3)
-  register __m128d v0=_mm_loadu_pd(&v0);
-  register __m128d v1=_mm_load_sd(&v2);
-  register __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),v0);   // m01*v1  m00*v0
-  register __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),v0);   // m11*v1  m10*v0
-  register __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),v0);   // m21*v1  m20*v0
-  register __m128d r02=_mm_mul_pd(_mm_load_sd(&m02),v1);    // 0       m02*v2
-  register __m128d r12=_mm_mul_pd(_mm_load_sd(&m12),v1);    // 0       m12*v2
-  register __m128d r22=_mm_mul_pd(_mm_load_sd(&m22),v1);    // 0       m22*v2
+  __m128d v0=_mm_loadu_pd(&v0);
+  __m128d v1=_mm_load_sd(&v2);
+  __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),v0);   // m01*v1  m00*v0
+  __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),v0);   // m11*v1  m10*v0
+  __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),v0);   // m21*v1  m20*v0
+  __m128d r02=_mm_mul_pd(_mm_load_sd(&m02),v1);    // 0       m02*v2
+  __m128d r12=_mm_mul_pd(_mm_load_sd(&m12),v1);    // 0       m12*v2
+  __m128d r22=_mm_mul_pd(_mm_load_sd(&m22),v1);    // 0       m22*v2
   FXVec3d r;
   r00=_mm_hadd_pd(r00,r02);     // m02*v2  m01*v1+m00*v0
   r10=_mm_hadd_pd(r10,r12);     // m12*v2  m11*v1+m10*v0
@@ -765,11 +795,11 @@
 // Vector times matrix
 FXVec2d operator*(const FXVec2d& v,const FXMat3d& m){
 #if defined(FOX_HAS_SSE2)
-  register __m128d m00=_mm_loadu_pd(&m00);
-  register __m128d m10=_mm_loadu_pd(&m10);
-  register __m128d m20=_mm_loadu_pd(&m20);
-  register __m128d v0=_mm_set1_pd(v0);
-  register __m128d v1=_mm_set1_pd(v1);
+  __m128d m00=_mm_loadu_pd(&m00);
+  __m128d m10=_mm_loadu_pd(&m10);
+  __m128d m20=_mm_loadu_pd(&m20);
+  __m128d v0=_mm_set1_pd(v0);
+  __m128d v1=_mm_set1_pd(v1);
   FXVec2d r;
   _mm_storeu_pd(&r0,_mm_add_pd(_mm_add_pd(_mm_mul_pd(m00,v0),_mm_mul_pd(m10,v1)),m20));
   return r;
@@ -782,25 +812,25 @@
 // Vector times matrix
 FXVec3d operator*(const FXVec3d& v,const FXMat3d& m){
 #if defined(FOX_HAS_AVX)
-  register __m256d m0=_mm256_maskload_pd(m0,MMM);
-  register __m256d m1=_mm256_maskload_pd(m1,MMM);
-  register __m256d m2=_mm256_maskload_pd(m2,MMM);
-  register __m256d v0=_mm256_set1_pd(v0);
-  register __m256d v1=_mm256_set1_pd(v1);
-  register __m256d v2=_mm256_set1_pd(v2);
+  __m256d m0=_mm256_maskload_pd(m0,MMM);
+  __m256d m1=_mm256_maskload_pd(m1,MMM);
+  __m256d m2=_mm256_maskload_pd(m2,MMM);
+  __m256d v0=_mm256_set1_pd(v0);
+  __m256d v1=_mm256_set1_pd(v1);
+  __m256d v2=_mm256_set1_pd(v2);
   FXVec3d r;
   _mm256_maskstore_pd(&r0,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(v0,m0),_mm256_mul_pd(v1,m1)),_mm256_mul_pd(v2,m2)));
   return r;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d m00=_mm_loadu_pd(&m00);
-  register __m128d m10=_mm_loadu_pd(&m10);
-  register __m128d m20=_mm_loadu_pd(&m20);
-  register __m128d m02=_mm_load_sd(&m02);
-  register __m128d m12=_mm_load_sd(&m12);
-  register __m128d m22=_mm_load_sd(&m22);
-  register __m128d v0=_mm_set1_pd(v0);
-  register __m128d v1=_mm_set1_pd(v1);
-  register __m128d v2=_mm_set1_pd(v2);
+  __m128d m00=_mm_loadu_pd(&m00);
+  __m128d m10=_mm_loadu_pd(&m10);
+  __m128d m20=_mm_loadu_pd(&m20);
+  __m128d m02=_mm_load_sd(&m02);
+  __m128d m12=_mm_load_sd(&m12);
+  __m128d m22=_mm_load_sd(&m22);
+  __m128d v0=_mm_set1_pd(v0);
+  __m128d v1=_mm_set1_pd(v1);
+  __m128d v2=_mm_set1_pd(v2);
   FXVec3d r;
   _mm_storeu_pd(&r0,_mm_add_pd(_mm_add_pd(_mm_mul_pd(m00,v0),_mm_mul_pd(m10,v1)),_mm_mul_pd(m20,v2)));
   _mm_store_sd(&r2,_mm_add_sd(_mm_add_sd(_mm_mul_sd(m02,v0),_mm_mul_sd(m12,v1)),_mm_mul_sd(m22,v2)));
@@ -815,9 +845,9 @@
 FXMat3d operator+(const FXMat3d& a,const FXMat3d& b){
 #if defined(FOX_HAS_AVX)
   FXMat3d r;
-  _mm256_storeu_pd(&r00,_mm256_add_pd(_mm256_loadu_pd(&a00),_mm256_loadu_pd(&b00)));
-  _mm256_storeu_pd(&r11,_mm256_add_pd(_mm256_loadu_pd(&a11),_mm256_loadu_pd(&b11)));
-  _mm_store_sd(&r22,_mm_add_sd(_mm_load_sd(&a22),_mm_load_sd(&b22)));
+  _mm256_maskstore_pd(&r00,MMM,_mm256_add_pd(_mm256_maskload_pd(&a00,MMM),_mm256_maskload_pd(&b00,MMM)));
+  _mm256_maskstore_pd(&r10,MMM,_mm256_add_pd(_mm256_maskload_pd(&a10,MMM),_mm256_maskload_pd(&b10,MMM)));
+  _mm256_maskstore_pd(&r20,MMM,_mm256_add_pd(_mm256_maskload_pd(&a20,MMM),_mm256_maskload_pd(&b20,MMM)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -825,7 +855,7 @@
   _mm_storeu_pd(&r02,_mm_add_pd(_mm_loadu_pd(&a02),_mm_loadu_pd(&b02)));
   _mm_storeu_pd(&r11,_mm_add_pd(_mm_loadu_pd(&a11),_mm_loadu_pd(&b11)));
   _mm_storeu_pd(&r20,_mm_add_pd(_mm_loadu_pd(&a20),_mm_loadu_pd(&b20)));
-  _mm_store_sd(&r22,_mm_add_sd(_mm_load_sd(&a22),_mm_load_sd(&b22)));
+  _mm_storeu_sd(&r22,_mm_add_sd(_mm_loadu_sd(&a22),_mm_loadu_sd(&b22)));
   return r;
 #else
   return FXMat3d(a00+b00,a01+b01,a02+b02, a10+b10,a11+b11,a12+b12, a20+b20,a21+b21,a22+b22);
@@ -837,9 +867,9 @@
 FXMat3d operator-(const FXMat3d& a,const FXMat3d& b){
 #if defined(FOX_HAS_AVX)
   FXMat3d r;
-  _mm256_storeu_pd(&r00,_mm256_sub_pd(_mm256_loadu_pd(&a00),_mm256_loadu_pd(&b00)));
-  _mm256_storeu_pd(&r11,_mm256_sub_pd(_mm256_loadu_pd(&a11),_mm256_loadu_pd(&b11)));
-  _mm_store_sd(&r22,_mm_sub_sd(_mm_load_sd(&a22),_mm_load_sd(&b22)));
+  _mm256_maskstore_pd(&r00,MMM,_mm256_sub_pd(_mm256_maskload_pd(&a00,MMM),_mm256_maskload_pd(&b00,MMM)));
+  _mm256_maskstore_pd(&r10,MMM,_mm256_sub_pd(_mm256_maskload_pd(&a10,MMM),_mm256_maskload_pd(&b10,MMM)));
+  _mm256_maskstore_pd(&r20,MMM,_mm256_sub_pd(_mm256_maskload_pd(&a20,MMM),_mm256_maskload_pd(&b20,MMM)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -847,7 +877,7 @@
   _mm_storeu_pd(&r02,_mm_sub_pd(_mm_loadu_pd(&a02),_mm_loadu_pd(&b02)));
   _mm_storeu_pd(&r11,_mm_sub_pd(_mm_loadu_pd(&a11),_mm_loadu_pd(&b11)));
   _mm_storeu_pd(&r20,_mm_sub_pd(_mm_loadu_pd(&a20),_mm_loadu_pd(&b20)));
-  _mm_store_sd(&r22,_mm_sub_sd(_mm_load_sd(&a22),_mm_load_sd(&b22)));
+  _mm_storeu_sd(&r22,_mm_sub_sd(_mm_loadu_sd(&a22),_mm_loadu_sd(&b22)));
   return r;
 #else
   return FXMat3d(a00-b00,a01-b01,a02-b02, a10-b10,a11-b11,a12-b12, a20-b20,a21-b21,a22-b22);
@@ -858,10 +888,10 @@
 // Matrix and matrix multiply
 FXMat3d operator*(const FXMat3d& a,const FXMat3d& b){
 #if defined(FOX_HAS_AVX)
-  register __m256d b0=_mm256_maskload_pd(b0,MMM);
-  register __m256d b1=_mm256_maskload_pd(b0,MMM);
-  register __m256d b2=_mm256_maskload_pd(b0,MMM);
-  register __m256d xx,yy,zz;
+  __m256d b0=_mm256_maskload_pd(b0,MMM);
+  __m256d b1=_mm256_maskload_pd(b0,MMM);
+  __m256d b2=_mm256_maskload_pd(b0,MMM);
+  __m256d xx,yy,zz;
   FXMat3d r;
   xx=_mm256_set1_pd(a00);
   yy=_mm256_set1_pd(a01);
@@ -870,20 +900,20 @@
   xx=_mm256_set1_pd(a10);
   yy=_mm256_set1_pd(a11);
   zz=_mm256_set1_pd(a12);
-  _mm256_maskstore_pd(r0,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
+  _mm256_maskstore_pd(r1,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
   xx=_mm256_set1_pd(a20);
   yy=_mm256_set1_pd(a21);
   zz=_mm256_set1_pd(a22);
-  _mm256_maskstore_pd(r0,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
+  _mm256_maskstore_pd(r2,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_mul_pd(b2,zz)));
   return r;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d b00=_mm_loadu_pd(&b00);
-  register __m128d b10=_mm_loadu_pd(&b10);
-  register __m128d b20=_mm_loadu_pd(&b20);
-  register __m128d b02=_mm_load_sd(&b02);
-  register __m128d b12=_mm_load_sd(&b12);
-  register __m128d b22=_mm_load_sd(&b22);
-  register __m128d xx,yy,zz;
+  __m128d b00=_mm_loadu_pd(&b00);
+  __m128d b10=_mm_loadu_pd(&b10);
+  __m128d b20=_mm_loadu_pd(&b20);
+  __m128d b02=_mm_load_sd(&b02);
+  __m128d b12=_mm_load_sd(&b12);
+  __m128d b22=_mm_load_sd(&b22);
+  __m128d xx,yy,zz;
   FXMat3d r;
   xx=_mm_set1_pd(a00);
   yy=_mm_set1_pd(a01);
@@ -902,7 +932,7 @@
   _mm_store_sd(&r22,_mm_add_sd(_mm_add_sd(_mm_mul_sd(b02,xx),_mm_mul_sd(b12,yy)),_mm_mul_sd(b22,zz)));
   return r;
 #else
-  register FXdouble x,y,z;
+  FXdouble x,y,z;
   FXMat3d r;
   x=a00; y=a01; z=a02;
   r00=x*b00+y*b10+z*b20;
@@ -927,7 +957,7 @@
   FXMat3d r;
   _mm256_storeu_pd(&r00,_mm256_mul_pd(_mm256_set1_pd(x),_mm256_loadu_pd(&m00)));
   _mm256_storeu_pd(&r11,_mm256_mul_pd(_mm256_set1_pd(x),_mm256_loadu_pd(&m11)));
-  _mm_store_sd(&r22,_mm_mul_sd(_mm_set1_pd(x),_mm_load_sd(&m22)));
+  _mm256_storeu_sd(&r22,_mm256_mul_sd(_mm256_set1_pd(x),_mm256_loadu_sd(&m22)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -935,7 +965,7 @@
   _mm_storeu_pd(&r02,_mm_mul_pd(_mm_set1_pd(x),_mm_loadu_pd(&m02)));
   _mm_storeu_pd(&r11,_mm_mul_pd(_mm_set1_pd(x),_mm_loadu_pd(&m11)));
   _mm_storeu_pd(&r20,_mm_mul_pd(_mm_set1_pd(x),_mm_loadu_pd(&m20)));
-  _mm_store_sd(&r22,_mm_mul_sd(_mm_set1_pd(x),_mm_load_sd(&m22)));
+  _mm_storeu_sd(&r22,_mm_mul_sd(_mm_set1_pd(x),_mm_loadu_sd(&m22)));
   return r;
 #else
   return FXMat3d(x*m00,x*m01,x*m02,
@@ -951,7 +981,7 @@
   FXMat3d r;
   _mm256_storeu_pd(&r00,_mm256_mul_pd(_mm256_loadu_pd(&m00),_mm256_set1_pd(x)));
   _mm256_storeu_pd(&r11,_mm256_mul_pd(_mm256_loadu_pd(&m11),_mm256_set1_pd(x)));
-  _mm_store_sd(&r22,_mm_mul_sd(_mm_load_sd(&m22),_mm_set1_pd(x)));
+  _mm256_storeu_sd(&r22,_mm256_mul_sd(_mm256_loadu_sd(&m22),_mm256_set1_pd(x)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -959,7 +989,7 @@
   _mm_storeu_pd(&r02,_mm_mul_pd(_mm_loadu_pd(&m02),_mm_set1_pd(x)));
   _mm_storeu_pd(&r11,_mm_mul_pd(_mm_loadu_pd(&m11),_mm_set1_pd(x)));
   _mm_storeu_pd(&r20,_mm_mul_pd(_mm_loadu_pd(&m20),_mm_set1_pd(x)));
-  _mm_store_sd(&r22,_mm_mul_sd(_mm_load_sd(&m22),_mm_set1_pd(x)));
+  _mm_storeu_sd(&r22,_mm_mul_sd(_mm_loadu_sd(&m22),_mm_set1_pd(x)));
   return r;
 #else
   return FXMat3d(m00*x,m01*x,m02*x,
@@ -975,7 +1005,7 @@
   FXMat3d r;
   _mm256_storeu_pd(&r00,_mm256_div_pd(_mm256_set1_pd(x),_mm256_loadu_pd(&m00)));
   _mm256_storeu_pd(&r11,_mm256_div_pd(_mm256_set1_pd(x),_mm256_loadu_pd(&m11)));
-  _mm_store_sd(&r22,_mm_div_sd(_mm_set1_pd(x),_mm_load_sd(&m22)));
+  _mm256_storeu_sd(&r22,_mm256_div_sd(_mm256_set1_pd(x),_mm256_loadu_sd(&m22)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -983,7 +1013,7 @@
   _mm_storeu_pd(&r02,_mm_div_pd(_mm_set1_pd(x),_mm_loadu_pd(&m02)));
   _mm_storeu_pd(&r11,_mm_div_pd(_mm_set1_pd(x),_mm_loadu_pd(&m11)));
   _mm_storeu_pd(&r20,_mm_div_pd(_mm_set1_pd(x),_mm_loadu_pd(&m20)));
-  _mm_store_sd(&r22,_mm_div_sd(_mm_set1_pd(x),_mm_load_sd(&m22)));
+  _mm_storeu_sd(&r22,_mm_div_sd(_mm_set1_pd(x),_mm_loadu_sd(&m22)));
   return r;
 #else
   return FXMat3d(x/m00,x/m01,x/m02,
@@ -999,7 +1029,7 @@
   FXMat3d r;
   _mm256_storeu_pd(&r00,_mm256_div_pd(_mm256_loadu_pd(&m00),_mm256_set1_pd(x)));
   _mm256_storeu_pd(&r11,_mm256_div_pd(_mm256_loadu_pd(&m11),_mm256_set1_pd(x)));
-  _mm_store_sd(&r22,_mm_div_sd(_mm_load_sd(&m22),_mm_set1_pd(x)));
+  _mm256_storeu_sd(&r22,_mm256_div_sd(_mm256_loadu_sd(&m22),_mm256_set1_pd(x)));
   return r;
 #elif defined(FOX_HAS_SSE2)
   FXMat3d r;
@@ -1007,7 +1037,7 @@
   _mm_storeu_pd(&r02,_mm_div_pd(_mm_loadu_pd(&m02),_mm_set1_pd(x)));
   _mm_storeu_pd(&r11,_mm_div_pd(_mm_loadu_pd(&m11),_mm_set1_pd(x)));
   _mm_storeu_pd(&r20,_mm_div_pd(_mm_loadu_pd(&m20),_mm_set1_pd(x)));
-  _mm_store_sd(&r22,_mm_div_sd(_mm_load_sd(&m22),_mm_set1_pd(x)));
+  _mm_storeu_sd(&r22,_mm_div_sd(_mm_loadu_sd(&m22),_mm_set1_pd(x)));
   return r;
 #else
   return FXMat3d(m00/x,m01/x,m02/x,

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMat3f.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMat3f.cpp Changed

@@ -3,7 +3,7 @@
 *            S i n g l e - P r e c i s i o n   3 x 3   M a t r i x              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -54,10 +54,13 @@
 
 // Initialize matrix from scalar
 FXMat3f::FXMat3f(FXfloat s){
-#if defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_ps(&m00,_mm256_set1_ps(s));
+  _mm_store_ss    (&m22,_mm_set1_ps   (s));
+#elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set1_ps(s));
   _mm_storeu_ps(&m11,_mm_set1_ps(s));
-  _mm_store_ss(&m22,_mm_set1_ps(s));
+  _mm_store_ss (&m22,_mm_set1_ps(s));
 #else
   m00=s; m01=s; m02=s;
   m10=s; m11=s; m12=s;
@@ -78,11 +81,9 @@
 FXMat3f::FXMat3f(const FXMat3f& s){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_loadu_ps(&s00));
-  _mm_store_ss(&m22,_mm_load_ss(&s22));
+  _mm_store_ss    (&m22,_mm_load_ss    (&s22));
 #elif defined(FOX_HAS_SSE)
-  _mm_storeu_ps(&m00,_mm_loadu_ps(&s00));
-  _mm_storeu_ps(&m11,_mm_loadu_ps(&s11));
-  _mm_store_ss(&m22,_mm_load_ss(&s22));
+  _mm_storeu_ps(&m00,_mm_loadu_ps(&s00)); _mm_storeu_ps(&m11,_mm_loadu_ps(&s11)); _mm_store_ss(&m22,_mm_load_ss(&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -109,11 +110,11 @@
 FXMat3f::FXMat3f(const FXfloat s){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_loadu_ps(s+0));
-  _mm_store_ss(&m22,_mm_load_ss(s+8));
+  _mm_store_ss    (&m22,_mm_load_ss    (s+8));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(s+0));
   _mm_storeu_ps(&m11,_mm_loadu_ps(s+4));
-  _mm_store_ss(&m22,_mm_load_ss(s+8));
+  _mm_store_ss (&m22,_mm_load_ss (s+8));
 #else
   m00=s0; m01=s1; m02=s2;
   m10=s3; m11=s4; m12=s5;
@@ -160,10 +161,13 @@
 
 // Assign from scalar
 FXMat3f& FXMat3f::operator=(FXfloat s){
-#if defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_ps(&m00,_mm256_set1_ps(s));
+  _mm_store_ss    (&m22,_mm_set1_ps   (s));
+#elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set1_ps(s));
   _mm_storeu_ps(&m11,_mm_set1_ps(s));
-  _mm_store_ss(&m22,_mm_set1_ps(s));
+  _mm_store_ss (&m22,_mm_set1_ps(s));
 #else
   m00=s; m01=s; m02=s;
   m10=s; m11=s; m12=s;
@@ -186,11 +190,11 @@
 FXMat3f& FXMat3f::operator=(const FXMat3f& s){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_loadu_ps(&s00));
-  _mm_store_ss(&m22,_mm_load_ss(&s22));
+  _mm_store_ss    (&m22,_mm_load_ss    (&s22));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(&s00));
   _mm_storeu_ps(&m11,_mm_loadu_ps(&s11));
-  _mm_store_ss(&m22,_mm_load_ss(&s22));
+  _mm_store_ss (&m22,_mm_load_ss (&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -226,11 +230,11 @@
 FXMat3f& FXMat3f::operator=(const FXfloat s){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_loadu_ps(s+0));
-  _mm_store_ss(&m22,_mm_load_ss(s+8));
+  _mm_store_ss    (&m22,_mm_load_ss    (s+8));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(s+0));
   _mm_storeu_ps(&m11,_mm_loadu_ps(s+4));
-  _mm_store_ss(&m22,_mm_load_ss(s+8));
+  _mm_store_ss (&m22,_mm_load_ss (s+8));
 #else
   m00=s0; m01=s1; m02=s2;
   m10=s3; m11=s4; m12=s5;
@@ -242,10 +246,13 @@
 
 // Set value from scalar
 FXMat3f& FXMat3f::set(FXfloat s){
-#if defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_AVX)
+  _mm256_storeu_ps(&m00,_mm256_set1_ps(s));
+  _mm_store_ss    (&m22,_mm_set1_ps   (s));
+#elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set1_ps(s));
   _mm_storeu_ps(&m11,_mm_set1_ps(s));
-  _mm_store_ss(&m22,_mm_set1_ps(s));
+  _mm_store_ss (&m22,_mm_set1_ps(s));
 #else
   m00=s; m01=s; m02=s;
   m10=s; m11=s; m12=s;
@@ -268,11 +275,11 @@
 FXMat3f& FXMat3f::set(const FXMat3f& s){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_loadu_ps(&s00));
-  _mm_store_ss(&m22,_mm_load_ss(&s22));
+  _mm_store_ss    (&m22,_mm_load_ss    (&s22));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(&s00));
   _mm_storeu_ps(&m11,_mm_loadu_ps(&s11));
-  _mm_store_ss(&m22,_mm_load_ss(&s22));
+  _mm_store_ss (&m22,_mm_load_ss (&s22));
 #else
   m00=s00; m01=s01; m02=s02;
   m10=s10; m11=s11; m12=s12;
@@ -301,11 +308,11 @@
 FXMat3f& FXMat3f::set(const FXfloat s){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_loadu_ps(s+0));
-  _mm_store_ss(&m22,_mm_load_ss(s+8));
+  _mm_store_ss    (&m22,_mm_load_ss    (s+8));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(s+0));
   _mm_storeu_ps(&m11,_mm_loadu_ps(s+4));
-  _mm_store_ss(&m22,_mm_load_ss(s+8));
+  _mm_store_ss (&m22,_mm_load_ss (s+8));
 #else
   m00=s0; m01=s1; m02=s2;
   m10=s3; m11=s4; m12=s5;
@@ -359,11 +366,11 @@
 FXMat3f& FXMat3f::operator+=(const FXMat3f& w){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_add_ps(_mm256_loadu_ps(&m00),_mm256_loadu_ps(&w00)));
-  _mm_store_ss(&m22,_mm_add_ss(_mm_load_ss(&m22),_mm_load_ss(&w22)));
+  _mm_store_ss    (&m22,_mm_add_ss(_mm_load_ss       (&m22),_mm_load_ss    (&w22)));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_add_ps(_mm_loadu_ps(&m00),_mm_loadu_ps(&w00)));
   _mm_storeu_ps(&m11,_mm_add_ps(_mm_loadu_ps(&m11),_mm_loadu_ps(&w11)));
-  _mm_store_ss(&m22,_mm_add_ss(_mm_load_ss (&m22),_mm_load_ss(&w22)));
+  _mm_store_ss (&m22,_mm_add_ss(_mm_load_ss (&m22),_mm_load_ss (&w22)));
 #else
   m00+=w00; m01+=w01; m02+=w02;
   m10+=w10; m11+=w11; m12+=w12;
@@ -377,11 +384,11 @@
 FXMat3f& FXMat3f::operator-=(const FXMat3f& w){
 #if defined(FOX_HAS_AVX)
   _mm256_storeu_ps(&m00,_mm256_sub_ps(_mm256_loadu_ps(&m00),_mm256_loadu_ps(&w00)));
-  _mm_store_ss(&m22,_mm_sub_ss(_mm_load_ss(&m22),_mm_load_ss (&w22)));
+  _mm_store_ss    (&m22,_mm_sub_ss(_mm_load_ss       (&m22),_mm_load_ss    (&w22)));
 #elif defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_sub_ps(_mm_loadu_ps(&m00),_mm_loadu_ps(&w00)));
   _mm_storeu_ps(&m11,_mm_sub_ps(_mm_loadu_ps(&m11),_mm_loadu_ps(&w11)));
-  _mm_store_ss(&m22,_mm_sub_ss(_mm_load_ss(&m22),_mm_load_ss (&w22)));
+  _mm_store_ss (&m22,_mm_sub_ss(_mm_load_ss (&m22),_mm_load_ss (&w22)));
 #else
   m00-=w00; m01-=w01; m02-=w02;
   m10-=w10; m11-=w11; m12-=w12;
@@ -396,7 +403,7 @@
 #if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_mul_ps(_mm_loadu_ps(&m00),_mm_set1_ps(s)));
   _mm_storeu_ps(&m11,_mm_mul_ps(_mm_loadu_ps(&m11),_mm_set1_ps(s)));
-  _mm_store_ss(&m22,_mm_mul_ss(_mm_load_ss(&m22),_mm_set1_ps(s)));
+  _mm_store_ss (&m22,_mm_mul_ss(_mm_load_ss (&m22),_mm_set1_ps(s)));
 #else
   m00*=s; m01*=s; m02*=s;
   m10*=s; m11*=s; m12*=s;
@@ -409,11 +416,11 @@
 // Multiply matrix by matrix
 FXMat3f& FXMat3f::operator*=(const FXMat3f& s){
 #if defined(FOX_HAS_AVX)
-  register __m128 b0=_mm_maskload_ps(&s00,MMM);
-  register __m128 b1=_mm_maskload_ps(&s10,MMM);
-  register __m128 b2=_mm_maskload_ps(&s20,MMM);
-  register __m128 r0,r1,r2;
-  register __m128 xx,yy,zz;
+  __m128 b0=_mm_maskload_ps(&s00,MMM);
+  __m128 b1=_mm_maskload_ps(&s10,MMM);
+  __m128 b2=_mm_maskload_ps(&s20,MMM);
+  __m128 r0,r1,r2;
+  __m128 xx,yy,zz;
   xx=_mm_set1_ps(m00);
   yy=_mm_set1_ps(m01);
   zz=_mm_set1_ps(m02);
@@ -431,11 +438,11 @@
   _mm_maskstore_ps(&m10,MMM,r2);
   return *this;
 #elif defined(FOX_HAS_SSE)
-  register __m128 b0=_mm_loadh_pi(_mm_load_ss(&s02),(const __m64*)&s00);  // s01  s00  0  s02
-  register __m128 b1=_mm_loadh_pi(_mm_load_ss(&s12),(const __m64*)&s10);  // s11  s10  0  s12
-  register __m128 b2=_mm_loadh_pi(_mm_load_ss(&s22),(const __m64*)&s20);  // s21  s20  0  s22
-  register __m128 r0,r1,r2;
-  register __m128 xx,yy,zz;
+  __m128 b0=_mm_loadh_pi(_mm_load_ss(&s02),(const __m64*)&s00);  // s01  s00  0  s02
+  __m128 b1=_mm_loadh_pi(_mm_load_ss(&s12),(const __m64*)&s10);  // s11  s10  0  s12
+  __m128 b2=_mm_loadh_pi(_mm_load_ss(&s22),(const __m64*)&s20);  // s21  s20  0  s22
+  __m128 r0,r1,r2;
+  __m128 xx,yy,zz;
   xx=_mm_set1_ps(m00);
   yy=_mm_set1_ps(m01);
   zz=_mm_set1_ps(m02);
@@ -453,7 +460,7 @@
   _mm_storeh_pi((__m64*)&m20,r2); _mm_store_ss(&m22,r2);
   return *this;
 #else
-  register FXfloat x,y,z;
+  FXfloat x,y,z;
   x=m00; y=m01; z=m02;
   m00=x*s00+y*s10+z*s20;
   m01=x*s01+y*s11+z*s21;
@@ -476,7 +483,7 @@
 #if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_div_ps(_mm_loadu_ps(&m00),_mm_set1_ps(s)));
   _mm_storeu_ps(&m11,_mm_div_ps(_mm_loadu_ps(&m11),_mm_set1_ps(s)));
-  _mm_store_ss(&m22,_mm_div_ss(_mm_load_ss(&m22),_mm_set1_ps(s)));
+  _mm_store_ss (&m22,_mm_div_ss(_mm_load_ss (&m22),_mm_set1_ps(s)));
 #else
   m00/=s; m01/=s; m02/=s;
   m10/=s; m11/=s; m12/=s;
@@ -492,7 +499,7 @@
   FXMat3f r;
   _mm_storeu_ps(&r00,_mm_sub_ps(_mm_set1_ps(0.0f),_mm_loadu_ps(&m00)));
   _mm_storeu_ps(&r11,_mm_sub_ps(_mm_set1_ps(0.0f),_mm_loadu_ps(&m11)));
-  _mm_store_ss(&r22,_mm_sub_ss(_mm_set1_ps(0.0f),_mm_load_ss(&m22)));
+  _mm_store_ss (&r22,_mm_sub_ss(_mm_set1_ps(0.0f),_mm_load_ss (&m22)));
   return r;
 #else
   return FXMat3f(-m00,-m01,-m02,
@@ -507,7 +514,7 @@
 #if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set_ps(0.0f,0.0f,0.0f,1.0f));
   _mm_storeu_ps(&m11,_mm_set_ps(0.0f,0.0f,0.0f,1.0f));
-  _mm_store_ss(&m22,_mm_set_ps(0.0f,0.0f,0.0f,1.0f));
+  _mm_store_ss (&m22,_mm_set_ps(0.0f,0.0f,0.0f,1.0f));
 #else
   m00=1.0f; m01=0.0f; m02=0.0f;
   m10=0.0f; m11=1.0f; m12=0.0f;
@@ -533,16 +540,16 @@
 
 // Multiply by rotation c,s about unit axis
 FXMat3f& FXMat3f::rot(const FXVec3f& v,FXfloat c,FXfloat s){
-  register FXfloat xx=v.x*v.x;
-  register FXfloat yy=v.y*v.y;
-  register FXfloat zz=v.z*v.z;
-  register FXfloat xy=v.x*v.y;
-  register FXfloat yz=v.y*v.z;
-  register FXfloat zx=v.z*v.x;
-  register FXfloat xs=v.x*s;
-  register FXfloat ys=v.y*s;
-  register FXfloat zs=v.z*s;
-  register FXfloat t=1.0f-c;
+  FXfloat xx=v.x*v.x;
+  FXfloat yy=v.y*v.y;
+  FXfloat zz=v.z*v.z;
+  FXfloat xy=v.x*v.y;
+  FXfloat yz=v.y*v.z;
+  FXfloat zx=v.z*v.x;
+  FXfloat xs=v.x*s;
+  FXfloat ys=v.y*s;
+  FXfloat zs=v.z*s;
+  FXfloat t=1.0f-c;
   return *this*=FXMat3f(t*xx+c,t*xy+zs,t*zx-ys,t*xy-zs,t*yy+c,t*yz+xs,t*zx+ys,t*yz-xs,t*zz+c);
   }
 
@@ -555,7 +562,7 @@
 
 // Rotate about x-axis
 FXMat3f& FXMat3f::xrot(FXfloat c,FXfloat s){
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m10; v=m20; m10=c*u+s*v; m20=c*v-s*u;
   u=m11; v=m21; m11=c*u+s*v; m21=c*v-s*u;
   u=m12; v=m22; m12=c*u+s*v; m22=c*v-s*u;
@@ -571,7 +578,7 @@
 
 // Rotate about y-axis
 FXMat3f& FXMat3f::yrot(FXfloat c,FXfloat s){
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m00; v=m20; m00=c*u-s*v; m20=c*v+s*u;
   u=m01; v=m21; m01=c*u-s*v; m21=c*v+s*u;
   u=m02; v=m22; m02=c*u-s*v; m22=c*v+s*u;
@@ -587,7 +594,7 @@
 
 // Rotate about z-axis
 FXMat3f& FXMat3f::zrot(FXfloat c,FXfloat s){
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m00; v=m10; m00=c*u+s*v; m10=c*v-s*u;
   u=m01; v=m11; m01=c*u+s*v; m11=c*v-s*u;
   u=m02; v=m12; m02=c*u+s*v; m12=c*v-s*u;
@@ -640,7 +647,7 @@
 
 // Invert matrix
 FXMat3f FXMat3f::invert() const {
-  register FXfloat dd;
+  FXfloat dd;
   FXMat3f res;
   res00=m11*m22-m12*m21;
   res01=m02*m21-m01*m22;
@@ -670,21 +677,21 @@
 // Matrix times vector
 FXVec2f operator*(const FXMat3f& m,const FXVec2f& v){
 #if defined(FOX_HAS_AVX)
-  register __m128 m0=_mm_maskload_ps(m0,MMM);         // 0  m02  m01  m00
-  register __m128 m1=_mm_maskload_ps(m1,MMM);         // 0  m12  m11  m10
-  register __m128 vv=_mm_set_ps(0.0f,1.0f,v1,v0);   // 0  1    v1   v0
+  __m128 m0=_mm_maskload_ps(m0,MMM);         // 0  m02  m01  m00
+  __m128 m1=_mm_maskload_ps(m1,MMM);         // 0  m12  m11  m10
+  __m128 vv=_mm_set_ps(0.0f,1.0f,v1,v0);   // 0  1    v1   v0
   FXVec2f r;
   _mm_store_ss(&r0,_mm_dp_ps(m0,vv,0x71));    // m02+m01*v1+m00*v0
   _mm_store_ss(&r1,_mm_dp_ps(m1,vv,0x71));    // m12+m11*v1+m10*v0
   return r;
 #elif defined(FOX_HAS_SSE3)
-  register __m128 m0=_mm_loadh_pi(_mm_load_ss(&m02),(const __m64*)&m00);  // m01  m00  0  m02
-  register __m128 m1=_mm_loadh_pi(_mm_load_ss(&m12),(const __m64*)&m10);  // m11  m10  0  m12
-  register __m128 m2=_mm_loadh_pi(_mm_load_ss(&m22),(const __m64*)&m20);  // m21  m20  0  m22
-  register __m128 vv=_mm_loadh_pi(_mm_set1_ps(1.0f),(const __m64*)&v0);         // v1   v0   1  1
-  register __m128 r0=_mm_mul_ps(m0,vv);         // m01*v1   m00*v0   0   m02
-  register __m128 r1=_mm_mul_ps(m1,vv);         // m11*v1   m10*v0   0   m12
-  register __m128 r2=_mm_mul_ps(m2,vv);         // m21*v1   m20*v0   0   m22
+  __m128 m0=_mm_loadh_pi(_mm_load_ss(&m02),(const __m64*)&m00);  // m01  m00  0  m02
+  __m128 m1=_mm_loadh_pi(_mm_load_ss(&m12),(const __m64*)&m10);  // m11  m10  0  m12
+  __m128 m2=_mm_loadh_pi(_mm_load_ss(&m22),(const __m64*)&m20);  // m21  m20  0  m22
+  __m128 vv=_mm_loadh_pi(_mm_set1_ps(1.0f),(const __m64*)&v0);         // v1   v0   1  1
+  __m128 r0=_mm_mul_ps(m0,vv);         // m01*v1   m00*v0   0   m02
+  __m128 r1=_mm_mul_ps(m1,vv);         // m11*v1   m10*v0   0   m12
+  __m128 r2=_mm_mul_ps(m2,vv);         // m21*v1   m20*v0   0   m22
   FXVec3f r;
   r0=_mm_hadd_ps(r0,r1);        // m11*v1+m10*v0   m12   m01*v1+m00*v0   m02
   r2=_mm_hadd_ps(r2,r2);        // m21*v1+m20*v0   m22   m21*v1+m20*v0   m22
@@ -700,23 +707,23 @@
 // Matrix times vector
 FXVec3f operator*(const FXMat3f& m,const FXVec3f& v){
 #if defined(FOX_HAS_AVX)
-  register __m128 m0=_mm_maskload_ps(m0,MMM); // 0  m02  m01  m00
-  register __m128 m1=_mm_maskload_ps(m1,MMM); // 0  m12  m11  m10
-  register __m128 m2=_mm_maskload_ps(m2,MMM); // 0  m22  m21  m20
-  register __m128 vv=_mm_maskload_ps(v,MMM);    // 0  v2   v1   v0
+  __m128 m0=_mm_maskload_ps(m0,MMM); // 0  m02  m01  m00
+  __m128 m1=_mm_maskload_ps(m1,MMM); // 0  m12  m11  m10
+  __m128 m2=_mm_maskload_ps(m2,MMM); // 0  m22  m21  m20
+  __m128 vv=_mm_maskload_ps(v,MMM);    // 0  v2   v1   v0
   FXVec3f r;
   _mm_store_ss(&r0,_mm_dp_ps(m0,vv,0x71));    // m02*v2+m01*v1+m00*v0
   _mm_store_ss(&r1,_mm_dp_ps(m1,vv,0x71));    // m12*v2+m11*v1+m10*v0
   _mm_store_ss(&r2,_mm_dp_ps(m2,vv,0x71));    // m22*v2+m21*v1+m20*v0
   return r;
 #elif defined(FOX_HAS_SSE3)
-  register __m128 m0=_mm_loadh_pi(_mm_load_ss(&m02),(const __m64*)&m00);        // m01 m00 0 m02
-  register __m128 m1=_mm_loadh_pi(_mm_load_ss(&m12),(const __m64*)&m10);        // m11 m10 0 m12
-  register __m128 m2=_mm_loadh_pi(_mm_load_ss(&m22),(const __m64*)&m20);        // m21 m20 0 m22
-  register __m128 vv=_mm_loadh_pi(_mm_load_ss(&v2),(const __m64*)&v0);              // v1  v0  0 v2
-  register __m128 r0=_mm_mul_ps(m0,vv);         // m01*v1   m00*v0   0   m02*v2
-  register __m128 r1=_mm_mul_ps(m1,vv);         // m11*v1   m10*v0   0   m12*v2
-  register __m128 r2=_mm_mul_ps(m2,vv);         // m21*v1   m20*v0   0   m22*v2
+  __m128 m0=_mm_loadh_pi(_mm_load_ss(&m02),(const __m64*)&m00);        // m01 m00 0 m02
+  __m128 m1=_mm_loadh_pi(_mm_load_ss(&m12),(const __m64*)&m10);        // m11 m10 0 m12
+  __m128 m2=_mm_loadh_pi(_mm_load_ss(&m22),(const __m64*)&m20);        // m21 m20 0 m22
+  __m128 vv=_mm_loadh_pi(_mm_load_ss(&v2),(const __m64*)&v0);              // v1  v0  0 v2
+  __m128 r0=_mm_mul_ps(m0,vv);         // m01*v1   m00*v0   0   m02*v2
+  __m128 r1=_mm_mul_ps(m1,vv);         // m11*v1   m10*v0   0   m12*v2
+  __m128 r2=_mm_mul_ps(m2,vv);         // m21*v1   m20*v0   0   m22*v2
   FXVec3f r;
   r0=_mm_hadd_ps(r0,r1);        // m11*v1+m10*v0   m12*v2   m01*v1+m00*v0   m02*v2
   r2=_mm_hadd_ps(r2,r2);        // m21*v1+m20*v0   m22*v2   m21*v1+m20*v0   m22*v2
@@ -733,12 +740,12 @@
 // Vector times matrix
 FXVec2f operator*(const FXVec2f& v,const FXMat3f& m){
 #if defined(FOX_HAS_SSE)
-  register __m128 v0=_mm_set1_ps(v0);
-  register __m128 v1=_mm_set1_ps(v1);
-  register __m128 m0=_mm_loadh_pi(_mm_set1_ps(0.0f),(const __m64*)&m00);        // m01  m00  0  0
-  register __m128 m1=_mm_loadh_pi(_mm_set1_ps(0.0f),(const __m64*)&m10);        // m11  m10  0  0
-  register __m128 m2=_mm_loadh_pi(_mm_set1_ps(0.0f),(const __m64*)&m20);        // m21  m20  0  0
-  register __m128 rr=_mm_add_ps(_mm_add_ps(_mm_mul_ps(m0,v0),_mm_mul_ps(m1,v1)),m2);
+  __m128 v0=_mm_set1_ps(v0);
+  __m128 v1=_mm_set1_ps(v1);
+  __m128 m0=_mm_loadh_pi(_mm_set1_ps(0.0f),(const __m64*)&m00);        // m01  m00  0  0
+  __m128 m1=_mm_loadh_pi(_mm_set1_ps(0.0f),(const __m64*)&m10);        // m11  m10  0  0
+  __m128 m2=_mm_loadh_pi(_mm_set1_ps(0.0f),(const __m64*)&m20);        // m21  m20  0  0
+  __m128 rr=_mm_add_ps(_mm_add_ps(_mm_mul_ps(m0,v0),_mm_mul_ps(m1,v1)),m2);
   FXVec2f r;
   _mm_storeh_pi((__m64*)&r0,rr);
   return r;
@@ -751,13 +758,13 @@
 // Vector times matrix
 FXVec3f operator*(const FXVec3f& v,const FXMat3f& m){
 #if defined(FOX_HAS_SSE)
-  register __m128 v0=_mm_set1_ps(v0);
-  register __m128 v1=_mm_set1_ps(v1);
-  register __m128 v2=_mm_set1_ps(v2);
-  register __m128 m0=_mm_loadh_pi(_mm_load_ss(&m02),(const __m64*)&m00);   // m01  m00  0  m02
-  register __m128 m1=_mm_loadh_pi(_mm_load_ss(&m12),(const __m64*)&m10);   // m11  m10  0  m12
-  register __m128 m2=_mm_loadh_pi(_mm_load_ss(&m22),(const __m64*)&m20);   // m21  m20  0  m22
-  register __m128 rr=_mm_add_ps(_mm_add_ps(_mm_mul_ps(m0,v0),_mm_mul_ps(m1,v1)),_mm_mul_ps(m2,v2));
+  __m128 v0=_mm_set1_ps(v0);
+  __m128 v1=_mm_set1_ps(v1);
+  __m128 v2=_mm_set1_ps(v2);
+  __m128 m0=_mm_loadh_pi(_mm_load_ss(&m02),(const __m64*)&m00);   // m01  m00  0  m02
+  __m128 m1=_mm_loadh_pi(_mm_load_ss(&m12),(const __m64*)&m10);   // m11  m10  0  m12
+  __m128 m2=_mm_loadh_pi(_mm_load_ss(&m22),(const __m64*)&m20);   // m21  m20  0  m22
+  __m128 rr=_mm_add_ps(_mm_add_ps(_mm_mul_ps(m0,v0),_mm_mul_ps(m1,v1)),_mm_mul_ps(m2,v2));
   FXVec3f r;
   _mm_storeh_pi((__m64*)&r0,rr); _mm_store_ss(&r2,rr);
   return r;
@@ -802,11 +809,11 @@
 // Matrix and matrix multiply
 FXMat3f operator*(const FXMat3f& a,const FXMat3f& b){
 #if defined(FOX_HAS_AVX)
-  register __m128 b0=_mm_maskload_ps(&b00,MMM);
-  register __m128 b1=_mm_maskload_ps(&b10,MMM);
-  register __m128 b2=_mm_maskload_ps(&b20,MMM);
-  register __m128 r0,r1,r2;
-  register __m128 xx,yy,zz;
+  __m128 b0=_mm_maskload_ps(&b00,MMM);
+  __m128 b1=_mm_maskload_ps(&b10,MMM);
+  __m128 b2=_mm_maskload_ps(&b20,MMM);
+  __m128 r0,r1,r2;
+  __m128 xx,yy,zz;
   FXMat3f r;
   xx=_mm_set1_ps(a00);
   yy=_mm_set1_ps(a01);
@@ -825,11 +832,11 @@
   _mm_maskstore_ps(&r10,MMM,r2);
   return r;
 #elif defined(FOX_HAS_SSE)
-  register __m128 b0=_mm_loadh_pi(_mm_load_ss(&b02),(const __m64*)&b00);
-  register __m128 b1=_mm_loadh_pi(_mm_load_ss(&b12),(const __m64*)&b10);
-  register __m128 b2=_mm_loadh_pi(_mm_load_ss(&b22),(const __m64*)&b20);
-  register __m128 r0,r1,r2;
-  register __m128 xx,yy,zz;
+  __m128 b0=_mm_loadh_pi(_mm_load_ss(&b02),(const __m64*)&b00);
+  __m128 b1=_mm_loadh_pi(_mm_load_ss(&b12),(const __m64*)&b10);
+  __m128 b2=_mm_loadh_pi(_mm_load_ss(&b22),(const __m64*)&b20);
+  __m128 r0,r1,r2;
+  __m128 xx,yy,zz;
   FXMat3f r;
   xx=_mm_set1_ps(a00);
   yy=_mm_set1_ps(a01);
@@ -848,7 +855,7 @@
   _mm_storeh_pi((__m64*)&r20,r2); _mm_store_ss(&r22,r2);
   return r;
 #else
-  register FXfloat x,y,z;
+  FXfloat x,y,z;
   FXMat3f r;
   x=a00; y=a01; z=a02;
   r00=x*b00+y*b10+z*b20;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMat4d.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMat4d.cpp Changed

@@ -3,7 +3,7 @@
 *            D o u b l e - P r e c i s i o n   4 x 4   M a t r i x              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -580,11 +580,11 @@
 // Multiply matrix by matrix
 FXMat4d& FXMat4d::operator*=(const FXMat4d& s){
 #if defined(FOX_HAS_AVX)
-  register __m256d b0=_mm256_loadu_pd(&s00);
-  register __m256d b1=_mm256_loadu_pd(&s10);
-  register __m256d b2=_mm256_loadu_pd(&s20);
-  register __m256d b3=_mm256_loadu_pd(&s30);
-  register __m256d xx,yy,zz,ww;
+  __m256d b0=_mm256_loadu_pd(&s00);
+  __m256d b1=_mm256_loadu_pd(&s10);
+  __m256d b2=_mm256_loadu_pd(&s20);
+  __m256d b3=_mm256_loadu_pd(&s30);
+  __m256d xx,yy,zz,ww;
   xx=_mm256_set1_pd(m00);
   yy=_mm256_set1_pd(m01);
   zz=_mm256_set1_pd(m02);
@@ -606,15 +606,15 @@
   ww=_mm256_set1_pd(m33);
   _mm256_storeu_pd(m3,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_add_pd(_mm256_mul_pd(b2,zz),_mm256_mul_pd(b3,ww))));
 #elif defined(FOX_HAS_SSE2)
-  register __m128d b00=_mm_loadu_pd(&s00);
-  register __m128d b02=_mm_loadu_pd(&s02);
-  register __m128d b10=_mm_loadu_pd(&s10);
-  register __m128d b12=_mm_loadu_pd(&s12);
-  register __m128d b20=_mm_loadu_pd(&s20);
-  register __m128d b22=_mm_loadu_pd(&s22);
-  register __m128d b30=_mm_loadu_pd(&s30);
-  register __m128d b32=_mm_loadu_pd(&s32);
-  register __m128d xx,yy,zz,ww;
+  __m128d b00=_mm_loadu_pd(&s00);
+  __m128d b02=_mm_loadu_pd(&s02);
+  __m128d b10=_mm_loadu_pd(&s10);
+  __m128d b12=_mm_loadu_pd(&s12);
+  __m128d b20=_mm_loadu_pd(&s20);
+  __m128d b22=_mm_loadu_pd(&s22);
+  __m128d b30=_mm_loadu_pd(&s30);
+  __m128d b32=_mm_loadu_pd(&s32);
+  __m128d xx,yy,zz,ww;
   xx=_mm_set1_pd(m00);
   yy=_mm_set1_pd(m01);
   zz=_mm_set1_pd(m02);
@@ -640,7 +640,7 @@
   _mm_storeu_pd(&m30,_mm_add_pd(_mm_add_pd(_mm_add_pd(_mm_mul_pd(b00,xx),_mm_mul_pd(b10,yy)),_mm_mul_pd(b20,zz)),_mm_mul_pd(b30,ww)));
   _mm_storeu_pd(&m32,_mm_add_pd(_mm_add_pd(_mm_add_pd(_mm_mul_pd(b02,xx),_mm_mul_pd(b12,yy)),_mm_mul_pd(b22,zz)),_mm_mul_pd(b32,ww)));
 #else
-  register FXdouble x,y,z,w;
+  FXdouble x,y,z,w;
   x=m00; y=m01; z=m02; w=m03;
   m00=x*s00+y*s10+z*s20+w*s30;
   m01=x*s01+y*s11+z*s21+w*s31;
@@ -758,9 +758,9 @@
 
 // Set orthographic projection from view volume
 FXMat4d& FXMat4d::setOrtho(FXdouble xlo,FXdouble xhi,FXdouble ylo,FXdouble yhi,FXdouble zlo,FXdouble zhi){
-  register FXdouble rl=xhi-xlo;
-  register FXdouble tb=yhi-ylo;
-  register FXdouble yh=zhi-zlo;
+  FXdouble rl=xhi-xlo;
+  FXdouble tb=yhi-ylo;
+  FXdouble yh=zhi-zlo;
   return set(2.0/rl,0.0,0.0,0.0,0.0,2.0/tb,0.0,0.0,0.0,0.0,-2.0/yh,0.0,-(xhi+xlo)/rl,-(yhi+ylo)/tb,-(zhi+zlo)/yh,1.0);
   }
 
@@ -778,18 +778,18 @@
 
 // Set to inverse orthographic projection
 FXMat4d& FXMat4d::setInverseOrtho(FXdouble xlo,FXdouble xhi,FXdouble ylo,FXdouble yhi,FXdouble zlo,FXdouble zhi){
-  register FXdouble rl=xhi-xlo;
-  register FXdouble tb=yhi-ylo;
-  register FXdouble yh=zhi-zlo;
+  FXdouble rl=xhi-xlo;
+  FXdouble tb=yhi-ylo;
+  FXdouble yh=zhi-zlo;
   return set(0.5*rl,0.0,0.0,0.0,0.0,0.5*tb,0.0,0.0,0.0,0.0,-0.5*yh,0.0,0.5*(xhi+xlo),0.5*(yhi+ylo),0.5*(zhi+zlo),1.0);
   }
 
 
 // Set to perspective projection from view volume
 FXMat4d& FXMat4d::setFrustum(FXdouble xlo,FXdouble xhi,FXdouble ylo,FXdouble yhi,FXdouble zlo,FXdouble zhi){
-  register FXdouble rl=xhi-xlo;
-  register FXdouble tb=yhi-ylo;
-  register FXdouble yh=zhi-zlo;
+  FXdouble rl=xhi-xlo;
+  FXdouble tb=yhi-ylo;
+  FXdouble yh=zhi-zlo;
   return set(2.0*zlo/rl,0.0,0.0,0.0,0.0,2.0*zlo/tb,0.0,0.0,(xhi+xlo)/rl,(yhi+ylo)/tb,-(zhi+zlo)/yh,-1.0,0.0,0.0,-2.0*zhi*zlo/yh,0.0);
   }
 
@@ -807,9 +807,9 @@
 
 // Set to inverse perspective projection from view volume
 FXMat4d& FXMat4d::setInverseFrustum(FXdouble xlo,FXdouble xhi,FXdouble ylo,FXdouble yhi,FXdouble zlo,FXdouble zhi){
-  register FXdouble rl=xhi-xlo;
-  register FXdouble tb=yhi-ylo;
-  register FXdouble yh=zhi-zlo;
+  FXdouble rl=xhi-xlo;
+  FXdouble tb=yhi-ylo;
+  FXdouble yh=zhi-zlo;
   return set(0.5*rl/zlo,0.0,0.0,0.0,0.0,0.5*tb/zlo,0.0,0.0,0.0,0.0,0.0,-0.5*yh/(zhi*zlo),0.5*(xhi+xlo)/zlo,0.5*(yhi+ylo)/zlo,-1.0,0.5*(zhi+zlo)/(zhi*zlo));
   }
 
@@ -826,7 +826,7 @@
 
 // Multiply by rotation matrix
 FXMat4d& FXMat4d::rot(const FXMat3d& r){
-  register FXdouble x,y,z;
+  FXdouble x,y,z;
   x=m00; y=m10; z=m20;
   m00=x*r00+y*r01+z*r02;
   m10=x*r10+y*r11+z*r12;
@@ -855,16 +855,16 @@
 
 // Multiply by rotation c,s about unit axis
 FXMat4d& FXMat4d::rot(const FXVec3d& v,FXdouble c,FXdouble s){
-  register FXdouble xx=v.x*v.x;
-  register FXdouble yy=v.y*v.y;
-  register FXdouble zz=v.z*v.z;
-  register FXdouble xy=v.x*v.y;
-  register FXdouble yz=v.y*v.z;
-  register FXdouble zx=v.z*v.x;
-  register FXdouble xs=v.x*s;
-  register FXdouble ys=v.y*s;
-  register FXdouble zs=v.z*s;
-  register FXdouble t=1.0-c;
+  FXdouble xx=v.x*v.x;
+  FXdouble yy=v.y*v.y;
+  FXdouble zz=v.z*v.z;
+  FXdouble xy=v.x*v.y;
+  FXdouble yz=v.y*v.z;
+  FXdouble zx=v.z*v.x;
+  FXdouble xs=v.x*s;
+  FXdouble ys=v.y*s;
+  FXdouble zs=v.z*s;
+  FXdouble t=1.0-c;
   return rot(FXMat3d(t*xx+c,t*xy+zs,t*zx-ys,t*xy-zs,t*yy+c,t*yz+xs,t*zx+ys,t*yz-xs,t*zz+c));
   }
 
@@ -878,25 +878,25 @@
 // Rotate about x-axis
 FXMat4d& FXMat4d::xrot(FXdouble c,FXdouble s){
 #if defined(FOX_HAS_AVX)
-  register __m256d cc=_mm256_set1_pd(c);
-  register __m256d ss=_mm256_set1_pd(s);
-  register __m256d uu=_mm256_loadu_pd(m1);
-  register __m256d vv=_mm256_loadu_pd(m2);
+  __m256d cc=_mm256_set1_pd(c);
+  __m256d ss=_mm256_set1_pd(s);
+  __m256d uu=_mm256_loadu_pd(m1);
+  __m256d vv=_mm256_loadu_pd(m2);
   _mm256_storeu_pd(m1,_mm256_add_pd(_mm256_mul_pd(cc,uu),_mm256_mul_pd(ss,vv)));
   _mm256_storeu_pd(m2,_mm256_sub_pd(_mm256_mul_pd(cc,vv),_mm256_mul_pd(ss,uu)));
 #elif defined(FOX_HAS_SSE2)
-  register __m128d cc=_mm_set1_pd(c);
-  register __m128d ss=_mm_set1_pd(s);
-  register __m128d uu0=_mm_loadu_pd(&m10);
-  register __m128d uu2=_mm_loadu_pd(&m12);
-  register __m128d vv0=_mm_loadu_pd(&m20);
-  register __m128d vv2=_mm_loadu_pd(&m22);
+  __m128d cc=_mm_set1_pd(c);
+  __m128d ss=_mm_set1_pd(s);
+  __m128d uu0=_mm_loadu_pd(&m10);
+  __m128d uu2=_mm_loadu_pd(&m12);
+  __m128d vv0=_mm_loadu_pd(&m20);
+  __m128d vv2=_mm_loadu_pd(&m22);
   _mm_storeu_pd(&m10,_mm_add_pd(_mm_mul_pd(cc,uu0),_mm_mul_pd(ss,vv0)));
   _mm_storeu_pd(&m12,_mm_add_pd(_mm_mul_pd(cc,uu2),_mm_mul_pd(ss,vv2)));
   _mm_storeu_pd(&m20,_mm_sub_pd(_mm_mul_pd(cc,vv0),_mm_mul_pd(ss,uu0)));
   _mm_storeu_pd(&m22,_mm_sub_pd(_mm_mul_pd(cc,vv2),_mm_mul_pd(ss,uu2)));
 #else
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m10; v=m20; m10=c*u+s*v; m20=c*v-s*u;
   u=m11; v=m21; m11=c*u+s*v; m21=c*v-s*u;
   u=m12; v=m22; m12=c*u+s*v; m22=c*v-s*u;
@@ -915,25 +915,25 @@
 // Rotate about y-axis
 FXMat4d& FXMat4d::yrot(FXdouble c,FXdouble s){
 #if defined(FOX_HAS_AVX)
-  register __m256d cc=_mm256_set1_pd(c);
-  register __m256d ss=_mm256_set1_pd(s);
-  register __m256d uu=_mm256_loadu_pd(m0);
-  register __m256d vv=_mm256_loadu_pd(m2);
+  __m256d cc=_mm256_set1_pd(c);
+  __m256d ss=_mm256_set1_pd(s);
+  __m256d uu=_mm256_loadu_pd(m0);
+  __m256d vv=_mm256_loadu_pd(m2);
   _mm256_storeu_pd(m0,_mm256_sub_pd(_mm256_mul_pd(cc,uu),_mm256_mul_pd(ss,vv)));
   _mm256_storeu_pd(m2,_mm256_add_pd(_mm256_mul_pd(cc,vv),_mm256_mul_pd(ss,uu)));
 #elif defined(FOX_HAS_SSE2)
-  register __m128d cc=_mm_set1_pd(c);
-  register __m128d ss=_mm_set1_pd(s);
-  register __m128d uu0=_mm_loadu_pd(&m00);
-  register __m128d uu2=_mm_loadu_pd(&m02);
-  register __m128d vv0=_mm_loadu_pd(&m20);
-  register __m128d vv2=_mm_loadu_pd(&m22);
+  __m128d cc=_mm_set1_pd(c);
+  __m128d ss=_mm_set1_pd(s);
+  __m128d uu0=_mm_loadu_pd(&m00);
+  __m128d uu2=_mm_loadu_pd(&m02);
+  __m128d vv0=_mm_loadu_pd(&m20);
+  __m128d vv2=_mm_loadu_pd(&m22);
   _mm_storeu_pd(&m00,_mm_sub_pd(_mm_mul_pd(cc,uu0),_mm_mul_pd(ss,vv0)));
   _mm_storeu_pd(&m02,_mm_sub_pd(_mm_mul_pd(cc,uu2),_mm_mul_pd(ss,vv2)));
   _mm_storeu_pd(&m20,_mm_add_pd(_mm_mul_pd(cc,vv0),_mm_mul_pd(ss,uu0)));
   _mm_storeu_pd(&m22,_mm_add_pd(_mm_mul_pd(cc,vv2),_mm_mul_pd(ss,uu2)));
 #else
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m00; v=m20; m00=c*u-s*v; m20=c*v+s*u;
   u=m01; v=m21; m01=c*u-s*v; m21=c*v+s*u;
   u=m02; v=m22; m02=c*u-s*v; m22=c*v+s*u;
@@ -952,25 +952,25 @@
 // Rotate about z-axis
 FXMat4d& FXMat4d::zrot(FXdouble c,FXdouble s){
 #if defined(FOX_HAS_AVX)
-  register __m256d cc=_mm256_set1_pd(c);
-  register __m256d ss=_mm256_set1_pd(s);
-  register __m256d uu=_mm256_loadu_pd(m0);
-  register __m256d vv=_mm256_loadu_pd(m1);
+  __m256d cc=_mm256_set1_pd(c);
+  __m256d ss=_mm256_set1_pd(s);
+  __m256d uu=_mm256_loadu_pd(m0);
+  __m256d vv=_mm256_loadu_pd(m1);
   _mm256_storeu_pd(m0,_mm256_add_pd(_mm256_mul_pd(cc,uu),_mm256_mul_pd(ss,vv)));
   _mm256_storeu_pd(m1,_mm256_sub_pd(_mm256_mul_pd(cc,vv),_mm256_mul_pd(ss,uu)));
 #elif defined(FOX_HAS_SSE2)
-  register __m128d cc=_mm_set1_pd(c);
-  register __m128d ss=_mm_set1_pd(s);
-  register __m128d uu0=_mm_loadu_pd(&m00);
-  register __m128d uu2=_mm_loadu_pd(&m02);
-  register __m128d vv0=_mm_loadu_pd(&m10);
-  register __m128d vv2=_mm_loadu_pd(&m12);
+  __m128d cc=_mm_set1_pd(c);
+  __m128d ss=_mm_set1_pd(s);
+  __m128d uu0=_mm_loadu_pd(&m00);
+  __m128d uu2=_mm_loadu_pd(&m02);
+  __m128d vv0=_mm_loadu_pd(&m10);
+  __m128d vv2=_mm_loadu_pd(&m12);
   _mm_storeu_pd(&m00,_mm_add_pd(_mm_mul_pd(cc,uu0),_mm_mul_pd(ss,vv0)));
   _mm_storeu_pd(&m02,_mm_add_pd(_mm_mul_pd(cc,uu2),_mm_mul_pd(ss,vv2)));
   _mm_storeu_pd(&m10,_mm_sub_pd(_mm_mul_pd(cc,vv0),_mm_mul_pd(ss,uu0)));
   _mm_storeu_pd(&m12,_mm_sub_pd(_mm_mul_pd(cc,vv2),_mm_mul_pd(ss,uu2)));
 #else
-  register FXdouble u,v;
+  FXdouble u,v;
   u=m00; v=m10; m00=c*u+s*v; m10=c*v-s*u;
   u=m01; v=m11; m01=c*u+s*v; m11=c*v-s*u;
   u=m02; v=m12; m02=c*u+s*v; m12=c*v-s*u;
@@ -988,7 +988,7 @@
 
 // Look at
 FXMat4d& FXMat4d::look(const FXVec3d& from,const FXVec3d& to,const FXVec3d& up){
-  register FXdouble x0,x1,x2,tx,ty,tz;
+  FXdouble x0,x1,x2,tx,ty,tz;
   FXVec3d rz,rx,ry;
   rz=normalize(from-to);
   rx=normalize(up^rz);
@@ -1019,26 +1019,26 @@
 // Translate
 FXMat4d& FXMat4d::trans(FXdouble tx,FXdouble ty,FXdouble tz){
 #if defined(FOX_HAS_AVX)
-  register __m256d ttx=_mm256_set1_pd(tx);
-  register __m256d tty=_mm256_set1_pd(ty);
-  register __m256d ttz=_mm256_set1_pd(tz);
-  register __m256d r0=_mm256_mul_pd(_mm256_loadu_pd(m0),ttx);
-  register __m256d r1=_mm256_mul_pd(_mm256_loadu_pd(m1),tty);
-  register __m256d r2=_mm256_mul_pd(_mm256_loadu_pd(m2),ttz);
-  register __m256d r3=_mm256_loadu_pd(m3);
+  __m256d ttx=_mm256_set1_pd(tx);
+  __m256d tty=_mm256_set1_pd(ty);
+  __m256d ttz=_mm256_set1_pd(tz);
+  __m256d r0=_mm256_mul_pd(_mm256_loadu_pd(m0),ttx);
+  __m256d r1=_mm256_mul_pd(_mm256_loadu_pd(m1),tty);
+  __m256d r2=_mm256_mul_pd(_mm256_loadu_pd(m2),ttz);
+  __m256d r3=_mm256_loadu_pd(m3);
   _mm256_storeu_pd(m3,_mm256_add_pd(_mm256_add_pd(r0,r1),_mm256_add_pd(r2,r3)));
 #elif defined(FOX_HAS_SSE2)
-  register __m128d ttx=_mm_set1_pd(tx);
-  register __m128d tty=_mm_set1_pd(ty);
-  register __m128d ttz=_mm_set1_pd(tz);
-  register __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),ttx);
-  register __m128d r02=_mm_mul_pd(_mm_loadu_pd(&m02),ttx);
-  register __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),tty);
-  register __m128d r12=_mm_mul_pd(_mm_loadu_pd(&m12),tty);
-  register __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),ttz);
-  register __m128d r22=_mm_mul_pd(_mm_loadu_pd(&m22),ttz);
-  register __m128d r30=_mm_loadu_pd(&m30);
-  register __m128d r32=_mm_loadu_pd(&m32);
+  __m128d ttx=_mm_set1_pd(tx);
+  __m128d tty=_mm_set1_pd(ty);
+  __m128d ttz=_mm_set1_pd(tz);
+  __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),ttx);
+  __m128d r02=_mm_mul_pd(_mm_loadu_pd(&m02),ttx);
+  __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),tty);
+  __m128d r12=_mm_mul_pd(_mm_loadu_pd(&m12),tty);
+  __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),ttz);
+  __m128d r22=_mm_mul_pd(_mm_loadu_pd(&m22),ttz);
+  __m128d r30=_mm_loadu_pd(&m30);
+  __m128d r32=_mm_loadu_pd(&m32);
   _mm_storeu_pd(&m30,_mm_add_pd(_mm_add_pd(r00,r10),_mm_add_pd(r20,r30)));
   _mm_storeu_pd(&m32,_mm_add_pd(_mm_add_pd(r02,r12),_mm_add_pd(r22,r32)));
 #else
@@ -1060,16 +1060,16 @@
 // Scale unqual
 FXMat4d& FXMat4d::scale(FXdouble sx,FXdouble sy,FXdouble sz){
 #if defined(FOX_HAS_AVX)
-  register __m256d ssx=_mm256_set1_pd(sx);
-  register __m256d ssy=_mm256_set1_pd(sy);
-  register __m256d ssz=_mm256_set1_pd(sz);
+  __m256d ssx=_mm256_set1_pd(sx);
+  __m256d ssy=_mm256_set1_pd(sy);
+  __m256d ssz=_mm256_set1_pd(sz);
   _mm256_storeu_pd(m0,_mm256_mul_pd(_mm256_loadu_pd(m0),ssx));
   _mm256_storeu_pd(m1,_mm256_mul_pd(_mm256_loadu_pd(m1),ssy));
   _mm256_storeu_pd(m2,_mm256_mul_pd(_mm256_loadu_pd(m2),ssz));
 #elif defined(FOX_HAS_SSE2)
-  register __m128d ssx=_mm_set1_pd(sx);
-  register __m128d ssy=_mm_set1_pd(sy);
-  register __m128d ssz=_mm_set1_pd(sz);
+  __m128d ssx=_mm_set1_pd(sx);
+  __m128d ssy=_mm_set1_pd(sy);
+  __m128d ssz=_mm_set1_pd(sz);
   _mm_storeu_pd(&m00,_mm_mul_pd(_mm_loadu_pd(&m00),ssx));
   _mm_storeu_pd(&m02,_mm_mul_pd(_mm_loadu_pd(&m02),ssx));
   _mm_storeu_pd(&m10,_mm_mul_pd(_mm_loadu_pd(&m10),ssy));
@@ -1111,14 +1111,14 @@
 // Transpose matrix
 FXMat4d FXMat4d::transpose() const {
 #if defined(FOX_HAS_AVX)
-  register __m256d m0=_mm256_loadu_pd(m0);    // a3 a2 a1 a0
-  register __m256d m1=_mm256_loadu_pd(m1);    // b3 b2 b1 b0
-  register __m256d m2=_mm256_loadu_pd(m2);    // c3 c2 c1 c0
-  register __m256d m3=_mm256_loadu_pd(m3);    // d3 d2 d1 d0
-  register __m256d s0=_mm256_unpackhi_pd(m0,m1);        // b3 a3 b1 a1
-  register __m256d s1=_mm256_unpacklo_pd(m0,m1);        // b2 a2 b0 a0
-  register __m256d s2=_mm256_unpackhi_pd(m2,m3);        // d3 c3 d1 c1
-  register __m256d s3=_mm256_unpacklo_pd(m2,m3);        // d2 c2 d0 c0
+  __m256d m0=_mm256_loadu_pd(m0);    // a3 a2 a1 a0
+  __m256d m1=_mm256_loadu_pd(m1);    // b3 b2 b1 b0
+  __m256d m2=_mm256_loadu_pd(m2);    // c3 c2 c1 c0
+  __m256d m3=_mm256_loadu_pd(m3);    // d3 d2 d1 d0
+  __m256d s0=_mm256_unpackhi_pd(m0,m1);        // b3 a3 b1 a1
+  __m256d s1=_mm256_unpacklo_pd(m0,m1);        // b2 a2 b0 a0
+  __m256d s2=_mm256_unpackhi_pd(m2,m3);        // d3 c3 d1 c1
+  __m256d s3=_mm256_unpacklo_pd(m2,m3);        // d2 c2 d0 c0
   FXMat4d r;
   _mm256_storeu_pd(r0,_mm256_permute2f128_pd(s1,s3,0x20));    // d0 c0 b0 a0
   _mm256_storeu_pd(r1,_mm256_permute2f128_pd(s0,s2,0x20));    // d1 c1 b1 a1
@@ -1126,14 +1126,14 @@
   _mm256_storeu_pd(r3,_mm256_permute2f128_pd(s0,s2,0x31));    // d3 c3 b3 a3
   return r;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d m00=_mm_loadu_pd(&m00);
-  register __m128d m02=_mm_loadu_pd(&m02);
-  register __m128d m10=_mm_loadu_pd(&m10);
-  register __m128d m12=_mm_loadu_pd(&m12);
-  register __m128d m20=_mm_loadu_pd(&m20);
-  register __m128d m22=_mm_loadu_pd(&m22);
-  register __m128d m30=_mm_loadu_pd(&m30);
-  register __m128d m32=_mm_loadu_pd(&m32);
+  __m128d m00=_mm_loadu_pd(&m00);
+  __m128d m02=_mm_loadu_pd(&m02);
+  __m128d m10=_mm_loadu_pd(&m10);
+  __m128d m12=_mm_loadu_pd(&m12);
+  __m128d m20=_mm_loadu_pd(&m20);
+  __m128d m22=_mm_loadu_pd(&m22);
+  __m128d m30=_mm_loadu_pd(&m30);
+  __m128d m32=_mm_loadu_pd(&m32);
   FXMat4d r;
   _mm_storeu_pd(&r00,_mm_unpacklo_pd(m00,m10));
   _mm_storeu_pd(&r02,_mm_unpacklo_pd(m20,m30));
@@ -1157,19 +1157,19 @@
 // Invert matrix
 FXMat4d FXMat4d::invert() const {
   FXMat4d r;
-  register FXdouble a0=m00*m11-m01*m10;
-  register FXdouble a1=m00*m12-m02*m10;
-  register FXdouble a2=m00*m13-m03*m10;
-  register FXdouble a3=m01*m12-m02*m11;
-  register FXdouble a4=m01*m13-m03*m11;
-  register FXdouble a5=m02*m13-m03*m12;
-  register FXdouble b0=m20*m31-m21*m30;
-  register FXdouble b1=m20*m32-m22*m30;
-  register FXdouble b2=m20*m33-m23*m30;
-  register FXdouble b3=m21*m32-m22*m31;
-  register FXdouble b4=m21*m33-m23*m31;
-  register FXdouble b5=m22*m33-m23*m32;
-  register FXdouble dd=a0*b5-a1*b4+a2*b3+a3*b2-a4*b1+a5*b0;
+  FXdouble a0=m00*m11-m01*m10;
+  FXdouble a1=m00*m12-m02*m10;
+  FXdouble a2=m00*m13-m03*m10;
+  FXdouble a3=m01*m12-m02*m11;
+  FXdouble a4=m01*m13-m03*m11;
+  FXdouble a5=m02*m13-m03*m12;
+  FXdouble b0=m20*m31-m21*m30;
+  FXdouble b1=m20*m32-m22*m30;
+  FXdouble b2=m20*m33-m23*m30;
+  FXdouble b3=m21*m32-m22*m31;
+  FXdouble b4=m21*m33-m23*m31;
+  FXdouble b5=m22*m33-m23*m32;
+  FXdouble dd=a0*b5-a1*b4+a2*b3+a3*b2-a4*b1+a5*b0;
   FXASSERT(dd!=0.0);
   dd=1.0/dd;
   r00=(m11*b5-m12*b4+m13*b3)*dd;
@@ -1194,7 +1194,7 @@
 
 // Invert affine matrix
 FXMat4d FXMat4d::affineInvert() const {
-  register FXdouble dd;
+  FXdouble dd;
   FXMat4d r;
   r00=m11*m22-m12*m21;
   r01=m02*m21-m01*m22;
@@ -1230,7 +1230,7 @@
 
 // Invert rigid body transform matrix
 FXMat4d FXMat4d::rigidInvert() const {
-  register FXdouble ss;
+  FXdouble ss;
   FXMat4d r;
   ss=1.0/(m00*m00+m01*m01+m02*m02);
   r00=m00*ss;
@@ -1255,7 +1255,7 @@
 
 // Return normal-transformation matrix (inverse transpose of upper 3x3 block)
 FXMat3d FXMat4d::normalMatrix() const {
-  register FXdouble dd;
+  FXdouble dd;
   FXMat3d res;
   res00=m11*m22-m12*m21;
   res01=m12*m20-m10*m22;
@@ -1285,15 +1285,15 @@
 // Matrix times vector
 FXVec3d operator*(const FXMat4d& m,const FXVec3d& v){
 #if defined(FOX_HAS_AVX)
-  register __m256d vv=_mm256_set_pd(1.0,v2,v1,v0);
-  register __m256d r0=_mm256_mul_pd(_mm256_loadu_pd(&m00),vv);      // m03  m02*v2  m01*v1  m00*v0
-  register __m256d r1=_mm256_mul_pd(_mm256_loadu_pd(&m10),vv);      // m13  m12*v2  m11*v1  m10*v0
-  register __m256d r2=_mm256_mul_pd(_mm256_loadu_pd(&m20),vv);      // m23  m22*v2  m21*v1  m20*v0
-  register __m256d r3=_mm256_mul_pd(_mm256_loadu_pd(&m30),vv);      // m33  m32*v2  m31*v1  m30*v0
-  register __m256d t0=_mm256_unpackhi_pd(r0,r1);      // m13     m03     m11*v1  m01*v1
-  register __m256d t1=_mm256_unpacklo_pd(r0,r1);      // m12*v2  m02*v2  m10*v0  m00*v0
-  register __m256d t2=_mm256_unpackhi_pd(r2,r3);      // m33     m23     m31*v1  m21*v1
-  register __m256d t3=_mm256_unpacklo_pd(r2,r3);      // m32*v2  m22*v2  m30*v0  m20*v0
+  __m256d vv=_mm256_set_pd(1.0,v2,v1,v0);
+  __m256d r0=_mm256_mul_pd(_mm256_loadu_pd(&m00),vv);      // m03  m02*v2  m01*v1  m00*v0
+  __m256d r1=_mm256_mul_pd(_mm256_loadu_pd(&m10),vv);      // m13  m12*v2  m11*v1  m10*v0
+  __m256d r2=_mm256_mul_pd(_mm256_loadu_pd(&m20),vv);      // m23  m22*v2  m21*v1  m20*v0
+  __m256d r3=_mm256_mul_pd(_mm256_loadu_pd(&m30),vv);      // m33  m32*v2  m31*v1  m30*v0
+  __m256d t0=_mm256_unpackhi_pd(r0,r1);      // m13     m03     m11*v1  m01*v1
+  __m256d t1=_mm256_unpacklo_pd(r0,r1);      // m12*v2  m02*v2  m10*v0  m00*v0
+  __m256d t2=_mm256_unpackhi_pd(r2,r3);      // m33     m23     m31*v1  m21*v1
+  __m256d t3=_mm256_unpacklo_pd(r2,r3);      // m32*v2  m22*v2  m30*v0  m20*v0
   FXVec3d r;
   r0=_mm256_permute2f128_pd(t1,t3,0x20);    // m30*v0 m20*v0 m10*v0 m00*v0
   r1=_mm256_permute2f128_pd(t0,t2,0x20);    // m31*v1 m21*v1 m11*v1 m01*v1
@@ -1302,14 +1302,14 @@
   _mm256_maskstore_pd(&r0,MMM,_mm256_add_pd(_mm256_add_pd(r0,r1),_mm256_add_pd(r2,r3)));
   return r;
 #elif defined(FOX_HAS_SSE3)
-  register __m128d v0=_mm_loadu_pd(&v0);
-  register __m128d v1=_mm_load_sd(&v2);
-  register __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),v0);   // m01*v1  m00*v0
-  register __m128d r02=_mm_mul_pd(_mm_loadu_pd(&m02),v1);   // m03     m02*v2
-  register __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),v0);   // m11*v1  m10*v0
-  register __m128d r12=_mm_mul_pd(_mm_loadu_pd(&m12),v1);   // m13     m12*v2
-  register __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),v0);   // m21*v1  m20*v0
-  register __m128d r22=_mm_mul_pd(_mm_loadu_pd(&m22),v1);   // m23     m22*v2
+  __m128d v0=_mm_loadu_pd(&v0);
+  __m128d v1=_mm_load_sd(&v2);
+  __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),v0);   // m01*v1  m00*v0
+  __m128d r02=_mm_mul_pd(_mm_loadu_pd(&m02),v1);   // m03     m02*v2
+  __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),v0);   // m11*v1  m10*v0
+  __m128d r12=_mm_mul_pd(_mm_loadu_pd(&m12),v1);   // m13     m12*v2
+  __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),v0);   // m21*v1  m20*v0
+  __m128d r22=_mm_mul_pd(_mm_loadu_pd(&m22),v1);   // m23     m22*v2
   FXVec3d r;
   r00=_mm_hadd_pd(r00,r02);     // m03+m02*v2  m01*v1+m00*v0
   r10=_mm_hadd_pd(r10,r12);     // m13+m12*v2  m11*v1+m10*v0
@@ -1328,15 +1328,15 @@
 // Matrix times vector
 FXVec4d operator*(const FXMat4d& m,const FXVec4d& v){
 #if defined(FOX_HAS_AVX)
-  register __m256d vv=_mm256_loadu_pd(v);
-  register __m256d r0=_mm256_mul_pd(_mm256_loadu_pd(&m00),vv);      // m03*v3  m02*v2  m01*v1  m00*v0
-  register __m256d r1=_mm256_mul_pd(_mm256_loadu_pd(&m10),vv);      // m13*v3  m12*v2  m11*v1  m10*v0
-  register __m256d r2=_mm256_mul_pd(_mm256_loadu_pd(&m20),vv);      // m23*v3  m22*v2  m21*v1  m20*v0
-  register __m256d r3=_mm256_mul_pd(_mm256_loadu_pd(&m30),vv);      // m33*v3  m32*v2  m31*v1  m30*v0
-  register __m256d t0=_mm256_unpackhi_pd(r0,r1);      // m13*v3  m03*v3  m11*v1  m01*v1
-  register __m256d t1=_mm256_unpacklo_pd(r0,r1);      // m12*v2  m02*v2  m10*v0  m00*v0
-  register __m256d t2=_mm256_unpackhi_pd(r2,r3);      // m33*v3  m23*v3  m31*v1  m21*v1
-  register __m256d t3=_mm256_unpacklo_pd(r2,r3);      // m32*v2  m22*v2  m30*v0  m20*v0
+  __m256d vv=_mm256_loadu_pd(v);
+  __m256d r0=_mm256_mul_pd(_mm256_loadu_pd(&m00),vv);      // m03*v3  m02*v2  m01*v1  m00*v0
+  __m256d r1=_mm256_mul_pd(_mm256_loadu_pd(&m10),vv);      // m13*v3  m12*v2  m11*v1  m10*v0
+  __m256d r2=_mm256_mul_pd(_mm256_loadu_pd(&m20),vv);      // m23*v3  m22*v2  m21*v1  m20*v0
+  __m256d r3=_mm256_mul_pd(_mm256_loadu_pd(&m30),vv);      // m33*v3  m32*v2  m31*v1  m30*v0
+  __m256d t0=_mm256_unpackhi_pd(r0,r1);      // m13*v3  m03*v3  m11*v1  m01*v1
+  __m256d t1=_mm256_unpacklo_pd(r0,r1);      // m12*v2  m02*v2  m10*v0  m00*v0
+  __m256d t2=_mm256_unpackhi_pd(r2,r3);      // m33*v3  m23*v3  m31*v1  m21*v1
+  __m256d t3=_mm256_unpacklo_pd(r2,r3);      // m32*v2  m22*v2  m30*v0  m20*v0
   FXVec4d r;
   r0=_mm256_permute2f128_pd(t1,t3,0x20);    // m30*v0 m20*v0 m10*v0 m00*v0
   r1=_mm256_permute2f128_pd(t0,t2,0x20);    // m31*v1 m21*v1 m11*v1 m01*v1
@@ -1345,16 +1345,16 @@
   _mm256_storeu_pd(&r0,_mm256_add_pd(_mm256_add_pd(r0,r1),_mm256_add_pd(r2,r3)));
   return r;
 #elif defined(FOX_HAS_SSE3)
-  register __m128d v0=_mm_loadu_pd(&v0);
-  register __m128d v1=_mm_loadu_pd(&v2);
-  register __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),v0);
-  register __m128d r02=_mm_mul_pd(_mm_loadu_pd(&m02),v1);
-  register __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),v0);
-  register __m128d r12=_mm_mul_pd(_mm_loadu_pd(&m12),v1);
-  register __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),v0);
-  register __m128d r22=_mm_mul_pd(_mm_loadu_pd(&m22),v1);
-  register __m128d r30=_mm_mul_pd(_mm_loadu_pd(&m30),v0);
-  register __m128d r32=_mm_mul_pd(_mm_loadu_pd(&m32),v1);
+  __m128d v0=_mm_loadu_pd(&v0);
+  __m128d v1=_mm_loadu_pd(&v2);
+  __m128d r00=_mm_mul_pd(_mm_loadu_pd(&m00),v0);
+  __m128d r02=_mm_mul_pd(_mm_loadu_pd(&m02),v1);
+  __m128d r10=_mm_mul_pd(_mm_loadu_pd(&m10),v0);
+  __m128d r12=_mm_mul_pd(_mm_loadu_pd(&m12),v1);
+  __m128d r20=_mm_mul_pd(_mm_loadu_pd(&m20),v0);
+  __m128d r22=_mm_mul_pd(_mm_loadu_pd(&m22),v1);
+  __m128d r30=_mm_mul_pd(_mm_loadu_pd(&m30),v0);
+  __m128d r32=_mm_mul_pd(_mm_loadu_pd(&m32),v1);
   FXVec4d r;
   r00=_mm_hadd_pd(r00,r02);     // m03*v3+m02*v2  m01*v1+m00*v0
   r10=_mm_hadd_pd(r10,r12);     // m13*v3+m12*v2  m11*v1+m10*v0
@@ -1374,28 +1374,28 @@
 // Vector times matrix
 FXVec3d operator*(const FXVec3d& v,const FXMat4d& m){
 #if defined(FOX_HAS_AVX)
-  register __m256d m0=_mm256_loadu_pd(&m00);
-  register __m256d m1=_mm256_loadu_pd(&m10);
-  register __m256d m2=_mm256_loadu_pd(&m20);
-  register __m256d m3=_mm256_loadu_pd(&m30);
-  register __m256d v0=_mm256_set1_pd(v0);
-  register __m256d v1=_mm256_set1_pd(v1);
-  register __m256d v2=_mm256_set1_pd(v2);
+  __m256d m0=_mm256_loadu_pd(&m00);
+  __m256d m1=_mm256_loadu_pd(&m10);
+  __m256d m2=_mm256_loadu_pd(&m20);
+  __m256d m3=_mm256_loadu_pd(&m30);
+  __m256d v0=_mm256_set1_pd(v0);
+  __m256d v1=_mm256_set1_pd(v1);
+  __m256d v2=_mm256_set1_pd(v2);
   FXVec3d r;
   _mm256_maskstore_pd(&r0,MMM,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(v0,m0),_mm256_mul_pd(v1,m1)),_mm256_add_pd(_mm256_mul_pd(v2,m2),m3)));
   return r;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d m00=_mm_loadu_pd(&m00);
-  register __m128d m02=_mm_loadu_pd(&m02);
-  register __m128d m10=_mm_loadu_pd(&m10);
-  register __m128d m12=_mm_loadu_pd(&m12);
-  register __m128d m20=_mm_loadu_pd(&m20);
-  register __m128d m22=_mm_loadu_pd(&m22);
-  register __m128d m30=_mm_loadu_pd(&m30);
-  register __m128d m32=_mm_loadu_pd(&m32);
-  register __m128d v0=_mm_set1_pd(v0);
-  register __m128d v1=_mm_set1_pd(v1);
-  register __m128d v2=_mm_set1_pd(v2);
+  __m128d m00=_mm_loadu_pd(&m00);
+  __m128d m02=_mm_loadu_pd(&m02);
+  __m128d m10=_mm_loadu_pd(&m10);
+  __m128d m12=_mm_loadu_pd(&m12);
+  __m128d m20=_mm_loadu_pd(&m20);
+  __m128d m22=_mm_loadu_pd(&m22);
+  __m128d m30=_mm_loadu_pd(&m30);
+  __m128d m32=_mm_loadu_pd(&m32);
+  __m128d v0=_mm_set1_pd(v0);
+  __m128d v1=_mm_set1_pd(v1);
+  __m128d v2=_mm_set1_pd(v2);
   FXVec3d r;
   _mm_storeu_pd(&r0,_mm_add_pd(_mm_add_pd(_mm_mul_pd(m00,v0),_mm_mul_pd(m10,v1)),_mm_add_pd(_mm_mul_pd(m20,v2),m30)));
   _mm_store_sd(&r2,_mm_add_sd(_mm_add_sd(_mm_mul_sd(m02,v0),_mm_mul_sd(m12,v1)),_mm_add_sd(_mm_mul_sd(m22,v2),m32)));
@@ -1409,30 +1409,30 @@
 // Vector times matrix
 FXVec4d operator*(const FXVec4d& v,const FXMat4d& m){
 #if defined(FOX_HAS_AVX)
-  register __m256d m0=_mm256_loadu_pd(&m00);
-  register __m256d m1=_mm256_loadu_pd(&m10);
-  register __m256d m2=_mm256_loadu_pd(&m20);
-  register __m256d m3=_mm256_loadu_pd(&m30);
-  register __m256d v0=_mm256_set1_pd(v0);
-  register __m256d v1=_mm256_set1_pd(v1);
-  register __m256d v2=_mm256_set1_pd(v2);
-  register __m256d v3=_mm256_set1_pd(v3);
+  __m256d m0=_mm256_loadu_pd(&m00);
+  __m256d m1=_mm256_loadu_pd(&m10);
+  __m256d m2=_mm256_loadu_pd(&m20);
+  __m256d m3=_mm256_loadu_pd(&m30);
+  __m256d v0=_mm256_set1_pd(v0);
+  __m256d v1=_mm256_set1_pd(v1);
+  __m256d v2=_mm256_set1_pd(v2);
+  __m256d v3=_mm256_set1_pd(v3);
   FXVec4d r;
   _mm256_storeu_pd(&r0,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(v0,m0),_mm256_mul_pd(v1,m1)),_mm256_add_pd(_mm256_mul_pd(v2,m2),_mm256_mul_pd(v3,m3))));
   return r;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d m00=_mm_loadu_pd(&m00);
-  register __m128d m02=_mm_loadu_pd(&m02);
-  register __m128d m10=_mm_loadu_pd(&m10);
-  register __m128d m12=_mm_loadu_pd(&m12);
-  register __m128d m20=_mm_loadu_pd(&m20);
-  register __m128d m22=_mm_loadu_pd(&m22);
-  register __m128d m30=_mm_loadu_pd(&m30);
-  register __m128d m32=_mm_loadu_pd(&m32);
-  register __m128d v0=_mm_set1_pd(v0);
-  register __m128d v1=_mm_set1_pd(v1);
-  register __m128d v2=_mm_set1_pd(v2);
-  register __m128d v3=_mm_set1_pd(v3);
+  __m128d m00=_mm_loadu_pd(&m00);
+  __m128d m02=_mm_loadu_pd(&m02);
+  __m128d m10=_mm_loadu_pd(&m10);
+  __m128d m12=_mm_loadu_pd(&m12);
+  __m128d m20=_mm_loadu_pd(&m20);
+  __m128d m22=_mm_loadu_pd(&m22);
+  __m128d m30=_mm_loadu_pd(&m30);
+  __m128d m32=_mm_loadu_pd(&m32);
+  __m128d v0=_mm_set1_pd(v0);
+  __m128d v1=_mm_set1_pd(v1);
+  __m128d v2=_mm_set1_pd(v2);
+  __m128d v3=_mm_set1_pd(v3);
   FXVec4d r;
   _mm_storeu_pd(&r0,_mm_add_pd(_mm_add_pd(_mm_mul_pd(m00,v0),_mm_mul_pd(m10,v1)),_mm_add_pd(_mm_mul_pd(m20,v2),_mm_mul_pd(m30,v3))));
   _mm_storeu_pd(&r2,_mm_add_pd(_mm_add_pd(_mm_mul_pd(m02,v0),_mm_mul_pd(m12,v1)),_mm_add_pd(_mm_mul_pd(m22,v2),_mm_mul_pd(m32,v3))));
@@ -1504,11 +1504,11 @@
 // Matrix and matrix multiply
 FXMat4d operator*(const FXMat4d& a,const FXMat4d& b){
 #if defined(FOX_HAS_AVX)
-  register __m256d b0=_mm256_loadu_pd(&b00);
-  register __m256d b1=_mm256_loadu_pd(&b10);
-  register __m256d b2=_mm256_loadu_pd(&b20);
-  register __m256d b3=_mm256_loadu_pd(&b30);
-  register __m256d xx,yy,zz,ww;
+  __m256d b0=_mm256_loadu_pd(&b00);
+  __m256d b1=_mm256_loadu_pd(&b10);
+  __m256d b2=_mm256_loadu_pd(&b20);
+  __m256d b3=_mm256_loadu_pd(&b30);
+  __m256d xx,yy,zz,ww;
   FXMat4d r;
   xx=_mm256_set1_pd(a00);
   yy=_mm256_set1_pd(a01);
@@ -1532,15 +1532,15 @@
   _mm256_storeu_pd(r3,_mm256_add_pd(_mm256_add_pd(_mm256_mul_pd(b0,xx),_mm256_mul_pd(b1,yy)),_mm256_add_pd(_mm256_mul_pd(b2,zz),_mm256_mul_pd(b3,ww))));
   return r;
 #elif defined(FOX_HAS_SSE2)
-  register __m128d b00=_mm_loadu_pd(&b00);
-  register __m128d b02=_mm_loadu_pd(&b02);
-  register __m128d b10=_mm_loadu_pd(&b10);
-  register __m128d b12=_mm_loadu_pd(&b12);
-  register __m128d b20=_mm_loadu_pd(&b20);
-  register __m128d b22=_mm_loadu_pd(&b22);
-  register __m128d b30=_mm_loadu_pd(&b30);
-  register __m128d b32=_mm_loadu_pd(&b32);
-  register __m128d xx,yy,zz,ww;
+  __m128d b00=_mm_loadu_pd(&b00);
+  __m128d b02=_mm_loadu_pd(&b02);
+  __m128d b10=_mm_loadu_pd(&b10);
+  __m128d b12=_mm_loadu_pd(&b12);
+  __m128d b20=_mm_loadu_pd(&b20);
+  __m128d b22=_mm_loadu_pd(&b22);
+  __m128d b30=_mm_loadu_pd(&b30);
+  __m128d b32=_mm_loadu_pd(&b32);
+  __m128d xx,yy,zz,ww;
   FXMat4d r;
   xx=_mm_set1_pd(a00);
   yy=_mm_set1_pd(a01);
@@ -1568,7 +1568,7 @@
   _mm_storeu_pd(&r32,_mm_add_pd(_mm_add_pd(_mm_add_pd(_mm_mul_pd(b02,xx),_mm_mul_pd(b12,yy)),_mm_mul_pd(b22,zz)),_mm_mul_pd(b32,ww)));
   return r;
 #else
-  register FXdouble x,y,z,w;
+  FXdouble x,y,z,w;
   FXMat4d r;
   x=a00; y=a01; z=a02; w=a03;
   r00=x*b00+y*b10+z*b20+w*b30;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMat4f.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMat4f.cpp Changed

@@ -3,7 +3,7 @@
 *            S i n g l e - P r e c i s i o n   4 x 4   M a t r i x              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -49,10 +49,6 @@
 namespace FX {
 
 
-// Mask bottom 3 elements
-#define MMM _mm_set_epi32(0,~0,~0,~0)
-
-
 // Initialize matrix from scalar
 FXMat4f::FXMat4f(FXfloat s){
 #if defined(FOX_HAS_SSE)
@@ -71,12 +67,7 @@
 
 // Initialize with 3x3 rotation and scaling matrix
 FXMat4f::FXMat4f(const FXMat3f& s){
-#if defined(FOX_HAS_AVX)
-  _mm_storeu_ps(&m00,_mm_maskload_ps(&s00,MMM));
-  _mm_storeu_ps(&m10,_mm_maskload_ps(&s10,MMM));
-  _mm_storeu_ps(&m20,_mm_maskload_ps(&s20,MMM));
-  _mm_storeu_ps(&m30,_mm_set_ps(1.0f,0.0f,0.0f,0.0f));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set_ps(0.0f,s02,s01,s00));
   _mm_storeu_ps(&m10,_mm_set_ps(0.0f,s12,s11,s10));
   _mm_storeu_ps(&m20,_mm_set_ps(0.0f,s22,s21,s20));
@@ -92,10 +83,7 @@
 
 // Initialize matrix from another matrix
 FXMat4f::FXMat4f(const FXMat4f& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_loadu_ps(&s00));
-  _mm256_storeu_ps(&m20,_mm256_loadu_ps(&s20));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(&s00));
   _mm_storeu_ps(&m10,_mm_loadu_ps(&s10));
   _mm_storeu_ps(&m20,_mm_loadu_ps(&s20));
@@ -111,10 +99,7 @@
 
 // Initialize matrix from array
 FXMat4f::FXMat4f(const FXfloat s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_loadu_ps(s+0));
-  _mm256_storeu_ps(&m20,_mm256_loadu_ps(s+8));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(s+0));
   _mm_storeu_ps(&m10,_mm_loadu_ps(s+4));
   _mm_storeu_ps(&m20,_mm_loadu_ps(s+8));
@@ -194,12 +179,7 @@
 
 // Assign from 3x3 rotation and scaling matrix
 FXMat4f& FXMat4f::operator=(const FXMat3f& s){
-#if defined(FOX_HAS_AVX)
-  _mm_storeu_ps(&m00,_mm_maskload_ps(&s00,MMM));
-  _mm_storeu_ps(&m10,_mm_maskload_ps(&s10,MMM));
-  _mm_storeu_ps(&m20,_mm_maskload_ps(&s20,MMM));
-  _mm_storeu_ps(&m30,_mm_set_ps(1.0f,0.0f,0.0f,0.0f));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set_ps(0.0f,s02,s01,s00));
   _mm_storeu_ps(&m10,_mm_set_ps(0.0f,s12,s11,s10));
   _mm_storeu_ps(&m20,_mm_set_ps(0.0f,s22,s21,s20));
@@ -216,10 +196,7 @@
 
 // Assignment operator
 FXMat4f& FXMat4f::operator=(const FXMat4f& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_loadu_ps(&s00));
-  _mm256_storeu_ps(&m20,_mm256_loadu_ps(&s20));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(&s00));
   _mm_storeu_ps(&m10,_mm_loadu_ps(&s10));
   _mm_storeu_ps(&m20,_mm_loadu_ps(&s20));
@@ -242,10 +219,7 @@
 
 // Assignment from array
 FXMat4f& FXMat4f::operator=(const FXfloat s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_loadu_ps(s+0));
-  _mm256_storeu_ps(&m20,_mm256_loadu_ps(s+8));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(s+0));
   _mm_storeu_ps(&m10,_mm_loadu_ps(s+4));
   _mm_storeu_ps(&m20,_mm_loadu_ps(s+8));
@@ -279,12 +253,7 @@
 
 // Set from 3x3 rotation and scaling matrix
 FXMat4f& FXMat4f::set(const FXMat3f& s){
-#if defined(FOX_HAS_AVX)
-  _mm_storeu_ps(&m00,_mm_maskload_ps(&s00,MMM));
-  _mm_storeu_ps(&m10,_mm_maskload_ps(&s10,MMM));
-  _mm_storeu_ps(&m20,_mm_maskload_ps(&s20,MMM));
-  _mm_storeu_ps(&m30,_mm_set_ps(1.0f,0.0f,0.0f,0.0f));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set_ps(0.0f,s02,s01,s00));
   _mm_storeu_ps(&m10,_mm_set_ps(0.0f,s12,s11,s10));
   _mm_storeu_ps(&m20,_mm_set_ps(0.0f,s22,s21,s20));
@@ -301,10 +270,7 @@
 
 // Set value from another matrix
 FXMat4f& FXMat4f::set(const FXMat4f& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_loadu_ps(&s00));
-  _mm256_storeu_ps(&m20,_mm256_loadu_ps(&s20));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(&s00));
   _mm_storeu_ps(&m10,_mm_loadu_ps(&s10));
   _mm_storeu_ps(&m20,_mm_loadu_ps(&s20));
@@ -321,10 +287,7 @@
 
 // Set value from array
 FXMat4f& FXMat4f::set(const FXfloat s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_loadu_ps(s+0));
-  _mm256_storeu_ps(&m20,_mm256_loadu_ps(s+8));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_loadu_ps(s+0));
   _mm_storeu_ps(&m10,_mm_loadu_ps(s+4));
   _mm_storeu_ps(&m20,_mm_loadu_ps(s+8));
@@ -391,10 +354,7 @@
 
 // Add matrices
 FXMat4f& FXMat4f::operator+=(const FXMat4f& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_add_ps(_mm256_loadu_ps(&m00),_mm256_loadu_ps(&s00)));
-  _mm256_storeu_ps(&m20,_mm256_add_ps(_mm256_loadu_ps(&m20),_mm256_loadu_ps(&s20)));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_add_ps(_mm_loadu_ps(&m00),_mm_loadu_ps(&s00)));
   _mm_storeu_ps(&m10,_mm_add_ps(_mm_loadu_ps(&m10),_mm_loadu_ps(&s10)));
   _mm_storeu_ps(&m20,_mm_add_ps(_mm_loadu_ps(&m20),_mm_loadu_ps(&s20)));
@@ -411,10 +371,7 @@
 
 // Subtract matrices
 FXMat4f& FXMat4f::operator-=(const FXMat4f& s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_sub_ps(_mm256_loadu_ps(&m00),_mm256_loadu_ps(&s00)));
-  _mm256_storeu_ps(&m20,_mm256_sub_ps(_mm256_loadu_ps(&m20),_mm256_loadu_ps(&s20)));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_sub_ps(_mm_loadu_ps(&m00),_mm_loadu_ps(&s00)));
   _mm_storeu_ps(&m10,_mm_sub_ps(_mm_loadu_ps(&m10),_mm_loadu_ps(&s10)));
   _mm_storeu_ps(&m20,_mm_sub_ps(_mm_loadu_ps(&m20),_mm_loadu_ps(&s20)));
@@ -431,10 +388,7 @@
 
 // Multiply matrix by scalar
 FXMat4f& FXMat4f::operator*=(FXfloat s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_mul_ps(_mm256_loadu_ps(&m00),_mm256_set1_ps(s)));
-  _mm256_storeu_ps(&m20,_mm256_mul_ps(_mm256_loadu_ps(&m20),_mm256_set1_ps(s)));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_mul_ps(_mm_loadu_ps(&m00),_mm_set1_ps(s)));
   _mm_storeu_ps(&m10,_mm_mul_ps(_mm_loadu_ps(&m10),_mm_set1_ps(s)));
   _mm_storeu_ps(&m20,_mm_mul_ps(_mm_loadu_ps(&m20),_mm_set1_ps(s)));
@@ -452,11 +406,11 @@
 // Multiply matrix by matrix
 FXMat4f& FXMat4f::operator*=(const FXMat4f& s){
 #if defined(FOX_HAS_SSE)
-  register __m128 b0=_mm_loadu_ps(&s00);
-  register __m128 b1=_mm_loadu_ps(&s10);
-  register __m128 b2=_mm_loadu_ps(&s20);
-  register __m128 b3=_mm_loadu_ps(&s30);
-  register __m128 xx,yy,zz,ww;
+  __m128 b0=_mm_loadu_ps(&s00);
+  __m128 b1=_mm_loadu_ps(&s10);
+  __m128 b2=_mm_loadu_ps(&s20);
+  __m128 b3=_mm_loadu_ps(&s30);
+  __m128 xx,yy,zz,ww;
   xx=_mm_set1_ps(m00);
   yy=_mm_set1_ps(m01);
   zz=_mm_set1_ps(m02);
@@ -478,7 +432,7 @@
   ww=_mm_set1_ps(m33);
   _mm_storeu_ps(m3,_mm_add_ps(_mm_add_ps(_mm_mul_ps(b0,xx),_mm_mul_ps(b1,yy)),_mm_add_ps(_mm_mul_ps(b2,zz),_mm_mul_ps(b3,ww))));
 #else
-  register FXfloat x,y,z,w;
+  FXfloat x,y,z,w;
   x=m00; y=m01; z=m02; w=m03;
   m00=x*s00+y*s10+z*s20+w*s30;
   m01=x*s01+y*s11+z*s21+w*s31;
@@ -506,10 +460,7 @@
 
 // Divide matric by scalar
 FXMat4f& FXMat4f::operator/=(FXfloat s){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_div_ps(_mm256_loadu_ps(&m00),_mm256_set1_ps(s)));
-  _mm256_storeu_ps(&m20,_mm256_div_ps(_mm256_loadu_ps(&m20),_mm256_set1_ps(s)));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_div_ps(_mm_loadu_ps(&m00),_mm_set1_ps(s)));
   _mm_storeu_ps(&m10,_mm_div_ps(_mm_loadu_ps(&m10),_mm_set1_ps(s)));
   _mm_storeu_ps(&m20,_mm_div_ps(_mm_loadu_ps(&m20),_mm_set1_ps(s)));
@@ -526,12 +477,7 @@
 
 // Unary minus
 FXMat4f FXMat4f::operator-() const {
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_sub_ps(_mm256_set1_ps(0.0f),_mm256_loadu_ps(&m00)));
-  _mm256_storeu_ps(&r20,_mm256_sub_ps(_mm256_set1_ps(0.0f),_mm256_loadu_ps(&m20)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(r0,_mm_sub_ps(_mm_set_ps(0.0f,0.0f,0.0f,0.0f),_mm_loadu_ps(m0)));
   _mm_storeu_ps(r1,_mm_sub_ps(_mm_set_ps(0.0f,0.0f,0.0f,0.0f),_mm_loadu_ps(m1)));
@@ -549,10 +495,7 @@
 
 // Set to identity matrix
 FXMat4f& FXMat4f::identity(){
-#if defined(FOX_HAS_AVX)
-  _mm256_storeu_ps(&m00,_mm256_set_ps(0.0f,0.0f,1.0f,0.0f, 0.0f,0.0f,0.0f,1.0f));
-  _mm256_storeu_ps(&m20,_mm256_set_ps(1.0f,0.0f,0.0f,0.0f, 0.0f,1.0f,0.0f,0.0f));
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   _mm_storeu_ps(&m00,_mm_set_ps(0.0f,0.0f,0.0f,1.0f));
   _mm_storeu_ps(&m10,_mm_set_ps(0.0f,0.0f,1.0f,0.0f));
   _mm_storeu_ps(&m20,_mm_set_ps(0.0f,1.0f,0.0f,0.0f));
@@ -578,9 +521,9 @@
 
 // Set orthographic projection from view volume
 FXMat4f& FXMat4f::setOrtho(FXfloat xlo,FXfloat xhi,FXfloat ylo,FXfloat yhi,FXfloat zlo,FXfloat zhi){
-  register FXfloat rl=xhi-xlo;
-  register FXfloat tb=yhi-ylo;
-  register FXfloat yh=zhi-zlo;
+  FXfloat rl=xhi-xlo;
+  FXfloat tb=yhi-ylo;
+  FXfloat yh=zhi-zlo;
   return set(2.0f/rl,0.0f,0.0f,0.0f,0.0f,2.0f/tb,0.0f,0.0f,0.0f,0.0f,-2.0f/yh,0.0f,-(xhi+xlo)/rl,-(yhi+ylo)/tb,-(zhi+zlo)/yh,1.0f);
   }
 
@@ -598,18 +541,18 @@
 
 // Set to inverse orthographic projection
 FXMat4f& FXMat4f::setInverseOrtho(FXfloat xlo,FXfloat xhi,FXfloat ylo,FXfloat yhi,FXfloat zlo,FXfloat zhi){
-  register FXfloat rl=xhi-xlo;
-  register FXfloat tb=yhi-ylo;
-  register FXfloat yh=zhi-zlo;
+  FXfloat rl=xhi-xlo;
+  FXfloat tb=yhi-ylo;
+  FXfloat yh=zhi-zlo;
   return set(0.5f*rl,0.0f,0.0f,0.0f,0.0f,0.5f*tb,0.0f,0.0f,0.0f,0.0f,-0.5f*yh,0.0f,0.5f*(xhi+xlo),0.5f*(yhi+ylo),0.5f*(zhi+zlo),1.0f);
   }
 
 
 // Set to perspective projection from view volume
 FXMat4f& FXMat4f::setFrustum(FXfloat xlo,FXfloat xhi,FXfloat ylo,FXfloat yhi,FXfloat zlo,FXfloat zhi){
-  register FXfloat rl=xhi-xlo;
-  register FXfloat tb=yhi-ylo;
-  register FXfloat yh=zhi-zlo;
+  FXfloat rl=xhi-xlo;
+  FXfloat tb=yhi-ylo;
+  FXfloat yh=zhi-zlo;
   return set(2.0f*zlo/rl,0.0f,0.0f,0.0f,0.0f,2.0f*zlo/tb,0.0f,0.0f,(xhi+xlo)/rl,(yhi+ylo)/tb,-(zhi+zlo)/yh,-1.0f,0.0f,0.0f,-2.0f*zhi*zlo/yh,0.0f);
   }
 
@@ -627,9 +570,9 @@
 
 // Set to inverse perspective projection from view volume
 FXMat4f& FXMat4f::setInverseFrustum(FXfloat xlo,FXfloat xhi,FXfloat ylo,FXfloat yhi,FXfloat zlo,FXfloat zhi){
-  register FXfloat rl=xhi-xlo;
-  register FXfloat tb=yhi-ylo;
-  register FXfloat yh=zhi-zlo;
+  FXfloat rl=xhi-xlo;
+  FXfloat tb=yhi-ylo;
+  FXfloat yh=zhi-zlo;
   return set(0.5f*rl/zlo,0.0f,0.0f,0.0f,0.0f,0.5f*tb/zlo,0.0f,0.0f,0.0f,0.0f,0.0f,-0.5f*yh/(zhi*zlo),0.5f*(xhi+xlo)/zlo,0.5f*(yhi+ylo)/zlo,-1.0f,0.5f*(zhi+zlo)/(zhi*zlo));
   }
 
@@ -646,7 +589,7 @@
 
 // Multiply by rotation matrix
 FXMat4f& FXMat4f::rot(const FXMat3f& r){
-  register FXfloat x,y,z;
+  FXfloat x,y,z;
   x=m00; y=m10; z=m20;
   m00=x*r00+y*r01+z*r02;
   m10=x*r10+y*r11+z*r12;
@@ -675,16 +618,16 @@
 
 // Multiply by rotation c,s about unit axis
 FXMat4f& FXMat4f::rot(const FXVec3f& v,FXfloat c,FXfloat s){
-  register FXfloat xx=v.x*v.x;
-  register FXfloat yy=v.y*v.y;
-  register FXfloat zz=v.z*v.z;
-  register FXfloat xy=v.x*v.y;
-  register FXfloat yz=v.y*v.z;
-  register FXfloat zx=v.z*v.x;
-  register FXfloat xs=v.x*s;
-  register FXfloat ys=v.y*s;
-  register FXfloat zs=v.z*s;
-  register FXfloat t=1.0f-c;
+  FXfloat xx=v.x*v.x;
+  FXfloat yy=v.y*v.y;
+  FXfloat zz=v.z*v.z;
+  FXfloat xy=v.x*v.y;
+  FXfloat yz=v.y*v.z;
+  FXfloat zx=v.z*v.x;
+  FXfloat xs=v.x*s;
+  FXfloat ys=v.y*s;
+  FXfloat zs=v.z*s;
+  FXfloat t=1.0f-c;
   return rot(FXMat3f(t*xx+c,t*xy+zs,t*zx-ys,t*xy-zs,t*yy+c,t*yz+xs,t*zx+ys,t*yz-xs,t*zz+c));
   }
 
@@ -698,14 +641,14 @@
 // Rotate about x-axis
 FXMat4f& FXMat4f::xrot(FXfloat c,FXfloat s){
 #if defined(FOX_HAS_SSE)
-  register __m128 cc=_mm_set1_ps(c);
-  register __m128 ss=_mm_set1_ps(s);
-  register __m128 uu=_mm_loadu_ps(&m10);
-  register __m128 vv=_mm_loadu_ps(&m20);
+  __m128 cc=_mm_set1_ps(c);
+  __m128 ss=_mm_set1_ps(s);
+  __m128 uu=_mm_loadu_ps(&m10);
+  __m128 vv=_mm_loadu_ps(&m20);
   _mm_storeu_ps(m1,_mm_add_ps(_mm_mul_ps(cc,uu),_mm_mul_ps(ss,vv)));
   _mm_storeu_ps(m2,_mm_sub_ps(_mm_mul_ps(cc,vv),_mm_mul_ps(ss,uu)));
 #else
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m10; v=m20; m10=c*u+s*v; m20=c*v-s*u;
   u=m11; v=m21; m11=c*u+s*v; m21=c*v-s*u;
   u=m12; v=m22; m12=c*u+s*v; m22=c*v-s*u;
@@ -724,14 +667,14 @@
 // Rotate about y-axis
 FXMat4f& FXMat4f::yrot(FXfloat c,FXfloat s){
 #if defined(FOX_HAS_SSE)
-  register __m128 cc=_mm_set1_ps(c);
-  register __m128 ss=_mm_set1_ps(s);
-  register __m128 uu=_mm_loadu_ps(&m00);
-  register __m128 vv=_mm_loadu_ps(&m20);
+  __m128 cc=_mm_set1_ps(c);
+  __m128 ss=_mm_set1_ps(s);
+  __m128 uu=_mm_loadu_ps(&m00);
+  __m128 vv=_mm_loadu_ps(&m20);
   _mm_storeu_ps(m0,_mm_sub_ps(_mm_mul_ps(cc,uu),_mm_mul_ps(ss,vv)));
   _mm_storeu_ps(m2,_mm_add_ps(_mm_mul_ps(cc,vv),_mm_mul_ps(ss,uu)));
 #else
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m00; v=m20; m00=c*u-s*v; m20=c*v+s*u;
   u=m01; v=m21; m01=c*u-s*v; m21=c*v+s*u;
   u=m02; v=m22; m02=c*u-s*v; m22=c*v+s*u;
@@ -750,14 +693,14 @@
 // Rotate about z-axis
 FXMat4f& FXMat4f::zrot(FXfloat c,FXfloat s){
 #if defined(FOX_HAS_SSE)
-  register __m128 cc=_mm_set1_ps(c);
-  register __m128 ss=_mm_set1_ps(s);
-  register __m128 uu=_mm_loadu_ps(&m00);
-  register __m128 vv=_mm_loadu_ps(&m10);
+  __m128 cc=_mm_set1_ps(c);
+  __m128 ss=_mm_set1_ps(s);
+  __m128 uu=_mm_loadu_ps(&m00);
+  __m128 vv=_mm_loadu_ps(&m10);
   _mm_storeu_ps(m0,_mm_add_ps(_mm_mul_ps(cc,uu),_mm_mul_ps(ss,vv)));
   _mm_storeu_ps(m1,_mm_sub_ps(_mm_mul_ps(cc,vv),_mm_mul_ps(ss,uu)));
 #else
-  register FXfloat u,v;
+  FXfloat u,v;
   u=m00; v=m10; m00=c*u+s*v; m10=c*v-s*u;
   u=m01; v=m11; m01=c*u+s*v; m11=c*v-s*u;
   u=m02; v=m12; m02=c*u+s*v; m12=c*v-s*u;
@@ -775,7 +718,7 @@
 
 // Look at
 FXMat4f& FXMat4f::look(const FXVec3f& from,const FXVec3f& to,const FXVec3f& up){
-  register FXfloat x0,x1,x2,tx,ty,tz;
+  FXfloat x0,x1,x2,tx,ty,tz;
   FXVec3f rz,rx,ry;
   rz=normalize(from-to);
   rx=normalize(up^rz);
@@ -806,13 +749,13 @@
 // Translate
 FXMat4f& FXMat4f::trans(FXfloat tx,FXfloat ty,FXfloat tz){
 #if defined(FOX_HAS_SSE)
-  register __m128 ttx=_mm_set1_ps(tx);
-  register __m128 tty=_mm_set1_ps(ty);
-  register __m128 ttz=_mm_set1_ps(tz);
-  register __m128 r0=_mm_mul_ps(_mm_loadu_ps(&m00),ttx);
-  register __m128 r1=_mm_mul_ps(_mm_loadu_ps(&m10),tty);
-  register __m128 r2=_mm_mul_ps(_mm_loadu_ps(&m20),ttz);
-  register __m128 r3=_mm_loadu_ps(&m30);
+  __m128 ttx=_mm_set1_ps(tx);
+  __m128 tty=_mm_set1_ps(ty);
+  __m128 ttz=_mm_set1_ps(tz);
+  __m128 r0=_mm_mul_ps(_mm_loadu_ps(&m00),ttx);
+  __m128 r1=_mm_mul_ps(_mm_loadu_ps(&m10),tty);
+  __m128 r2=_mm_mul_ps(_mm_loadu_ps(&m20),ttz);
+  __m128 r3=_mm_loadu_ps(&m30);
   _mm_storeu_ps(&m30,_mm_add_ps(_mm_add_ps(r0,r1),_mm_add_ps(r2,r3)));
 #else
   m30=m30+tx*m00+ty*m10+tz*m20;
@@ -833,9 +776,9 @@
 // Scale unqual
 FXMat4f& FXMat4f::scale(FXfloat sx,FXfloat sy,FXfloat sz){
 #if defined(FOX_HAS_SSE)
-  register __m128 ssx=_mm_set1_ps(sx);
-  register __m128 ssy=_mm_set1_ps(sy);
-  register __m128 ssz=_mm_set1_ps(sz);
+  __m128 ssx=_mm_set1_ps(sx);
+  __m128 ssy=_mm_set1_ps(sy);
+  __m128 ssz=_mm_set1_ps(sz);
   _mm_storeu_ps(&m00,_mm_mul_ps(_mm_loadu_ps(&m00),ssx));
   _mm_storeu_ps(&m10,_mm_mul_ps(_mm_loadu_ps(&m10),ssy));
   _mm_storeu_ps(&m20,_mm_mul_ps(_mm_loadu_ps(&m20),ssz));
@@ -876,14 +819,14 @@
 FXMat4f FXMat4f::transpose() const {
 #if defined(FOX_HAS_SSE)
   FXMat4f r;
-  register __m128 m0=_mm_loadu_ps(&m00);
-  register __m128 m1=_mm_loadu_ps(&m10);
-  register __m128 m2=_mm_loadu_ps(&m20);
-  register __m128 m3=_mm_loadu_ps(&m30);
-  register __m128 t0=_mm_unpacklo_ps(m0,m1); // m11 m01 m10 m00
-  register __m128 t1=_mm_unpacklo_ps(m2,m3); // m31 m21 m30 m20
-  register __m128 t2=_mm_unpackhi_ps(m0,m1); // m13 m03 m12 m02
-  register __m128 t3=_mm_unpackhi_ps(m2,m3); // m33 m23 m32 m22
+  __m128 m0=_mm_loadu_ps(&m00);
+  __m128 m1=_mm_loadu_ps(&m10);
+  __m128 m2=_mm_loadu_ps(&m20);
+  __m128 m3=_mm_loadu_ps(&m30);
+  __m128 t0=_mm_unpacklo_ps(m0,m1);    // m11 m01 m10 m00
+  __m128 t1=_mm_unpacklo_ps(m2,m3);    // m31 m21 m30 m20
+  __m128 t2=_mm_unpackhi_ps(m0,m1);    // m13 m03 m12 m02
+  __m128 t3=_mm_unpackhi_ps(m2,m3);    // m33 m23 m32 m22
   _mm_storeu_ps(r0,_mm_movelh_ps(t0,t1));     // m30 m20 m10 m00
   _mm_storeu_ps(r1,_mm_movehl_ps(t1,t0));     // m31 m21 m11 m01
   _mm_storeu_ps(r2,_mm_movelh_ps(t2,t3));     // m32 m22 m12 m02
@@ -901,19 +844,19 @@
 // Invert matrix
 FXMat4f FXMat4f::invert() const {
   FXMat4f r;
-  register FXfloat a0=m00*m11-m01*m10;
-  register FXfloat a1=m00*m12-m02*m10;
-  register FXfloat a2=m00*m13-m03*m10;
-  register FXfloat a3=m01*m12-m02*m11;
-  register FXfloat a4=m01*m13-m03*m11;
-  register FXfloat a5=m02*m13-m03*m12;
-  register FXfloat b0=m20*m31-m21*m30;
-  register FXfloat b1=m20*m32-m22*m30;
-  register FXfloat b2=m20*m33-m23*m30;
-  register FXfloat b3=m21*m32-m22*m31;
-  register FXfloat b4=m21*m33-m23*m31;
-  register FXfloat b5=m22*m33-m23*m32;
-  register FXfloat dd=a0*b5-a1*b4+a2*b3+a3*b2-a4*b1+a5*b0;
+  FXfloat a0=m00*m11-m01*m10;
+  FXfloat a1=m00*m12-m02*m10;
+  FXfloat a2=m00*m13-m03*m10;
+  FXfloat a3=m01*m12-m02*m11;
+  FXfloat a4=m01*m13-m03*m11;
+  FXfloat a5=m02*m13-m03*m12;
+  FXfloat b0=m20*m31-m21*m30;
+  FXfloat b1=m20*m32-m22*m30;
+  FXfloat b2=m20*m33-m23*m30;
+  FXfloat b3=m21*m32-m22*m31;
+  FXfloat b4=m21*m33-m23*m31;
+  FXfloat b5=m22*m33-m23*m32;
+  FXfloat dd=a0*b5-a1*b4+a2*b3+a3*b2-a4*b1+a5*b0;
   FXASSERT(dd!=0.0f);
   dd=1.0f/dd;
   r00=(m11*b5-m12*b4+m13*b3)*dd;
@@ -938,7 +881,7 @@
 
 // Invert affine matrix
 FXMat4f FXMat4f::affineInvert() const {
-  register FXfloat dd;
+  FXfloat dd;
   FXMat4f r;
   r00=m11*m22-m12*m21;
   r01=m02*m21-m01*m22;
@@ -974,7 +917,7 @@
 
 // Invert rigid body transform matrix
 FXMat4f FXMat4f::rigidInvert() const {
-  register FXfloat ss;
+  FXfloat ss;
   FXMat4f r;
   ss=1.0f/(m00*m00+m01*m01+m02*m02);
   r00=m00*ss;
@@ -999,7 +942,7 @@
 
 // Return normal-transformation matrix (inverse transpose of upper 3x3 block)
 FXMat3f FXMat4f::normalMatrix() const {
-  register FXfloat dd;
+  FXfloat dd;
   FXMat3f res;
   res00=m11*m22-m12*m21;
   res01=m12*m20-m10*m22;
@@ -1028,33 +971,20 @@
 
 // Matrix times vector
 FXVec3f operator*(const FXMat4f& m,const FXVec3f& v){
-#if defined(FOX_HAS_AVX)
-  register __m128 m0=_mm_loadu_ps(&m00);
-  register __m128 m1=_mm_loadu_ps(&m10);
-  register __m128 m2=_mm_loadu_ps(&m20);
-  register __m128 vv=_mm_set_ps(1.0f,v2,v1,v0);
-  register __m128 r0=_mm_mul_ps(m0,vv);
-  register __m128 r1=_mm_mul_ps(m1,vv);
-  register __m128 r2=_mm_mul_ps(m2,vv);
-  FXVec3f r;
-  r0=_mm_hadd_ps(r0,r1);
-  r2=_mm_hadd_ps(r2,m0);
-  r0=_mm_hadd_ps(r0,r2);
-  _mm_maskstore_ps(&r0,MMM,r0);
-  return r;
-#elif defined(FOX_HAS_SSE3)
-  register __m128 m0=_mm_loadu_ps(&m00);
-  register __m128 m1=_mm_loadu_ps(&m10);
-  register __m128 m2=_mm_loadu_ps(&m20);
-  register __m128 vv=_mm_set_ps(1.0f,v2,v1,v0);
-  register __m128 r0=_mm_mul_ps(m0,vv);         // m03 m02*v2 m01*v1 m00*v0
-  register __m128 r1=_mm_mul_ps(m1,vv);         // m13 m12*v2 m11*v1 m10*v0
-  register __m128 r2=_mm_mul_ps(m2,vv);         // m23 m22*v2 m21*v1 m20*v0
+#if defined(FOX_HAS_SSE3)
+  __m128 m0=_mm_loadu_ps(&m00);
+  __m128 m1=_mm_loadu_ps(&m10);
+  __m128 m2=_mm_loadu_ps(&m20);
+  __m128 vv=_mm_set_ps(1.0f,v2,v1,v0);
+  __m128 r0=_mm_mul_ps(m0,vv);         // m03 m02*v2 m01*v1 m00*v0
+  __m128 r1=_mm_mul_ps(m1,vv);         // m13 m12*v2 m11*v1 m10*v0
+  __m128 r2=_mm_mul_ps(m2,vv);         // m23 m22*v2 m21*v1 m20*v0
   FXVec3f r;
   r0=_mm_hadd_ps(r0,r1);        // m13+m12*v2  m11*v1+m10*v0  m03+m02*v2  m01*v1+m00*v0
   r2=_mm_hadd_ps(r2,m0);        // **********  *************  m23+m22*v2  m21*v1+m20*v0
   r0=_mm_hadd_ps(r0,r2);        // ************************  m23+m22*v2+m21*v1+m20*v0  m13+m12*v2+m11*v1+m10*v0  m03+m02*v2+m01*v1+m00*v0
-  _mm_storel_pi((__m64*)&r0,r0); _mm_store_ss(&r2,_mm_movehl_ps(r0,r0));
+  _mm_storel_pi((__m64*)&r0,r0);
+  _mm_store_ss(&r2,_mm_movehl_ps(r0,r0));
   return r;
 #else
   return FXVec3f(m00*v0+m01*v1+m02*v2+m03, m10*v0+m11*v1+m12*v2+m13, m20*v0+m21*v1+m22*v2+m23);
@@ -1065,11 +995,11 @@
 // Matrix times vector
 FXVec4f operator*(const FXMat4f& m,const FXVec4f& v){
 #if defined(FOX_HAS_SSE3)
-  register __m128 vv=_mm_loadu_ps(v);
-  register __m128 r0=_mm_mul_ps(_mm_loadu_ps(&m00),vv);     // m03*v3 m02*v2 m01*v1 m00*v0
-  register __m128 r1=_mm_mul_ps(_mm_loadu_ps(&m10),vv);     // m13*v3 m12*v2 m11*v1 m10*v0
-  register __m128 r2=_mm_mul_ps(_mm_loadu_ps(&m20),vv);     // m23*v3 m22*v2 m21*v1 m20*v0
-  register __m128 r3=_mm_mul_ps(_mm_loadu_ps(&m30),vv);     // m33*v3 m32*v2 m31*v1 m30*v0
+  __m128 vv=_mm_loadu_ps(v);
+  __m128 r0=_mm_mul_ps(_mm_loadu_ps(&m00),vv);     // m03*v3 m02*v2 m01*v1 m00*v0
+  __m128 r1=_mm_mul_ps(_mm_loadu_ps(&m10),vv);     // m13*v3 m12*v2 m11*v1 m10*v0
+  __m128 r2=_mm_mul_ps(_mm_loadu_ps(&m20),vv);     // m23*v3 m22*v2 m21*v1 m20*v0
+  __m128 r3=_mm_mul_ps(_mm_loadu_ps(&m30),vv);     // m33*v3 m32*v2 m31*v1 m30*v0
   FXVec4f r;
   r0=_mm_hadd_ps(r0,r1);        // m13*v3+m12*v2  m11*v1+m10*v0  m03*v3+m02*v2  m01*v1+m00*v0
   r2=_mm_hadd_ps(r2,r3);        // m33*v3+m32*v2  m31*v1+m30*v0  m23*v3+m22*v2  m21*v1+m20*v0
@@ -1083,16 +1013,21 @@
 
 
 // Vector times matrix
+//
+//  v0*m00 + v1*m10 + v2*m20 + m30
+//  v0*m01 + v1*m11 + v2*m21 + m31
+//  v0*m02 + v1*m12 + v2*m22 + m32
+//
 FXVec3f operator*(const FXVec3f& v,const FXMat4f& m){
 #if defined(FOX_HAS_SSE)
-  register __m128 m0=_mm_loadu_ps(&m00);
-  register __m128 m1=_mm_loadu_ps(&m10);
-  register __m128 m2=_mm_loadu_ps(&m20);
-  register __m128 m3=_mm_loadu_ps(&m30);
-  register __m128 v0=_mm_set1_ps(v0);
-  register __m128 v1=_mm_set1_ps(v1);
-  register __m128 v2=_mm_set1_ps(v2);
-  register __m128 rr=_mm_add_ps(_mm_add_ps(_mm_mul_ps(v0,m0),_mm_mul_ps(v1,m1)),_mm_add_ps(_mm_mul_ps(v2,m2),m3));
+  __m128 m0=_mm_loadu_ps(&m00);
+  __m128 m1=_mm_loadu_ps(&m10);
+  __m128 m2=_mm_loadu_ps(&m20);
+  __m128 m3=_mm_loadu_ps(&m30);
+  __m128 v0=_mm_set1_ps(v0);
+  __m128 v1=_mm_set1_ps(v1);
+  __m128 v2=_mm_set1_ps(v2);
+  __m128 rr=_mm_add_ps(_mm_add_ps(_mm_mul_ps(v0,m0),_mm_mul_ps(v1,m1)),_mm_add_ps(_mm_mul_ps(v2,m2),m3));
   FXVec3f r;
   _mm_storel_pi((__m64*)&r0,rr);
   _mm_store_ss(&r2,_mm_movehl_ps(rr,rr));
@@ -1104,16 +1039,22 @@
 
 
 // Vector times matrix
+//
+//  v0*m00 + v1*m10 + v2*m20 + v3*m30
+//  v0*m01 + v1*m11 + v2*m21 + v3*m31
+//  v0*m02 + v1*m12 + v2*m22 + v3*m32
+//  v0*m03 + v1*m13 + v2*m23 + v3*m33
+//
 FXVec4f operator*(const FXVec4f& v,const FXMat4f& m){
 #if defined(FOX_HAS_SSE)
-  register __m128 m0=_mm_loadu_ps(&m00);
-  register __m128 m1=_mm_loadu_ps(&m10);
-  register __m128 m2=_mm_loadu_ps(&m20);
-  register __m128 m3=_mm_loadu_ps(&m30);
-  register __m128 v0=_mm_set1_ps(v0);
-  register __m128 v1=_mm_set1_ps(v1);
-  register __m128 v2=_mm_set1_ps(v2);
-  register __m128 v3=_mm_set1_ps(v3);
+  __m128 m0=_mm_loadu_ps(&m00);
+  __m128 m1=_mm_loadu_ps(&m10);
+  __m128 m2=_mm_loadu_ps(&m20);
+  __m128 m3=_mm_loadu_ps(&m30);
+  __m128 v0=_mm_set1_ps(v0);
+  __m128 v1=_mm_set1_ps(v1);
+  __m128 v2=_mm_set1_ps(v2);
+  __m128 v3=_mm_set1_ps(v3);
   FXVec4f r;
   _mm_storeu_ps(&r0,_mm_add_ps(_mm_add_ps(_mm_mul_ps(v0,m0),_mm_mul_ps(v1,m1)),_mm_add_ps(_mm_mul_ps(v2,m2),_mm_mul_ps(v3,m3))));
   return r;
@@ -1125,12 +1066,7 @@
 
 // Matrix and matrix add
 FXMat4f operator+(const FXMat4f& a,const FXMat4f& b){
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_add_ps(_mm256_loadu_ps(&a00),_mm256_loadu_ps(&b00)));
-  _mm256_storeu_ps(&r20,_mm256_add_ps(_mm256_loadu_ps(&a20),_mm256_loadu_ps(&b20)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(&r00,_mm_add_ps(_mm_loadu_ps(&a00),_mm_loadu_ps(&b00)));
   _mm_storeu_ps(&r10,_mm_add_ps(_mm_loadu_ps(&a10),_mm_loadu_ps(&b10)));
@@ -1148,12 +1084,7 @@
 
 // Matrix and matrix subtract
 FXMat4f operator-(const FXMat4f& a,const FXMat4f& b){
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_sub_ps(_mm256_loadu_ps(&a00),_mm256_loadu_ps(&b00)));
-  _mm256_storeu_ps(&r20,_mm256_sub_ps(_mm256_loadu_ps(&a20),_mm256_loadu_ps(&b20)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(&r00,_mm_sub_ps(_mm_loadu_ps(&a00),_mm_loadu_ps(&b00)));
   _mm_storeu_ps(&r10,_mm_sub_ps(_mm_loadu_ps(&a10),_mm_loadu_ps(&b10)));
@@ -1172,11 +1103,11 @@
 // Matrix and matrix multiply
 FXMat4f operator*(const FXMat4f& a,const FXMat4f& b){
 #if defined(FOX_HAS_SSE)
-  register __m128 b0=_mm_loadu_ps(&b00);
-  register __m128 b1=_mm_loadu_ps(&b10);
-  register __m128 b2=_mm_loadu_ps(&b20);
-  register __m128 b3=_mm_loadu_ps(&b30);
-  register __m128 xx,yy,zz,ww;
+  __m128 b0=_mm_loadu_ps(&b00);
+  __m128 b1=_mm_loadu_ps(&b10);
+  __m128 b2=_mm_loadu_ps(&b20);
+  __m128 b3=_mm_loadu_ps(&b30);
+  __m128 xx,yy,zz,ww;
   FXMat4f r;
   xx=_mm_set1_ps(a00);
   yy=_mm_set1_ps(a01);
@@ -1200,7 +1131,7 @@
   _mm_storeu_ps(r3,_mm_add_ps(_mm_add_ps(_mm_mul_ps(b0,xx),_mm_mul_ps(b1,yy)),_mm_add_ps(_mm_mul_ps(b2,zz),_mm_mul_ps(b3,ww))));
   return r;
 #else
-  register FXfloat x,y,z,w;
+  FXfloat x,y,z,w;
   FXMat4f r;
   x=a00; y=a01; z=a02; w=a03;
   r00=x*b00+y*b10+z*b20+w*b30;
@@ -1229,12 +1160,7 @@
 
 // Multiply scalar by matrix
 FXMat4f operator*(FXfloat x,const FXMat4f& a){
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_mul_ps(_mm256_set1_ps(x),_mm256_loadu_ps(&a00)));
-  _mm256_storeu_ps(&r20,_mm256_mul_ps(_mm256_set1_ps(x),_mm256_loadu_ps(&a20)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(&r00,_mm_mul_ps(_mm_set1_ps(x),_mm_loadu_ps(&a00)));
   _mm_storeu_ps(&r10,_mm_mul_ps(_mm_set1_ps(x),_mm_loadu_ps(&a10)));
@@ -1252,12 +1178,7 @@
 
 // Multiply matrix by scalar
 FXMat4f operator*(const FXMat4f& a,FXfloat x){
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_mul_ps(_mm256_loadu_ps(&a00),_mm256_set1_ps(x)));
-  _mm256_storeu_ps(&r20,_mm256_mul_ps(_mm256_loadu_ps(&a20),_mm256_set1_ps(x)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(&r00,_mm_mul_ps(_mm_loadu_ps(&a00),_mm_set1_ps(x)));
   _mm_storeu_ps(&r10,_mm_mul_ps(_mm_loadu_ps(&a10),_mm_set1_ps(x)));
@@ -1275,12 +1196,7 @@
 
 // Divide scalar by matrix
 FXMat4f operator/(FXfloat x,const FXMat4f& a){
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_div_ps(_mm256_set1_ps(x),_mm256_loadu_ps(&a00)));
-  _mm256_storeu_ps(&r20,_mm256_div_ps(_mm256_set1_ps(x),_mm256_loadu_ps(&a20)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(&r00,_mm_div_ps(_mm_set1_ps(x),_mm_loadu_ps(&a00)));
   _mm_storeu_ps(&r10,_mm_div_ps(_mm_set1_ps(x),_mm_loadu_ps(&a10)));
@@ -1298,12 +1214,7 @@
 
 // Divide matrix by scalar
 FXMat4f operator/(const FXMat4f& a,FXfloat x){
-#if defined(FOX_HAS_AVX)
-  FXMat4f r;
-  _mm256_storeu_ps(&r00,_mm256_div_ps(_mm256_loadu_ps(&a00),_mm256_set1_ps(x)));
-  _mm256_storeu_ps(&r20,_mm256_div_ps(_mm256_loadu_ps(&a20),_mm256_set1_ps(x)));
-  return r;
-#elif defined(FOX_HAS_SSE)
+#if defined(FOX_HAS_SSE)
   FXMat4f r;
   _mm_storeu_ps(&r00,_mm_div_ps(_mm_loadu_ps(&a00),_mm_set1_ps(x)));
   _mm_storeu_ps(&r10,_mm_div_ps(_mm_loadu_ps(&a10),_mm_set1_ps(x)));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMatrix.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMatrix.cpp Changed

@@ -3,7 +3,7 @@
 *                   M a t r i x   C o n t a i n e r   O b j e c t               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -114,22 +114,22 @@
 
 // Get child's row
 FXint FXMatrix::rowOfChild(const FXWindow* child) const {
-  register FXint i=indexOfChild(child);
+  FXint i=indexOfChild(child);
   return (options&MATRIX_BY_COLUMNS) ? i/num : i%num;
   }
 
 
 // Get child's column
 FXint FXMatrix::colOfChild(const FXWindow* child) const {
-  register FXint i=indexOfChild(child);
+  FXint i=indexOfChild(child);
   return (options&MATRIX_BY_COLUMNS) ? i%num : i/num;
   }
 
 
 // Focus moved up
 long FXMatrix::onFocusUp(FXObject*,FXSelector,void* ptr){
-  register FXWindow *child;
-  register FXint r,c;
+  FXWindow *child;
+  FXint r,c;
   if(getFocus()){
     r=rowOfChild(getFocus());
     c=colOfChild(getFocus());
@@ -156,8 +156,8 @@
 
 // Focus moved down
 long FXMatrix::onFocusDown(FXObject*,FXSelector,void* ptr){
-  register FXWindow *child;
-  register FXint r,c;
+  FXWindow *child;
+  FXint r,c;
   if(getFocus()){
     r=rowOfChild(getFocus());
     c=colOfChild(getFocus());
@@ -184,8 +184,8 @@
 
 // Focus moved to left
 long FXMatrix::onFocusLeft(FXObject*,FXSelector,void* ptr){
-  register FXWindow *child;
-  register FXint r,c;
+  FXWindow *child;
+  FXint r,c;
   if(getFocus()){
     r=rowOfChild(getFocus());
     c=colOfChild(getFocus());
@@ -212,8 +212,8 @@
 
 // Focus moved to right
 long FXMatrix::onFocusRight(FXObject*,FXSelector,void* ptr){
-  register FXWindow *child;
-  register FXint r,c;
+  FXWindow *child;
+  FXint r,c;
   if(getFocus()){
     r=rowOfChild(getFocus());
     c=colOfChild(getFocus());
@@ -272,9 +272,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXMatrix::getDefaultWidth(){
-  register FXint c,n,w,nzcol=0,wmax=0,mw=0;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint c,n,w,nzcol=0,wmax=0,mw=0;
+  FXWindow *child;
+  FXuint hints;
   FXint colwMAXNUM;
   for(c=0; c<MAXNUM; c++) colwc=0;
   if(options&PACK_UNIFORM_WIDTH) mw=maxChildWidth();
@@ -301,9 +301,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXMatrix::getDefaultHeight(){
-  register FXint r,n,h,nzrow=0,hmax=0,mh=0;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint r,n,h,nzrow=0,hmax=0,mh=0;
+  FXWindow *child;
+  FXuint hints;
   FXint rowhMAXNUM;
   for(r=0; r<MAXNUM; r++) rowhr=0;
   if(options&PACK_UNIFORM_HEIGHT) mh=maxChildHeight();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMemMap.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMemMap.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMemoryStream.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMemoryStream.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuBar.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuCaption.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuCaption.cpp Changed

@@ -3,7 +3,7 @@
 *                       M e n u   C a p t i o n   W i d g e t                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -107,19 +107,20 @@
 // Menu entry
 FXMenuCaption::FXMenuCaption(FXComposite* p,const FXString& text,FXIcon* ic,FXuint opts):FXWindow(p,opts,0,0,0,0){
   FXString string=text.section('\t',0);
-  flags|=FLAG_SHOWN;
+  hotkey=parseHotKey(string);
   label=stripHotKey(string);
-  icon=ic;
+  hotoff=findHotKey(string);
   font=getApp()->getNormalFont();
   help=text.section('\t',2);
+  tip=text.section('\t',1);
   textColor=getApp()->getForeColor();
-  seltextColor=getApp()->getSelMenuTextColor();
   selbackColor=getApp()->getSelMenuBackColor();
+  seltextColor=getApp()->getSelMenuTextColor();
   hiliteColor=getApp()->getHiliteColor();
   shadowColor=getApp()->getShadowColor();
-  hotkey=parseHotKey(string);
-  hotoff=findHotKey(string);
+  icon=ic;
   addHotKey(hotkey);
+  flags|=FLAG_SHOWN;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuCascade.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuCascade.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuCheck.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuCheck.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuCommand.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuCommand.cpp Changed

@@ -3,7 +3,7 @@
 *                         M e n u   C o m m a n d    W i d g e t                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -105,7 +105,7 @@
   target=tgt;
   message=sel;
   accel=text.section('\t',1);
-  acckey=parseAccel(accel);
+  acckey=FXAccelTable::parseAccel(accel);
   if(acckey){
     FXWindow *own=getShell()->getOwner();
     if(own){
@@ -333,7 +333,7 @@
 void FXMenuCommand::setAccelText(const FXString& text,FXbool acc){
   if(accel!=text){
     if(acc){
-      FXHotKey yekcca=parseAccel(text);
+      FXHotKey yekcca=FXAccelTable::parseAccel(text);
       if(acckey || yekcca){
         FXWindow *own=getShell()->getOwner();
         if(own){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuPane.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuPane.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuRadio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuRadio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuSeparator.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuSeparator.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMenuTitle.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMenuTitle.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMessageBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMessageBox.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMessageChannel.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMessageChannel.cpp Changed

@@ -3,7 +3,7 @@
 *         I n t e r - T h r e a d    M e s s a g i n g    C h a n n e l         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -43,15 +43,23 @@
 /*
   Notes:
   - Inter-thread messaging is handy to have.
-  - Redo this in terms of FXPipe when that becomes possible.
-  - Because of unbelievably retarded design of Windows, we need to
-    use an Event-object to actually signal the GUI thread when we've
-    written something to the pipe.
+  - A pipe is used to pass data from worker thread to main GUI thread, so that
+    small messages may be sent from worker thread to main GUI thread asynchronously.
+  - On windows, an additional semaphore is needed to provide a watchable handle
+    for FXApp to block on, in MsgWaitForMultipleObjects().
+  - Main GUI thread blocks on a set of input sources, and wakes up and dispatches
+    to a handler when any one of them is raised.  For the message channel, control
+    will dispatch to onMessage(), which will pull the message from the pipe, and
+    invoke the handler read from the FXMessage struct.
+  - Note that the handler may get called later than message(); it depends on when
+    the main GUI thread returns to the event processing loop.
   - Based on suggestion from Axel Schmidt <axel.schmidt@analytica-karlsruhe.de>,
     the Event object was replaced by counting Semaphore.
     This way, the number of calls to message() has to be equal to the number of calls
     to MsgWaitForMultipleObjects.  Thus, each call to message() results in exactly
     one callback in the GUI thread.
+  - FIXME technically, FXMessageChannel should refer to an event loop instance (or
+    FXDispatcher instance), not FXApp.  Not all applications are GUI applications.
 */
 
 
@@ -59,7 +67,7 @@
 #define MAXMESSAGE 8192
 
 // Bad handle value
-#ifdef WIN32
+#if defined(WIN32)
 #define BadHandle  INVALID_HANDLE_VALUE
 #else
 #define BadHandle  -1
@@ -115,7 +123,7 @@
 
 // Add handler to application
 FXMessageChannel::FXMessageChannel(FXApp* a):app(a){
-#ifdef WIN32
+#if defined(WIN32)
   if((h2=::CreateSemaphore(NULL,0,2147483647,NULL))==NULL){ throw FXResourceException("unable to create semaphore."); }
   if(::CreatePipe(&h0,&h1,NULL,0)==0){ throw FXResourceException("unable to create pipe."); }
   app->addInput(this,ID_IO_READ,h2,INPUT_READ,NULL);
@@ -131,7 +139,7 @@
 // Fire signal message to target
 long FXMessageChannel::onMessage(FXObject*,FXSelector,void*){
   FXDataMessage pkg;
-#ifdef WIN32
+#if defined(WIN32)
   DWORD nread=-1;
   if(::ReadFile(h0,&pkg,sizeof(FXMessage),&nread,NULL) && nread==sizeof(FXMessage)){
     if(0<pkg.size && (::ReadFile(h0,pkg.data,pkg.size,&nread,NULL) && nread==pkg.size)){
@@ -161,7 +169,7 @@
   pkg.pad=0;
 #endif
   pkg.size=FXMIN(size,MAXMESSAGE);
-#ifdef WIN32
+#if defined(WIN32)
   DWORD nwritten=-1;
   if(::WriteFile(h1,&pkg,sizeof(FXMessage),&nwritten,NULL) && nwritten==sizeof(FXMessage)){
     if(pkg.size<=0 || (::WriteFile(h1,data,pkg.size,&nwritten,NULL) && nwritten==pkg.size)){
@@ -182,7 +190,7 @@
 
 // Remove handler from application
 FXMessageChannel::~FXMessageChannel(){
-#ifdef WIN32
+#if defined(WIN32)
   app->removeInput(h2,INPUT_READ);
   ::CloseHandle(h0);
   ::CloseHandle(h1);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMetaClass.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMetaClass.cpp Changed

@@ -3,7 +3,7 @@
 *                         M e t a C l a s s   O b j e c t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -22,19 +22,10 @@
 #include "fxver.h"
 #include "fxdefs.h"
 #include "fxmath.h"
+#include "FXElement.h"
 #include "FXArray.h"
-#include "FXHash.h"
-#include "FXStream.h"
 #include "FXMetaClass.h"
 #include "FXObject.h"
-#include "FXElement.h"
-#include "FXException.h"
-#include "FXRectangle.h"
-#include "FXStream.h"
-#include "FXString.h"
-#include "FXEvent.h"
-
-#include "FXDebugTarget.h"
 
 /*
   Notes:
@@ -82,7 +73,7 @@
 
 // Resize memory
 FXbool fxresize(void** ptr,FXuval size){
-  register void *p=NULL;
+  void *p=NULL;
   if(size!=0){
     if((p=realloc(*ptr,size))==NULL) return false;
     }
@@ -107,9 +98,9 @@
 
 // String duplicate
 FXchar *fxstrdup(const FXchar* str){
-  register FXchar *ptr=NULL;
+  FXchar *ptr=NULL;
   if(str!=NULL){
-    register FXint size=strlen(str)+1;
+    FXint size=strlen(str)+1;
     if((ptr=(FXchar*)malloc(size))!=NULL){
       memcpy(ptr,str,size);
       }
@@ -138,12 +129,12 @@
 FXuint              FXMetaClass::metaClassCount=0;
 
 
-// Hash function for string
+// Compute FNV1a hash value of string
 static inline FXuint hashstring(const FXchar* str){
-  register FXuint result=0;
-  register FXuchar c;
+  FXuint result=0x811C9DC5;
+  FXuchar c;
   while((c=*str++)!='\0'){
-    result=((result<<5)+result)^c;
+    result=(result^c)*0x01000193;
     }
   return result;
   }
@@ -151,9 +142,9 @@
 
 // Resize global hash table
 void FXMetaClass::resize(FXuint slots){
-  register const FXMetaClass *ptr;
   const FXMetaClass **table;
-  register FXuint p,x,s;
+  const FXMetaClass *ptr;
+  FXuint p,x,s;
   callocElms(table,slots);
   for(s=0; s<metaClassSlots; ++s){
     if((ptr=metaClassTables)!=NULL && ptr!=EMPTY){
@@ -172,8 +163,9 @@
 
 // Constructor adds metaclass to the table
 FXMetaClass::FXMetaClass(const FXchar* name,FXObject *(fac)(),const FXMetaClass* base,const void* ass,FXuint nass,FXuint assz):className(name),manufacture(fac),baseClass(base),assoc(ass),nassocs(nass),assocsz(assz){
-  register FXuint p=hashstring(className);
-  register FXuint x=(p<<1)|1;
+  FXTRACE((100,"FXMetaClass::FXMetaClass(%s)\n",className));
+  FXuint p=hashstring(className);
+  FXuint x=(p<<1)|1;
   if((++metaClassCount<<1) > metaClassSlots){
     resize(metaClassSlots?metaClassSlots<<1:1);
     }
@@ -192,9 +184,9 @@
 
 // Find function
 const void* FXMetaClass::search(FXSelector key) const {
-  register const FXObject::FXMapEntry* lst=(const FXObject::FXMapEntry*)assoc;
-  register FXuint inc=assocsz;
-  register FXuint n=nassocs;
+  const FXObject::FXMapEntry* lst=(const FXObject::FXMapEntry*)assoc;
+  FXuint inc=assocsz;
+  FXuint n=nassocs;
   while(n--){
     if(__unlikely(key<=lst->keyhi) && __likely(lst->keylo<=key)) return lst;
     lst=(const FXObject::FXMapEntry*) (((const FXchar*)lst)+inc);
@@ -205,7 +197,7 @@
 
 // Test if subclass
 FXbool FXMetaClass::isSubClassOf(const FXMetaClass* metaclass) const {
-  register const FXMetaClass* cls;
+  const FXMetaClass* cls;
   for(cls=this; cls; cls=cls->baseClass){
     if(cls==metaclass) return true;
     }
@@ -216,8 +208,8 @@
 // Find the FXMetaClass belonging to class name
 const FXMetaClass* FXMetaClass::getMetaClassFromName(const FXchar* name){
   if(metaClassSlots && name){
-    register FXuint p=hashstring(name);
-    register FXuint x=(p<<1)|1;
+    FXuint p=hashstring(name);
+    FXuint x=(p<<1)|1;
     while(metaClassTablep=(p+x)&(metaClassSlots-1)!=NULL){
       if(metaClassTablep!=EMPTY && strcmp(metaClassTablep->className,name)==0){
         return metaClassTablep;
@@ -236,9 +228,11 @@
 
 // Destructor removes metaclass from the table
 FXMetaClass::~FXMetaClass(){
-  register FXuint p=hashstring(className);
-  register FXuint x=(p<<1)|1;
+  FXTRACE((100,"FXMetaClass::~FXMetaClass(%s)\n",className));
+  FXuint p=hashstring(className);
+  FXuint x=(p<<1)|1;
   while(metaClassTablep=(p+x)&(metaClassSlots-1)!=this){
+    if(metaClassTablep==NULL) return;
     }
   metaClassTablep=EMPTY;
   if((--metaClassCount<<1) <= metaClassSlots){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXMutex.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXMutex.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXObject.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXObject.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXObjectList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXObjectList.cpp Changed

@@ -3,7 +3,7 @@
 *                            O b j e c t   L i s t                              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -64,7 +64,7 @@
 FXbool FXObjectList::no(FXival num){
   if(__likely(num!=no())){
     if(0<num){
-      register FXptr p;
+      FXptr p;
       if(ptr!=EMPTY){
         if(__unlikely((p=::realloc(((FXival*)ptr)-1,sizeof(FXival)+sizeof(FXObject*)*ROUNDUP(num)))==NULL)) return false;
         }
@@ -91,10 +91,10 @@
 
 
 // Copy constructor
-FXObjectList::FXObjectList(const FXObjectList& src):ptr(EMPTY){
-  register FXival num=src.no();
+FXObjectList::FXObjectList(const FXObjectList& other):ptr(EMPTY){
+  FXival num=other.no();
   if(__likely(0<num && no(num))){
-    copyElms(ptr,src.ptr,num);
+    copyElms(ptr,other.ptr,num);
     }
   }
 
@@ -124,19 +124,19 @@
 
 
 // Assignment operator
-FXObjectList& FXObjectList::operator=(const FXObjectList& src){
-  if(__likely(ptr!=src.ptr && no(src.no()))){
-    copyElms(ptr,src.ptr,src.no());
+FXObjectList& FXObjectList::operator=(const FXObjectList& other){
+  if(__likely(ptr!=other.ptr && no(other.no()))){
+    copyElms(ptr,other.ptr,other.no());
     }
   return *this;
   }
 
 
 // Adopt objects from src, leaving src empty
-FXObjectList& FXObjectList::adopt(FXObjectList& src){
-  if(__likely(ptr!=src.ptr)){
-    swap(ptr,src.ptr);
-    src.clear();
+FXObjectList& FXObjectList::adopt(FXObjectList& other){
+  if(__likely(ptr!=other.ptr)){
+    swap(ptr,other.ptr);
+    other.clear();
     }
   return *this;
   }
@@ -144,7 +144,7 @@
 
 // Find object in list, searching forward; return position or -1
 FXival FXObjectList::find(const FXObject* object,FXival pos) const {
-  register FXival p=FXMAX(0,pos);
+  FXival p=FXMAX(0,pos);
   while(p<no()){
     if(ptrp==object){ return p; }
     ++p;
@@ -155,7 +155,7 @@
 
 // Find object in list, searching backward; return position or -1
 FXival FXObjectList::rfind(const FXObject* object,FXival pos) const {
-  register FXival p=FXMIN(pos,no()-1);
+  FXival p=FXMIN(pos,no()-1);
   while(0<=p){
     if(ptrp==object){ return p; }
     --p;
@@ -202,7 +202,7 @@
 
 // Insert an object
 FXbool FXObjectList::insert(FXival pos,FXObject* object){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+1))){
     moveElms(ptr+pos+1,ptr+pos,num-pos);
     ptrpos=object;
@@ -214,7 +214,7 @@
 
 // Insert n copies of object at specified position
 FXbool FXObjectList::insert(FXival pos,FXObject* object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+pos+n,ptr+pos,num-pos);
     fillElms(ptr+pos,object,n);
@@ -226,7 +226,7 @@
 
 // Insert n objects at specified position
 FXbool FXObjectList::insert(FXival pos,FXObject** objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+pos+n,ptr+pos,num-pos);
     copyElms(ptr+pos,objects,n);
@@ -244,7 +244,7 @@
 
 // Prepend an object
 FXbool FXObjectList::prepend(FXObject* object){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+1))){
     moveElms(ptr+1,ptr,num);
     ptr0=object;
@@ -256,7 +256,7 @@
 
 // Prepend n copies of object
 FXbool FXObjectList::prepend(FXObject* object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+n,ptr,num);
     fillElms(ptr,object,n);
@@ -268,7 +268,7 @@
 
 // Prepend n objects
 FXbool FXObjectList::prepend(FXObject** objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+n,ptr,num);
     copyElms(ptr,objects,n);
@@ -286,7 +286,7 @@
 
 // Append an object
 FXbool FXObjectList::append(FXObject* object){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+1))){
     ptrnum=object;
     return true;
@@ -297,7 +297,7 @@
 
 // Append n copies of object
 FXbool FXObjectList::append(FXObject* object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     fillElms(ptr+num,object,n);
     return true;
@@ -308,7 +308,7 @@
 
 // Append n objects
 FXbool FXObjectList::append(FXObject** objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     copyElms(ptr+num,objects,n);
     return true;
@@ -332,7 +332,7 @@
 
 // Replaces the m objects at pos with n copies of object
 FXbool FXObjectList::replace(FXival pos,FXival m,FXObject* object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__unlikely(m<n)){
     if(__unlikely(!no(num-m+n))) return false;
     moveElms(ptr+pos+n,ptr+pos+m,num-pos-n);
@@ -348,7 +348,7 @@
 
 // Replaces the m objects at pos with n objects
 FXbool FXObjectList::replace(FXival pos,FXival m,FXObject** objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__unlikely(m<n)){
     if(__unlikely(!no(num-m+n))) return false;
     moveElms(ptr+pos+n,ptr+pos+m,num-pos-n);
@@ -370,7 +370,7 @@
 
 // Remove object at pos
 FXbool FXObjectList::erase(FXival pos){
-  register FXival num=no();
+  FXival num=no();
   moveElms(ptr+pos,ptr+pos+1,num-pos-1);
   return no(num-1);
   }
@@ -378,7 +378,7 @@
 
 // Remove n objects at pos
 FXbool FXObjectList::erase(FXival pos,FXival n){
-  register FXival num=no();
+  FXival num=no();
   moveElms(ptr+pos,ptr+pos+n,num-n-pos);
   return no(num-n);
   }
@@ -386,7 +386,7 @@
 
 // Remove object
 FXbool FXObjectList::remove(const FXObject* object){
-  register FXival pos;
+  FXival pos;
   if(0<=(pos=find(object))){
     return erase(pos);
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXOptionMenu.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXOptionMenu.cpp Changed

@@ -3,7 +3,7 @@
 *                             O p t i o n   M e n u                             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -744,7 +744,7 @@
 
 // Set current option
 void FXOptionMenu::setCurrentNo(FXint no,FXbool notify){
-  register FXOption *win=NULL;
+  FXOption *win=NULL;
   if(pane) win=dynamic_cast<FXOption*>(pane->childAtIndex(no));
   setCurrent(win,notify);
   }
@@ -764,7 +764,7 @@
 
 // Change popup
 void FXOptionMenu::setMenu(FXPopup *pup){
-  register FXOption *win;
+  FXOption *win;
   if(pup!=pane){
     pane=pup;
     if(pane){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPCXIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPCXIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPCXImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPCXImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPNGIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPNGIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPNGImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPNGImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPPMIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPPMIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPPMImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPPMImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPacker.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPacker.cpp Changed

@@ -3,7 +3,7 @@
 *                P a c k e r   C o n t a i n e r   O b j e c t                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -497,9 +497,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXPacker::getDefaultWidth(){
-  register FXint w,wcum,wmax,mw;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint w,wcum,wmax,mw;
+  FXWindow* child;
+  FXuint hints;
   wmax=wcum=mw=0;
   if(options&PACK_UNIFORM_WIDTH) mw=maxChildWidth();
   for(child=getLast(); child; child=child->getPrev()){
@@ -528,9 +528,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXPacker::getDefaultHeight(){
-  register FXint h,hcum,hmax,mh;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint h,hcum,hmax,mh;
+  FXWindow* child;
+  FXuint hints;
   hmax=hcum=mh=0;
   if(options&PACK_UNIFORM_HEIGHT) mh=maxChildHeight();
   for(child=getLast(); child; child=child->getPrev()){
@@ -559,10 +559,10 @@
 
 // Recalculate layout
 void FXPacker::layout(){
-  register FXint left,right,top,bottom,x,y,w,h;
-  register FXint mw=0,mh=0;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint left,right,top,bottom,x,y,w,h;
+  FXint mw=0,mh=0;
+  FXWindow* child;
+  FXuint hints;
 
   // Placement rectangle; right/bottom non-inclusive
   left=border+padleft;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPath.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPath.cpp Changed

@@ -3,7 +3,7 @@
 *                  P a t h   N a m e   M a n i p u l a t i o n                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2000,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2000,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -61,6 +61,18 @@
       -  Uppercase only filename.
 
   - Deal with Windows paths "\\?\" long pathname convention.
+
+  - On Windows environment variables:
+
+      - Variables have a percent sign on both sides: %ThisIsAVariable%.
+
+      - Name can include spaces, punctuation and mixed case: %_Another Ex.ample%.
+
+      - A variable name may include any of the following characters:
+
+          A-Z, a-z, 0-9, # $ ' ( ) * + , - . ? @   _ ` { } ~
+
+      - The first character of the name must not be numeric.
 */
 
 
@@ -354,69 +366,227 @@
 // Perform tilde or environment variable expansion
 FXString FXPath::expand(const FXString& file){
   if(!file.empty()){
-    FXString result;
+    FXString result,value; FXint b=0,e=0,p;
 #if defined(WIN32)
-    FXString var,val;
-    FXint b=0,e;
-    while(fileb){
-      if(fileb=='%'){
-        e=file.find('%',b+1);
-        if(b<e){
-          var=file.mid(b+1,e-b-1);
-          val=FXSystem::getEnvironment(var);
-          if(!val.empty()){                             // Value found, replace the %VARIABLE% with it
-            result.append(val);
-            }
-          else{                                         // No value; leave %VARIABLE% in place
-            result.append(&fileb,e-b+1);
+    while(filee){
+      if(filee=='%'){
+        p=++e;
+        while(Ascii::isAlphaNumeric(filee) || filee=='_') e++;
+        if(filee=='%'){
+          if(p<e){
+            value=FXSystem::getEnvironment(file.mid(p,e-p));
+            if(!value.empty()){
+              result.append(&fileb,p-b-1);
+              result.append(value);
+              b=e+1;
+              }
             }
-          b=e+1;
-          }
-        else{                                           // Unmatched '%'; just copy the rest
-          result.append(&fileb,file.length()-b);
-          b=file.length();
-          }
-        }
-      else{
-        e=file.find('%',b+1);
-        if(b<e){
-          result.append(&fileb,e-b);                  // Copy string up till first '%'
-          b=e;
-          }
-        else{
-          result.append(&fileb,file.length()-b);      // Just copy the rest
-          b=file.length();
+          ++e;
           }
+        continue;
         }
+      ++e;
       }
+    result.append(&fileb,e-b);
 #else
-    FXint b,e,n;
 
     // Expand leading tilde of the form ~/filename or ~user/filename
-    n=0;
-    if(filen=='~'){
-      n++;
-      b=n;
-      while(filen && !ISPATHSEP(filen)) n++;
-      e=n;
-      result.append(FXSystem::getUserDirectory(file.mid(b,e-b)));
+    // Also don't expand if non-existing user-directory.
+    if(filee=='~'){
+      ++e;
+      while(filee && !(ISPATHSEP(filee) && filee-1!='\\')){
+        ++e;
+        }
+      if(e==1){
+        result=FXSystem::getHomeDirectory();
+        }
+      else{
+        result=FXSystem::getUserDirectory(file.mid(b+1,e-b-1));
+        }
+      if(result.empty()){
+        e=b;
+        }
       }
 
     // Expand environment variables of the form $HOME or ${HOME}
-    while(filen){
-      if(filen=='$'){
-        n++;
-        if(filen=='{') n++;
-        b=n;
-        while(Ascii::isAlphaNumeric(filen) || filen=='_') n++;
-        e=n;
-        if(filen=='}') n++;
-        result.append(FXSystem::getEnvironment(file.mid(b,e-b)));
+    b=e;
+    while(filee){
+      if(filee=='$'){
+        ++e;
+        if(filee=='{'){       // ${VAR}...
+          p=++e;
+          while(Ascii::isAlphaNumeric(filee) || filee=='_') e++;
+          if(filee=='}'){
+            if(p<e){
+              value=FXSystem::getEnvironment(file.mid(p,e-p));
+              if(!value.empty()){
+                result.append(&fileb,p-b-2);
+                result.append(value);
+                b=e+1;
+                }
+              }
+            ++e;
+            }
+          }
+        else{                   // $VAR...
+          p=e;
+          while(Ascii::isAlphaNumeric(filee) || filee=='_') e++;
+          if(p<e){
+            value=FXSystem::getEnvironment(file.mid(p,e-p));
+            if(!value.empty()){
+              result.append(&fileb,p-b-1);
+              result.append(value);
+              b=e;
+              }
+            }
+          }
         continue;
         }
-      result.append(filen);
-      n++;
+      ++e;
       }
+    result.append(&fileb,e-b);
+#endif
+    return result;
+    }
+  return FXString::null;
+  }
+
+
+// Convert a foreign path or paths to local conventions.
+//
+// When converting from foreign to local Windows filename conventions:
+//
+//  - Replace '/' with '\' for path separator.
+//  - Replace ':' with ';' for pathlist separator, except when
+//    identified as drive letter at start of filename.
+//  - Replace $ENVVAR and ${ENVVAR} with %ENVVAR%.
+//
+// When converting foreign to local UNIX filename conventions:
+//
+//  - Replace '\' with '/' for path separator.
+//  - Replace ';' with ':' for pathlist separator, except when
+//    identified as drive letter at start of filename; in that case,
+//    drive letter is removed; drive letter syntax not supported on UNIX.
+//  - Remove '\\hostname' file share designation, as syntax not supported.
+//  - Replace %ENVVAR% with ${ENVVAR}.
+//
+// Limitations: filenames with escaped characters obviously would not
+// convert properly; we welcome suggestions in this department.
+FXString FXPath::convert(const FXString& path){
+  if(!path.empty()){
+    FXString result; FXint b=0,e=0,h=1,p;
+#if defined(WIN32)
+    while(pathe){
+      if(pathe=='/'){                                 // Path separator
+        result.append(&pathb,e-b);
+        result.append(PATHSEP);
+        b=++e;
+        h=0;
+        continue;
+        }
+      if(Ascii::isLetter(pathe) && pathe+1==':' && h){      // Drive letter "C:"
+        e+=2;
+        h=0;
+        continue;
+        }
+      if(pathe==':'){                                 // Pathlist separator
+        result.append(&pathb,e-b);
+        result.append(PATHLISTSEP);
+        b=++e;
+        h=1;
+        continue;
+        }
+      if(pathe==';'){                                 // Pathlist separator
+        ++e;
+        h=1;
+        continue;
+        }
+      h=0;
+      if(pathe=='$'){                                 // Environment variable
+        ++e;
+        if(pathe=='{'){                               // ${VAR}...
+          p=++e;
+          while(Ascii::isAlphaNumeric(pathe) || pathe=='_') e++;
+          if(pathe=='}'){
+            if(p<e){
+              result.append(&pathb,p-b-2);
+              result.append('%');
+              result.append(path.mid(p,e-p));
+              result.append('%');
+              b=e+1;
+              }
+            ++e;
+            }
+          }
+        else{                                           // $VAR...
+          p=e;
+          while(Ascii::isAlphaNumeric(pathe) || pathe=='_') e++;
+          if(p<e){
+            result.append(&pathb,p-b-1);
+            result.append('%');
+            result.append(path.mid(p,e-p));
+            result.append('%');
+            b=e;
+            }
+          }
+        continue;
+        }
+      e++;
+      }
+    result.append(&pathb,e-b);
+#else
+    while(pathe){
+      if(pathe=='\\'){                                // Path separator
+        result.append(&pathb,e-b);
+        b=++e;
+        if(pathe=='\\' && h){                         // Strip "\\hostname" component.
+          e++;
+          while(pathe && pathe!='\\') e++;
+          b=e;
+          h=0;
+          continue;
+          }
+        result.append(PATHSEP);
+        h=0;
+        continue;
+        }
+      if(Ascii::isLetter(pathe) && pathe+1==':' && h){   // Strip "C:" drive letter
+        result.append(&pathb,e-b);
+        b=e=e+2;
+        h=0;
+        continue;
+        }
+      if(pathe==';'){                                 // Pathlist separator
+        result.append(&pathb,e-b);
+        result.append(PATHLISTSEP);
+        b=++e;
+        h=1;
+        continue;
+        }
+      if(pathe==':'){                                 // Pathlist separator
+        ++e;
+        h=1;
+        continue;
+        }
+      h=0;
+      if(pathe=='%'){                                 // Environment variable
+        p=++e;
+        while(Ascii::isAlphaNumeric(pathe) || pathe=='_') e++;
+        if(pathe=='%'){
+          if(p<e){
+            result.append(&pathb,p-b-1);
+            result.append("${");
+            result.append(&pathp,e-p);
+            result.append("}");
+            b=e+1;
+            }
+          ++e;
+          }
+        continue;
+        }
+      e++;
+      }
+    result.append(&pathb,e-b);
 #endif
     return result;
     }
@@ -612,59 +782,53 @@
 
 /*******************************************************************************/
 
-// Build absolute pathname
+// Return absolute path from current directory and file name
 FXString FXPath::absolute(const FXString& file){
 #if defined(WIN32)
   if(!((ISPATHSEP(file0) && ISPATHSEP(file1)) || (Ascii::isLetter(file0) && file1==':' && ISPATHSEP(file2)))){
     if(ISPATHSEP(file0)){
-      return FXPath::simplify(FXSystem::getCurrentDrive()+file);        // \file -> D:\file
+      return FXPath::simplify(FXSystem::getCurrentDrive()+file);
       }
     if(Ascii::isLetter(file0) && file1==':'){
-      return FXPath::simplify(file.left(2)+PATHSEPSTRING+file.right(file.length()-2));  // D:file -> D:\file
+      return FXPath::simplify(file.left(2)+PATHSEPSTRING+file.right(file.length()-2));
       }
-    FXString result(FXSystem::getCurrentDirectory());
-    if(!ISPATHSEP(result.tail())) result.append(PATHSEP);
-    result.append(file);
-    return FXPath::simplify(result);                                    // file -> D:\cwd\file
+    FXString path(FXSystem::getCurrentDirectory());
+    if(!ISPATHSEP(path.tail())) path.append(PATHSEP);
+    path.append(file);
+    return FXPath::simplify(path);
     }
-  return FXPath::simplify(file);                                        // D:\dirs\file  OR  \\share\file
+  return FXPath::simplify(file);
 #else
   if(!ISPATHSEP(file0)){
-    FXString result(FXSystem::getCurrentDirectory());
-    if(!ISPATHSEP(result.tail())) result.append(PATHSEP);
-    result.append(file);
-    return FXPath::simplify(result);                                    // file -> /cwd/file
+    FXString path(FXSystem::getCurrentDirectory());
+    if(!ISPATHSEP(path.tail())) path.append(PATHSEP);
+    path.append(file);
+    return FXPath::simplify(path);
     }
-  return FXPath::simplify(file);                                        // /dirs/file
+  return FXPath::simplify(file);
 #endif
   }
 
 /*******************************************************************************/
 
-// Build absolute pathname from parts
+// Return absolute path from base directory and file name
 FXString FXPath::absolute(const FXString& base,const FXString& file){
 #if defined(WIN32)
   if(!((ISPATHSEP(file0) && ISPATHSEP(file1)) || (Ascii::isLetter(file0) && file1==':' && ISPATHSEP(file2)))){
-    if(ISPATHSEP(file0)){
-      return FXPath::simplify(FXSystem::getCurrentDrive()+file);        // \file -> D:\file
-      }
-    if(Ascii::isLetter(file0) && file1==':'){
-      return FXPath::simplify(file.left(2)+PATHSEPSTRING+file.right(file.length()-2));  // D:file -> D:\file
-      }
-    FXString result(FXPath::absolute(base));
-    if(!ISPATHSEP(result.tail())) result.append(PATHSEP);
-    result.append(file);
-    return FXPath::simplify(result);                                    // file -> /base/file
+    FXString path(base);
+    if(!ISPATHSEP(path.tail())) path.append(PATHSEP);
+    path.append(file);
+    return FXPath::absolute(path);
     }
-  return FXPath::simplify(file);                                        // D:\dirs\file  OR  \\share\file
+  return FXPath::simplify(file);
 #else
   if(!ISPATHSEP(file0)){
-    FXString result(FXPath::absolute(base));
-    if(!ISPATHSEP(result.tail())) result.append(PATHSEP);
-    result.append(file);
-    return FXPath::simplify(result);                                    // file -> /base/file
+    FXString path(base);
+    if(!ISPATHSEP(path.tail())) path.append(PATHSEP);
+    path.append(file);
+    return FXPath::absolute(path);
     }
-  return FXPath::simplify(file);                                        // /dirs/file
+  return FXPath::simplify(file);
 #endif
   }
 
@@ -702,69 +866,71 @@
 //  /p/q       /a/b         ../../a/b   Branch point is /
 //
 FXString FXPath::relative(const FXString& base,const FXString& file){
+  if(!base.empty() && !file.empty()){
 
-  // Base and file non-empty and either both absolute, or both relative
-  if(!base.empty() && !file.empty() && (FXPath::isAbsolute(base) == FXPath::isAbsolute(file))){
-    FXint p=0,q=0,bp=0,bq=0;
+    // Base and file either both absolute or both relative
+    if(FXPath::isAbsolute(base) == FXPath::isAbsolute(file)){
+      FXint p=0,q=0,bp=0,bq=0;
 
-    // Find branch point
+      // Find branch point
 #if defined(WIN32)
-    while(basep && fileq){
-      if(ISPATHSEP(basep) && ISPATHSEP(fileq)){
-        bp=p; while(ISPATHSEP(basep)) p++;    // Eat multiple slashes
-        bq=q; while(ISPATHSEP(fileq)) q++;
-        continue;
-        }
-      if(Ascii::toLower(basep)==Ascii::toLower(fileq)){
-        p++;
-        q++;
-        continue;
+      while(basep && fileq){
+        if(ISPATHSEP(basep) && ISPATHSEP(fileq)){
+          bp=p; while(ISPATHSEP(basep)) p++;    // Eat multiple slashes
+          bq=q; while(ISPATHSEP(fileq)) q++;
+          continue;
+          }
+        if(Ascii::toLower(basep)==Ascii::toLower(fileq)){
+          p++;
+          q++;
+          continue;
+          }
+        break;
         }
-      break;
-      }
 #else
-    while(basep && fileq){
-      if(ISPATHSEP(basep) && ISPATHSEP(fileq)){
-        bp=p; while(ISPATHSEP(basep)) p++;    // Eat multiple slashes
-        bq=q; while(ISPATHSEP(fileq)) q++;
-        continue;
-        }
-      if(basep==fileq){
-        p++;
-        q++;
-        continue;
+      while(basep && fileq){
+        if(ISPATHSEP(basep) && ISPATHSEP(fileq)){
+          bp=p; while(ISPATHSEP(basep)) p++;    // Eat multiple slashes
+          bq=q; while(ISPATHSEP(fileq)) q++;
+          continue;
+          }
+        if(basep==fileq){
+          p++;
+          q++;
+          continue;
+          }
+        break;
         }
-      break;
-      }
 #endif
 
-    // Common prefix except for trailing path separator
-    if((basep=='\0' || ISPATHSEP(basep)) && (fileq=='\0' || ISPATHSEP(fileq))){
-      bp=p;
-      bq=q;
-      }
+      // Common prefix except for trailing path separator
+      if((basep=='\0' || ISPATHSEP(basep)) && (fileq=='\0' || ISPATHSEP(fileq))){
+        bp=p;
+        bq=q;
+        }
 
-    // Strip leading path character off, if any
-    while(ISPATHSEP(filebq)) bq++;
+      // Strip leading path character off, if any
+      while(ISPATHSEP(filebq)) bq++;
 
-    // Non trivial
-    if(filebq){
-      FXString result;
+      // Non trivial
+      if(filebq){
+        FXString result;
 
-      // Up to branch point
-      while(basebp){
-        while(ISPATHSEP(basebp)) bp++;
-        if(basebp){
-          result.append(".." PATHSEPSTRING);
-          while(basebp && !ISPATHSEP(basebp)) bp++;
+        // Up to branch point
+        while(basebp){
+          while(ISPATHSEP(basebp)) bp++;
+          if(basebp){
+            while(basebp && !ISPATHSEP(basebp)) bp++;
+            result.append(".." PATHSEPSTRING);
+            }
           }
-        }
 
-      // Append tail end
-      result.append(&filebq);
-      return result;
+        // Append tail end
+        result.append(&filebq);
+        return result;
+        }
+      return ".";
       }
-    return ".";
     }
   return file;
   }
@@ -898,48 +1064,6 @@
 
 /*******************************************************************************/
 
-// Convert path from using 'sepfm' to use 'septo' path-separators
-FXString FXPath::convert(const FXString& file,FXchar septo,FXchar sepfm){
-  if(!file.empty()){
-    FXString result(file);
-    FXint p=0,q=0;
-#if defined(WIN32)
-    if(resultq==sepfm || resultq==septo){                   // UNC
-      resultp++=septo; q++;
-      if(resultq==sepfm || resultq==septo){
-        resultp++=septo; q++;
-        while(resultq==sepfm || resultq==septo) q++;
-        }
-      }
-    else if(Ascii::isLetter(resultq) && resultq+1==':'){    // C:
-      resultp++=resultq++;
-      resultp++=':'; q++;
-      if(resultq==sepfm || resultq==septo){
-        resultp++=septo; q++;
-        while(resultq==sepfm || resultq==septo) q++;
-        }
-      }
-#else
-    if(resultq==sepfm || resultq==septo){
-      resultp++=septo; q++;
-      while(resultq==sepfm || resultq==septo) q++;
-      }
-#endif
-    while(resultq){
-      if(resultq==sepfm || resultq==septo){
-        resultp++=septo; q++;
-        while(resultq==sepfm || resultq==septo) q++;
-        continue;
-        }
-      resultp++=resultq++;
-      }
-    return result.trunc(p);
-    }
-  return FXString::null;
-  }
-
-/*******************************************************************************/
-
 // Up one level, given absolute path
 FXString FXPath::upLevel(const FXString& file){
   if(!file.empty()){
@@ -1046,7 +1170,7 @@
 FXString FXPath::validPath(const FXString& file){
   if(FXPath::isAbsolute(file)){
     FXString result(file);
-    while(!FXStat::exists(result) && !FXPath::isTopDirectory(result)){
+    while(!FXPath::isTopDirectory(result) && !FXStat::exists(result)){
       result=FXPath::upLevel(result);
       }
     return result;
@@ -1290,12 +1414,10 @@
       case '\n':
       case '\v':
       case ' ':
+      case '#':                 // Comments
         force=true;             // Force quotes
         q++;
         continue;
-      case '#':                 // Comments
-      case '~':                 // Username substitution
-        if(p==1) force=true;    // Force quotes if at beginning
       default:                  // Normal character
         q++;
         continue;
@@ -1799,13 +1921,12 @@
 //       will fail.
 //
 // ( | ) Will start, separate, and end a group of alternatives, each of which may contain pattern
-//       characters as well as sub-groups thereof.
+//       characters as well as sub-groups thereof; The ',' may also be used.
 //
 static FXbool domatch(const FXchar* string,const FXchar* s,const FXchar* p,FXuint flags){
   const FXchar* q;
   FXwchar pp,qq,ss;
   FXbool neg,ok;
-  //FXTRACE((1,"domatch(string: \"%s\", pattern: \"%s\", flags: %x)\n",s,p,flags));
   while(*p!='\0'){
     switch(*p){
       case '(':         // Start subpattern
@@ -1945,7 +2066,6 @@
 
 // Search pathlist for file
 FXString FXPath::search(const FXString& pathlist,const FXString& file){
-  FXTRACE((100,"FXPath::search(\"%s\",\"%s\")\n",pathlist.text(),file.text()));
   if(!file.empty()){
     FXString path;
     FXint beg,end;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPicker.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPicker.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPipe.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPipe.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPoint.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPoint.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPopup.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPopup.cpp Changed

@@ -3,7 +3,7 @@
 *                     P o p u p   W i n d o w   O b j e c t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -170,9 +170,9 @@
 
 // Get width
 FXint FXPopup::getDefaultWidth(){
-  register FXWindow* child;
-  register FXint w,wmax,wcum;
-  register FXuint hints;
+  FXWindow* child;
+  FXint w,wmax,wcum;
+  FXuint hints;
   wmax=wcum=0;
   for(child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
@@ -198,9 +198,9 @@
 
 // Get height
 FXint FXPopup::getDefaultHeight(){
-  register FXWindow* child;
-  register FXint h,hmax,hcum;
-  register FXuint hints;
+  FXWindow* child;
+  FXint h,hmax,hcum;
+  FXuint hints;
   hmax=hcum=0;
   for(child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
@@ -226,14 +226,14 @@
 
 // Recalculate layout
 void FXPopup::layout(){
-  register FXWindow *child;
-  register FXint w,h,x,y,remain,t;
-  register FXuint hints;
-  register FXint sumexpand=0;
-  register FXint numexpand=0;
-  register FXint mw=0;
-  register FXint mh=0;
-  register FXint e=0;
+  FXWindow *child;
+  FXint w,h,x,y,remain,t;
+  FXuint hints;
+  FXint sumexpand=0;
+  FXint numexpand=0;
+  FXint mw=0;
+  FXint mh=0;
+  FXint e=0;
 
   // Horizontal
   if(options&POPUP_HORIZONTAL){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPrintDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPrintDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXProcess.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXProcess.cpp Changed

@@ -3,7 +3,7 @@
 *                         P r o c e s s   S u p p o r t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -175,9 +175,9 @@
 
 // See if quotes are needed
 static FXbool needquotes(const FXchar* ptr){
-  register FXchar c;
+  FXchar c;
   while((c=*ptr++)!='\0'){
-    if(c==' ' || c=='"' || c=='\t' || c=='\v') return true;
+    if(c==' ' || c=='"' || c=='\t' || c=='\v' || c=='\n') return true;
     }
   return false;
   }
@@ -189,7 +189,7 @@
 static FXnchar* commandline(const FXchar *const *args){
   FXnchar *result=NULL;
   if(args){
-    register FXint size,s,n,w;
+    FXint size,s,n,w;
     const FXchar  *ptr;
     FXnchar       *dst;
     FXbool         q;
@@ -289,7 +289,7 @@
 static FXchar* commandline(const FXchar *const *args){
   FXchar *result=NULL;
   if(args){
-    register FXint size,s,n,w;
+    FXint size,s,n,w;
     const FXchar  *ptr;
     FXchar        *dst;
     FXbool         q;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXProgressBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXProgressBar.cpp Changed

@@ -3,7 +3,7 @@
 *                      P r o g r e s s B a r   W i d g e t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -98,7 +98,7 @@
 
 // Get minimum width
 FXint FXProgressBar::getDefaultWidth(){
-  register FXint w=1,t;
+  FXint w=1,t;
   if((options&PROGRESSBAR_VERTICAL) || (options&PROGRESSBAR_DIAL)){
     w=barsize;
     if(options&PROGRESSBAR_PERCENTAGE){
@@ -112,7 +112,7 @@
 
 // Get minimum height
 FXint FXProgressBar::getDefaultHeight(){
-  register FXint h=1,t;
+  FXint h=1,t;
   if(!(options&PROGRESSBAR_VERTICAL) || (options&PROGRESSBAR_DIAL)){
     h=barsize;
     if(options&PROGRESSBAR_PERCENTAGE){
@@ -190,8 +190,8 @@
 
 // Draw only the interior, i.e. the part that changes
 void FXProgressBar::drawInterior(FXDCWindow& dc){
-  register FXdouble fraction=(total>0)?((FXdouble)progress/(FXdouble)total):1.0;
-  register FXint percent,barlength,barwidth,barfilled,tx,ty,tw,th,dx,dy,ds,n;
+  FXdouble fraction=(total>0)?((FXdouble)progress/(FXdouble)total):1.0;
+  FXint percent,barlength,barwidth,barfilled,tx,ty,tw,th,dx,dy,ds,n;
   FXchar numtext10;
 
   // Calculate percentage complete

gogglesmm-1.2.1.tar.gz/cfox/lib/FXProgressDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXProgressDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPtrList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPtrList.cpp Changed

@@ -3,7 +3,7 @@
 *                            P o i n t e r   L i s t                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -58,7 +58,7 @@
 FXbool FXPtrList::no(FXival num){
   if(__likely(num!=no())){
     if(0<num){
-      register FXptr p;
+      FXptr p;
       if(ptr!=EMPTY){
         if(__unlikely((p=::realloc(((FXival*)ptr)-1,sizeof(FXival)+sizeof(FXptr)*ROUNDUP(num)))==NULL)) return false;
         }
@@ -85,10 +85,10 @@
 
 
 // Copy constructor
-FXPtrList::FXPtrList(const FXPtrList& src):ptr(EMPTY){
-  register FXival num=src.no();
+FXPtrList::FXPtrList(const FXPtrList& other):ptr(EMPTY){
+  FXival num=other.no();
   if(__likely(0<num && no(num))){
-    copyElms(ptr,src.ptr,num);
+    copyElms(ptr,other.ptr,num);
     }
   }
 
@@ -118,19 +118,19 @@
 
 
 // Assignment operator
-FXPtrList& FXPtrList::operator=(const FXPtrList& src){
-  if(__likely(ptr!=src.ptr && no(src.no()))){
-    copyElms(ptr,src.ptr,src.no());
+FXPtrList& FXPtrList::operator=(const FXPtrList& other){
+  if(__likely(ptr!=other.ptr && no(other.no()))){
+    copyElms(ptr,other.ptr,other.no());
     }
   return *this;
   }
 
 
 // Adopt objects from src, leaving src empty
-FXPtrList& FXPtrList::adopt(FXPtrList& src){
-  if(__likely(ptr!=src.ptr)){
-    swap(ptr,src.ptr);
-    src.clear();
+FXPtrList& FXPtrList::adopt(FXPtrList& other){
+  if(__likely(ptr!=other.ptr)){
+    swap(ptr,other.ptr);
+    other.clear();
     }
   return *this;
   }
@@ -138,7 +138,7 @@
 
 // Find object in list, searching forward; return position or -1
 FXival FXPtrList::find(FXptr object,FXival pos) const {
-  register FXival p=FXMAX(0,pos);
+  FXival p=FXMAX(0,pos);
   while(p<no()){
     if(ptrp==object){ return p; }
     ++p;
@@ -149,7 +149,7 @@
 
 // Find object in list, searching backward; return position or -1
 FXival FXPtrList::rfind(FXptr object,FXival pos) const {
-  register FXival p=FXMIN(pos,no()-1);
+  FXival p=FXMIN(pos,no()-1);
   while(0<=p){
     if(ptrp==object){ return p; }
     --p;
@@ -196,7 +196,7 @@
 
 // Insert an object
 FXbool FXPtrList::insert(FXival pos,FXptr object){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+1))){
     moveElms(ptr+pos+1,ptr+pos,num-pos);
     ptrpos=object;
@@ -208,7 +208,7 @@
 
 // Insert n copies of object at specified position
 FXbool FXPtrList::insert(FXival pos,FXptr object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+pos+n,ptr+pos,num-pos);
     fillElms(ptr+pos,object,n);
@@ -220,7 +220,7 @@
 
 // Insert n objects at specified position
 FXbool FXPtrList::insert(FXival pos,FXptr* objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+pos+n,ptr+pos,num-pos);
     copyElms(ptr+pos,objects,n);
@@ -238,7 +238,7 @@
 
 // Prepend an object
 FXbool FXPtrList::prepend(FXptr object){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+1))){
     moveElms(ptr+1,ptr,num);
     ptr0=object;
@@ -250,7 +250,7 @@
 
 // Prepend n copies of object
 FXbool FXPtrList::prepend(FXptr object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+n,ptr,num);
     fillElms(ptr,object,n);
@@ -262,7 +262,7 @@
 
 // Prepend n objects
 FXbool FXPtrList::prepend(FXptr* objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     moveElms(ptr+n,ptr,num);
     copyElms(ptr,objects,n);
@@ -280,7 +280,7 @@
 
 // Append an object
 FXbool FXPtrList::append(FXptr object){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+1))){
     ptrnum=object;
     return true;
@@ -291,7 +291,7 @@
 
 // Append n copies of object
 FXbool FXPtrList::append(FXptr object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     fillElms(ptr+num,object,n);
     return true;
@@ -302,7 +302,7 @@
 
 // Append n objects
 FXbool FXPtrList::append(FXptr* objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__likely(no(num+n))){
     copyElms(ptr+num,objects,n);
     return true;
@@ -326,7 +326,7 @@
 
 // Replaces the m objects at pos with n copies of object
 FXbool FXPtrList::replace(FXival pos,FXival m,FXptr object,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__unlikely(m<n)){
     if(__unlikely(!no(num-m+n))) return false;
     moveElms(ptr+pos+n,ptr+pos+m,num-pos-n);
@@ -342,7 +342,7 @@
 
 // Replaces the m objects at pos with n objects
 FXbool FXPtrList::replace(FXival pos,FXival m,FXptr* objects,FXival n){
-  register FXival num=no();
+  FXival num=no();
   if(__unlikely(m<n)){
     if(__unlikely(!no(num-m+n))) return false;
     moveElms(ptr+pos+n,ptr+pos+m,num-pos-n);
@@ -364,7 +364,7 @@
 
 // Remove object at pos
 FXbool FXPtrList::erase(FXival pos){
-  register FXival num=no();
+  FXival num=no();
   moveElms(ptr+pos,ptr+pos+1,num-pos-1);
   return no(num-1);
   }
@@ -372,7 +372,7 @@
 
 // Remove n objects at pos
 FXbool FXPtrList::erase(FXival pos,FXival n){
-  register FXival num=no();
+  FXival num=no();
   moveElms(ptr+pos,ptr+pos+n,num-n-pos);
   return no(num-n);
   }
@@ -380,7 +380,7 @@
 
 // Remove object
 FXbool FXPtrList::remove(FXptr object){
-  register FXival pos;
+  FXival pos;
   if(0<=(pos=find(object))){
     return erase(pos);
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXPtrQueue.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXPtrQueue.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXQuatd.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXQuatd.cpp Changed

@@ -3,7 +3,7 @@
 *              D o u b l e - P r e c i s i o n  Q u a t e r n i o n             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -31,7 +31,21 @@
 #include "FXVec4d.h"
 #include "FXQuatd.h"
 #include "FXMat3d.h"
+#include "FXMat4d.h"
 
+/*
+  Notes:
+
+  - Quaternion represents a rotation as follows:
+
+                   phi       axis            phi
+     Q =  ( sin ( ----- ) * ------  , cos ( ----- ) )
+                    2       |axis|            2
+
+  - Typically, |Q| == 1.  But this is not always a given.
+  - Repeated operations should periodically fix Q to maintain |Q| == 1, using
+    the adjust() API.
+*/
 
 using namespace FX;
 
@@ -39,40 +53,46 @@
 
 namespace FX {
 
-// Construct from angle and axis
+// Construct from rotation axis and angle in radians
 FXQuatd::FXQuatd(const FXVec3d& axis,FXdouble phi){
   setAxisAngle(axis,phi);
   }
 
 
-// Construct from roll, pitch, yaw
-FXQuatd::FXQuatd(FXdouble roll,FXdouble pitch,FXdouble yaw){
-  setRollPitchYaw(roll,pitch,yaw);
+// Construct quaternion from arc between two unit vectors fm and to
+FXQuatd::FXQuatd(const FXVec3d& fr,const FXVec3d& to){
+  set(arc(fr,to));
   }
 
 
-// Construct quaternion from two unit vectors
-FXQuatd::FXQuatd(const FXVec3d& fr,const FXVec3d& to){
-  set(arc(fr,to));
+// Construct from euler angles yaw (z), pitch (y), and roll (x)
+FXQuatd::FXQuatd(FXdouble roll,FXdouble pitch,FXdouble yaw){
+  setRollPitchYaw(roll,pitch,yaw);
   }
 
 
-// Construct quaternion from axes
+// Construct quaternion from three orthogonal unit vectors
 FXQuatd::FXQuatd(const FXVec3d& ex,const FXVec3d& ey,const FXVec3d& ez){
   setAxes(ex,ey,ez);
   }
 
 
+// Construct quaternion from rotation vector rot, representing a rotation
+// by |rot| radians about a unit vector rot/|rot|.
+FXQuatd::FXQuatd(const FXVec3d& rot){
+  setRotation(rot);
+  }
+
+
 // Adjust quaternion length
 FXQuatd& FXQuatd::adjust(){
-  register FXdouble t=x*x+y*y+z*z+w*w;
-  register FXdouble f;
-  if(__likely(t>0.0)){
-    f=1.0/Math::sqrt(t);
-    x*=f;
-    y*=f;
-    z*=f;
-    w*=f;
+  FXdouble mag2(x*x+y*y+z*z+w*w);
+  if(__likely(0.0<mag2)){
+    FXdouble s(1.0/Math::sqrt(mag2));
+    x*=s;
+    y*=s;
+    z*=s;
+    w*=s;
     }
   return *this;
   }
@@ -80,50 +100,94 @@
 
 // Set axis and angle
 void FXQuatd::setAxisAngle(const FXVec3d& axis,FXdouble phi){
-  register FXdouble mag=axis.length();
-  register FXdouble a,m;
-  if(__likely(0.0<mag)){
-    a=0.5*phi;
-    m=Math::sin(a)/mag;
-    x=axis.x*m;
-    y=axis.y*m;
-    z=axis.z*m;
-    w=Math::cos(a);
-    return;
+  FXdouble mag2(axis.length2());
+  if(__likely(0.0<mag2)){
+    FXdouble arg(0.5*phi);
+    FXdouble mag(Math::sqrt(mag2));
+    FXdouble s(Math::sin(arg)/mag);
+    FXdouble c(Math::cos(arg));
+    x=axis.x*s;
+    y=axis.y*s;
+    z=axis.z*s;
+    w=c;
+    }
+  else{
+    x=0.0;
+    y=0.0;
+    z=0.0;
+    w=1.0;
     }
-  x=0.0;
-  y=0.0;
-  z=0.0;
-  w=1.0;
   }
 
 
 // Obtain axis and angle
 // Remeber that: q = sin(A/2)*(x*i+y*j+z*k)+cos(A/2)
 void FXQuatd::getAxisAngle(FXVec3d& axis,FXdouble& phi) const {
-  register FXdouble mag=x*x+y*y+z*z;
-  register FXdouble m;
-  if(__likely(0.0<mag)){
-    m=Math::sqrt(mag);
-    axis.x=x/m;
-    axis.y=y/m;
-    axis.z=z/m;
-    phi=2.0*Math::acos(w/Math::sqrt(mag+w*w));
-    return;
+  FXdouble mag2(x*x+y*y+z*z);
+  if(0.0<mag2){
+    FXdouble mag(Math::sqrt(mag2));
+    axis.x=x/mag;
+    axis.y=y/mag;
+    axis.z=z/mag;
+    phi=2.0*Math::atan2(mag,w);
+    }
+  else{
+    axis.x=1.0;
+    axis.y=0.0;
+    axis.z=0.0;
+    phi=0.0;
+    }
+  }
+
+
+// Set quaternion from rotation vector rot
+//
+//                 |rot|         rot              |rot|
+//   Q =  ( sin ( ------- ) *  -------  , cos (  ------- ) )
+//                   2          |rot|               2
+//
+void FXQuatd::setRotation(const FXVec3d& rot){
+  FXdouble mag2(rot.length2());
+  if(0.0<mag2){
+    FXdouble mag(Math::sqrt(mag2));
+    FXdouble arg(mag*0.5);
+    FXdouble s(Math::sin(arg)/mag);
+    FXdouble c(Math::cos(arg));
+    x=rot.x*s;
+    y=rot.y*s;
+    z=rot.z*s;
+    w=c;
+    }
+  else{
+    x=0.0;
+    y=0.0;
+    z=0.0;
+    w=1.0;
     }
-  axis.x=1.0;
-  axis.y=0.0;
-  axis.z=0.0;
-  phi=0.0;
+  }
+
+
+// Get rotation vector from quaternion
+FXVec3d FXQuatd::getRotation() const {
+  FXVec3d rot(0.0,0.0,0.0);
+  FXdouble mag2(x*x+y*y+z*z);
+  if(0.0<mag2){
+    FXdouble mag(Math::sqrt(mag2));
+    FXdouble phi(2.0*Math::atan2(mag,w)/mag);
+    rot.x=x*phi*mag;
+    rot.y=y*phi*mag;
+    rot.z=z*phi*mag;
+    }
+  return rot;
   }
 
 
 // Set quaternion from roll (x), pitch (y), yaw (z)
 void FXQuatd::setRollPitchYaw(FXdouble roll,FXdouble pitch,FXdouble yaw){
-  register FXdouble sr,cr,sp,cp,sy,cy;
-  register FXdouble rr=0.5*roll;
-  register FXdouble pp=0.5*pitch;
-  register FXdouble yy=0.5*yaw;
+  FXdouble sr,cr,sp,cp,sy,cy;
+  FXdouble rr=0.5*roll;
+  FXdouble pp=0.5*pitch;
+  FXdouble yy=0.5*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -136,10 +200,10 @@
 
 // Set quaternion from yaw (z), pitch (y), roll (x)
 void FXQuatd::setYawPitchRoll(FXdouble yaw,FXdouble pitch,FXdouble roll){
-  register FXdouble sr,cr,sp,cp,sy,cy;
-  register FXdouble rr=0.5*roll;
-  register FXdouble pp=0.5*pitch;
-  register FXdouble yy=0.5*yaw;
+  FXdouble sr,cr,sp,cp,sy,cy;
+  FXdouble rr=0.5*roll;
+  FXdouble pp=0.5*pitch;
+  FXdouble yy=0.5*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -152,10 +216,10 @@
 
 // Set quaternion from roll (x), yaw (z), pitch (y)
 void FXQuatd::setRollYawPitch(FXdouble roll,FXdouble yaw,FXdouble pitch){
-  register FXdouble sr,cr,sp,cp,sy,cy;
-  register FXdouble rr=0.5*roll;
-  register FXdouble pp=0.5*pitch;
-  register FXdouble yy=0.5*yaw;
+  FXdouble sr,cr,sp,cp,sy,cy;
+  FXdouble rr=0.5*roll;
+  FXdouble pp=0.5*pitch;
+  FXdouble yy=0.5*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -168,10 +232,10 @@
 
 // Set quaternion from pitch (y), roll (x),yaw (z)
 void FXQuatd::setPitchRollYaw(FXdouble pitch,FXdouble roll,FXdouble yaw){
-  register FXdouble sr,cr,sp,cp,sy,cy;
-  register FXdouble rr=0.5*roll;
-  register FXdouble pp=0.5*pitch;
-  register FXdouble yy=0.5*yaw;
+  FXdouble sr,cr,sp,cp,sy,cy;
+  FXdouble rr=0.5*roll;
+  FXdouble pp=0.5*pitch;
+  FXdouble yy=0.5*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -184,10 +248,10 @@
 
 // Set quaternion from pitch (y), yaw (z), roll (x)
 void FXQuatd::setPitchYawRoll(FXdouble pitch,FXdouble yaw,FXdouble roll){
-  register FXdouble sr,cr,sp,cp,sy,cy;
-  register FXdouble rr=0.5*roll;
-  register FXdouble pp=0.5*pitch;
-  register FXdouble yy=0.5*yaw;
+  FXdouble sr,cr,sp,cp,sy,cy;
+  FXdouble rr=0.5*roll;
+  FXdouble pp=0.5*pitch;
+  FXdouble yy=0.5*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -200,10 +264,10 @@
 
 // Set quaternion from yaw (z), roll (x), pitch (y)
 void FXQuatd::setYawRollPitch(FXdouble yaw,FXdouble roll,FXdouble pitch){
-  register FXdouble sr,cr,sp,cp,sy,cy;
-  register FXdouble rr=0.5*roll;
-  register FXdouble pp=0.5*pitch;
-  register FXdouble yy=0.5*yaw;
+  FXdouble sr,cr,sp,cp,sy,cy;
+  FXdouble rr=0.5*roll;
+  FXdouble pp=0.5*pitch;
+  FXdouble yy=0.5*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -215,151 +279,57 @@
 
 
 // Obtain roll, pitch, yaw
-// Math is from "3D Game Engine Design" by David Eberly pp 19-20.
-// However, instead of testing asin(Sy) against -PI/2 and PI/2, I
-// test Sy against -1 and 1; this is numerically more stable, as
-// asin doesn't like arguments outside -1,1.
 void FXQuatd::getRollPitchYaw(FXdouble& roll,FXdouble& pitch,FXdouble& yaw) const {
-  register FXdouble s=-2.0*(x*z-w*y);
-  if(__likely(s<1.0)){
-    if(__likely(-1.0<s)){
-      roll=Math::atan2(2.0*(y*z+w*x),1.0-2.0*(x*x+y*y));
-      pitch=Math::asin(s);
-      yaw=Math::atan2(2.0*(x*y+w*z),1.0-2.0*(y*y+z*z));
-      }
-    else{
-      roll=0.0;
-      pitch=-1.57079632679489661923;
-      yaw=-Math::atan2(-2.0*(x*y-w*z),2.0*(x*z+w*y));
-      }
-    }
-  else{
-    roll=0.0;
-    pitch=1.57079632679489661923;
-    yaw=Math::atan2(-2.0*(x*y-w*z),2.0*(x*z+w*y));
-    }
+  roll=Math::atan2(2.0*(y*z+w*x),1.0-2.0*(x*x+y*y));
+  pitch=Math::asin(Math::fclamp(-1.0,-2.0*(x*z-w*y),1.0));
+  yaw=Math::atan2(2.0*(x*y+w*z),1.0-2.0*(y*y+z*z));
   }
 
 
 // Obtain yaw, pitch, and roll
 void FXQuatd::getYawPitchRoll(FXdouble& yaw,FXdouble& pitch,FXdouble& roll) const {
-  register FXdouble s=2.0*(x*z+w*y);
-  if(__likely(s<1.0)){
-    if(__likely(-1.0<s)){
-      yaw=Math::atan2(-2.0*(x*y-w*z),1.0-2.0*(y*y+z*z));
-      pitch=Math::asin(s);
-      roll=Math::atan2(-2.0*(y*z-w*x),1.0-2.0*(x*x+y*y));
-      }
-    else{
-      yaw=0.0;
-      pitch=-1.57079632679489661923;
-      roll=-Math::atan2(2.0*(x*y+w*z),1.0-2.0*(x*x+z*z));
-      }
-    }
-  else{
-    yaw=0.0;
-    pitch=1.57079632679489661923;
-    roll=Math::atan2(2.0*(x*y+w*z),1.0-2.0*(x*x+z*z));
-    }
+  yaw=Math::atan2(-2.0*(x*y-w*z),1.0-2.0*(y*y+z*z));
+  pitch=Math::asin(Math::fclamp(-1.0,2.0*(x*z+w*y),1.0));
+  roll=Math::atan2(-2.0*(y*z-w*x),1.0-2.0*(x*x+y*y));
   }
 
 
 // Obtain roll, yaw, pitch
 void FXQuatd::getRollYawPitch(FXdouble& roll,FXdouble& yaw,FXdouble& pitch) const {
-  register FXdouble s=2.0*(x*y+w*z);
-  if(__likely(s<1.0)){
-    if(__likely(-1.0<s)){
-      roll=Math::atan2(-2.0*(y*z-w*x),1.0-2.0*(x*x+z*z));
-      yaw=Math::asin(s);
-      pitch=Math::atan2(-2.0*(x*z-w*y),1.0-2.0*(y*y+z*z));
-      }
-    else{
-      roll=0.0;
-      yaw=-1.57079632679489661923;
-      pitch=-Math::atan2(2.0*(y*z+w*x),1.0-2.0*(x*x+y*y));
-      }
-    }
-  else{
-    roll=0.0;
-    yaw=1.57079632679489661923;
-    pitch=Math::atan2(2.0*(y*z+w*x),1.0-2.0*(x*x+y*y));
-    }
+  roll=Math::atan2(-2.0*(y*z-w*x),1.0-2.0*(x*x+z*z));
+  yaw=Math::asin(Math::fclamp(-1.0,2.0*(x*y+w*z),1.0));
+  pitch=Math::atan2(-2.0*(x*z-w*y),1.0-2.0*(y*y+z*z));
   }
 
 
 // Obtain pitch, roll, yaw
 void FXQuatd::getPitchRollYaw(FXdouble& pitch,FXdouble& roll,FXdouble& yaw) const {
-  register FXdouble s=2.0*(y*z+w*x);
-  if(__likely(s<1.0)){
-    if(__likely(-1.0<s)){
-      pitch=Math::atan2(-2.0*(x*z-w*y),1.0-2.0*(x*x+y*y));
-      roll=Math::asin(s);
-      yaw=Math::atan2(-2.0*(x*y-w*z),1.0-2.0*(x*x+z*z));
-      }
-    else{
-      pitch=0.0;
-      roll=-1.57079632679489661923;
-      yaw=-Math::atan2(2.0*(x*z+w*y),1.0-2.0*(y*y+z*z));
-      }
-    }
-  else{
-    pitch=0.0;
-    roll=1.57079632679489661923;
-    yaw=Math::atan2(2.0*(x*z+w*y),1.0-2.0*(y*y+z*z));
-    }
+  pitch=Math::atan2(-2.0*(x*z-w*y),1.0-2.0*(x*x+y*y));
+  roll=Math::asin(Math::fclamp(-1.0,2.0*(y*z+w*x),1.0));
+  yaw=Math::atan2(-2.0*(x*y-w*z),1.0-2.0*(x*x+z*z));
   }
 
 
 // Obtain pitch, yaw, roll
 void FXQuatd::getPitchYawRoll(FXdouble& pitch,FXdouble& yaw,FXdouble& roll) const {
-  register FXdouble s=-2.0*(x*y-w*z);
-  if(__likely(s<1.0)){
-    if(__likely(-1.0<s)){
-      pitch=Math::atan2(2.0*(x*z+w*y),1.0-2.0*(y*y+z*z));
-      yaw=Math::asin(s);
-      roll=Math::atan2(2.0*(y*z+w*x),1.0-2.0*(x*x+z*z));
-      }
-    else{
-      pitch=0.0;
-      yaw=-1.57079632679489661923;
-      roll=-Math::atan2(-2.0*(x*z-w*y),1.0-2.0*(x*x+y*y));
-      }
-    }
-  else{
-    pitch=0.0;
-    yaw=1.57079632679489661923;
-    roll=Math::atan2(-2.0*(x*z-w*y),1.0-2.0*(x*x+y*y));
-    }
+  pitch=Math::atan2(2.0*(x*z+w*y),1.0-2.0*(y*y+z*z));
+  yaw=Math::asin(Math::fclamp(-1.0,-2.0*(x*y-w*z),1.0));
+  roll=Math::atan2(2.0*(y*z+w*x),1.0-2.0*(x*x+z*z));
   }
 
 
 // Obtain yaw, roll, pitch
 void FXQuatd::getYawRollPitch(FXdouble& yaw,FXdouble& roll,FXdouble& pitch) const {
-  register FXdouble s=-2.0*(y*z-w*x);
-  if(__likely(s<1.0)){
-    if(__likely(-1.0<s)){
-      yaw=Math::atan2(2.0*(x*y+w*z),1.0-2.0*(x*x+z*z));
-      roll=Math::asin(s);
-      pitch=Math::atan2(2.0*(x*z+w*y),1.0-2.0*(x*x+y*y));
-      }
-    else{
-      yaw=0.0;
-      roll=-1.57079632679489661923;
-      pitch=-Math::atan2(-2.0*(x*y-w*z),1.0-2.0*(y*y+z*z));
-      }
-    }
-  else{
-    yaw=0.0;
-    roll=1.57079632679489661923;
-    pitch=Math::atan2(-2.0*(x*y-w*z),1.0-2.0*(y*y+z*z));
-    }
+  yaw=Math::atan2(2.0*(x*y+w*z),1.0-2.0*(x*x+z*z));
+  roll=Math::asin(Math::fclamp(-1.0,-2.0*(y*z-w*x),1.0));
+  pitch=Math::atan2(2.0*(x*z+w*y),1.0-2.0*(x*x+y*y));
   }
 
 
 // Set quaternion from axes
 void FXQuatd::setAxes(const FXVec3d& ex,const FXVec3d& ey,const FXVec3d& ez){
-  register FXdouble trace=ex.x+ey.y+ez.z;
-  register FXdouble scale;
+  FXdouble trace=ex.x+ey.y+ez.z;
+  FXdouble scale;
   if(trace>0.0){
     scale=Math::sqrt(1.0+trace);
     w=0.5*scale;
@@ -394,18 +364,18 @@
 
 // Get quaternion axes
 void FXQuatd::getAxes(FXVec3d& ex,FXVec3d& ey,FXVec3d& ez) const {
-  register FXdouble tx=2.0*x;
-  register FXdouble ty=2.0*y;
-  register FXdouble tz=2.0*z;
-  register FXdouble twx=tx*w;
-  register FXdouble twy=ty*w;
-  register FXdouble twz=tz*w;
-  register FXdouble txx=tx*x;
-  register FXdouble txy=ty*x;
-  register FXdouble txz=tz*x;
-  register FXdouble tyy=ty*y;
-  register FXdouble tyz=tz*y;
-  register FXdouble tzz=tz*z;
+  FXdouble tx=2.0*x;
+  FXdouble ty=2.0*y;
+  FXdouble tz=2.0*z;
+  FXdouble twx=tx*w;
+  FXdouble twy=ty*w;
+  FXdouble twz=tz*w;
+  FXdouble txx=tx*x;
+  FXdouble txy=ty*x;
+  FXdouble txz=tz*x;
+  FXdouble tyy=ty*y;
+  FXdouble tyz=tz*y;
+  FXdouble tzz=tz*z;
   ex.x=1.0-tyy-tzz;
   ex.y=txy+twz;
   ex.z=txz-twy;
@@ -420,24 +390,24 @@
 
 // Obtain local x axis
 FXVec3d FXQuatd::getXAxis() const {
-  register FXdouble ty=2.0*y;
-  register FXdouble tz=2.0*z;
+  FXdouble ty=2.0*y;
+  FXdouble tz=2.0*z;
   return FXVec3d(1.0-ty*y-tz*z,ty*x+tz*w,tz*x-ty*w);
   }
 
 
 // Obtain local y axis
 FXVec3d FXQuatd::getYAxis() const {
-  register FXdouble tx=2.0*x;
-  register FXdouble tz=2.0*z;
+  FXdouble tx=2.0*x;
+  FXdouble tz=2.0*z;
   return FXVec3d(tx*y-tz*w,1.0-tx*x-tz*z,tz*y+tx*w);
   }
 
 
 // Obtain local z axis
 FXVec3d FXQuatd::getZAxis() const {
-  register FXdouble tx=2.0*x;
-  register FXdouble ty=2.0*y;
+  FXdouble tx=2.0*x;
+  FXdouble ty=2.0*y;
   return FXVec3d(tx*z+ty*w,ty*z-tx*w,1.0-tx*x-ty*y);
   }
 
@@ -446,14 +416,16 @@
 // Given q = theta*(x*i+y*j+z*k), where length of (x,y,z) is 1,
 // then exp(q) = sin(theta)*(x*i+y*j+z*k)+cos(theta).
 FXQuatd FXQuatd::exp() const {
-  register FXdouble theta=Math::sqrt(x*x+y*y+z*z);
-  register FXdouble scale;
-  FXQuatd result(x,y,z,Math::cos(theta));
-  if(__likely(0.000000001<theta)){
-    scale=Math::sin(theta)/theta;
-    result.x*=scale;
-    result.y*=scale;
-    result.z*=scale;
+  FXQuatd result(0.0,0.0,0.0,1.0);
+  FXdouble mag2(x*x+y*y+z*z);
+  if(0.0<mag2){
+    FXdouble mag(Math::sqrt(mag2));
+    FXdouble s(Math::sin(mag)/mag);
+    FXdouble c(Math::cos(mag));
+    result.x=x*s;
+    result.y=y*s;
+    result.z=z*s;
+    result.w=c;
     }
   return result;
   }
@@ -463,14 +435,14 @@
 // Given q = sin(theta)*(x*i+y*j+z*k)+cos(theta), length of (x,y,z) is 1,
 // then log(q) = theta*(x*i+y*j+z*k).
 FXQuatd FXQuatd::log() const {
-  register FXdouble scale=Math::sqrt(x*x+y*y+z*z);
-  register FXdouble theta=Math::atan2(scale,w);
-  FXQuatd result(x,y,z,0.0);
-  if(__likely(0.0<scale)){
-    scale=theta/scale;
-    result.x*=scale;
-    result.y*=scale;
-    result.z*=scale;
+  FXQuatd result(0.0,0.0,0.0,0.0);
+  FXdouble mag2(x*x+y*y+z*z);
+  if(0.0<mag2){
+    FXdouble mag(Math::sqrt(mag2));
+    FXdouble phi(Math::atan2(mag,w)/mag);
+    result.x=x*phi;
+    result.y=y*phi;
+    result.z=z*phi;
     }
   return result;
   }
@@ -482,34 +454,37 @@
   }
 
 
-// Invert quaternion
-FXQuatd FXQuatd::invert() const {
-  register FXdouble n=length2();
-  return FXQuatd(-x/n,-y/n,-z/n,w/n);
-  }
-
-
-// Invert unit quaternion
-FXQuatd FXQuatd::unitinvert() const {
-  return FXQuatd(-x,-y,-z,w);
-  }
-
-
-// Conjugate quaternion
-FXQuatd FXQuatd::conj() const {
-  return FXQuatd(-x,-y,-z,w);
+// Rotation unit-quaternion and vector v . q = (q . v . q*) where q* is
+// the conjugate of q.
+//
+// The Rodriques Formula for rotating a vector V about a unit-axis K is:
+//
+//    V' = K (K . V) + (K x V) sin(A) - K x (K x V) cos(A)
+//
+// Given UNIT quaternion q=(S,c), i.e. |q|=1, defined as a imaginary part S with
+// |S|=K sin(A/2), where K is a unit vector, and a real part c=cos(A/2), we can obtain,
+// after some (well, a LOT of) manipulation:
+//
+//    V' = S (S . V) + c (c V + S x V) + S x (c V + S x V)
+//
+// Using:
+//
+//    A x (B x C) = B (A . C) - C (A . B)
+//
+// We can further simplify:
+//
+//    V' = V + 2 S x (S x V + c V)
+//
+FXVec3d operator*(const FXVec3d& v,const FXQuatd& q){
+  FXVec3d s(q.x,q.y,q.z);
+  return v+(s^((s^v)+(v*q.w)))*2.0;
   }
 
 
-// Rotation of a vector by a quaternion; this is defined as q.v.q*
-// where q* is the conjugate of q.
-// Alternatively, using ^ to denote cross product, it can be expressed as:
-//
-//   t = 2 * (q.xyz ^ v)
-//   v' = v + q.w * t + (q.xyz ^ t)
-//
-FXVec3d FXQuatd::operator*(const FXVec3d& v) const {
-  return v*FXMat3d(*this);
+// Rotation unit-quaternion and vector q . v = (q* . v . q)
+FXVec3d operator*(const FXQuatd& q,const FXVec3d& v){
+  FXVec3d s(q.x,q.y,q.z);
+  return v+(((v^s)+(v*q.w))^s)*2.0;     // Yes, -a^b is b^a!
   }
 
 
@@ -544,7 +519,7 @@
 //  2 * cos(theta/2)   = sqrt(2 + 2 * (f . t))
 //
 FXQuatd arc(const FXVec3d& f,const FXVec3d& t){
-  register FXdouble dot=f.x*t.x+f.y*t.y+f.z*t.z,div;
+  FXdouble dot=f.x*t.x+f.y*t.y+f.z*t.z,div;
   FXQuatd result;
   if(__unlikely(dot>0.999999999999999)){        // Unit quaternion
     result.x=0.0;
@@ -589,12 +564,12 @@
 // Spherical lerp of unit quaternions u,v
 // This is equivalent to: u * (u.unitinvert()*v).pow(f)
 FXQuatd lerp(const FXQuatd& u,const FXQuatd& v,FXdouble f){
-  register FXdouble dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
-  register FXdouble cost=Math::fabs(dot);
-  register FXdouble sint;
-  register FXdouble fr=1.0-f;
-  register FXdouble to=f;
-  register FXdouble theta;
+  FXdouble dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
+  FXdouble cost=Math::fabs(dot);
+  FXdouble sint;
+  FXdouble fr=1.0-f;
+  FXdouble to=f;
+  FXdouble theta;
   FXQuatd result;
   if(__likely(cost<0.999999999999999)){
     sint=Math::sqrt(1.0-cost*cost);
@@ -615,12 +590,12 @@
 // This is equivalent to: u * (u.unitinvert()*v).pow(f) * (u.unitinvert()*v).log(),
 // which is itself equivalent to: lerp(u,v,f) * (u.unitinvert()*v).log()
 FXQuatd lerpdot(const FXQuatd& u,const FXQuatd& v,FXdouble f){
-  register FXdouble dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
-  register FXdouble cost=Math::fabs(dot);
-  register FXdouble sint;
-  register FXdouble fr=1.0-f;
-  register FXdouble to=f;
-  register FXdouble theta;
+  FXdouble dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
+  FXdouble cost=Math::fabs(dot);
+  FXdouble sint;
+  FXdouble fr=1.0-f;
+  FXdouble to=f;
+  FXdouble theta;
   FXQuatd result;
   if(__likely(cost<0.999999999999999)){
     sint=Math::sqrt(1.0-cost*cost);
@@ -636,6 +611,108 @@
   }
 
 
+// Cubic hermite quaternion interpolation
+FXQuatd hermite(const FXQuatd& q0,const FXVec3d& r0,const FXQuatd& q1,const FXVec3d& r1,FXdouble t){
+  FXQuatd w1(r00*0.333333333333333333,r01*0.333333333333333333,r02*0.333333333333333333,0.0);
+  FXQuatd w3(r10*0.333333333333333333,r11*0.333333333333333333,r12*0.333333333333333333,0.0);
+  FXQuatd w2((w1.exp().unitinvert()*q0.unitinvert()*q1*w3.exp().unitinvert()).log());
+  FXdouble t2=t*t;
+  FXdouble beta3=t2*t;
+  FXdouble beta1=3.0*t-3.0*t2+beta3;
+  FXdouble beta2=3.0*t2-2.0*beta3;
+  return q0*(w1*beta1).exp()*(w2*beta2).exp()*(w3*beta3).exp();
+  }
+
+
+// Estimate angular body rates omega from unit quaternions Q0 and Q1 separated by time dt
+//
+//                      -1
+//          2 * log ( Q0   * Q1 )
+//   w   =  ---------------------
+//    b              dt
+//
+// Be aware that we don't know how many full revolutions happened between q0 and q1;
+// there may be aliasing!
+FXVec3d omegaBody(const FXQuatd& q0,const FXQuatd& q1,FXdouble dt){
+  FXVec3d omega(0.0,0.0,0.0);
+  FXQuatd diff(q0.unitinvert()*q1);
+  FXdouble mag2(diff.x*diff.x+diff.y*diff.y+diff.z*diff.z);
+  if(0.0<mag2){
+    FXdouble mag(Math::sqrt(mag2));
+    FXdouble phi(2.0*Math::atan2(mag,diff.w));
+    FXdouble s(Math::wrap(phi)/(mag*dt));       // Wrap angle -PI*2...PI*2 to -PI...PI range
+    omega.x=diff.x*s;
+    omega.y=diff.y*s;
+    omega.z=diff.z*s;
+    }
+  return omega;
+  }
+
+
+// Derivative q' of orientation quaternion q with angular body rates omega (rad/s)
+//
+//   .
+//   Q = 0.5 * Q * w
+//
+FXQuatd quatDot(const FXQuatd& q,const FXVec3d& omega){
+  return FXQuatd( 0.5*(omega.x*q.w-omega.y*q.z+omega.z*q.y),
+                  0.5*(omega.x*q.z+omega.y*q.w-omega.z*q.x),
+                  0.5*(omega.y*q.x+omega.z*q.w-omega.x*q.y),
+                 -0.5*(omega.x*q.x+omega.y*q.y+omega.z*q.z));
+  }
+
+
+// Calculate angular acceleration of a body with inertial moments tensor M
+// Rotationg about its axes with angular rates omega, under a torque torq.
+// Formula is:
+//
+//   .         -1
+//   w    =   M   * ( T   -   w  x  ( M * w )
+//    b                        b           b
+//
+// Where M is inertia tensor:
+//
+//      ( Ixx   Ixy   Ixz )                                                              T
+//  M = ( Iyx   Iyy   Iyz )     , with Ixy == Iyz,  Ixz == Izx,  Iyz == Izy, i.e. M == M
+//      ( Izx   Izy   Izz )
+//
+// In the unlikely case that M is singular, return angular acceleration of 0.
+FXVec3d omegaDot(const FXMat3d& M,const FXVec3d& omega,const FXVec3d& torq){
+  FXVec3d result(0.0,0.0,0.0);
+  FXdouble Ixx=M00;
+  FXdouble Ixy=M01;
+  FXdouble Ixz=M02;
+  FXdouble Iyy=M11;
+  FXdouble Iyz=M12;
+  FXdouble Izz=M22;
+  FXdouble m00=Iyy*Izz-Iyz*Iyz;                 // Cofactors of M
+  FXdouble m01=Ixz*Iyz-Ixy*Izz;
+  FXdouble m02=Ixy*Iyz-Ixz*Iyy;
+  FXdouble m11=Ixx*Izz-Ixz*Ixz;
+  FXdouble m12=Ixy*Ixz-Ixx*Iyz;
+  FXdouble m22=Ixx*Iyy-Ixy*Ixy;
+  FXdouble det=Ixx*m00+Ixy*m01+Ixz*m02;
+  FXASSERT(M01==M10);
+  FXASSERT(M02==M20);
+  FXASSERT(M12==M21);
+  if(__likely(det!=0.0)){                       // Check if M is singular
+    FXdouble ox=omega.x;
+    FXdouble oy=omega.y;
+    FXdouble oz=omega.z;
+    FXdouble mox=Ixx*ox+Ixy*oy+Ixz*oz;           // M * w
+    FXdouble moy=Ixy*ox+Iyy*oy+Iyz*oz;
+    FXdouble moz=Ixz*ox+Iyz*oy+Izz*oz;
+    FXdouble rhx=torq.x-(oy*moz-oz*moy);         // R = T - w x (M * w)
+    FXdouble rhy=torq.y-(oz*mox-ox*moz);
+    FXdouble rhz=torq.z-(ox*moy-oy*mox);
+    result.x=(m00*rhx+m01*rhy+m02*rhz)/det;     //  -1
+    result.y=(m01*rhx+m11*rhy+m12*rhz)/det;     // M   * R
+    result.z=(m02*rhx+m12*rhy+m22*rhz)/det;     //
+    }
+  return result;
+  }
+
+
 // Save vector to stream
 FXStream& operator<<(FXStream& store,const FXQuatd& v){
   store << v.x << v.y << v.z << v.w;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXQuatf.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXQuatf.cpp Changed

@@ -3,7 +3,7 @@
 *              S i n g l e - P r e c i s i o n  Q u a t e r n i o n             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -31,7 +31,21 @@
 #include "FXVec4f.h"
 #include "FXQuatf.h"
 #include "FXMat3f.h"
+#include "FXMat4f.h"
 
+/*
+  Notes:
+
+  - Quaternion represents a rotation as follows:
+
+                   phi       axis            phi
+     Q =  ( sin ( ----- ) * ------  , cos ( ----- ) )
+                    2       |axis|            2
+
+  - Typically, |Q| == 1.  But this is not always a given.
+  - Repeated operations should periodically fix Q to maintain |Q| == 1, using
+    the adjust() API.
+*/
 
 using namespace FX;
 
@@ -39,40 +53,46 @@
 
 namespace FX {
 
-// Construct from angle and axis
+// Construct from rotation axis and angle in radians
 FXQuatf::FXQuatf(const FXVec3f& axis,FXfloat phi){
   setAxisAngle(axis,phi);
   }
 
 
-// Construct from roll, pitch, yaw
-FXQuatf::FXQuatf(FXfloat roll,FXfloat pitch,FXfloat yaw){
-  setRollPitchYaw(roll,pitch,yaw);
+// Construct quaternion from arc between two unit vectors fm and to
+FXQuatf::FXQuatf(const FXVec3f& fr,const FXVec3f& to){
+  set(arc(fr,to));
   }
 
 
-// Construct quaternion from two unit vectors
-FXQuatf::FXQuatf(const FXVec3f& fr,const FXVec3f& to){
-  set(arc(fr,to));
+// Construct from euler angles yaw (z), pitch (y), and roll (x)
+FXQuatf::FXQuatf(FXfloat roll,FXfloat pitch,FXfloat yaw){
+  setRollPitchYaw(roll,pitch,yaw);
   }
 
 
-// Construct quaternion from axes
+// Construct quaternion from three orthogonal unit vectors
 FXQuatf::FXQuatf(const FXVec3f& ex,const FXVec3f& ey,const FXVec3f& ez){
   setAxes(ex,ey,ez);
   }
 
 
+// Construct quaternion from rotation vector rot, representing a rotation
+// by |rot| radians about a unit vector rot/|rot|.
+FXQuatf::FXQuatf(const FXVec3f& rot){
+  setRotation(rot);
+  }
+
+
 // Adjust quaternion length
 FXQuatf& FXQuatf::adjust(){
-  register FXfloat t=length2();
-  register FXfloat f;
-  if(__likely(t>0.0f)){
-    f=1.0f/Math::sqrt(t);
-    x*=f;
-    y*=f;
-    z*=f;
-    w*=f;
+  FXfloat mag2(x*x+y*y+z*z+w*w);
+  if(__likely(0.0f<mag2)){
+    FXfloat s(1.0f/Math::sqrt(mag2));
+    x*=s;
+    y*=s;
+    z*=s;
+    w*=s;
     }
   return *this;
   }
@@ -80,50 +100,94 @@
 
 // Set axis and angle
 void FXQuatf::setAxisAngle(const FXVec3f& axis,FXfloat phi){
-  register FXfloat mag=axis.length();
-  register FXfloat a,m;
-  if(__likely(0.0f<mag)){
-    a=0.5f*phi;
-    m=Math::sin(a)/mag;
-    x=axis.x*m;
-    y=axis.y*m;
-    z=axis.z*m;
-    w=Math::cos(a);
-    return;
+  FXfloat mag2(axis.length2());
+  if(__likely(0.0f<mag2)){
+    FXfloat arg(0.5f*phi);
+    FXfloat mag(Math::sqrt(mag2));
+    FXfloat s(Math::sin(arg)/mag);
+    FXfloat c(Math::cos(arg));
+    x=axis.x*s;
+    y=axis.y*s;
+    z=axis.z*s;
+    w=c;
+    }
+  else{
+    x=0.0f;
+    y=0.0f;
+    z=0.0f;
+    w=1.0f;
     }
-  x=0.0f;
-  y=0.0f;
-  z=0.0f;
-  w=1.0f;
   }
 
 
 // Obtain axis and angle
 // Remeber that: q = sin(A/2)*(x*i+y*j+z*k)+cos(A/2)
 void FXQuatf::getAxisAngle(FXVec3f& axis,FXfloat& phi) const {
-  register FXfloat mag=x*x+y*y+z*z;
-  register FXfloat m;
-  if(__likely(0.0f<mag)){
-    m=Math::sqrt(mag);
-    axis.x=x/m;
-    axis.y=y/m;
-    axis.z=z/m;
-    phi=2.0f*Math::acos(w/Math::sqrt(mag+w*w));
-    return;
+  FXfloat mag2(x*x+y*y+z*z);
+  if(0.0f<mag2){
+    FXfloat mag(Math::sqrt(mag2));
+    axis.x=x/mag;
+    axis.y=y/mag;
+    axis.z=z/mag;
+    phi=2.0f*Math::atan2(mag,w);
+    }
+  else{
+    axis.x=1.0f;
+    axis.y=0.0f;
+    axis.z=0.0f;
+    phi=0.0f;
     }
-  axis.x=1.0f;
-  axis.y=0.0f;
-  axis.z=0.0f;
-  phi=0.0f;
+  }
+
+
+// Set quaternion from rotation vector rot
+//
+//                 |rot|         rot              |rot|
+//   Q =  ( sin ( ------- ) *  -------  , cos (  ------- ) )
+//                   2          |rot|               2
+//
+void FXQuatf::setRotation(const FXVec3f& rot){
+  FXfloat mag2(rot.length2());
+  if(0.0f<mag2){
+    FXfloat mag(Math::sqrt(mag2));
+    FXfloat arg(mag*0.5f);
+    FXfloat s(Math::sin(arg)/mag);
+    FXfloat c(Math::cos(arg));
+    x=rot.x*s;
+    y=rot.y*s;
+    z=rot.z*s;
+    w=c;
+    }
+  else{
+    x=0.0f;
+    y=0.0f;
+    z=0.0f;
+    w=1.0f;
+    }
+  }
+
+
+// Get rotation vector from quaternion
+FXVec3f FXQuatf::getRotation() const {
+  FXVec3f rot(0.0f,0.0f,0.0f);
+  FXfloat mag2(x*x+y*y+z*z);
+  if(0.0f<mag2){
+    FXfloat mag(Math::sqrt(mag2));
+    FXfloat phi(2.0f*Math::atan2(mag,w)/mag);
+    rot.x=x*phi*mag;
+    rot.y=y*phi*mag;
+    rot.z=z*phi*mag;
+    }
+  return rot;
   }
 
 
 // Set quaternion from roll (x), pitch (y), yaw (z)
 void FXQuatf::setRollPitchYaw(FXfloat roll,FXfloat pitch,FXfloat yaw){
-  register FXfloat sr,cr,sp,cp,sy,cy;
-  register FXfloat rr=0.5f*roll;
-  register FXfloat pp=0.5f*pitch;
-  register FXfloat yy=0.5f*yaw;
+  FXfloat sr,cr,sp,cp,sy,cy;
+  FXfloat rr=0.5f*roll;
+  FXfloat pp=0.5f*pitch;
+  FXfloat yy=0.5f*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -136,10 +200,10 @@
 
 // Set quaternion from yaw (z), pitch (y), roll (x)
 void FXQuatf::setYawPitchRoll(FXfloat yaw,FXfloat pitch,FXfloat roll){
-  register FXfloat sr,cr,sp,cp,sy,cy;
-  register FXfloat rr=0.5f*roll;
-  register FXfloat pp=0.5f*pitch;
-  register FXfloat yy=0.5f*yaw;
+  FXfloat sr,cr,sp,cp,sy,cy;
+  FXfloat rr=0.5f*roll;
+  FXfloat pp=0.5f*pitch;
+  FXfloat yy=0.5f*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -152,10 +216,10 @@
 
 // Set quaternion from roll (x), yaw (z), pitch (y)
 void FXQuatf::setRollYawPitch(FXfloat roll,FXfloat yaw,FXfloat pitch){
-  register FXfloat sr,cr,sp,cp,sy,cy;
-  register FXfloat rr=0.5f*roll;
-  register FXfloat pp=0.5f*pitch;
-  register FXfloat yy=0.5f*yaw;
+  FXfloat sr,cr,sp,cp,sy,cy;
+  FXfloat rr=0.5f*roll;
+  FXfloat pp=0.5f*pitch;
+  FXfloat yy=0.5f*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -168,10 +232,10 @@
 
 // Set quaternion from pitch (y), roll (x),yaw (z)
 void FXQuatf::setPitchRollYaw(FXfloat pitch,FXfloat roll,FXfloat yaw){
-  register FXfloat sr,cr,sp,cp,sy,cy;
-  register FXfloat rr=0.5f*roll;
-  register FXfloat pp=0.5f*pitch;
-  register FXfloat yy=0.5f*yaw;
+  FXfloat sr,cr,sp,cp,sy,cy;
+  FXfloat rr=0.5f*roll;
+  FXfloat pp=0.5f*pitch;
+  FXfloat yy=0.5f*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -184,10 +248,10 @@
 
 // Set quaternion from pitch (y), yaw (z), roll (x)
 void FXQuatf::setPitchYawRoll(FXfloat pitch,FXfloat yaw,FXfloat roll){
-  register FXfloat sr,cr,sp,cp,sy,cy;
-  register FXfloat rr=0.5f*roll;
-  register FXfloat pp=0.5f*pitch;
-  register FXfloat yy=0.5f*yaw;
+  FXfloat sr,cr,sp,cp,sy,cy;
+  FXfloat rr=0.5f*roll;
+  FXfloat pp=0.5f*pitch;
+  FXfloat yy=0.5f*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -200,10 +264,10 @@
 
 // Set quaternion from yaw (z), roll (x), pitch (y)
 void FXQuatf::setYawRollPitch(FXfloat yaw,FXfloat roll,FXfloat pitch){
-  register FXfloat sr,cr,sp,cp,sy,cy;
-  register FXfloat rr=0.5f*roll;
-  register FXfloat pp=0.5f*pitch;
-  register FXfloat yy=0.5f*yaw;
+  FXfloat sr,cr,sp,cp,sy,cy;
+  FXfloat rr=0.5f*roll;
+  FXfloat pp=0.5f*pitch;
+  FXfloat yy=0.5f*yaw;
   sr=Math::sin(rr); cr=Math::cos(rr);
   sp=Math::sin(pp); cp=Math::cos(pp);
   sy=Math::sin(yy); cy=Math::cos(yy);
@@ -215,151 +279,57 @@
 
 
 // Obtain roll, pitch, yaw
-// Math is from "3D Game Engine Design" by David Eberly pp 19-20.
-// However, instead of testing asin(Sy) against -PI/2 and PI/2, I
-// test Sy against -1 and 1; this is numerically more stable, as
-// asin doesn't like arguments outside -1,1.
 void FXQuatf::getRollPitchYaw(FXfloat& roll,FXfloat& pitch,FXfloat& yaw) const {
-  register FXfloat s=-2.0f*(x*z-w*y);
-  if(__likely(s<1.0f)){
-    if(__likely(-1.0f<s)){
-      roll=Math::atan2(2.0f*(y*z+w*x),1.0f-2.0f*(x*x+y*y));
-      pitch=Math::asin(s);
-      yaw=Math::atan2(2.0f*(x*y+w*z),1.0f-2.0f*(y*y+z*z));
-      }
-    else{
-      roll=0.0f;
-      pitch=-1.57079632679489661923f;
-      yaw=-Math::atan2(-2.0f*(x*y-w*z),2.0f*(x*z+w*y));
-      }
-    }
-  else{
-    roll=0.0f;
-    pitch=1.57079632679489661923f;
-    yaw=Math::atan2(-2.0f*(x*y-w*z),2.0f*(x*z+w*y));
-    }
+  roll=Math::atan2(2.0f*(y*z+w*x),1.0f-2.0f*(x*x+y*y));
+  pitch=Math::asin(Math::fclamp(-1.0f,-2.0f*(x*z-w*y),1.0f));
+  yaw=Math::atan2(2.0f*(x*y+w*z),1.0f-2.0f*(y*y+z*z));
   }
 
 
 // Obtain yaw, pitch, and roll
 void FXQuatf::getYawPitchRoll(FXfloat& yaw,FXfloat& pitch,FXfloat& roll) const {
-  register FXfloat s=2.0f*(x*z+w*y);
-  if(__likely(s<1.0f)){
-    if(__likely(-1.0f<s)){
-      yaw=Math::atan2(-2.0f*(x*y-w*z),1.0f-2.0f*(y*y+z*z));
-      pitch=Math::asin(s);
-      roll=Math::atan2(-2.0f*(y*z-w*x),1.0f-2.0f*(x*x+y*y));
-      }
-    else{
-      yaw=0.0f;
-      pitch=-1.57079632679489661923f;
-      roll=-Math::atan2(2.0f*(x*y+w*z),1.0f-2.0f*(x*x+z*z));
-      }
-    }
-  else{
-    yaw=0.0f;
-    pitch=1.57079632679489661923f;
-    roll=Math::atan2(2.0f*(x*y+w*z),1.0f-2.0f*(x*x+z*z));
-    }
+  yaw=Math::atan2(-2.0f*(x*y-w*z),1.0f-2.0f*(y*y+z*z));
+  pitch=Math::asin(Math::fclamp(-1.0f,2.0f*(x*z+w*y),1.0f));
+  roll=Math::atan2(-2.0f*(y*z-w*x),1.0f-2.0f*(x*x+y*y));
   }
 
 
 // Obtain roll, yaw, pitch
 void FXQuatf::getRollYawPitch(FXfloat& roll,FXfloat& yaw,FXfloat& pitch) const {
-  register FXfloat s=2.0f*(x*y+w*z);
-  if(__likely(s<1.0f)){
-    if(__likely(-1.0f<s)){
-      roll=Math::atan2(-2.0f*(y*z-w*x),1.0f-2.0f*(x*x+z*z));
-      yaw=Math::asin(s);
-      pitch=Math::atan2(-2.0f*(x*z-w*y),1.0f-2.0f*(y*y+z*z));
-      }
-    else{
-      roll=0.0f;
-      yaw=-1.57079632679489661923f;
-      pitch=-Math::atan2(2.0f*(y*z+w*x),1.0f-2.0f*(x*x+y*y));
-      }
-    }
-  else{
-    roll=0.0f;
-    yaw=1.57079632679489661923f;
-    pitch=Math::atan2(2.0f*(y*z+w*x),1.0f-2.0f*(x*x+y*y));
-    }
+  roll=Math::atan2(-2.0f*(y*z-w*x),1.0f-2.0f*(x*x+z*z));
+  yaw=Math::asin(Math::fclamp(-1.0f,2.0f*(x*y+w*z),1.0f));
+  pitch=Math::atan2(-2.0f*(x*z-w*y),1.0f-2.0f*(y*y+z*z));
   }
 
 
 // Obtain pitch, roll, yaw
 void FXQuatf::getPitchRollYaw(FXfloat& pitch,FXfloat& roll,FXfloat& yaw) const {
-  register FXfloat s=2.0f*(y*z+w*x);
-  if(__likely(s<1.0f)){
-    if(__likely(-1.0f<s)){
-      pitch=Math::atan2(-2.0f*(x*z-w*y),1.0f-2.0f*(x*x+y*y));
-      roll=Math::asin(s);
-      yaw=Math::atan2(-2.0f*(x*y-w*z),1.0f-2.0f*(x*x+z*z));
-      }
-    else{
-      pitch=0.0f;
-      roll=-1.57079632679489661923f;
-      yaw=-Math::atan2(2.0f*(x*z+w*y),1.0f-2.0f*(y*y+z*z));
-      }
-    }
-  else{
-    pitch=0.0f;
-    roll=1.57079632679489661923f;
-    yaw=Math::atan2(2.0f*(x*z+w*y),1.0f-2.0f*(y*y+z*z));
-    }
+  pitch=Math::atan2(-2.0f*(x*z-w*y),1.0f-2.0f*(x*x+y*y));
+  roll=Math::asin(Math::fclamp(-1.0f,2.0f*(y*z+w*x),1.0f));
+  yaw=Math::atan2(-2.0f*(x*y-w*z),1.0f-2.0f*(x*x+z*z));
   }
 
 
 // Obtain pitch, yaw, roll
 void FXQuatf::getPitchYawRoll(FXfloat& pitch,FXfloat& yaw,FXfloat& roll) const {
-  register FXfloat s=-2.0f*(x*y-w*z);
-  if(__likely(s<1.0f)){
-    if(__likely(-1.0f<s)){
-      pitch=Math::atan2(2.0f*(x*z+w*y),1.0f-2.0f*(y*y+z*z));
-      yaw=Math::asin(s);
-      roll=Math::atan2(2.0f*(y*z+w*x),1.0f-2.0f*(x*x+z*z));
-      }
-    else{
-      pitch=0.0f;
-      yaw=-1.57079632679489661923f;
-      roll=-Math::atan2(-2.0f*(x*z-w*y),1.0f-2.0f*(x*x+y*y));
-      }
-    }
-  else{
-    pitch=0.0f;
-    yaw=1.57079632679489661923f;
-    roll=Math::atan2(-2.0f*(x*z-w*y),1.0f-2.0f*(x*x+y*y));
-    }
+  pitch=Math::atan2(2.0f*(x*z+w*y),1.0f-2.0f*(y*y+z*z));
+  yaw=Math::asin(Math::fclamp(-1.0f,-2.0f*(x*y-w*z),1.0f));
+  roll=Math::atan2(2.0f*(y*z+w*x),1.0f-2.0f*(x*x+z*z));
   }
 
 
 // Obtain yaw, roll, pitch
 void FXQuatf::getYawRollPitch(FXfloat& yaw,FXfloat& roll,FXfloat& pitch) const {
-  register FXfloat s=-2.0f*(y*z-w*x);
-  if(__likely(s<1.0f)){
-    if(__likely(-1.0f<s)){
-      yaw=Math::atan2(2.0f*(x*y+w*z),1.0f-2.0f*(x*x+z*z));
-      roll=Math::asin(s);
-      pitch=Math::atan2(2.0f*(x*z+w*y),1.0f-2.0f*(x*x+y*y));
-      }
-    else{
-      yaw=0.0f;
-      roll=-1.57079632679489661923f;
-      pitch=-Math::atan2(-2.0f*(x*y-w*z),1.0f-2.0f*(y*y+z*z));
-      }
-    }
-  else{
-    yaw=0.0f;
-    roll=1.57079632679489661923f;
-    pitch=Math::atan2(-2.0f*(x*y-w*z),1.0f-2.0f*(y*y+z*z));
-    }
+  yaw=Math::atan2(2.0f*(x*y+w*z),1.0f-2.0f*(x*x+z*z));
+  roll=Math::asin(Math::fclamp(-1.0f,-2.0f*(y*z-w*x),1.0f));
+  pitch=Math::atan2(2.0f*(x*z+w*y),1.0f-2.0f*(x*x+y*y));
   }
 
 
 // Set quaternion from axes
 void FXQuatf::setAxes(const FXVec3f& ex,const FXVec3f& ey,const FXVec3f& ez){
-  register FXfloat trace=ex.x+ey.y+ez.z;
-  register FXfloat scale;
+  FXfloat trace=ex.x+ey.y+ez.z;
+  FXfloat scale;
   if(trace>0.0f){
     scale=Math::sqrt(1.0f+trace);
     w=0.5f*scale;
@@ -394,18 +364,18 @@
 
 // Get quaternion axes
 void FXQuatf::getAxes(FXVec3f& ex,FXVec3f& ey,FXVec3f& ez) const {
-  register FXfloat tx=2.0f*x;
-  register FXfloat ty=2.0f*y;
-  register FXfloat tz=2.0f*z;
-  register FXfloat twx=tx*w;
-  register FXfloat twy=ty*w;
-  register FXfloat twz=tz*w;
-  register FXfloat txx=tx*x;
-  register FXfloat txy=ty*x;
-  register FXfloat txz=tz*x;
-  register FXfloat tyy=ty*y;
-  register FXfloat tyz=tz*y;
-  register FXfloat tzz=tz*z;
+  FXfloat tx=2.0f*x;
+  FXfloat ty=2.0f*y;
+  FXfloat tz=2.0f*z;
+  FXfloat twx=tx*w;
+  FXfloat twy=ty*w;
+  FXfloat twz=tz*w;
+  FXfloat txx=tx*x;
+  FXfloat txy=ty*x;
+  FXfloat txz=tz*x;
+  FXfloat tyy=ty*y;
+  FXfloat tyz=tz*y;
+  FXfloat tzz=tz*z;
   ex.x=1.0f-tyy-tzz;
   ex.y=txy+twz;
   ex.z=txz-twy;
@@ -420,24 +390,24 @@
 
 // Obtain local x axis
 FXVec3f FXQuatf::getXAxis() const {
-  register FXfloat ty=2.0f*y;
-  register FXfloat tz=2.0f*z;
+  FXfloat ty=2.0f*y;
+  FXfloat tz=2.0f*z;
   return FXVec3f(1.0f-ty*y-tz*z,ty*x+tz*w,tz*x-ty*w);
   }
 
 
 // Obtain local y axis
 FXVec3f FXQuatf::getYAxis() const {
-  register FXfloat tx=2.0f*x;
-  register FXfloat tz=2.0f*z;
+  FXfloat tx=2.0f*x;
+  FXfloat tz=2.0f*z;
   return FXVec3f(tx*y-tz*w,1.0f-tx*x-tz*z,tz*y+tx*w);
   }
 
 
 // Obtain local z axis
 FXVec3f FXQuatf::getZAxis() const {
-  register FXfloat tx=2.0f*x;
-  register FXfloat ty=2.0f*y;
+  FXfloat tx=2.0f*x;
+  FXfloat ty=2.0f*y;
   return FXVec3f(tx*z+ty*w,ty*z-tx*w,1.0f-tx*x-ty*y);
   }
 
@@ -446,14 +416,16 @@
 // Given q = theta*(x*i+y*j+z*k), where length of (x,y,z) is 1,
 // then exp(q) = sin(theta)*(x*i+y*j+z*k)+cos(theta).
 FXQuatf FXQuatf::exp() const {
-  register FXfloat theta=Math::sqrt(x*x+y*y+z*z);
-  register FXfloat scale;
-  FXQuatf result(x,y,z,Math::cos(theta));
-  if(__likely(0.000001f<theta)){
-    scale=Math::sin(theta)/theta;
-    result.x*=scale;
-    result.y*=scale;
-    result.z*=scale;
+  FXQuatf result(0.0f,0.0f,0.0f,1.0f);
+  FXfloat mag2(x*x+y*y+z*z);
+  if(0.0f<mag2){
+    FXfloat mag(Math::sqrt(mag2));
+    FXfloat s(Math::sin(mag)/mag);
+    FXfloat c(Math::cos(mag));
+    result.x=x*s;
+    result.y=y*s;
+    result.z=z*s;
+    result.w=c;
     }
   return result;
   }
@@ -463,14 +435,14 @@
 // Given q = sin(theta)*(x*i+y*j+z*k)+cos(theta), length of (x,y,z) is 1,
 // then log(q) = theta*(x*i+y*j+z*k).
 FXQuatf FXQuatf::log() const {
-  register FXfloat scale=Math::sqrt(x*x+y*y+z*z);
-  register FXfloat theta=Math::atan2(scale,w);
-  FXQuatf result(x,y,z,0.0f);
-  if(__likely(0.0f<scale)){
-    scale=theta/scale;
-    result.x*=scale;
-    result.y*=scale;
-    result.z*=scale;
+  FXQuatf result(0.0f,0.0f,0.0f,0.0f);
+  FXfloat mag2(x*x+y*y+z*z);
+  if(0.0f<mag2){
+    FXfloat mag(Math::sqrt(mag2));
+    FXfloat phi(Math::atan2(mag,w)/mag);
+    result.x=x*phi;
+    result.y=y*phi;
+    result.z=z*phi;
     }
   return result;
   }
@@ -482,71 +454,37 @@
   }
 
 
-// Invert quaternion
-FXQuatf FXQuatf::invert() const {
-  register FXfloat n=x*x+y*y+z*z+w*w;
-  return FXQuatf(-x/n,-y/n,-z/n,w/n);
-  }
-
-
-// Invert unit quaternion
-FXQuatf FXQuatf::unitinvert() const {
-  return FXQuatf(-x,-y,-z,w);
+// Rotation unit-quaternion and vector v . q = (q . v . q*) where q* is
+// the conjugate of q.
+//
+// The Rodriques Formula for rotating a vector V about a unit-axis K is:
+//
+//    V' = K (K . V) + (K x V) sin(A) - K x (K x V) cos(A)
+//
+// Given UNIT quaternion q=(S,c), i.e. |q|=1, defined as a imaginary part S with
+// |S|=K sin(A/2), where K is a unit vector, and a real part c=cos(A/2), we can obtain,
+// after some (well, a LOT of) manipulation:
+//
+//    V' = S (S . V) + c (c V + S x V) + S x (c V + S x V)
+//
+// Using:
+//
+//    A x (B x C) = B (A . C) - C (A . B)
+//
+// We can further simplify:
+//
+//    V' = V + 2 S x (S x V + c V)
+//
+FXVec3f operator*(const FXVec3f& v,const FXQuatf& q){
+  FXVec3f s(q.x,q.y,q.z);
+  return v+(s^((s^v)+(v*q.w)))*2.0;
   }
 
 
-// Conjugate quaternion
-FXQuatf FXQuatf::conj() const {
-  return FXQuatf(-x,-y,-z,w);
-  }
-
-
-/*
-
-According to someone on gdalgorithms list, this is faster:
-
-V' = V - 2 * cross( (cross( q.xyz, V ) - q.w * V ), q.xyz )
-
-==
-v' = q.v.q*
-
-expand to get:
-
-v' = (s.v)s + w(wv + s x v) + s x (wv + s x v)
-
-Where s is the vector part of the quaternion and w is the scalar part (q = (w, s))
-
-Expanding this out further gives:
-
-v' = (s.v)s + (w^2)v + 2w(s x v) + s x (s x v)
-
-Use the vector triple product identity:
-
-a x (b x c) = b(a.c) - c(a.b)
-
-To give
-
-v' + s(s.v) - v(s.s) = (s.v)s + (w^2)v + 2w(s x v) + 2(s x (s x v))
-
-Cancelling to:
-
-v' = (w^2 + s.s)v + 2(s x (s x v + wv))
-
-From the definition of a quaternion representing a rotation,
-w = cos(a/2), s = sin(a/2)*r where r is a unit vector representing the
-axis of the rotation. So (w^2 + s.s) = (cos(a/2))^2 + (sin(a/2))^2 = 1,
-giving us the final formula:
-
-v' = v + 2(s x (s x v + vw))
-*/
-
-// FIXME try the above
-// FIXME remove dependence on FXMat3f.
-
-// Rotation of a vector by a quaternion; this is defined as q.v.q*
-// where q* is the conjugate of q.
-FXVec3f FXQuatf::operator*(const FXVec3f& v) const {
-  return v*FXMat3f(*this);
+// Rotation unit-quaternion and vector q . v = (q* . v . q)
+FXVec3f operator*(const FXQuatf& q,const FXVec3f& v){
+  FXVec3f s(q.x,q.y,q.z);
+  return v+(((v^s)+(v*q.w))^s)*2.0;     // Yes, -a^b is b^a!
   }
 
 
@@ -581,7 +519,7 @@
 //  2 * cos(theta/2)   = sqrt(2 + 2 * (f . t))
 //
 FXQuatf arc(const FXVec3f& f,const FXVec3f& t){
-  register FXfloat dot=f.x*t.x+f.y*t.y+f.z*t.z,div;
+  FXfloat dot=f.x*t.x+f.y*t.y+f.z*t.z,div;
   FXQuatf result;
   if(__unlikely(dot> 0.999999f)){       // Unit quaternion
     result.x=0.0f;
@@ -626,12 +564,12 @@
 // Spherical lerp of unit quaternions u,v
 // This is equivalent to: u * (u.unitinvert()*v).pow(f)
 FXQuatf lerp(const FXQuatf& u,const FXQuatf& v,FXfloat f){
-  register FXfloat dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
-  register FXfloat cost=Math::fabs(dot);
-  register FXfloat sint;
-  register FXfloat fr=1.0f-f;
-  register FXfloat to=f;
-  register FXfloat theta;
+  FXfloat dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
+  FXfloat cost=Math::fabs(dot);
+  FXfloat sint;
+  FXfloat fr=1.0f-f;
+  FXfloat to=f;
+  FXfloat theta;
   FXQuatf result;
   if(__likely(cost<0.999999f)){
     sint=Math::sqrt(1.0f-cost*cost);
@@ -652,12 +590,12 @@
 // This is equivalent to: u * (u.unitinvert()*v).pow(f) * (u.unitinvert()*v).log(),
 // which is itself equivalent to: lerp(u,v,f) * (u.unitinvert()*v).log()
 FXQuatf lerpdot(const FXQuatf& u,const FXQuatf& v,FXfloat f){
-  register FXfloat dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
-  register FXfloat cost=Math::fabs(dot);
-  register FXfloat sint;
-  register FXfloat fr=1.0f-f;
-  register FXfloat to=f;
-  register FXfloat theta;
+  FXfloat dot=u.x*v.x+u.y*v.y+u.z*v.z+u.w*v.w;
+  FXfloat cost=Math::fabs(dot);
+  FXfloat sint;
+  FXfloat fr=1.0f-f;
+  FXfloat to=f;
+  FXfloat theta;
   FXQuatf result;
   if(__likely(cost<0.999999f)){
     sint=Math::sqrt(1.0f-cost*cost);
@@ -673,6 +611,110 @@
   }
 
 
+// Cubic hermite quaternion interpolation
+FXQuatf hermite(const FXQuatf& q0,const FXVec3f& r0,const FXQuatf& q1,const FXVec3f& r1,FXfloat t){
+  FXQuatf w1(r00*0.333333333333333333f,r01*0.333333333333333333f,r02*0.333333333333333333f,0.0f);
+  FXQuatf w3(r10*0.333333333333333333f,r11*0.333333333333333333f,r12*0.333333333333333333f,0.0f);
+  FXQuatf w2((w1.exp().unitinvert()*q0.unitinvert()*q1*w3.exp().unitinvert()).log());
+  FXfloat t2=t*t;
+  FXfloat beta3=t2*t;
+  FXfloat beta1=3.0f*t-3.0f*t2+beta3;
+  FXfloat beta2=3.0f*t2-2.0f*beta3;
+  return q0*(w1*beta1).exp()*(w2*beta2).exp()*(w3*beta3).exp();
+  }
+
+
+// Estimate angular body rates omega from unit quaternions Q0 and Q1 separated by time dt
+//
+//                      -1
+//          2 * log ( Q0   * Q1 )
+//   w   =  ---------------------
+//    b              dt
+//
+// Be aware that we don't know how many full revolutions happened between q0 and q1;
+// there may be aliasing!
+FXVec3f omegaBody(const FXQuatf& q0,const FXQuatf& q1,FXfloat dt){
+  FXVec3f omega(0.0f,0.0f,0.0f);
+  FXQuatf diff(q0.unitinvert()*q1);
+  FXfloat mag2(diff.x*diff.x+diff.y*diff.y+diff.z*diff.z);
+  if(0.0f<mag2){
+    FXfloat mag(Math::sqrt(mag2));
+    FXfloat phi(2.0f*Math::atan2(mag,diff.w));
+    FXfloat s(Math::wrap(phi)/(mag*dt));        // Wrap angle -PI*2...PI*2 to -PI...PI range
+    omega.x=diff.x*s;
+    omega.y=diff.y*s;
+    omega.z=diff.z*s;
+    }
+  return omega;
+  }
+
+
+// Derivative q' of orientation quaternion q with angular body rates omega (rad/s)
+//
+//   .
+//   Q = 0.5 * Q * w
+//
+FXQuatf quatDot(const FXQuatf& q,const FXVec3f& omega){
+  return FXQuatf( 0.5f*(omega.x*q.w-omega.y*q.z+omega.z*q.y),
+                  0.5f*(omega.x*q.z+omega.y*q.w-omega.z*q.x),
+                  0.5f*(omega.y*q.x+omega.z*q.w-omega.x*q.y),
+                 -0.5f*(omega.x*q.x+omega.y*q.y+omega.z*q.z));
+  }
+
+
+
+
+// Calculate angular acceleration of a body with inertial moments tensor M
+// Rotationg about its axes with angular rates omega, under a torque torq.
+// Formula is:
+//
+//   .         -1
+//   w    =   M   * ( T   -   w  x  ( M * w )
+//    b                        b           b
+//
+// Where M is inertia tensor:
+//
+//      ( Ixx   Ixy   Ixz )                                                              T
+//  M = ( Iyx   Iyy   Iyz )     , with Ixy == Iyz,  Ixz == Izx,  Iyz == Izy, i.e. M == M
+//      ( Izx   Izy   Izz )
+//
+// In the unlikely case that M is singular, return angular acceleration of 0.
+FXVec3f omegaDot(const FXMat3f& M,const FXVec3f& omega,const FXVec3f& torq){
+  FXVec3f result(0.0f,0.0f,0.0f);
+  FXfloat Ixx=M00;
+  FXfloat Ixy=M01;
+  FXfloat Ixz=M02;
+  FXfloat Iyy=M11;
+  FXfloat Iyz=M12;
+  FXfloat Izz=M22;
+  FXfloat m00=Iyy*Izz-Iyz*Iyz;                  // Cofactors of M
+  FXfloat m01=Ixz*Iyz-Ixy*Izz;
+  FXfloat m02=Ixy*Iyz-Ixz*Iyy;
+  FXfloat m11=Ixx*Izz-Ixz*Ixz;
+  FXfloat m12=Ixy*Ixz-Ixx*Iyz;
+  FXfloat m22=Ixx*Iyy-Ixy*Ixy;
+  FXfloat det=Ixx*m00+Ixy*m01+Ixz*m02;
+  FXASSERT(M01==M10);
+  FXASSERT(M02==M20);
+  FXASSERT(M12==M21);
+  if(__likely(det!=0.0f)){                       // Check if M is singular
+    FXfloat ox=omega.x;
+    FXfloat oy=omega.y;
+    FXfloat oz=omega.z;
+    FXfloat mox=Ixx*ox+Ixy*oy+Ixz*oz;           // M * w
+    FXfloat moy=Ixy*ox+Iyy*oy+Iyz*oz;
+    FXfloat moz=Ixz*ox+Iyz*oy+Izz*oz;
+    FXfloat rhx=torq.x-(oy*moz-oz*moy);         // R = T - w x (M * w)
+    FXfloat rhy=torq.y-(oz*mox-ox*moz);
+    FXfloat rhz=torq.z-(ox*moy-oy*mox);
+    result.x=(m00*rhx+m01*rhy+m02*rhz)/det;     //  -1
+    result.y=(m01*rhx+m11*rhy+m12*rhz)/det;     // M   * R
+    result.z=(m02*rhx+m12*rhy+m22*rhz)/det;     //
+    }
+  return result;
+  }
+
+
 // Save vector to stream
 FXStream& operator<<(FXStream& store,const FXQuatf& v){
   store << v.x << v.y << v.z << v.w;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRASIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRASIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRASImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRASImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRGBIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRGBIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRGBImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRGBImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRadioButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRadioButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRandom.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRandom.cpp Changed

@@ -3,7 +3,7 @@
 *                  R a n d o m   N u m b e r   G e n e r a t o r                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2007,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2007,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -76,25 +76,19 @@
 FXulong FXRandom::randLong(){
   return next()*FXULONG(2685821657736338717);
   }
-
+ 
 
 // Get random double
 FXfloat FXRandom::randFloat(){
-#if (_MSC_VER <= 1300)
-  return ((FXuint)randLong())*2.3283064370808E-10f;
-#else
-  return randLong()*5.42101086242752217033113759206E-20f;
-#endif
+  FXlong num=(FXlong)randLong();
+  return Math::fabs(num*1.0842021724855044340074528008699e-19f);
   }
 
 
 // Get random double
 FXdouble FXRandom::randDouble(){
-#if (_MSC_VER <= 1300)
-  return ((FXuint)randLong())*2.3283064370808E-10;
-#else
-  return randLong()*5.42101086242752217033113759206E-20;
-#endif
+  FXlong num=(FXlong)randLong();
+  return Math::fabs(num*1.0842021724855044340074528008699e-19);
   }
 
 }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRangeSlider.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRangeSlider.cpp Changed

@@ -3,7 +3,7 @@
 *                           S l i d e r   W i d g e t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -274,8 +274,8 @@
 
 // Pressed LEFT button
 long FXRangeSlider::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -366,7 +366,7 @@
 
 // Released Left button
 long FXRangeSlider::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -386,8 +386,8 @@
 
 // Moving
 long FXRangeSlider::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint xx,yy,ww,hh,lo,hi,p,h,travel;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint xx,yy,ww,hh,lo,hi,p,h,travel;
   if(!isEnabled()) return 0;
   if(flags&FLAG_PRESSED){
     yy=border+padtop+2;
@@ -459,8 +459,8 @@
 
 // Pressed middle or right
 long FXRangeSlider::onMiddleBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint xx,yy,ww,hh,lo,hi,p,h,travel;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint xx,yy,ww,hh,lo,hi,p,h,travel;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -542,7 +542,7 @@
 
 // Released middle button
 long FXRangeSlider::onMiddleBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -562,9 +562,9 @@
 
 // Mouse wheel
 long FXRangeSlider::onMouseWheel(FXObject*,FXSelector,void* ptr){
-  register FXEvent* event=(FXEvent*)ptr;
-  register FXint a=(options&RANGESLIDER_VERTICAL) ? (event->win_y<=(headPos0+headSize+headPos1)/2) : (event->win_x>=(headPos0+headSize+headPos1)/2);
-  register FXint p=valuesa+1+(((FXEvent*)ptr)->code*incr)/120;
+  FXEvent* event=(FXEvent*)ptr;
+  FXint a=(options&RANGESLIDER_VERTICAL) ? (event->win_y<=(headPos0+headSize+headPos1)/2) : (event->win_x>=(headPos0+headSize+headPos1)/2);
+  FXint p=valuesa+1+(((FXEvent*)ptr)->code*incr)/120;
   if(p<valuesa+0) p=valuesa+0;
   if(p>valuesa+2) p=valuesa+2;
   if(p!=valuesa+1){
@@ -653,8 +653,8 @@
 
 // Automatically move slider while holding down mouse
 long FXRangeSlider::onAutoSlide(FXObject*,FXSelector,void* ptr){
-  register FXint inc=(FXint)(FXival)ptr;
-  register FXint p=valuesactive+1+inc;
+  FXint inc=(FXint)(FXival)ptr;
+  FXint p=valuesactive+1+inc;
   if(p<=valuesactive+0){
     p=valuesactive+0;
     }
@@ -871,8 +871,8 @@
 // Also, the minimal amount is repainted, as one sometimes as very
 // large/wide sliders.
 void FXRangeSlider::setValue(FXint head,FXint value,FXbool notify){
-  register FXint interval=values3-values0;
-  register FXint travel,lo,hi,h;
+  FXint interval=values3-values0;
+  FXint travel,lo,hi,h;
   if(value<valueshead+0) value=valueshead+0;
   if(value>valueshead+2) value=valueshead+2;
   if(options&RANGESLIDER_VERTICAL){
@@ -910,7 +910,7 @@
 
 // Set slider options
 void FXRangeSlider::setSliderStyle(FXuint style){
-  register FXuint opts=(options&~RANGESLIDER_MASK) | (style&RANGESLIDER_MASK);
+  FXuint opts=(options&~RANGESLIDER_MASK) | (style&RANGESLIDER_MASK);
   if(options!=opts){
     headSize=(opts&RANGESLIDER_INSIDE_BAR)?HEADINSIDEBAR:HEADOVERHANGING;
     options=opts;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRanged.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRanged.cpp Changed

@@ -3,7 +3,7 @@
 *           D o u b l e - P r e c i s i o n    R a n g e    C l a s s           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -53,27 +53,27 @@
 
 // Longest side
 FXdouble FXRanged::longest() const {
-  register FXdouble x=upper.x-lower.x;
-  register FXdouble y=upper.y-lower.y;
-  register FXdouble z=upper.z-lower.z;
+  FXdouble x=upper.x-lower.x;
+  FXdouble y=upper.y-lower.y;
+  FXdouble z=upper.z-lower.z;
   return Math::fmax(Math::fmax(x,y),z);
   }
 
 
 // Shortest side
 FXdouble FXRanged::shortest() const {
-  register FXdouble x=upper.x-lower.x;
-  register FXdouble y=upper.y-lower.y;
-  register FXdouble z=upper.z-lower.z;
+  FXdouble x=upper.x-lower.x;
+  FXdouble y=upper.y-lower.y;
+  FXdouble z=upper.z-lower.z;
   return Math::fmin(Math::fmin(x,y),z);
   }
 
 
 // Length of diagonal
 FXdouble FXRanged::diameter() const {
-  register FXdouble x=upper.x-lower.x;
-  register FXdouble y=upper.y-lower.y;
-  register FXdouble z=upper.z-lower.z;
+  FXdouble x=upper.x-lower.x;
+  FXdouble y=upper.y-lower.y;
+  FXdouble z=upper.z-lower.z;
   return Math::sqrt(x*x+y*y+z*z);
   }
 
@@ -241,9 +241,9 @@
 
 // Intersect box with ray p+lambda*d, returning true if hit
 FXbool FXRanged::intersect(const FXVec3d& pos,const FXVec3d& dir,FXdouble hit) const {
-  register FXdouble f= DBL_MAX;
-  register FXdouble n=-DBL_MAX;
-  register FXdouble ni,fi;
+  FXdouble f= DBL_MAX;
+  FXdouble n=-DBL_MAX;
+  FXdouble ni,fi;
   if(__likely(dir.x!=0.0)){
     if(0.0<dir.x){
       ni=(lower.x-pos.x)/dir.x;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRangef.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRangef.cpp Changed

@@ -3,7 +3,7 @@
 *           S i n g l e - P r e c i s i o n    R a n g e    C l a s s           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -53,27 +53,27 @@
 
 // Longest side
 FXfloat FXRangef::longest() const {
-  register FXfloat x=upper.x-lower.x;
-  register FXfloat y=upper.y-lower.y;
-  register FXfloat z=upper.z-lower.z;
+  FXfloat x=upper.x-lower.x;
+  FXfloat y=upper.y-lower.y;
+  FXfloat z=upper.z-lower.z;
   return Math::fmax(Math::fmax(x,y),z);
   }
 
 
 // Shortest side
 FXfloat FXRangef::shortest() const {
-  register FXfloat x=upper.x-lower.x;
-  register FXfloat y=upper.y-lower.y;
-  register FXfloat z=upper.z-lower.z;
+  FXfloat x=upper.x-lower.x;
+  FXfloat y=upper.y-lower.y;
+  FXfloat z=upper.z-lower.z;
   return Math::fmin(Math::fmin(x,y),z);
   }
 
 
 // Length of diagonal
 FXfloat FXRangef::diameter() const {
-  register FXfloat x=upper.x-lower.x;
-  register FXfloat y=upper.y-lower.y;
-  register FXfloat z=upper.z-lower.z;
+  FXfloat x=upper.x-lower.x;
+  FXfloat y=upper.y-lower.y;
+  FXfloat z=upper.z-lower.z;
   return Math::sqrt(x*x+y*y+z*z);
   }
 
@@ -241,9 +241,9 @@
 
 // Intersect box with ray pos+lambda*dir, returning true if hit
 FXbool FXRangef::intersect(const FXVec3f& pos,const FXVec3f& dir,FXfloat hit) const {
-  register FXfloat f= FLT_MAX;
-  register FXfloat n=-FLT_MAX;
-  register FXfloat ni,fi;
+  FXfloat f= FLT_MAX;
+  FXfloat n=-FLT_MAX;
+  FXfloat ni,fi;
   if(__likely(dir.x!=0.0f)){
     if(0.0f<dir.x){
       ni=(lower.x-pos.x)/dir.x;

gogglesmm-1.2.2.tar.gz/cfox/lib/FXReactor.cpp Added

@@ -0,0 +1,832 @@
+/********************************************************************************
+*                                                                               *
+*                            R e a c t o r   C l a s s                          *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "FXAtomic.h"
+#include "FXAutoThreadStorageKey.h"
+#include "FXThread.h"
+#include "FXElement.h"
+#include "FXReactor.h"
+#include "FXReactorCore.h"
+#include "FXException.h"
+
+/*
+  Notes:
+
+  - FXReactor implements the a reactor pattern: it watches objects such as sockets,
+    pipes, events, etc, blocking the calling thread in a special system call.
+
+  - When activity occurs on any of the watched objects, the thread is woken up
+    from the system call and dispatches to code that handles the activity; for
+    example, a socket may have data from a network in a kernel buffer and now
+    this data must be processed.
+
+  - If no activity arrives within a maximum blocking time, the thread also wakes
+    up, and simply returns with no action (the default blocking time is forever).
+
+  - A timeout may be computed to wake the thread early; if the timeout occurs
+    before the maximum blocking time expires, control is dispatched to the
+    timout handler.
+
+  - If, during the wait, an interrupt (signal) occurs, the waiting thread is
+    awoken and dispatched to the signal handler.  This can happen in either
+    of two ways: synchronously, or asynchronously.  Synchronous handling
+    should be preferred, as asynchronous handling executes from the context
+    of the interrupt service routine and may find the program in an inconsistent
+    state.
+
+  - When FXReactor dispatches to a handler, it must assume that the callback handler
+    for the event may do anything whatsoever, which includes adding or removing
+    signals, handles, etc.  Thus, dispatch() should be made to return, to
+    re-enter at a later time.
+    The callback handler indicates this by returning true, i.e. the callback
+    has been processed and may have had an effect.
+
+    If a callback handler is not handled, it should return false; in this case
+    FXReactor will continue to process in dispatch() and not return until its
+    done (timed out, or issued a another callback which then returned true).
+
+  - The dispatch() driver determines which events have taken place and calls the
+    appropriate handling routine.
+
+  - Thus, once a set of events is determined, we need to keep track of this set
+    and only check for new events once all the events from the last check have
+    been dealt with.
+
+  - More than one object may become active during the wait; on UNIX systems the
+    FXReactor will perform a dispatch on each active object prior to blocking
+    again in the system call.
+
+  - Prior to blocking on system call, FXReactor performs a poll on the objects
+    to check for activity; if none are active, then just prior to blocking a
+    special "idle" handler is called.
+
+  - Thus, the idle handler will only be called when no other items demand attention;
+    performing idle processing would therefore simply cut into the amount of time
+    the thread would otherwise have spent waiting in the system call.
+
+  - The control-set flags narrow down the set of handlers to be tested; by default, all
+    handlers are dispatched to (DispatchAll).
+
+  - When DispatchSignals is not in control-set, no signals are processed.
+
+  - When DispatchTimers is not in control-set, no timers are processed (this has the
+    effect of possibly oversleeping over due timers!).
+
+  - When DispatchIdle is not in control-set, no idle processing is performed; the
+    calling thread will block in the system-call immediately after determining no
+    objects are active.
+
+  - FXReactor tries to give all objects a "fair shake" and processes active
+    objects in round-robin fashion so as to not let any single object hog all the
+    attention. On Windows, this is done by shuffling the list of objects.
+
+  - Each interrupt (signal) is handled by only one single FXReactor.  However, there
+    may be multiple FXReactors, each one handling a different, non-overlapping set of
+    signals.
+
+*/
+
+// Bad handle value
+#if defined(_WIN32)
+#define BadHandle INVALID_HANDLE_VALUE
+#else
+#define BadHandle -1
+#endif
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+// Units of time in nanoseconds
+const FXTime seconds=1000000000;
+
+// Sleep no longer than this
+const FXTime FXReactor::maxwait=86400*seconds;
+
+
+// Construct reactor object
+FXReactor::FXReactor():internals(NULL),sigreceived(0),numhandles(0),numwatched(0),numraised(0){
+#if defined(_WIN32)
+  current=-1;
+#else
+  current=0;
+#endif
+  }
+
+
+// Initialize reactor
+FXbool FXReactor::init(){
+  if(!internals){
+    if(callocElms(internals,1)){
+#if defined(HAVE_EPOLL_CREATE1)
+      internals->handle=epoll_create1(EPOLL_CLOEXEC);
+      if(internals->handle<0){ freeElms(internals); return false; }
+#endif
+#if !defined(_WIN32)
+      sigfillset(&internals->sigmaskset);
+#endif
+      sigreceived=0;
+      numhandles=0;
+      numwatched=0;
+      numraised=0;
+      current=-1;
+      return true;
+      }
+    }
+  return false;
+  }
+
+
+/*******************************************************************************/
+
+
+// Which reactor is responsible for which signal
+FXReactor *volatile FXReactor::sigmanager64;
+
+
+// Handler for a synchronous managed signal simply sets flag that a signal
+// was raised, and remembers most-recently raised signal.
+void FXReactor::signalhandler(FXint sig){
+  sigmanagersig->internals->signotifiedsig=1;
+  sigmanagersig->sigreceived=sig;
+  }
+
+
+// Asynchronous signal handler for managed signal directly dispatches to
+// handling code; this is potentially dangerous, so use at your own risk.
+void FXReactor::signalhandlerasync(FXint sig){
+  sigmanagersig->dispatchSignal(sig);
+  }
+
+
+// Return true if signal sig is handled.
+FXbool FXReactor::hasSignal(FXint sig) const {
+  return (0<sig && sig<64 && sigmanagersig==this);
+  }
+
+// Idea: if we handle signal, it will be masked, except when in
+// pselect() or epoll_pwait(), where it will be unmasked.
+// This prevents race a signal being raised just after we tested
+// it not being raced, but prior to entering the system call.
+// If that happens we would miss the signal while in the system call,
+// i.e. not wake up when we should have.
+//
+// Now, outside of the event loop, we do NOT want it masked as we're
+// not checking it then, so want it to go off if it does.
+// So, before entering loop we mask, then test, then atomically unmask
+// during system call, then leave it masked while in loop, and unmask
+// again upon exit of the loop.
+//
+// Does this make sense???
+
+//        sigemptyset(&sigact.sa_mask);
+//        sigaddset(&sigmaskset,sig);
+//        sigdelset(&sigmaskset,sig);
+//        sigfillset(&sigact.sa_mask);
+//    FXint res=sigismember(&sigmaskset,sig);
+
+// Append signal to signal-set observed by the reactor
+FXbool FXReactor::addSignal(FXint sig,FXbool async){
+  if(internals){
+    if(sig<=0) return false;
+    if(sig>=64) return false;
+    if(atomicBoolCas(&sigmanagersig,(FXReactor*)NULL,this)){
+      void (CDECL *handler)(int);
+      if(async){
+        handler=FXReactor::signalhandlerasync;  // Asynchronous callback
+        }
+      else{
+        handler=FXReactor::signalhandler;       // Normal callback
+        }
+      internals->signotifiedsig=0;            // Set non-raised
+#if defined(_WIN32)
+      if(signal(sig,handler)==SIG_ERR){         // Set handler
+        sigmanagersig=NULL;
+        return false;
+        }
+#elif defined(_POSIX_SOURCE) || defined(_INCLUDE_POSIX_SOURCE) || defined(_XOPEN_SOURCE)
+      struct sigaction sigact;
+      sigdelset(&internals->sigmaskset,sig);
+      sigact.sa_handler=handler;
+      sigact.sa_flags=0;
+      sigfillset(&sigact.sa_mask);              // Block other signals while running handler
+      if(sigaction(sig,&sigact,NULL)==-1){      // Set handler
+        sigmanagersig=NULL;
+        return false;
+        }
+#else
+      sigdelset(&internals->sigmaskset,sig);
+      if(signal(sig,handler)==SIG_ERR){         // Set handler
+        sigmanagersig=NULL;
+        return false;
+        }
+#endif
+      return true;
+      }
+    }
+  return false;
+  }
+
+
+// Remove signal from signal-set observed by the reactor
+FXbool FXReactor::remSignal(FXint sig){
+  if(internals){
+    if(sig<=0) return false;
+    if(sig>=64) return false;
+    if(sigmanagersig==this){
+#if defined(_WIN32)
+      if(signal(sig,SIG_DFL)==SIG_ERR){         // Unset handler
+        return false;
+        }
+#elif defined(_POSIX_SOURCE) || defined(_INCLUDE_POSIX_SOURCE) || defined(_XOPEN_SOURCE)
+      struct sigaction sigact;
+      sigaddset(&internals->sigmaskset,sig);
+      sigact.sa_handler=SIG_DFL;
+      sigact.sa_flags=0;
+      sigemptyset(&sigact.sa_mask);             // Pass all signals while running handler
+      if(sigaction(sig,&sigact,NULL)==-1){      // Unset handler
+        return false;
+        }
+#else
+      sigaddset(&internals->sigmaskset,sig);
+      if(signal(sig,SIG_DFL)==SIG_ERR){         // Unset handler
+        return false;
+        }
+#endif
+      sigmanagersig=NULL;                     // Now release it
+      internals->signotifiedsig=0;            // Set non-raised
+      return true;
+      }
+    }
+  return false;
+  }
+
+
+// Dispatch when a signal was fired
+FXbool FXReactor::dispatchSignal(FXint){
+  return false;
+  }
+
+
+/*******************************************************************************/
+
+
+// Return timeout when something needs to happen
+FXTime FXReactor::nextTimeout(){
+  return forever;
+  }
+
+
+// Dispatch when timeout expires
+FXbool FXReactor::dispatchTimeout(FXTime){
+  return false;
+  }
+
+
+/*******************************************************************************/
+
+
+// Dispatch when idle
+FXbool FXReactor::dispatchIdle(){
+  return false;
+  }
+
+
+/*******************************************************************************/
+
+#if defined(_WIN32)
+
+// Find index of the given handle; -1 if not found
+static inline FXint findHandle(FXInputHandle hnd,const FXInputHandle handles,FXint n){
+  while(--n>=0 && handlesn!=hnd){ }
+  return n;
+  }
+
+#endif
+
+// Append new handle hnd to watch-list
+FXbool FXReactor::addHandle(FXInputHandle hnd,FXuint mode){
+  if(internals){
+#if defined(_WIN32)
+    if(hnd==BadHandle) return false;
+    if(numhandles>=MAXIMUM_WAIT_OBJECTS) return false;
+    if(findHandle(hnd,internals->handles,numhandles)>=0) return false;
+    internals->handlesnumhandles=hnd;
+    internals->modesnumhandles=mode;
+    numhandles++;
+    return true;
+#elif defined(HAVE_EPOLL_CREATE1)
+    struct epoll_event ev;
+    if(hnd<0) return false;
+    ev.events=0;
+    ev.data.fd=hnd;
+    if(mode&InputRead) ev.events|=EPOLLIN;
+    if(mode&InputWrite) ev.events|=EPOLLOUT;
+    if(mode&InputExcept) ev.events|=EPOLLPRI;
+    if(epoll_ctl(internals->handle,EPOLL_CTL_ADD,hnd,&ev)!=0) return false;
+    numhandles++;
+    return true;
+#else
+    if(hnd<0) return false;
+    if(hnd>=FD_SETSIZE) return false;
+    if(FD_ISSET(hnd,&internals->handles0) || FD_ISSET(hnd,&internals->handles1) || FD_ISSET(hnd,&internals->handles2)) return false;
+    if(mode&InputRead){ FD_SET(hnd,&internals->handles0); }
+    if(mode&InputWrite){ FD_SET(hnd,&internals->handles1); }
+    if(mode&InputExcept){ FD_SET(hnd,&internals->handles2); }
+    if(numhandles<=hnd){ numhandles=hnd+1; }
+    return true;
+#endif
+    }
+  return false;
+  }
+
+
+// Remove handle hnd from list
+FXbool FXReactor::remHandle(FXInputHandle hnd){
+  if(internals){
+#if defined(_WIN32)
+    FXint s;
+    if(hnd==BadHandle) return false;
+    if((s=findHandle(hnd,internals->handles,numhandles))<0) return false;
+    internals->handless=internals->handlesnumhandles-1;
+    internals->modess=internals->modesnumhandles-1;
+    if(current==s) current=-1;                          // Removed a raised handle
+    if(current==numhandles-1) current=s;                // Renumbered a raised handle
+    numhandles--;
+    return true;
+#elif defined(HAVE_EPOLL_CREATE1)
+    struct epoll_event ev;
+    if(hnd<0) return false;
+    ev.events=0;                                        // Doesn't really matter, ignored by kernel
+    ev.data.fd=0;
+    if(epoll_ctl(internals->handle,EPOLL_CTL_DEL,hnd,&ev)!=0) return false;
+    numhandles--;
+    return true;
+#else
+    if(hnd<0) return false;
+    if(hnd>=FD_SETSIZE) return false;
+    if(!FD_ISSET(hnd,&internals->handles0) && !FD_ISSET(hnd,&internals->handles1) && !FD_ISSET(hnd,&internals->handles2)) return false;
+    if(FD_ISSET(hnd,&internals->watched0)){ FD_CLR(hnd,&internals->watched0); numraised--; }
+    if(FD_ISSET(hnd,&internals->watched1)){ FD_CLR(hnd,&internals->watched1); numraised--; }
+    if(FD_ISSET(hnd,&internals->watched2)){ FD_CLR(hnd,&internals->watched2); numraised--; }
+    FD_CLR(hnd,&internals->handles0);
+    FD_CLR(hnd,&internals->handles1);
+    FD_CLR(hnd,&internals->handles2);
+    if(hnd==numhandles-1){
+      while(0<numhandles && !FD_ISSET(numhandles-1,&internals->handles0) && !FD_ISSET(numhandles-1,&internals->handles1) && !FD_ISSET(numhandles-1,&internals->handles2)){
+        --numhandles;
+        }
+      }
+    return true;
+#endif
+    }
+  return false;
+  }
+
+
+// Dispatch when when handle hnd is signaled with mode
+FXbool FXReactor::dispatchHandle(FXInputHandle,FXuint,FXuint){
+  return false;
+  }
+
+
+#if defined(_WIN32) /////////////////////////////////////////////////////////////
+
+// Dispatch driver
+FXbool FXReactor::dispatch(FXTime blocking,FXuint flags){
+  if(internals){
+    FXTime now,due,delay,interval;
+    FXuint sig,nxt,mode,ms;
+    FXInputHandle hnd;
+
+    // Loop till we got something
+    while(1){
+
+      // Check for timeout
+      delay=forever;
+      if(flags&DispatchTimers){
+        due=nextTimeout();
+        if(due<forever){
+          now=FXThread::time();
+          delay=due-now;
+          if(delay<FXLONG(1000)){
+            if(dispatchTimeout(due)) return true;       // Timer activity
+            continue;
+            }
+          }
+        }
+
+      // Check for signal
+      if(flags&DispatchSignals){
+        sig=nxt=sigreceived;
+        if(atomicSet(&internals->signotifiedsig,0)){
+          do{ nxt=(nxt+63)&63; }while(!internals->signotifiednxt && nxt!=sig);
+          sigreceived=nxt;
+          if(dispatchSignal(sig)) return true;          // Signal activity
+          continue;
+          }
+        }
+
+      // Check active handles
+      if(0<=current && current<numhandles){
+        hnd=internals->handlescurrent;                // Shuffle raised handle up in the list
+        mode=internals->modescurrent;                 // To give all handles equal play time
+        nxt=(current+1)%numhandles;
+        swap(internals->handlescurrent,internals->handlesnxt);
+        swap(internals->modescurrent,internals->modesnxt);
+        current=-1;
+        if(dispatchHandle(hnd,mode,flags)) return true; // IO activity
+        continue;
+        }
+
+      // Select active handles; don't block
+      current=WaitForMultipleObjectsEx(numhandles,internals->handles,false,0,true);
+
+      // No handles were active
+      if(current==WAIT_TIMEOUT){
+
+        // Idle callback if we're about to block
+        if(flags&DispatchIdle){
+          if(dispatchIdle()) return true;               // Idle activity
+          }
+
+        // We're not blocking
+        if(blocking<=0) return false;
+
+        // Indefinite wait
+        ms=INFINITE;
+
+        // If not blocking indefinitely, don't exceed maxwait time interval.
+        interval=Math::imin(delay,blocking);
+        if(interval<forever){
+          interval=Math::imin(interval,maxwait);
+          ms=(FXuint)(interval/1000000);
+          }
+
+        // Select active handles, wait for timeout or maximum block time
+        current=WaitForMultipleObjectsEx(numhandles,internals->handles,false,ms,true);
+
+        // Return if there was no timeout within maximum block time
+        if(current==WAIT_TIMEOUT){
+          if(blocking<forever){                         // Next blocking period reduced by time already expired
+            blocking-=interval;
+            if(blocking<=0) return false;               // Nothing happened during blocking period!
+            }
+          continue;
+          }
+        }
+
+      // I/O completion took place; maybe some i/o took place, causing
+      // somestuff to have been changed; we must leave loop.
+      if(current==WAIT_IO_COMPLETION) return false;
+
+      // Bad stuff happened
+      if(current==WAIT_FAILED || current>=WAIT_ABANDONED_0){
+        throw FXFatalException("FXReactor::dispatch: error waiting on handles.");
+        }
+      }
+    }
+  return false;
+  }
+
+#elif defined(HAVE_EPOLL_CREATE1) ///////////////////////////////////////////////
+
+// Dispatch driver
+FXbool FXReactor::dispatch(FXTime blocking,FXuint flags){
+  if(internals){
+    FXTime now,due,delay,interval;
+    FXuint sig,nxt,mode,ms;
+    FXInputHandle hnd;
+
+    // Loop till we got something
+    while(1){
+
+      // Check for timeout
+      delay=forever;
+      if(flags&DispatchTimers){
+        due=nextTimeout();
+        if(due<forever){
+          now=FXThread::time();
+          delay=due-now;
+          if(delay<FXLONG(1000)){
+            if(dispatchTimeout(due)) return true;       // Timer activity
+            continue;
+            }
+          }
+        }
+
+      // Check for signal
+      if(flags&DispatchSignals){
+        sig=nxt=sigreceived;
+        if(atomicSet(&internals->signotifiedsig,0)){
+          do{ nxt=(nxt+63)&63; }while(!internals->signotifiednxt && nxt!=sig);
+          sigreceived=nxt;
+          if(dispatchSignal(sig)) return true;          // Signal activity
+          continue;
+          }
+        }
+
+      // Check active handles
+      if(0<numraised){
+        mode=0;
+        numraised--;
+        current=(current+1)%numwatched;
+        hnd=internals->eventscurrent.data.fd;
+        if(internals->eventscurrent.events&EPOLLIN){ mode|=InputRead; }
+        if(internals->eventscurrent.events&EPOLLOUT){ mode|=InputWrite; }
+        if(internals->eventscurrent.events&EPOLLERR){ mode|=InputExcept; }
+        if(dispatchHandle(hnd,mode,flags)) return true; // IO activity
+        continue;
+        }
+
+      // Select active handles and check signals; don't block
+      numwatched=epoll_pwait(internals->handle,internals->events,ARRAYNUMBER(internals->events),0,NULL);
+
+      // No active handles yet; need to wait
+      if(numwatched==0){
+
+        // Idle callback if we're about to block
+        if(flags&DispatchIdle){
+          if(dispatchIdle()) return true;               // Idle activity
+          }
+
+        // We're not blocking
+        if(blocking<=0) return false;
+
+        // Indefinite wait
+        ms=-1;
+
+        // If not blocking indefinitely, don't exceed maxwait time interval.
+        interval=Math::imin(delay,blocking);
+        if(interval<forever){
+          interval=Math::imin(interval,maxwait);
+          ms=(FXuint)(interval/1000000);
+          }
+
+        // Select active handles and check signals, waiting for timeout or maximum block time
+        numwatched=epoll_pwait(internals->handle,internals->events,ARRAYNUMBER(internals->events),ms,NULL);
+
+        // Return if there was no timeout within maximum block time
+        if(numwatched==0){
+          if(blocking<forever){                         // Next blocking period reduced by time already expired
+            blocking-=interval;
+            if(blocking<=0) return false;               // Nothing happened during blocking period!
+            }
+          continue;
+          }
+        }
+
+      // Bad stuff happened
+      if(numwatched<0){
+        if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXReactor::dispatch: error waiting on handles."); }
+        continue;
+        }
+
+      // Keep track of original set
+      numraised=numwatched;
+      }
+    }
+  return false;
+  }
+
+#else ///////////////////////////////////////////////////////////////////////////
+
+// Wait for file descriptors
+extern FXint sselect(FXint nfds,fd_set* readfds,fd_set* writefds,fd_set* errorfds,FXTime interval);
+
+// Wait for file descriptors
+FXint sselect(FXint nfds,fd_set* readfds,fd_set* writefds,fd_set* errorfds,FXTime interval){
+#if (_POSIX_C_SOURCE >= 200112L)
+  if(interval<forever){
+    struct timespec delta;
+    delta.tv_sec=interval/seconds;
+    delta.tv_nsec=interval-seconds*delta.tv_sec;
+    return pselect(nfds,readfds,writefds,errorfds,&delta,NULL);
+    }
+  return pselect(nfds,readfds,writefds,errorfds,NULL,NULL);
+#else
+  if(interval<forever){
+    struct timeval delta;
+    interval=interval/1000;
+    delta.tv_sec=interval/1000000;
+    delta.tv_usec=interval-1000000*delta.tv_sec;
+    return select(nfds,readfds,writefds,errorfds,&delta);
+    }
+  return select(nfds,readfds,writefds,errorfds,NULL);
+#endif
+  }
+
+
+#if 0
+
+#if !defined(_WIN32) && defined(_GNU_SOURCE) && (_POSIX_C_SOURCE >= 199506L || _XOPEN_SOURCE >= 500)
+
+// Block set of signals until leaving scope
+class ScopedSigBlock {
+private:
+  sigset_t savedset;
+public:
+  ScopedSigBlock(sigset_t& blockset){
+    pthread_sigmask(SIG_BLOCK,&blockset,&savedset);
+    }
+ ~ScopedSigBlock(){
+    pthread_sigmask(SIG_SETMASK,&savedset,NULL);
+    }
+  };
+
+#endif
+
+
+//           s = pthread_sigmask(SIG_BLOCK, &set, NULL);
+//           pthread_sigmask(SIG_SETMASK, &sigmask, &origmask);
+//           pthread_sigmask(SIG_SETMASK, &origmask, NULL);
+#if (_POSIX_C_SOURCE >= 200112L)
+    sigset_t watchset;        // Watched signals
+    sigset_t savedset;        // Current masked signals
+#endif
+
+    // Get signal mask from thread
+#if (_POSIX_C_SOURCE >= 200112L)
+    pthread_sigmask(SIG_SETMASK,NULL,&savedset);
+    sigandset(&watchset,&internals->sigmaskset,&savedset);
+#endif
+
+
+      // Get signal mask from thread
+      pthread_sigmask(SIG_SETMASK,NULL,&savedset);
+      sigandset(&watchset,&internals->sigmaskset,&savedset);
+
+      // Check for activity before falling asleep
+      numraised=sselect(numhandles,&internals->watched0,&internals->watched1,&internals->watched2,0,&watchset);
+#endif
+
+
+// Dispatch driver
+FXbool FXReactor::dispatch(FXTime blocking,FXuint flags){
+  if(internals){
+    FXTime now,due,delay,interval;
+    FXuint sig,nxt,mode;
+
+    // Loop till we got something
+    while(1){
+
+      // Check for timeout
+      delay=forever;
+      if(flags&DispatchTimers){
+        due=nextTimeout();
+        if(due<forever){
+          now=FXThread::time();
+          delay=due-now;
+          if(delay<FXLONG(1000)){
+            if(dispatchTimeout(due)) return true;       // Timer activity
+            continue;
+            }
+          }
+        }
+
+      // Check for signal
+      if(flags&DispatchSignals){
+        sig=nxt=sigreceived;
+        if(atomicSet(&internals->signotifiedsig,0)){
+          do{ nxt=(nxt+63)&63; }while(!internals->signotifiednxt && nxt!=sig);
+          sigreceived=nxt;
+          if(dispatchSignal(sig)) return true;          // Signal activity
+          continue;
+          }
+        }
+
+      // Check active handles
+      if(0<numraised){
+        mode=0;
+        do{
+          current=(current+1)%numwatched;
+          if(FD_ISSET(current,&internals->watched0)){
+            FD_CLR(current,&internals->watched0);
+            mode|=InputRead;
+            numraised--;
+            }
+          if(FD_ISSET(current,&internals->watched1)){
+            FD_CLR(current,&internals->watched1);
+            mode|=InputWrite;
+            numraised--;
+            }
+          if(FD_ISSET(current,&internals->watched2)){
+            FD_CLR(current,&internals->watched2);
+            mode|=InputExcept;
+            numraised--;
+            }
+          }
+        while(mode==0);
+        if(dispatchHandle(current,mode,flags)) return true;     // IO activity
+        continue;
+        }
+
+      // Prepare handles to check
+      internals->watched0=internals->handles0;
+      internals->watched1=internals->handles1;
+      internals->watched2=internals->handles2;
+
+      // Select active handles and check signals; don't block
+      numraised=sselect(numhandles,&internals->watched0,&internals->watched1,&internals->watched2,0);
+
+      // No handles were active
+      if(numraised==0){
+
+        // Idle callback if we're about to block
+        if(flags&DispatchIdle){
+          if(dispatchIdle()) return true;               // Idle activity
+          }
+
+        // We're not blocking
+        if(blocking<=0) return false;
+
+        // Prepare handles to check
+        internals->watched0=internals->handles0;
+        internals->watched1=internals->handles1;
+        internals->watched2=internals->handles2;
+
+        // Nanoseconds to wait
+        interval=Math::imin(delay,blocking);
+        if(interval<forever){
+          interval=Math::imin(interval,maxwait);
+          }
+
+        // Select active handles and check signals, waiting for timeout or maximum block time
+        numraised=sselect(numhandles,&internals->watched0,&internals->watched1,&internals->watched2,interval);
+
+        // Return if there was no timeout within maximum block time
+        if(numraised==0){
+          if(blocking<forever){                         // Next blocking period reduced by time already expired
+            blocking-=interval;
+            if(blocking<=0) return false;               // Nothing happened during blocking period!
+            }
+          continue;
+          }
+        }
+
+      // Bad stuff happened
+      if(numraised<0){
+        if(errno!=EAGAIN && errno!=EINTR){ throw FXFatalException("FXReactor::dispatch: error waiting on handles."); }
+        continue;
+        }
+
+      // Keep track of original set
+      numwatched=numhandles;
+      }
+    }
+  return false;
+  }
+
+#endif //////////////////////////////////////////////////////////////////////////
+
+
+// Exit reactor
+FXbool FXReactor::exit(){
+  if(internals){
+    for(FXint s=1; s<64; ++s){
+      remSignal(s);
+      }
+#if defined(HAVE_EPOLL_CREATE1)
+    close(internals->handle);
+#endif
+    freeElms(internals);
+    sigreceived=0;
+    numhandles=0;
+    numwatched=0;
+    numraised=0;
+    current=-1;
+    return true;
+    }
+  return false;
+  }
+
+
+// Destroy reactor object
+FXReactor::~FXReactor(){
+  exit();
+  }
+
+}

gogglesmm-1.2.2.tar.gz/cfox/lib/FXReactorCore.h Added

@@ -0,0 +1,50 @@
+/********************************************************************************
+*                                                                               *
+*                            R e a c t o r   C o r e                            *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#ifndef FXREACTORCORE_H
+#define FXREACTORCORE_H
+
+//#undef HAVE_EPOLL_CREATE1
+
+namespace FX {
+
+
+// Platform dependent reactor internals
+struct FXReactor::Internals {
+#if defined(_WIN32)
+  FXint              signotified64;                   // Signal notify flag
+  FXInputHandle      handlesMAXIMUM_WAIT_OBJECTS;     // Handles
+  FXuint             modesMAXIMUM_WAIT_OBJECTS;       // IO Modes each handle
+#elif defined(HAVE_EPOLL_CREATE1)
+  FXint              signotified64;                   // Signal notify flag
+  sigset_t           sigmaskset;                        // Signal mask
+  struct epoll_event events128;                       // Events
+  FXInputHandle      handle;                            // Poll handle
+#else
+  FXint              signotified64;                   // Signal notify flag
+  sigset_t           sigmaskset;                        // Signal mask
+  fd_set             watched3;                        // Watched handles
+  fd_set             handles3;                        // Known handles
+#endif
+  };
+
+}
+
+#endif

gogglesmm-1.2.1.tar.gz/cfox/lib/FXReadWriteLock.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXReadWriteLock.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRealSlider.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRealSlider.cpp Changed

@@ -3,7 +3,7 @@
 *                       R e a l S l i d e r   W i d g e t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -337,8 +337,8 @@
 
 // Pressed LEFT button
 long FXRealSlider::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXdouble p=pos;
+  FXEvent *event=(FXEvent*)ptr;
+  FXdouble p=pos;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -390,7 +390,7 @@
 
 // Released Left button
 long FXRealSlider::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -410,9 +410,9 @@
 
 // Moving
 long FXRealSlider::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint xx,yy,ww,hh,lo,hi,h,travel;
-  register FXdouble p;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint xx,yy,ww,hh,lo,hi,h,travel;
+  FXdouble p;
   if(!isEnabled()) return 0;
   if(flags&FLAG_PRESSED){
     yy=border+padtop+2;
@@ -465,9 +465,9 @@
 
 // Pressed middle or right
 long FXRealSlider::onMiddleBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint xx,yy,ww,hh,lo,hi,h,travel;
-  register FXdouble p;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint xx,yy,ww,hh,lo,hi,h,travel;
+  FXdouble p;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -526,7 +526,7 @@
 
 // Released middle button
 long FXRealSlider::onMiddleBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -546,8 +546,8 @@
 
 // Mouse wheel
 long FXRealSlider::onMouseWheel(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXdouble p=pos+incr*(event->code/120);
+  FXEvent *event=(FXEvent*)ptr;
+  FXdouble p=pos+incr*(event->code/120);
   if(p<range0) p=range0;
   if(p>range1) p=range1;
   if(pos!=p){
@@ -636,8 +636,8 @@
 
 // Automatically move slider while holding down mouse
 long FXRealSlider::onAutoSlide(FXObject*,FXSelector,void* ptr){
-  register FXint dir=(FXint)(FXival)ptr;
-  register FXdouble p=pos+incr*dir;
+  FXint dir=(FXint)(FXival)ptr;
+  FXdouble p=pos+incr*dir;
   if(p<=range0){
     p=range0;
     }
@@ -659,9 +659,9 @@
 
 // Draw horizontal ticks
 void FXRealSlider::drawHorzTicks(FXDCWindow& dc,FXint,FXint y,FXint,FXint){
-  register FXdouble interval=range1-range0;
-  register FXint travel,offset,p;
-  register FXdouble v,d;
+  FXdouble interval=range1-range0;
+  FXint travel,offset,p;
+  FXdouble v,d;
   if(0.0<interval){
     d=delta;
     if(d<=0.0) d=incr;
@@ -678,9 +678,9 @@
 
 // Draw vertical ticks
 void FXRealSlider::drawVertTicks(FXDCWindow& dc,FXint x,FXint,FXint,FXint){
-  register FXdouble interval=range1-range0;
-  register FXint travel,offset,p;
-  register FXdouble v,d;
+  FXdouble interval=range1-range0;
+  FXint travel,offset,p;
+  FXdouble v,d;
   if(0.0<interval){
     d=delta;
     if(d<=0.0) d=incr;
@@ -895,8 +895,8 @@
 // Also, the minimal amount is repainted, as one sometimes as very
 // large/wide sliders.
 void FXRealSlider::setValue(FXdouble p,FXbool notify){
-  register FXdouble interval=range1-range0;
-  register FXint travel,lo,hi,h;
+  FXdouble interval=range1-range0;
+  FXint travel,lo,hi,h;
   if(p<range0) p=range0;
   if(p>range1) p=range1;
   if(options&REALSLIDER_VERTICAL){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRealSpinner.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRealSpinner.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRecentFiles.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRecentFiles.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRectangle.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRectangle.cpp Changed

@@ -3,7 +3,7 @@
 *                          R e c t a n g l e    C l a s s                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -118,20 +118,20 @@
 
 // Union between rectangles
 FXRectangle FXRectangle::operator+(const FXRectangle& r) const {
-  register FXshort xx=_min(x,r.x);
-  register FXshort ww=_max(x+w,r.x+r.w)-xx;
-  register FXshort yy=_min(y,r.y);
-  register FXshort hh=_max(y+h,r.y+r.h)-yy;
+  FXshort xx=_min(x,r.x);
+  FXshort ww=_max(x+w,r.x+r.w)-xx;
+  FXshort yy=_min(y,r.y);
+  FXshort hh=_max(y+h,r.y+r.h)-yy;
   return FXRectangle(xx,yy,ww,hh);
   }
 
 
 // Intersection between rectangles
 FXRectangle FXRectangle::operator*(const FXRectangle& r) const {
-  register FXshort xx=_max(x,r.x);
-  register FXshort ww=_min(x+w,r.x+r.w)-xx;
-  register FXshort yy=_max(y,r.y);
-  register FXshort hh=_min(y+h,r.y+r.h)-yy;
+  FXshort xx=_max(x,r.x);
+  FXshort ww=_min(x+w,r.x+r.w)-xx;
+  FXshort yy=_max(y,r.y);
+  FXshort hh=_min(y+h,r.y+r.h)-yy;
   return FXRectangle(xx,yy,ww,hh);
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRegion.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRegion.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRegistry.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRegistry.cpp Changed

@@ -3,7 +3,7 @@
 *                           R e g i s t r y   C l a s s                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -474,15 +474,15 @@
         }
       }
     }
-  else{
 #if defined(WIN32)
+  else{
     // Try read system-wide registry settings from HKEY_LOCAL_MACHINE
     if(readFromRegistry(HKEY_LOCAL_MACHINE,false)) ok=true;
 
     // Try read per-user registry settings from HKEY_CURRENT_USER
     if(readFromRegistry(HKEY_CURRENT_USER,true)) ok=true;
-#endif
     }
+#endif
   return ok;
   }
 
@@ -533,12 +533,12 @@
           }
         }
       }
-    else{
 #if defined(WIN32)
+    else{
       // Write per-user registry settings to HKEY_CURRENT_USER
       if(writeToRegistry(HKEY_CURRENT_USER)) ok=true;
-#endif
       }
+#endif
     }
   return ok;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXReplaceDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXReplaceDialog.cpp Changed

gogglesmm-1.2.2.tar.gz/cfox/lib/FXReverseDictionary.cpp Added

@@ -0,0 +1,271 @@
+/********************************************************************************
+*                                                                               *
+*                 R e v e r s e   D i c t i o n a r y    C l a s s              *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "FXElement.h"
+#include "FXException.h"
+#include "FXString.h"
+#include "FXReverseDictionary.h"
+
+/*
+  Notes:
+*/
+
+
+#define EMPTY     (const_cast<Entry*>((const Entry*)(__reversedictionary__empty__+3)))
+#define NOMEMORY  ((const Entry*)(((FXival*)NULL)+3))
+#define HASH(x)   ((FXival)(x)^(((FXival)(x))>>13))
+#define VOID      ((FXptr)-1L)
+#define LEGAL(p)  ((p)!=NULL && (p)!=VOID)
+#define BSHIFT    5
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+extern const FXint __string__empty__;
+extern const FXival __reversedictionary__empty__;
+const FXival __reversedictionary__empty__5={1,0,1,0,(FXival)(__string__empty__+1)};
+
+
+// Resize buffer for the dictionary.
+FXbool FXReverseDictionary::no(FXival n){
+  FXival m=no();
+  if(__likely(m!=n)){
+    Entry *elbat;
+    if(1<m){
+      destructElms(table,m);
+      ::free(((FXival*)table)-3);
+      table=EMPTY;
+      }
+    if(1<n){
+      if((elbat=(Entry*)(((FXival*)::calloc(sizeof(FXival)*3+sizeof(Entry)*n,1))+3))==NOMEMORY) return false;
+      ((FXival*)elbat)-3=n;
+      ((FXival*)elbat)-2=0;
+      ((FXival*)elbat)-1=n;
+      constructElms(elbat,n);
+      table=elbat;
+      }
+    }
+  return true;
+  }
+
+
+// Resize dictionary; new size must be a power of two.
+// A new table is allocated and current entries are rehashed into the new
+// table; then the tables are switched and the old table is deleted.
+FXbool FXReverseDictionary::resize(FXival n){
+  FXReverseDictionary elbat;
+  FXASSERT((n&(n-1))==0);
+  FXASSERT((n-used())>0);
+  if(elbat.no(n)){
+    if(1<elbat.no() && 1<no()){
+      FXptr ky;
+      FXuval p,b,x;
+      FXival i;
+      for(i=0; i<no(); ++i){
+        ky=tablei.key;
+        if(LEGAL(ky)){
+          p=b=HASH(ky);
+          while(elbat.tablex=p&(n-1).key){
+            p=(p<<2)+p+b+1;
+            b>>=BSHIFT;
+            }
+          elbat.tablex.key=ky;
+          elbat.tablex.data.adopt(tablei.data);
+          }
+        }
+      elbat.free(n-used());
+      elbat.used(used());
+      }
+    adopt(elbat);
+    return true;
+    }
+  return false;
+  }
+
+
+// Initialize dictionary to empty.
+FXReverseDictionary::FXReverseDictionary():table(EMPTY){
+  FXASSERT(sizeof(FXReverseDictionary)==sizeof(void*));
+  FXASSERT(sizeof(Entry)<=sizeof(FXival)*2);
+  }
+
+
+// Copy constructor initializes this dictionary with the data from another.
+FXReverseDictionary::FXReverseDictionary(const FXReverseDictionary& other):table(EMPTY){
+  FXASSERT(sizeof(FXReverseDictionary)==sizeof(void*));
+  FXASSERT(sizeof(Entry)<=sizeof(FXival)*2);
+  if(1<other.no()){
+    if(!no(other.no())){ throw FXMemoryException("FXReverseDictionary::FXReverseDictionary: out of memory\n"); }
+    copyElms(table,other.table,no());
+    free(other.free());
+    used(other.used());
+    }
+  }
+
+
+// Assign this dictionary with the data from another.
+FXReverseDictionary& FXReverseDictionary::operator=(const FXReverseDictionary& other){
+  if(table!=other.table){
+    if(1<other.no()){
+      if(!no(other.no())){ throw FXMemoryException("FXReverseDictionary::operator=: out of memory\n"); }
+      copyElms(table,other.table,no());
+      free(other.free());
+      used(other.used());
+      }
+    else{
+      no(1);
+      }
+    }
+  return *this;
+  }
+
+
+// Adopt data from other dictionary; this means the other dictionary now becomes
+// empty, and any data held by this dictionary is lost.
+FXReverseDictionary& FXReverseDictionary::adopt(FXReverseDictionary& other){
+  if(table!=other.table){
+    swap(table,other.table);
+    other.clear();
+    }
+  return *this;
+  }
+
+
+// Locate slot associated with key, if key is non-NULL.
+// If not found, or key is NULL, return -1.
+FXival FXReverseDictionary::find(FXptr ky) const {
+  if(LEGAL(ky)){
+    FXuval p,b,x;
+    p=b=HASH(ky);
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==ky) return x;
+      p=(p<<2)+p+b+1;
+      b>>=BSHIFT;
+      }
+    }
+  return -1;
+  }
+
+
+// Access element at given key, if key is non-NULL.
+// If found, return reference to the data element associated with the key.
+// If not found, optionally resize the array if needed, and then return a
+// reference to (possibly newly created) data element.
+// Write access to data associated with a NULL key will generate exception.
+FXString& FXReverseDictionary::at(FXptr ky){
+  if(LEGAL(ky)){
+    FXuval p,b,h,x;
+    p=b=h=HASH(ky);
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==ky) goto x;
+      p=(p<<2)+p+b+1;
+      b>>=BSHIFT;
+      }
+    if(free()<=1+(no()>>2) && !resize(no()<<1)){ throw FXMemoryException("FXReverseDictionary::at: out of memory\n"); }
+    p=b=h;
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==VOID) goto y;
+      p=(p<<2)+p+b+1;
+      b>>=BSHIFT;
+      }
+    free(free()-1);
+y:  used(used()+1);
+    tablex.key=ky;
+x:  return tablex.data;
+    }
+  return *((FXString*)NULL);              // Can NOT be referenced; will generate segfault!
+  }
+
+
+// Access element at given key, if key is non-NULL.
+// If found, return const-reference to the data element; if not found,
+// or if the key is NULL, return const-reference to the special empty data.
+const FXString& FXReverseDictionary::at(FXptr ky) const {
+  if(LEGAL(ky)){
+    FXuval p,b,x;
+    p=b=HASH(ky);
+    while(tablex=p&(no()-1).key){
+      if(tablex.key==ky) return tablex.data;
+      p=(p<<2)+p+b+1;
+      b>>=BSHIFT;
+      }
+    }
+  return EMPTY0.data;
+  }
+
+
+// Remove data at given key, if key is non-NULL.
+// A resize is triggered when the occupancy drops below the next smaller power of two.
+FXString FXReverseDictionary::remove(FXptr ky){
+  if(LEGAL(ky)){
+    FXString old;
+    FXuval p,b,x;
+    p=b=HASH(ky);
+    while(tablex=p&(no()-1).key!=ky){
+      if(tablex.key==NULL) return FXString::null;
+      p=(p<<2)+p+b+1;
+      b>>=BSHIFT;
+      }
+    tablex.key=VOID;                  // Void the slot (not empty!)
+    old=tablex.data;
+    tablex.data.clear();
+    used(used()-1);
+    if(used()<=(no()>>2)) resize(no()>>1);
+    }
+  return FXString::null;
+  }
+
+
+// Erase element at pos, if it wasn't empty already.
+// A resize is triggered when the occupancy drops below the next smaller power of two.
+FXString FXReverseDictionary::erase(FXival pos){
+  if(pos<0 || no()<=pos){ throw FXRangeException("FXReverseDictionary::erase: argument out of range\n"); }
+  if(LEGAL(tablepos.key)){
+    FXString old;
+    tablepos.key=VOID;                // Void the slot (not empty!)
+    old=tablepos.data;
+    tablepos.data.clear();
+    used(used()-1);
+    if(used()<=(no()>>2)) resize(no()>>1);
+    return old;
+    }
+  return FXString::null;
+  }
+
+
+// Resize to one element (the special empty element) when cleared.
+void FXReverseDictionary::clear(){
+  no(1);
+  }
+
+
+// When destroyed, clear the dictionary.
+FXReverseDictionary::~FXReverseDictionary(){
+  clear();
+  }
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRex.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRex.cpp Changed

@@ -3,7 +3,7 @@
 *                 R e g u l a r   E x p r e s s i o n   C l a s s               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -1234,7 +1234,7 @@
   FXshort greediness=GREEDY;
   FXshort rep_min=1;
   FXshort rep_max=1;
-  FXshort ch;
+  FXuchar ch;
 
   // Remember point before atom
   FXuchar* ptr=pc;
@@ -1458,11 +1458,12 @@
 
 // Parse atom
 FXRex::Error FXCompile::atom(FXshort& flags,FXshort& smin,FXshort& smax){
-  FXRex::Error err;
-  FXshort level,len,ch;
   const FXchar* savepat;
+  FXshort level,len;
+  FXRex::Error err;
   FXuchar *ptr;
   FXint save;
+  FXuchar ch;
   flags=FLG_WORST;                                      // Assume the worst
   smin=0;
   smax=0;
@@ -1814,7 +1815,7 @@
 
 // Parse character class
 FXRex::Error FXCompile::charset(){
-  register FXint first,last,op,i;
+  FXint first,last,op,i;
   FXuchar set32;
   ZERO(set);
   first=-1;
@@ -1989,7 +1990,7 @@
 
 // Append opcode
 FXuchar* FXCompile::append(FXuchar op){
-  register FXuchar *ret=pc;
+  FXuchar *ret=pc;
   if(code){
     SETOP(pc,op);
     }
@@ -2000,7 +2001,7 @@
 
 // Append one-argument opcode
 FXuchar* FXCompile::append(FXuchar op,FXshort arg){
-  register FXuchar *ret=pc;
+  FXuchar *ret=pc;
   if(code){
     SETOP(pc,op);
     SETARG(pc+1,arg);
@@ -2012,7 +2013,7 @@
 
 // Append two-argument opcode
 FXuchar* FXCompile::append(FXuchar op,FXshort arg1,FXshort arg2){
-  register FXuchar *ret=pc;
+  FXuchar *ret=pc;
   if(code){
     SETOP(pc,op);
     SETARG(pc+1,arg1);
@@ -2025,7 +2026,7 @@
 
 // Append character class opcode
 FXuchar* FXCompile::appendset(FXuchar op,const FXuchar set){
-  register FXuchar *ret=pc;
+  FXuchar *ret=pc;
   if(code){
     SETOP(pc,op);
     memcpy(pc+1,set,32);
@@ -2103,7 +2104,7 @@
 // to->10:  ....      10:  ....
 //
 void FXCompile::patch(FXuchar *fm,FXuchar *to){
-  register FXshort delta;
+  FXshort delta;
   if(code && fm){
     do{
       delta=GETARG(fm);
@@ -2201,7 +2202,7 @@
 
 // Search in string, starting at ptr
 const FXchar* FXExecute::search(const FXuchar* prog,const FXchar* fm,const FXchar* to){
-  register FXchar ch;
+  FXchar ch;
 
   // Must be true
   FXASSERT(str_beg<=fm && fm<=str_end);
@@ -4487,14 +4488,20 @@
       savemode=mode;
       if(*src=='?'){
         *dst++=*src++;
-        if((ch=*src)!='i' && ch!='I' && ch!='n' && ch!='N' && ch!=':' && ch!='=' && ch!='!' && ch!='>' && (ch!='<' || (*(src+1)!='=' && *(src+1)!='!'))) return FXRex::ErrToken;
-        *dst++=*src++;
-        if(ch=='=' || ch=='!'){                         // Non-reversed segment
-          mode&=~FXRex::Reverse;
+        if((ch=*src)==':' || ch=='i' || ch=='I' || ch=='n' || ch=='N' || ch=='>'){      // Some type of sub-expression
+          *dst++=*src++;
           }
-        else if(ch=='<'){                               // Reversed segment
-          mode|=FXRex::Reverse;
+        else if(ch=='=' || ch=='!'){                                                    // Positive or negative look-ahead
           *dst++=*src++;
+          mode&=~FXRex::Reverse;                        // Non-reversed segment
+          }
+        else if(ch=='<' && (*(src+1)=='=' || *(src+1)=='!')){                           // Positive or negative look-behind
+          *dst++=*src++;
+          *dst++=*src++;
+          mode|=FXRex::Reverse;                         // Reversed segment
+          }
+        else{                                           // Bad token
+          return FXRex::ErrToken;
           }
         }
       if((err=expression())!=FXRex::ErrOK) return err;
@@ -4752,8 +4759,10 @@
 
 // Return substitution string
 FXString FXRex::substitute(const FXchar* string,FXint len,FXint* beg,FXint* end,const FXchar* replace,FXint npar){
-  register FXint ch,n,i=0;
   FXString result;
+  FXint i=0;
+  FXint n;
+  FXuchar ch;
   if(__unlikely(!string || !replace || len<0 || !beg || !end || npar<1 || NSUBEXP<npar)){ fxerror("FXRex::substitute: bad argument.\n"); }
   while((ch=replacei++)!='\0'){
     if(ch=='&' || (ch=='\\' && '1'<=replacei && replacei<='9')){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRootWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRootWindow.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRuler.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRuler.cpp Changed

@@ -3,7 +3,7 @@
 *                            R u l e r   W i d g e t                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -850,8 +850,8 @@
 
 // Pressed LEFT button
 long FXRuler::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent* event=(FXEvent*)ptr;
-  register FXint lo,hi;
+  FXEvent* event=(FXEvent*)ptr;
+  FXint lo,hi;
   flags&=~FLAG_TIP;
   if(isEnabled()){
     grab();
@@ -899,7 +899,7 @@
 
 // Determine what was picked
 FXint FXRuler::picked(FXint x,FXint y){
-  register FXint wlo,whi,lo,hi;
+  FXint wlo,whi,lo,hi;
   lo=pos+edgeSpacing+marginLower;
   hi=lo+documentSize-marginUpper-marginLower;
   if(options&RULER_VERTICAL){
@@ -937,7 +937,7 @@
 
 // Moving
 long FXRuler::onMotion(FXObject*,FXSelector,void*ptr){
-  register FXEvent* event=(FXEvent*)ptr;
+  FXEvent* event=(FXEvent*)ptr;
   FXint value=(options&RULER_VERTICAL)?(event->win_y+off):(event->win_x+off);
   switch(mode){
     case MOUSE_NONE:

gogglesmm-1.2.1.tar.gz/cfox/lib/FXRulerView.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXRulerView.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXScopedThread.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXScopedThread.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXScrollArea.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXScrollArea.cpp Changed

@@ -3,7 +3,7 @@
 *                      S c r o l l A r e a   W i d g e t                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -174,7 +174,7 @@
 
 // Get default width
 FXint FXScrollArea::getDefaultWidth(){
-  register FXint w=0;
+  FXint w=0;
   if((options&HSCROLLER_NEVER)&&(options&HSCROLLER_ALWAYS)) w=getContentWidth();
   if(!(options&VSCROLLER_NEVER)) w+=vertical->getDefaultWidth();
   return FXMAX(w,1);
@@ -183,7 +183,7 @@
 
 // Get default height
 FXint FXScrollArea::getDefaultHeight(){
-  register FXint h=0;
+  FXint h=0;
   if((options&VSCROLLER_NEVER)&&(options&VSCROLLER_ALWAYS)) h=getContentHeight();
   if(!(options&HSCROLLER_NEVER)) h+=horizontal->getDefaultHeight();
   return FXMAX(h,1);
@@ -200,11 +200,11 @@
 
 // Start automatic scrolling
 FXbool FXScrollArea::startAutoScroll(FXEvent *event,FXbool onlywheninside){
-  register FXint vx=getVisibleX();
-  register FXint vy=getVisibleY();
-  register FXint vw=getVisibleWidth();
-  register FXint vh=getVisibleHeight();
-  register FXbool autoscrolling=false;
+  FXint vx=getVisibleX();
+  FXint vy=getVisibleY();
+  FXint vw=getVisibleWidth();
+  FXint vh=getVisibleHeight();
+  FXbool autoscrolling=false;
   flags&=~FLAG_SCROLLINSIDE;
   if(onlywheninside) flags|=FLAG_SCROLLINSIDE;
   if(horizontal->getPage()<horizontal->getRange()){
@@ -237,9 +237,9 @@
 
 // Place scrollbars
 void FXScrollArea::placeScrollBars(FXint vw,FXint vh){
-  register FXint cw,ch,new_x,new_y;
-  register FXint sh_h=0;
-  register FXint sv_w=0;
+  FXint cw,ch,new_x,new_y;
+  FXint sh_h=0;
+  FXint sv_w=0;
 
   // Inviolate
   FXASSERT(pos_x<=0 && pos_y<=0);
@@ -406,13 +406,13 @@
 
 // Timeout
 long FXScrollArea::onAutoScroll(FXObject*,FXSelector sel,void* ptr){
-  register FXEvent* event=(FXEvent*)ptr;
-  register FXint vx=getVisibleX();
-  register FXint vy=getVisibleY();
-  register FXint vw=getVisibleWidth();
-  register FXint vh=getVisibleHeight();
-  register FXint dx=0;
-  register FXint dy=0;
+  FXEvent* event=(FXEvent*)ptr;
+  FXint vx=getVisibleX();
+  FXint vy=getVisibleY();
+  FXint vw=getVisibleWidth();
+  FXint vh=getVisibleHeight();
+  FXint dx=0;
+  FXint dy=0;
 
   // If scrolling only while inside, and not inside, we stop scrolling
   if((flags&FLAG_SCROLLINSIDE) && !(vx<=event->win_x && vy<=event->win_y && event->win_x<vx+vw && event->win_y<vy+vh)) return 0;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXScrollBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXScrollBar.cpp Changed

@@ -3,7 +3,7 @@
 *                         S c r o l l b a r   O b j e c t s                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -207,9 +207,9 @@
 // Pressed LEFT button in slider
 // Note we don't move the focus to the scrollbar widget!
 long FXScrollBar::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint r=range-page;
-  register FXint p=pos;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint r=range-page;
+  FXint p=pos;
   if(isEnabled()){
     grab();
     getApp()->removeTimeout(this,ID_TIMEWHEEL);
@@ -318,9 +318,9 @@
 // Pressed MIDDLE button in slider
 long FXScrollBar::onMiddleBtnPress(FXObject*,FXSelector,void* ptr){
   FXEvent *event=(FXEvent*)ptr;
-  register FXint r=range-page;
-  register FXint p=pos;
-  register FXint travel,lo,hi,t;
+  FXint r=range-page;
+  FXint p=pos;
+  FXint travel,lo,hi,t;
   if(isEnabled()){
     grab();
     getApp()->removeTimeout(this,ID_TIMEWHEEL);
@@ -392,9 +392,9 @@
 
 // Pressed RIGHT button in slider
 long FXScrollBar::onRightBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint r=range-page;
-  register FXint p=pos;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint r=range-page;
+  FXint p=pos;
   if(isEnabled()){
     grab();
     getApp()->removeTimeout(this,ID_TIMEWHEEL);
@@ -513,10 +513,10 @@
 
 // Moving
 long FXScrollBar::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint r=range-page;
-  register FXint p=pos;
-  register FXint travel,hi,lo,t;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint r=range-page;
+  FXint p=pos;
+  FXint travel,hi,lo,t;
   if(!isEnabled()) return 0;
   if(mode>=MODE_DRAG){
 
@@ -685,8 +685,8 @@
 
 // Automatic scroll based on timer
 long FXScrollBar::onAutoScroll(FXObject*,FXSelector,void* ptr){
-  register FXint p=pos+(FXint)(FXival)ptr;
-  register FXint r=range-page;
+  FXint p=pos+(FXint)(FXival)ptr;
+  FXint r=range-page;
   if(p>=r) p=r;
   if(p<=0) p=0;
   FXASSERT(0<=p);
@@ -837,8 +837,8 @@
 
 // Handle repaint
 long FXScrollBar::onPaint(FXObject*,FXSelector,void* ptr){
-  register FXEvent *ev=(FXEvent*)ptr;
-  register int total;
+  FXEvent *ev=(FXEvent*)ptr;
+  int total;
   FXDCWindow dc(this,ev);
   if(options&SCROLLBAR_HORIZONTAL){
     total=width-height-height;
@@ -946,10 +946,10 @@
 // Set position; tricky because the thumb size may have changed
 // as well; we do the minimal possible update to repaint properly.
 void FXScrollBar::setPosition(FXint p,FXbool notify){
-  register FXint hi=thumbpos+thumbsize;
-  register FXint lo=thumbpos;
-  register FXint r=range-page;
-  register FXint total,travel,l,h;
+  FXint hi=thumbpos+thumbsize;
+  FXint lo=thumbpos;
+  FXint r=range-page;
+  FXint total,travel,l,h;
   if(p>r) p=r;
   if(p<0) p=0;
   FXASSERT(0<=p);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXScrollPane.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXScrollPane.cpp Changed

@@ -3,7 +3,7 @@
 *               S c r o l l i n g   M e n u   P a n e   W i d g e t             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -96,9 +96,9 @@
 
 // Get width
 FXint FXScrollPane::getDefaultWidth(){
-  register FXWindow* child;
-  register FXint wmax,wcum,w,n;
-  register FXuint hints;
+  FXWindow* child;
+  FXint wmax,wcum,w,n;
+  FXuint hints;
   wmax=wcum=0;
   for(child=dn->getNext(); child; child=child->getNext()){
     if(child->shown()){
@@ -131,9 +131,9 @@
 
 // Get height
 FXint FXScrollPane::getDefaultHeight(){
-  register FXWindow* child;
-  register FXint hmax,hcum,h,n;
-  register FXuint hints;
+  FXWindow* child;
+  FXint hmax,hcum,h,n;
+  FXuint hints;
   hmax=hcum=0;
   for(child=dn->getNext(); child; child=child->getNext()){
     if(child->shown()){
@@ -166,9 +166,9 @@
 
 // Recalculate layout
 void FXScrollPane::layout(){
-  register FXint w,h,x,y,mw,mh,arrowsize,n;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint w,h,x,y,mw,mh,arrowsize,n;
+  FXWindow *child;
+  FXuint hints;
 
   // Horizontal
   if(options&POPUP_HORIZONTAL){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXScrollWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXScrollWindow.cpp Changed

@@ -3,7 +3,7 @@
 *                     S c r o l l W i n d o w   W i d g e t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -85,8 +85,8 @@
 
 // Determine content width of scroll area
 FXint FXScrollWindow::getContentWidth(){
-  register FXuint hints;
-  register FXint w=1;
+  FXuint hints;
+  FXint w=1;
   if(contentWindow()){
     hints=contentWindow()->getLayoutHints();
     if(hints&LAYOUT_FIX_WIDTH) w=contentWindow()->getWidth();
@@ -98,8 +98,8 @@
 
 // Determine content height of scroll area
 FXint FXScrollWindow::getContentHeight(){
-  register FXuint hints;
-  register FXint h=1;
+  FXuint hints;
+  FXint h=1;
   if(contentWindow()){
     hints=contentWindow()->getLayoutHints();
     if(hints&LAYOUT_FIX_HEIGHT) h=contentWindow()->getHeight();
@@ -111,9 +111,9 @@
 
 // Move contents; moves child window
 void FXScrollWindow::moveContents(FXint x,FXint y){
-  register FXWindow* contents=contentWindow();
-  register FXint xx,yy,ww,hh,vw,vh;
-  register FXuint hints;
+  FXWindow* contents=contentWindow();
+  FXint xx,yy,ww,hh,vw,vh;
+  FXuint hints;
   if(contents){
 
     // Get hints
@@ -153,9 +153,9 @@
 
 // Recalculate layout
 void FXScrollWindow::layout(){
-  register FXWindow* contents=contentWindow();
-  register FXint xx,yy,ww,hh,vw,vh;
-  register FXuint hints;
+  FXWindow* contents=contentWindow();
+  FXint xx,yy,ww,hh,vw,vh;
+  FXuint hints;
 
   // Layout scroll bars and viewport
   FXScrollArea::layout();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSearchDialog.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSearchDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSemaQueue.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSemaQueue.cpp Changed

@@ -3,7 +3,7 @@
 *                          S e m a p h o r e   Q u e u e                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -38,21 +38,28 @@
 
 using namespace FX;
 
+/*******************************************************************************/
 
 namespace FX {
 
-/*******************************************************************************/
+// Create a queue and set its size to sz
+FXSemaQueue::FXSemaQueue(FXuint sz):queue(sz),free(sz),used(0){
+  }
 
 
-// Create a queue and set its size to sz
-FXSemaQueue::FXSemaQueue(FXuint sz):list(sz),free(sz),used(0){
+// Push object into queue
+FXbool FXSemaQueue::push(FXptr obj){
+  free.wait();
+  queue.push(obj);
+  used.post();
+  return true;
   }
 
 
 // Try push object into queue
 FXbool FXSemaQueue::trypush(FXptr obj){
   if(free.trywait()){
-    list.push(obj);
+    queue.push(obj);
     used.post();
     return true;
     }
@@ -60,11 +67,23 @@
   }
 
 
-// Push object into queue
-FXbool FXSemaQueue::push(FXptr obj){
-  free.wait();
-  list.push(obj);
-  used.post();
+// Try push object into queue, waiting up
+// to nsec for space to become available.
+FXbool FXSemaQueue::trypush(FXptr obj,FXTime nsec){
+  if(free.wait(nsec)){
+    queue.push(obj);
+    used.post();
+    return true;
+    }
+  return false;
+  }
+
+
+// Pop onject from queue
+FXbool FXSemaQueue::pop(FXptr& obj){
+  used.wait();
+  queue.pop(obj);
+  free.post();
   return true;
   }
 
@@ -72,7 +91,7 @@
 // Try pop object from queue
 FXbool FXSemaQueue::trypop(FXptr& obj){
   if(used.trywait()){
-    list.pop(obj);
+    queue.pop(obj);
     free.post();
     return true;
     }
@@ -80,19 +99,22 @@
   }
 
 
-// Pop onject from queue
-FXbool FXSemaQueue::pop(FXptr& obj){
-  used.wait();
-  list.pop(obj);
-  free.post();
-  return true;
+// Try pop object from queue, waiting up
+// to nsec for object to become available.
+FXbool FXSemaQueue::trypop(FXptr& obj,FXTime nsec){
+  if(used.wait(nsec)){
+    queue.pop(obj);
+    free.post();
+    return true;
+    }
+  return false;
   }
 
 
 // Pop onject from queue
 FXbool FXSemaQueue::pop(){
   used.wait();
-  list.pop();
+  queue.pop();
   free.post();
   return true;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSemaphore.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSemaphore.cpp Changed

@@ -3,7 +3,7 @@
 *                          S e m a p h o r e   C l a s s                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -31,6 +31,19 @@
   - Implementation using Condition and Mutex now used for MacOSX and Minix.
     This may be less performant than a true semaphore, but its a nice and fully functional
     fallback until full posix semaphore implementation is available.
+  - Increased reserved for pthread_mutex_t as up to 11 FXuval's in size on MacOSX,
+    worst case is on 32-bit versions.
+  - Keep in mind we can not do sizeof() in the header file, as we're trying to avoid
+    including system-headers from public accessible FOX header files.  This is so
+    as to avoid "accidental" incorporation of declarations or unexpected macros,
+    that may clash.
+  - Also we want to avoid calls to memory allocators as that would incur a big
+    performance penalty; besides, a memory allocator may need to call locking
+    primitives since memory is a resource shared by all threads.
+  - The upshot is that the space allocated for the semaphore may be a bit more
+    than strictly necessary on some machines.  It may actually be a good thing
+    as this increases the odds of these datastructures living in dedicated
+    cache-lines.
 */
 
 using namespace FX;
@@ -52,7 +65,7 @@
   //FXTRACE((150,"sizeof(pthread_cond_t)=%d\n",sizeof(pthread_cond_t)));
   //FXTRACE((150,"sizeof(pthread_mutex_t)=%d\n",sizeof(pthread_mutex_t)));
   FXASSERT(sizeof(FXuval)*9 >= sizeof(pthread_cond_t));
-  FXASSERT(sizeof(FXuval)*6 >= sizeof(pthread_mutex_t));
+  FXASSERT(sizeof(FXuval)*11 >= sizeof(pthread_mutex_t));
   data0=count;
   pthread_cond_init((pthread_cond_t*)&data1,NULL);
   pthread_mutex_init((pthread_mutex_t*)&data10,NULL);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSeparator.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSeparator.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSettings.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSettings.cpp Changed

@@ -3,7 +3,7 @@
 *                          S e t t i n g s   C l a s s                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -110,11 +110,10 @@
   FXASSERT((n-used())>0);       // At least one free slot
   if(elbat.no(n)){
     if(1<elbat.no() && 1<no()){
-      FXuval p,b,h,x;
-      FXival i;
+      FXuval p,b,h,x; FXival i;
       for(i=0; i<no(); ++i){                  // Hash existing entries into new table
-        p=b=h=tablei.hash;
         if(!tablei.key.empty()){
+          p=b=h=tablei.hash;
           while(elbat.tablex=p&(n-1).hash){ // Locate slot
             p=(p<<2)+p+b+1;
             b>>=BSHIFT;
@@ -349,7 +348,7 @@
       while(b<e && Ascii::isBlank(stre-1)) e--;
 
       // Grab the unescaped value
-      value=unescape(str.mid(b,e-b),'"','"');
+      value=FXString::unescape(str.mid(b,e-b),'"','"');
 
       // Add entry to current section
       at(section).at(name,mrk)=value;
@@ -397,8 +396,8 @@
             // Write marked key-value pairs only
             str.append(data(sec).key(ent));
             str.append("=");
-            if(shouldEscape(data(sec).data(ent),'"','"')){
-              str.append(escape(data(sec).data(ent),'"','"'));
+            if(FXString::shouldEscape(data(sec).data(ent),'"','"')){
+              str.append(FXString::escape(data(sec).data(ent),'"','"'));
               }
             else{
               str.append(data(sec).data(ent));

gogglesmm-1.2.1.tar.gz/cfox/lib/FXShell.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXShell.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXShutter.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXShutter.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSize.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSize.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSlider.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSlider.cpp Changed

@@ -3,7 +3,7 @@
 *                           S l i d e r   W i d g e t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -332,8 +332,8 @@
 
 // Pressed LEFT button
 long FXSlider::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p=pos;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p=pos;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -384,7 +384,7 @@
 
 // Released Left button
 long FXSlider::onLeftBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -404,8 +404,8 @@
 
 // Moving
 long FXSlider::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint xx,yy,ww,hh,lo,hi,p,h,travel;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint xx,yy,ww,hh,lo,hi,p,h,travel;
   if(!isEnabled()) return 0;
   if(flags&FLAG_PRESSED){
     yy=border+padtop+2;
@@ -457,8 +457,8 @@
 
 // Pressed middle or right
 long FXSlider::onMiddleBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint xx,yy,ww,hh,lo,hi,p,h,travel;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint xx,yy,ww,hh,lo,hi,p,h,travel;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -516,7 +516,7 @@
 
 // Released middle button
 long FXSlider::onMiddleBtnRelease(FXObject*,FXSelector,void* ptr){
-  register FXuint flgs=flags;
+  FXuint flgs=flags;
   if(isEnabled()){
     ungrab();
     getApp()->removeTimeout(this,ID_AUTOSLIDE);
@@ -536,8 +536,8 @@
 
 // Mouse wheel
 long FXSlider::onMouseWheel(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
-  register FXint p=pos+(event->code*incr)/120;
+  FXEvent *event=(FXEvent*)ptr;
+  FXint p=pos+(event->code*incr)/120;
   if(p<range0) p=range0;
   if(p>range1) p=range1;
   if(pos!=p){
@@ -626,8 +626,8 @@
 
 // Automatically move slider while holding down mouse
 long FXSlider::onAutoSlide(FXObject*,FXSelector,void* ptr){
-  register FXint inc=(FXint)(FXival)ptr;
-  register FXint p=pos+inc;
+  FXint inc=(FXint)(FXival)ptr;
+  FXint p=pos+inc;
   if(p<=range0){
     p=range0;
     }
@@ -649,8 +649,8 @@
 
 // Draw horizontal ticks
 void FXSlider::drawHorzTicks(FXDCWindow& dc,FXint,FXint y,FXint,FXint){
-  register FXint interval=range1-range0;
-  register FXint travel,offset,v,d,p;
+  FXint interval=range1-range0;
+  FXint travel,offset,v,d,p;
   if(0<interval){
     d=delta;
     if(d<=0) d=incr;
@@ -667,8 +667,8 @@
 
 // Draw vertical ticks
 void FXSlider::drawVertTicks(FXDCWindow& dc,FXint x,FXint,FXint,FXint){
-  register FXint interval=range1-range0;
-  register FXint travel,offset,v,d,p;
+  FXint interval=range1-range0;
+  FXint travel,offset,v,d,p;
   if(0<interval){
     d=delta;
     if(d<=0) d=incr;
@@ -708,7 +708,7 @@
       dc.drawLine(x,y,x+w-m-1,y);
       dc.drawLine(x,y+1,x,y+h-1);
       dc.drawLine(x+w-1,y+m,x+w-m-1,y);
-#ifdef WIN32
+#if defined(WIN32)
       dc.setForeground(shadowColor);
       dc.drawLine(x+w-1,y+h-m-2,x+w-m-2,y+h-1);
       dc.drawLine(x+1,y+h-2,x+w-m-1,y+h-2);
@@ -883,8 +883,8 @@
 // Also, the minimal amount is repainted, as one sometimes as very
 // large/wide sliders.
 void FXSlider::setValue(FXint p,FXbool notify){
-  register FXint interval=range1-range0;
-  register FXint travel,lo,hi,h;
+  FXint interval=range1-range0;
+  FXint travel,lo,hi,h;
   if(p<range0) p=range0;
   if(p>range1) p=range1;
   if(options&SLIDER_VERTICAL){
@@ -922,7 +922,7 @@
 
 // Set slider options
 void FXSlider::setSliderStyle(FXuint style){
-  register FXuint opts=(options&~SLIDER_MASK) | (style&SLIDER_MASK);
+  FXuint opts=(options&~SLIDER_MASK) | (style&SLIDER_MASK);
   if(options!=opts){
     headSize=(opts&SLIDER_INSIDE_BAR)?HEADINSIDEBAR:HEADOVERHANGING;
     options=opts;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSocket.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSocket.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSphered.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSphered.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSpheref.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSpheref.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSpinLock.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSpinLock.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSpinner.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSpinner.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSplashWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSplashWindow.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSplitter.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSplitter.cpp Changed

@@ -3,7 +3,7 @@
 *                S p l i t t e r   W i n d o w   O b j e c t                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -132,8 +132,8 @@
 
 // Get default width
 FXint FXSplitter::getDefaultWidth(){
-  register FXWindow* child;
-  register FXint wmax,w,numc;
+  FXWindow* child;
+  FXint wmax,w,numc;
   wmax=numc=0;
   if(options&SPLITTER_VERTICAL){
     for(child=getFirst(); child; child=child->getNext()){
@@ -158,8 +158,8 @@
 
 // Get default height
 FXint FXSplitter::getDefaultHeight(){
-  register FXWindow* child;
-  register FXint hmax,h,numc;
+  FXWindow* child;
+  FXint hmax,h,numc;
   hmax=numc=0;
   if(options&SPLITTER_VERTICAL){
     for(child=getFirst(); child; child=child->getNext()){
@@ -369,7 +369,7 @@
 
 // Find child just before split
 FXWindow* FXSplitter::findHSplit(FXint pos){
-  register FXWindow* child=getFirst();
+  FXWindow* child=getFirst();
   if(options&SPLITTER_REVERSED){
     while(child){
       if(child->shown()){
@@ -392,7 +392,7 @@
 
 // Find child just before split
 FXWindow* FXSplitter::findVSplit(FXint pos){
-  register FXWindow* child=getFirst();
+  FXWindow* child=getFirst();
   if(options&SPLITTER_REVERSED){
     while(child){
       if(child->shown()){
@@ -415,8 +415,8 @@
 
 // Move the horizontal split intelligently
 void FXSplitter::moveHSplit(FXint pos){
-  register FXint smin,smax;
-  register FXuint hints;
+  FXint smin,smax;
+  FXuint hints;
   FXASSERT(window);
   hints=window->getLayoutHints();
   if(options&SPLITTER_REVERSED){
@@ -437,8 +437,8 @@
 
 // Move the vertical split intelligently
 void FXSplitter::moveVSplit(FXint pos){
-  register FXint smin,smax;
-  register FXuint hints;
+  FXint smin,smax;
+  FXuint hints;
   FXASSERT(window);
   hints=window->getLayoutHints();
   if(options&SPLITTER_REVERSED){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSpring.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSpring.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXStat.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXStat.cpp Changed

@@ -3,7 +3,7 @@
 *                        F i l e   S t a t i s t i c s                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -182,14 +182,13 @@
   }
 
 
-#ifdef WIN32
+#if defined(WIN32)
 
 // Convert 100ns since 01/01/1601 to ns since 01/01/1970
 static inline FXTime fxunixtime(FXTime ft){
   return (ft-FXLONG(116444736000000000))*FXLONG(100);
   }
 
-
 // Convert ns since 01/01/1970 to 100ns since 01/01/1601
 static inline FXTime fxwintime(FXTime ut){
   return ut/FXLONG(100)+FXLONG(116444736000000000);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXStatusBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXStatusBar.cpp Changed

@@ -3,7 +3,7 @@
 *                        S t a t u s   B a r   W i d g e t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -73,9 +73,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXStatusBar::getDefaultWidth(){
-  register FXint w,wcum,numc;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint w,wcum,numc;
+  FXWindow* child;
+  FXuint hints;
   wcum=numc=0;
   for(child=corner->getNext(); child; child=child->getNext()){
     if(child->shown()){
@@ -94,9 +94,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXStatusBar::getDefaultHeight(){
-  register FXint h,hmax;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint h,hmax;
+  FXWindow* child;
+  FXuint hints;
   hmax=0;
   for(child=corner->getNext(); child; child=child->getNext()){
     if(child->shown()){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXStatusLine.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXStatusLine.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXStream.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXStream.cpp Changed

@@ -3,7 +3,7 @@
 *       P e r s i s t e n t   S t o r a g e   S t r e a m   C l a s s e s       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -139,7 +139,7 @@
     if(begptr+size!=endptr){
 
       // Old buffer location
-      register FXuchar *oldbegptr=begptr;
+      FXuchar *oldbegptr=begptr;
 
       // Only resize if owned
       if(!owns){ fxerror("FXStream::setSpace: cannot resize external data buffer.\n"); }
@@ -369,7 +369,7 @@
 
 // Write array of shorts
 FXStream& FXStream::save(const FXushort* p,FXuval n){
-  register const FXuchar *q=(const FXuchar*)p;
+  const FXuchar *q=(const FXuchar*)p;
   if(code==FXStreamOK){
     n<<=1;
     FXASSERT(begptr<=rdptr);
@@ -412,7 +412,7 @@
 
 // Write array of ints
 FXStream& FXStream::save(const FXuint* p,FXuval n){
-  register const FXuchar *q=(const FXuchar*)p;
+  const FXuchar *q=(const FXuchar*)p;
   if(code==FXStreamOK){
     n<<=2;
     FXASSERT(begptr<=rdptr);
@@ -459,7 +459,7 @@
 
 // Write array of doubles
 FXStream& FXStream::save(const FXdouble* p,FXuval n){
-  register const FXuchar *q=(const FXuchar*)p;
+  const FXuchar *q=(const FXuchar*)p;
   if(code==FXStreamOK){
     n<<=3;
     FXASSERT(begptr<=rdptr);
@@ -639,7 +639,7 @@
 
 // Read array of shorts
 FXStream& FXStream::load(FXushort* p,FXuval n){
-  register FXuchar *q=(FXuchar*)p;
+  FXuchar *q=(FXuchar*)p;
   if(code==FXStreamOK){
     n<<=1;
     FXASSERT(begptr<=rdptr);
@@ -682,7 +682,7 @@
 
 // Read array of ints
 FXStream& FXStream::load(FXuint* p,FXuval n){
-  register FXuchar *q=(FXuchar*)p;
+  FXuchar *q=(FXuchar*)p;
   if(code==FXStreamOK){
     n<<=2;
     FXASSERT(begptr<=rdptr);
@@ -729,7 +729,7 @@
 
 // Read array of doubles
 FXStream& FXStream::load(FXdouble* p,FXuval n){
-  register FXuchar *q=(FXuchar*)p;
+  FXuchar *q=(FXuchar*)p;
   if(code==FXStreamOK){
     n<<=3;
     FXASSERT(begptr<=rdptr);
@@ -804,8 +804,8 @@
 
 // Save object
 FXStream& FXStream::saveObject(const FXObject* v){
-  register const FXMetaClass *cls;
-  register const FXchar *name;
+  const FXMetaClass *cls;
+  const FXchar *name;
   FXuint tag,zero=0;
   if(dir!=FXStreamSave){ fxerror("FXStream::saveObject: wrong stream direction.\n"); }
   if(code==FXStreamOK){
@@ -840,7 +840,7 @@
 
 // Load object
 FXStream& FXStream::loadObject(FXObject*& v){
-  register const FXMetaClass *cls;
+  const FXMetaClass *cls;
   FXchar nameMAXCLASSNAME+1;
   FXuint tag,esc;
   if(dir!=FXStreamLoad){ fxerror("FXStream::loadObject: wrong stream direction.\n"); }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXString.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXString.cpp Changed

@@ -3,7 +3,7 @@
 *                           S t r i n g   O b j e c t                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -86,19 +86,6 @@
 
 namespace FX {
 
-
-// Furnish our own versions
-extern FXAPI FXint __vsscanf(const FXchar* string,const FXchar* format,va_list arg_ptr);
-extern FXAPI FXint __vsnprintf(FXchar* string,FXint length,const FXchar* format,va_list args);
-extern FXAPI FXint __snprintf(FXchar* string,FXint length,const FXchar* format,...);
-extern FXAPI FXlong __strtoll(const FXchar *beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
-extern FXAPI FXulong __strtoull(const FXchar* beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
-extern FXAPI FXint __strtol(const FXchar *beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
-extern FXAPI FXuint __strtoul(const FXchar* beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
-extern FXAPI FXdouble __strtod(const FXchar *beg,const FXchar** end=NULL,FXbool* ok=NULL);
-extern FXAPI FXfloat __strtof(const FXchar *beg,const FXchar** end=NULL,FXbool* ok=NULL);
-
-
 // For conversion from UTF16 to UTF32
 const FXint SURROGATE_OFFSET=0x10000-(0xD800<<10)-0xDC00;
 
@@ -167,9 +154,21 @@
   4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
   };
 
+
+// Furnish our own versions
+extern FXAPI FXint __vsscanf(const FXchar* string,const FXchar* format,va_list arg_ptr);
+extern FXAPI FXint __vsnprintf(FXchar* string,FXint length,const FXchar* format,va_list args);
+extern FXAPI FXint __snprintf(FXchar* string,FXint length,const FXchar* format,...);
+extern FXAPI FXlong __strtoll(const FXchar *beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
+extern FXAPI FXulong __strtoull(const FXchar* beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
+extern FXAPI FXint __strtol(const FXchar *beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
+extern FXAPI FXuint __strtoul(const FXchar* beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
+extern FXAPI FXdouble __strtod(const FXchar *beg,const FXchar** end=NULL,FXbool* ok=NULL);
+extern FXAPI FXfloat __strtof(const FXchar *beg,const FXchar** end=NULL,FXbool* ok=NULL);
+
 /*******************************************************************************/
 
-// Length of wide character string
+// Length of character string
 static inline FXint strlen(const FXchar *src){
   return ::strlen(src);
   }
@@ -177,7 +176,7 @@
 
 // Length of narrow character string
 static inline FXint strlen(const FXnchar *src){
-  register FXint i=0;
+  FXint i=0;
   while(srci) i++;
   return i;
   }
@@ -185,7 +184,7 @@
 
 // Length of wide character string
 static inline FXint strlen(const FXwchar *src){
-  register FXint i=0;
+  FXint i=0;
   while(srci) i++;
   return i;
   }
@@ -194,7 +193,7 @@
 
 // Return wide character from utf8 string at ptr
 FXwchar wc(const FXchar* ptr){
-  register FXwchar w=(FXuchar)ptr0;
+  FXwchar w=(FXuchar)ptr0;
   if(__unlikely(0xC0<=w)){ w=(w<<6)^(FXuchar)ptr1^0x3080;
   if(__unlikely(0x800<=w)){ w=(w<<6)^(FXuchar)ptr2^0x20080;
   if(__unlikely(0x10000<=w)){ w=(w<<6)^(FXuchar)ptr3^0x400080; }}}
@@ -204,7 +203,7 @@
 
 // Return wide character from utf16 string at ptr
 FXwchar wc(const FXnchar* ptr){
-  register FXwchar w=ptr0;
+  FXwchar w=ptr0;
   if(__unlikely(FXISLEADUTF16(w))){ w=SURROGATE_OFFSET+(w<<10)+ptr1; }
   return w;
   }
@@ -282,19 +281,19 @@
 
 
 // Return number of FXchar's of wide character at ptr
-FXint wclen(const FXchar *ptr){
-  return FXString::utfBytes(FXuchar)*ptr;
+FXival wclen(const FXchar *ptr){
+  return FXUTF8LEN(*ptr);
   }
 
 
 // Return number of FXnchar's of narrow character at ptr
-FXint wclen(const FXnchar *ptr){
-  return 1+FXISLEADUTF16(*ptr);
+FXival wclen(const FXnchar *ptr){
+  return FXUTF16LEN(*ptr);
   }
 
 
 // Return true if valid utf8 character sequence
-FXint wcvalid(const FXchar* ptr){
+FXival wcvalid(const FXchar* ptr){
   if((FXuchar)ptr0<0x80) return 1;
   if((FXuchar)ptr0<0xC0) return 0;
   if((FXuchar)ptr1<0x80) return 0;
@@ -311,7 +310,7 @@
 
 
 // Return true if valid utf16 character sequence
-FXint wcvalid(const FXnchar* ptr){
+FXival wcvalid(const FXnchar* ptr){
   if(ptr0<0xD800) return 1;
   if(ptr0>0xDFFF) return 1;
   if(ptr0>0xDBFF) return 0;
@@ -323,91 +322,94 @@
 /*******************************************************************************/
 
 // Return number of bytes for utf8 representation of wide character w
-FXint wc2utf(FXwchar w){
-//  return (w>=0x80)+(w>=0x800)+(w>=0x10000)+1;
-  if(__likely(w<0x80)) return 1;
-  if(__likely(w<0x800)) return 2;
-  if(__likely(w<0x10000)) return 3;
-  return 4;
+FXival wc2utf(FXwchar w){
+  return (w>=0x80)+(w>=0x800)+(w>=0x10000)+1;
   }
 
 
 // Return number of narrow characters for utf16 representation of wide character w
-FXint wc2nc(FXwchar w){
+FXival wc2nc(FXwchar w){
   return (w>=0x10000)+1;
   }
 
 
 // Return number of bytes for utf8 representation of wide character string
-FXint wcs2utf(const FXwchar *ptr,FXint len){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<len){
-    w=ptrq++;
-    if(__likely(w<0x80)){ p+=1; continue; }
-    if(__likely(w<0x800)){ p+=2; continue; }
-    if(__likely(w<0x10000)){ p+=3; continue; }
-    if(__likely(w<0x110000)){ p+=4; continue; }
-    break;
+FXival wcs2utf(const FXwchar* src,FXival srclen){
+  const FXwchar* srcend=src+srclen;
+  FXival p=0;
+  FXwchar w;
+  while(src<srcend && (w=*src++)!=0){
+    p+=wc2utf(w);
     }
   return p;
   }
 
 
 // Return number of bytes for utf8 representation of wide character string
-FXint wcs2utf(const FXwchar *ptr){
-  return wcs2utf(ptr,strlen(ptr));
+FXival wcs2utf(const FXwchar *src){
+  FXival p=0;
+  FXwchar w;
+  while((w=*src++)!=0){
+    p+=wc2utf(w);
+    }
+  return p;
   }
 
 
 // Return number of bytes for utf8 representation of narrow character string
-FXint ncs2utf(const FXnchar *ptr,FXint len){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<len){
-    w=ptrq++;
-    if(__likely(w<0x80)){ p+=1; continue; }
-    if(__likely(w<0x800)){ p+=2; continue; }
-    if(__likely(!FXISSEQUTF16(w))){ p+=3; continue; }
-    if(__likely(FXISLEADUTF16(w) && q<len && FXISFOLLOWUTF16(ptrq++))){ p+=4; continue; }
-    break;
+FXival ncs2utf(const FXnchar *src,FXival srclen){
+  const FXnchar* srcend=src+srclen;
+  FXival p=0;
+  FXnchar w;
+  while(src<srcend && (w=*src++)!=0){
+    if(FXISLEADUTF16(w)){
+      if(__unlikely(src>=srcend)) break;
+      if(__unlikely(!FXISFOLLOWUTF16(*src))) break;
+      w=SURROGATE_OFFSET+(w<<10)+*src++;
+      }
+    p+=wc2utf(w);
     }
   return p;
   }
 
 
 // Return number of bytes for utf8 representation of narrow character string
-FXint ncs2utf(const FXnchar *ptr){
-  return ncs2utf(ptr,strlen(ptr));
+FXival ncs2utf(const FXnchar *src){
+  FXival p=0;
+  FXnchar w;
+  while((w=*src++)!=0){
+    if(FXISLEADUTF16(w)){
+      if(__unlikely(!FXISFOLLOWUTF16(*src))) break;
+      w=SURROGATE_OFFSET+(w<<10)+*src++;
+      }
+    p+=wc2utf(w);
+    }
+  return p;
   }
 
 
 // Return number of wide characters for utf8 character string
-FXint utf2wcs(const FXchar *ptr,FXint len){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<len){
-    w=(FXuchar)ptrq++;
-    if(__unlikely(0x80<=w)){
-      if(__unlikely(w<0xC0)) break;
-      if(__unlikely(q>=len)) break;
-      if(__unlikely(!FXISFOLLOWUTF8(ptrq))) break;
-      w=(w<<6)^(FXuchar)ptrq++^0x3080;
-      if(__unlikely(0x800<=w)){
-        if(__unlikely(q>=len)) break;
-        if(__unlikely(!FXISFOLLOWUTF8(ptrq))) break;
-        w=(w<<6)^(FXuchar)ptrq++^0x20080;
-        if(__unlikely(0x10000<=w)){
-          if(__unlikely(q>=len)) break;
-          if(__unlikely(!FXISFOLLOWUTF8(ptrq))) break;
-          w=(w<<6)^(FXuchar)ptrq++^0x400080;
-          if(__unlikely(0x110000<=w)) break;
+FXival utf2wcs(const FXchar *src,FXival srclen){
+  const FXchar* srcend=src+srclen;
+  FXival p=0;
+  FXuchar c;
+  while(src<srcend && (c=src0)!=0){
+    if(0xC0<=c){
+      if(__unlikely(src+1>=srcend)) break;
+      if(__unlikely(!FXISFOLLOWUTF8(src1))) break;
+      if(0xE0<=c){
+        if(__unlikely(src+2>=srcend)) break;
+        if(__unlikely(!FXISFOLLOWUTF8(src2))) break;
+        if(0xF0<=c){
+          if(__unlikely(src+3>=srcend)) break;
+          if(__unlikely(!FXISFOLLOWUTF8(src3))) break;
+          src++;
           }
+        src++;
         }
+      src++;
       }
+    src++;
     p++;
     }
   return p;
@@ -415,36 +417,52 @@
 
 
 // Return number of wide characters for utf8 character string
-FXint utf2wcs(const FXchar *ptr){
-  return utf2wcs(ptr,strlen(ptr));
+FXival utf2wcs(const FXchar *src){
+  FXival p=0;
+  FXuchar c;
+  while((c=src0)!=0){
+    if(0xC0<=c){
+      if(__unlikely(!FXISFOLLOWUTF8(src1))) break;
+      if(0xE0<=c){
+        if(__unlikely(!FXISFOLLOWUTF8(src2))) break;
+        if(0xF0<=c){
+          if(__unlikely(!FXISFOLLOWUTF8(src3))) break;
+          src++;
+          }
+        src++;
+        }
+      src++;
+      }
+    src++;
+    p++;
+    }
+  return p;
   }
 
 
 // Return number of narrow characters for utf8 character string
-FXint utf2ncs(const FXchar *ptr,FXint len){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<len){
-    w=(FXuchar)ptrq++;
-    if(__unlikely(0x80<=w)){
-      if(__unlikely(w<0xC0)) break;
-      if(__unlikely(q>=len)) break;
-      if(__unlikely(!FXISFOLLOWUTF8(ptrq))) break;
-      w=(w<<6)^(FXuchar)ptrq++^0x3080;
-      if(__unlikely(0x800<=w)){
-        if(__unlikely(q>=len)) break;
-        if(__unlikely(!FXISFOLLOWUTF8(ptrq))) break;
-        w=(w<<6)^(FXuchar)ptrq++^0x20080;
-        if(__unlikely(0x10000<=w)){
-          if(__unlikely(q>=len)) break;
-          if(__unlikely(!FXISFOLLOWUTF8(ptrq))) break;
-          w=(w<<6)^(FXuchar)ptrq++^0x400080;
-          if(__unlikely(0x110000<=w)) break;
+FXival utf2ncs(const FXchar *src,FXival len){
+  const FXchar* end=src+len;
+  FXival p=0;
+  FXuchar c;
+  while(src<end && (c=src0)!=0){
+    if(0xC0<=c){
+      if(__unlikely(src+1>=end)) break;
+      if(__unlikely(!FXISFOLLOWUTF8(src1))) break;
+      if(0xE0<=c){
+        if(__unlikely(src+2>=end)) break;
+        if(__unlikely(!FXISFOLLOWUTF8(src2))) break;
+        if(0xF0<=c){
+        if(__unlikely(src+3>=end)) break;
+          if(__unlikely(!FXISFOLLOWUTF8(src3))) break;
+          src++;
           p++;
           }
+        src++;
         }
+      src++;
       }
+    src++;
     p++;
     }
   return p;
@@ -452,15 +470,32 @@
 
 
 // Return number of narrow characters for utf8 character string
-FXint utf2ncs(const FXchar *ptr){
-  return utf2ncs(ptr,strlen(ptr));
+FXival utf2ncs(const FXchar *src){
+  FXival p=0;
+  FXuchar c;
+  while((c=src0)!=0){
+    if(0xC0<=c){
+      if(__unlikely(!FXISFOLLOWUTF8(src1))) break;
+      if(0xE0<=c){
+        if(__unlikely(!FXISFOLLOWUTF8(src2))) break;
+        if(0xF0<=c){
+          if(__unlikely(!FXISFOLLOWUTF8(src3))) break;
+          src++;
+          p++;
+          }
+        src++;
+        }
+      src++;
+      }
+    src++;
+    p++;
+    }
+  return p;
   }
 
 
-/*******************************************************************************/
-
 // Convert wide character to utf8 string
-FXint wc2utf(FXchar *dst,FXwchar w){
+FXival wc2utf(FXchar *dst,FXwchar w){
   if(__likely(w<0x80)){
     dst0=w;
     return 1;
@@ -485,7 +520,7 @@
 
 
 // Convert wide character to narrow character string
-FXint wc2nc(FXnchar *dst,FXwchar w){
+FXival wc2nc(FXnchar *dst,FXwchar w){
   if(__likely(w<0x10000)){
     dst0=w;
     return 1;
@@ -497,182 +532,322 @@
 
 
 // Convert wide character string to utf8 string
-FXint wcs2utf(FXchar *dst,const FXwchar* src,FXint dlen,FXint slen){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<slen){
-    w=srcq++;
-    if(__likely(w<0x80)){
-      if(__unlikely(p>=dlen)) break;
-      dstp++=w;
+FXival wcs2utf(FXchar *dst,const FXwchar* src,FXival dstlen,FXival srclen){
+  const FXwchar* srcend=src+srclen;
+  FXchar* ptrend=dst+dstlen;
+  FXchar* ptr=dst;
+  FXwchar w;
+  while(src<srcend && (w=*src++)!=0){
+    if(w<0x80){
+      if(__unlikely(ptr>=ptrend)) break;
+      *ptr++=w;
       continue;
       }
-    if(__likely(w<0x800)){
-      if(__unlikely(p+1>=dlen)) break;
-      dstp++=(w>>6)|0xC0;
-      dstp++=(w&0x3F)|0x80;
+    if(w<0x800){
+      if(__unlikely(ptr+1>=ptrend)) break;
+      *ptr++=(w>>6)|0xC0;
+      *ptr++=(w&0x3F)|0x80;
       continue;
       }
-    if(__likely(w<0x10000)){
-      if(__unlikely(p+2>=dlen)) break;
-      dstp++=(w>>12)|0xE0;
-      dstp++=((w>>6)&0x3F)|0x80;
-      dstp++=(w&0x3F)|0x80;
+    if(w<0x10000){
+      if(__unlikely(ptr+2>=ptrend)) break;
+      *ptr++=(w>>12)|0xE0;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
       continue;
       }
-    if(__likely(w<0x110000)){
-      if(__unlikely(p+3>=dlen)) break;
-      dstp++=(w>>18)|0xF0;
-      dstp++=((w>>12)&0x3F)|0x80;
-      dstp++=((w>>6)&0x3F)|0x80;
-      dstp++=(w&0x3F)|0x80;
+    if(w<0x110000){
+      if(__unlikely(ptr+3>=ptrend)) break;
+      *ptr++=(w>>18)|0xF0;
+      *ptr++=((w>>12)&0x3F)|0x80;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
       continue;
       }
     break;
     }
-  return p;
+  if(ptr<ptrend){
+    *ptr='\0';
+    }
+  return ptr-dst;
   }
 
 
 // Convert wide character string to utf8 string
-FXint wcs2utf(FXchar *dst,const FXwchar* src,FXint dlen){
-  return wcs2utf(dst,src,dlen,strlen(src)+1)-1;
+FXival wcs2utf(FXchar *dst,const FXwchar* src,FXival dstlen){
+  FXchar* ptrend=dst+dstlen;
+  FXchar* ptr=dst;
+  FXwchar w;
+  while((w=*src++)!=0){
+    if(w<0x80){
+      if(__unlikely(ptr>=ptrend)) break;
+      *ptr++=w;
+      continue;
+      }
+    if(w<0x800){
+      if(__unlikely(ptr+1>=ptrend)) break;
+      *ptr++=(w>>6)|0xC0;
+      *ptr++=(w&0x3F)|0x80;
+      continue;
+      }
+    if(w<0x10000){
+      if(__unlikely(ptr+2>=ptrend)) break;
+      *ptr++=(w>>12)|0xE0;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
+      continue;
+      }
+    if(w<0x110000){
+      if(__unlikely(ptr+3>=ptrend)) break;
+      *ptr++=(w>>18)|0xF0;
+      *ptr++=((w>>12)&0x3F)|0x80;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
+      continue;
+      }
+    break;
+    }
+  if(ptr<ptrend){
+    *ptr='\0';
+    }
+  return ptr-dst;
   }
 
 
 // Convert narrow character string to utf8 string
-FXint ncs2utf(FXchar *dst,const FXnchar* src,FXint dlen,FXint slen){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<slen){
-    w=srcq++;
-    if(__likely(w<0x80)){
-      if(__unlikely(p>=dlen)) break;
-      dstp++=w;
+FXival ncs2utf(FXchar *dst,const FXnchar* src,FXival dstlen,FXival srclen){
+  const FXnchar* srcend=src+srclen;
+  FXchar* ptrend=dst+dstlen;
+  FXchar* ptr=dst;
+  FXwchar w;
+  while(src<srcend && (w=*src++)!=0){
+    if(w<0x80){
+      if(__unlikely(ptr>=ptrend)) break;
+      *ptr++=w;
       continue;
       }
-    if(__likely(w<0x800)){
-      if(__unlikely(p+1>=dlen)) break;
-      dstp++=(w>>6)|0xC0;
-      dstp++=(w&0x3F)|0x80;
+    if(w<0x800){
+      if(__unlikely(ptr+1>=ptrend)) break;
+      *ptr++=(w>>6)|0xC0;
+      *ptr++=(w&0x3F)|0x80;
       continue;
       }
-    if(__likely(!FXISSEQUTF16(w))){
-      if(__unlikely(p+2>=dlen)) break;
-      dstp++=(w>>12)|0xE0;
-      dstp++=((w>>6)&0x3F)|0x80;
-      dstp++=(w&0x3F)|0x80;
+    if(!FXISLEADUTF16(w)){
+      if(__unlikely(ptr+2>=ptrend)) break;
+      *ptr++=(w>>12)|0xE0;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
       continue;
       }
-    if(__likely(FXISLEADUTF16(w) && q<slen && FXISFOLLOWUTF16(srcq))){
-      if(__unlikely(p+3>=dlen)) break;
-      w=SURROGATE_OFFSET+(w<<10)+srcq++;
-      dstp++=(w>>18)|0xF0;
-      dstp++=((w>>12)&0x3F)|0x80;
-      dstp++=((w>>6)&0x3F)|0x80;
-      dstp++=(w&0x3F)|0x80;
+    if(src<srcend && FXISFOLLOWUTF16(*src)){
+      if(__unlikely(ptr+3>=ptrend)) break;
+      w=SURROGATE_OFFSET+(w<<10)+*src++;
+      *ptr++=(w>>18)|0xF0;
+      *ptr++=((w>>12)&0x3F)|0x80;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
       continue;
       }
     break;
     }
-  return p;
+  if(ptr<ptrend){
+    *ptr='\0';
+    }
+  return ptr-dst;
   }
 
 
 // Convert narrow character string to utf8 string
-FXint ncs2utf(FXchar *dst,const FXnchar* src,FXint dlen){
-  return ncs2utf(dst,src,dlen,strlen(src)+1)-1;
+FXival ncs2utf(FXchar *dst,const FXnchar* src,FXival dstlen){
+  FXchar* ptrend=dst+dstlen;
+  FXchar* ptr=dst;
+  FXwchar w;
+  while((w=*src++)!=0){
+    if(w<0x80){
+      if(__unlikely(ptr>=ptrend)) break;
+      *ptr++=w;
+      continue;
+      }
+    if(w<0x800){
+      if(__unlikely(ptr+1>=ptrend)) break;
+      *ptr++=(w>>6)|0xC0;
+      *ptr++=(w&0x3F)|0x80;
+      continue;
+      }
+    if(!FXISSEQUTF16(w)){
+      if(__unlikely(ptr+2>=ptrend)) break;
+      *ptr++=(w>>12)|0xE0;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
+      continue;
+      }
+    if(FXISFOLLOWUTF16(*src)){
+      if(__unlikely(ptr+3>=ptrend)) break;
+      w=SURROGATE_OFFSET+(w<<10)+*src++;
+      *ptr++=(w>>18)|0xF0;
+      *ptr++=((w>>12)&0x3F)|0x80;
+      *ptr++=((w>>6)&0x3F)|0x80;
+      *ptr++=(w&0x3F)|0x80;
+      continue;
+      }
+    break;
+    }
+  if(ptr<ptrend){
+    *ptr='\0';
+    }
+  return ptr-dst;
   }
 
 
 // Convert utf8 string to wide character string
-FXint utf2wcs(FXwchar *dst,const FXchar* src,FXint dlen,FXint slen){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<slen){
-    w=(FXuchar)srcq++;
-    if(__unlikely(0x80<=w)){
-      if(__unlikely(w<0xC0)) break;
-      if(__unlikely(q>=slen)) break;
-      if(__unlikely(!FXISFOLLOWUTF8(srcq))) break;
-      w=(w<<6)^(FXuchar)srcq++^0x3080;
-      if(__unlikely(0x800<=w)){
-        if(__unlikely(q>=slen)) break;
-        if(__unlikely(!FXISFOLLOWUTF8(srcq))) break;
-        w=(w<<6)^(FXuchar)srcq++^0x20080;
-        if(__unlikely(0x10000<=w)){
-          if(__unlikely(q>=slen)) break;
-          if(__unlikely(!FXISFOLLOWUTF8(srcq))) break;
-          w=(w<<6)^(FXuchar)srcq++^0x400080;
-          if(__unlikely(0x110000<=w)) break;
+FXival utf2wcs(FXwchar *dst,const FXchar* src,FXival dstlen,FXival srclen){
+  const FXchar* srcend=src+srclen;
+  FXwchar* ptrend=dst+dstlen;
+  FXwchar* ptr=dst;
+  FXwchar w;
+  FXuchar c;
+  while(src<srcend && (w=c=*src++)!=0){
+    if(0xC0<=w){
+      if(__unlikely(src>=srcend)) break;
+      c=*src++;
+      if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+      w=(w<<6) ^ c ^ 0x3080;
+      if(0x800<=w){
+        if(__unlikely(src>=srcend)) break;
+        c=*src++;
+        if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+        w=(w<<6) ^ c ^ 0x20080;
+        if(0x10000<=w){
+          if(__unlikely(src>=srcend)) break;
+          c=*src++;
+          if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+          w=(w<<6) ^ c ^ 0x400080;
           }
         }
       }
-    if(__unlikely(p>=dlen)) break;
-    dstp++=w;
+    if(__unlikely(ptr>=ptrend)) break;
+    *ptr++=w;
     }
-  return p;
+  if(ptr<ptrend){
+    *ptr=0;
+    }
+  return ptr-dst;
   }
 
-// FIXME utf2utf() may be useful:- safe copy from utf8 to utf8 with
-// FIXME checks for propriety
 
 // Convert utf8 string to wide character string
-FXint utf2wcs(FXwchar *dst,const FXchar* src,FXint dlen){
-  return utf2wcs(dst,src,dlen,strlen(src)+1)-1;
+FXival utf2wcs(FXwchar *dst,const FXchar* src,FXival dstlen){
+  FXwchar* ptrend=dst+dstlen;
+  FXwchar* ptr=dst;
+  FXwchar w;
+  FXuchar c;
+  while((w=c=*src++)!=0){
+    if(0xC0<=c){
+      c=*src++;
+      if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+      w=(w<<6) ^ c ^ 0x3080;
+      if(0x800<=w){
+        c=*src++;
+        if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+        w=(w<<6) ^ c ^ 0x20080;
+        if(0x10000<=w){
+          c=*src++;
+          if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+          w=(w<<6) ^ c ^ 0x400080;
+          }
+        }
+      }
+    if(__unlikely(ptr>=ptrend)) break;
+    *ptr++=w;
+    }
+  if(ptr<ptrend){
+    *ptr=0;
+    }
+  return ptr-dst;
   }
 
 
 // Convert utf8 string to narrow character string
-FXint utf2ncs(FXnchar *dst,const FXchar* src,FXint dlen,FXint slen){
-  register FXint p=0;
-  register FXint q=0;
-  register FXwchar w;
-  while(q<slen){
-    w=(FXuchar)srcq++;
-    if(__unlikely(0x80<=w)){
-      if(__unlikely(w<0xC0)) break;
-      if(__unlikely(q>=slen)) break;
-      if(__unlikely(!FXISFOLLOWUTF8(srcq))) break;
-      w=(w<<6)^(FXuchar)srcq++^0x3080;
-      if(__unlikely(0x800<=w)){
-        if(__unlikely(q>=slen)) break;
-        if(__unlikely(!FXISFOLLOWUTF8(srcq))) break;
-        w=(w<<6)^(FXuchar)srcq++^0x20080;
-        if(__unlikely(0x10000<=w)){
-          if(__unlikely(q>=slen)) break;
-          if(__unlikely(!FXISFOLLOWUTF8(srcq))) break;
-          w=(w<<6)^(FXuchar)srcq++^0x400080;
-          if(__unlikely(0x110000<=w)) break;
-          if(__unlikely(p+1>=dlen)) break;
-          dstp++=LEAD_OFFSET+(w>>10);
-          dstp++=TAIL_OFFSET+(w&0x3FF);
+FXival utf2ncs(FXnchar *dst,const FXchar* src,FXival dstlen,FXival srclen){
+  const FXchar* srcend=src+srclen;
+  FXnchar* ptrend=dst+dstlen;
+  FXnchar* ptr=dst;
+  FXwchar w;
+  FXuchar c;
+  while(src<srcend && (w=c=*src++)!=0){
+    if(0xC0<=w){
+      if(__unlikely(src>=srcend)) break;
+      c=*src++;
+      if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+      w=(w<<6) ^ c ^ 0x3080;
+      if(0x800<=w){
+        if(__unlikely(src>=srcend)) break;
+        c=*src++;
+        if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+        w=(w<<6) ^ c ^ 0x20080;
+        if(0x10000<=w){
+          if(__unlikely(src>=srcend)) break;
+          c=*src++;
+          if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+          w=(w<<6) ^ c ^ 0x400080;
+          if(__unlikely(ptr+1>=ptrend)) break;
+          *ptr++=LEAD_OFFSET+(w>>10);
+          *ptr++=TAIL_OFFSET+(w&0x3FF);
           continue;
           }
         }
       }
-    if(__unlikely(p>=dlen)) break;
-    dstp++=w;
+    if(__unlikely(ptr>=ptrend)) break;
+    *ptr++=w;
     }
-  return p;
+  if(ptr<ptrend){
+    *ptr=0;
+    }
+  return ptr-dst;
   }
 
 
 // Convert utf8 string to narrow character string
-FXint utf2ncs(FXnchar *dst,const FXchar* src,FXint dlen){
-  return utf2ncs(dst,src,dlen,strlen(src)+1)-1;
+FXival utf2ncs(FXnchar *dst,const FXchar* src,FXival dstlen){
+  FXnchar* ptrend=dst+dstlen;
+  FXnchar* ptr=dst;
+  FXwchar w;
+  FXuchar c;
+  while((w=c=*src++)!=0){
+    if(0xC0<=w){
+      c=*src++;
+      if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+      w=(w<<6) ^ c ^ 0x3080;
+      if(0x800<=w){
+        c=*src++;
+        if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+        w=(w<<6) ^ c ^ 0x20080;
+        if(0x10000<=w){
+          c=*src++;
+          if(__unlikely(!FXISFOLLOWUTF8(c))) break;
+          w=(w<<6) ^ c ^ 0x400080;
+          if(__unlikely(ptr+1>=ptrend)) break;
+          *ptr++=LEAD_OFFSET+(w>>10);
+          *ptr++=TAIL_OFFSET+(w&0x3FF);
+          continue;
+          }
+        }
+      }
+    if(__unlikely(ptr>=ptrend)) break;
+    *ptr++=w;
+    }
+  if(ptr<ptrend){
+    *ptr=0;
+    }
+  return ptr-dst;
   }
 
-
 /*******************************************************************************/
 
 // Change the length of the string to len
 void FXString::length(FXint len){
   if(__likely(len!=length())){
-    register FXchar *ptr;
+    FXchar *ptr;
     if(0<len){
       if(str==EMPTY){
         ptr=(FXchar*)::malloc(ROUNDUP(1+len)+sizeof(FXint));
@@ -695,14 +870,14 @@
   }
 
 
-// Simple construct
+// Initialize to empty
 FXString::FXString():str(EMPTY){
   }
 
 
 // Construct copy of another string
 FXString::FXString(const FXString& s):str(EMPTY){
-  register FXint n=s.length();
+  FXint n=s.length();
   if(0<n){
     length(n);
     memcpy(str,s.str,n);
@@ -710,9 +885,9 @@
   }
 
 
-// Construct and init
+// Construct and initialize with string s
 FXString::FXString(const FXchar* s):str(EMPTY){
-  register FXint m;
+  FXint m;
   if(__likely(s && 0<(m=strlen(s)))){
     length(m);
     memcpy(str,s,m);
@@ -720,9 +895,9 @@
   }
 
 
-// Construct and init
+// Construct and init from narrow character string
 FXString::FXString(const FXnchar* s):str(EMPTY){
-  register FXint m;
+  FXint m;
   if(__likely(s && 0<(m=ncs2utf(s)))){
     length(m);
     ncs2utf(str,s,m);
@@ -730,9 +905,9 @@
   }
 
 
-// Construct and init
+// Construct and init from wide character string
 FXString::FXString(const FXwchar* s):str(EMPTY){
-  register FXint m;
+  FXint m;
   if(__likely(s && 0<(m=wcs2utf(s)))){
     length(m);
     wcs2utf(str,s,m);
@@ -751,7 +926,7 @@
 
 // Construct and init with narrow character substring
 FXString::FXString(const FXnchar* s,FXint n):str(EMPTY){
-  register FXint m;
+  FXint m;
   if(__likely(s && 0<(m=ncs2utf(s,n)))){
     length(m);
     ncs2utf(str,s,m,n);
@@ -761,7 +936,7 @@
 
 // Construct and init with wide character substring
 FXString::FXString(const FXwchar* s,FXint n):str(EMPTY){
-  register FXint m;
+  FXint m;
   if(__likely(s && 0<(m=wcs2utf(s,n)))){
     length(m);
     wcs2utf(str,s,m,n);
@@ -786,7 +961,7 @@
 
 // Return wide character starting at offset i
 FXwchar FXString::wc(FXint p) const {
-  register FXwchar w=(FXuchar)strp;
+  FXwchar w=(FXuchar)strp;
   if(__unlikely(0xC0<=w)){ w=(w<<6)^(FXuchar)strp+1^0x3080;
   if(__unlikely(0x800<=w)){ w=(w<<6)^(FXuchar)strp+2^0x20080;
   if(__unlikely(0x10000<=w)){ w=(w<<6)^(FXuchar)strp+3^0x400080; }}}
@@ -822,9 +997,9 @@
 
 // Count number of utf8 characters in subrange start...end
 FXint FXString::count(FXint start,FXint end) const {
-  register FXint cnt=0;
+  FXint cnt=0;
   while(start<end){
-    start+=utfBytes(FXuchar)strstart;
+    start+=FXUTF8LEN(strstart);
     cnt++;
     }
   return cnt;
@@ -839,11 +1014,11 @@
 
 // Return byte offset of utf8 character at index
 FXint FXString::offset(FXint indx) const {
-  register FXint len=length();
-  register FXint i=0;
-  register FXint p=0;
+  FXint len=length();
+  FXint i=0;
+  FXint p=0;
   while(i<indx && p<len){
-    p+=utfBytes(FXuchar)strp;
+    p+=FXUTF8LEN(strp);
     i++;
     }
   return p;
@@ -852,11 +1027,11 @@
 
 // Return index of utf8 character at byte offset
 FXint FXString::index(FXint offs) const {
-  register FXint len=length();
-  register FXint i=0;
-  register FXint p=0;
+   FXint len=length();
+   FXint i=0;
+   FXint p=0;
   while(p<offs && p<len){
-    p+=utfBytes(FXuchar)strp;
+    p+=FXUTF8LEN(strp);
     i++;
     }
   return i;
@@ -950,11 +1125,12 @@
   }
 
 
-// Assign first n characters of input string to this string
-FXString& FXString::assign(const FXchar* s,FXint n){
-  if(__likely(s && 0<n)){
-    length(n);
-    memmove(str,s,n);
+// Assign input string to this string
+FXString& FXString::assign(const FXchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=strlen(s)))){
+    length(m);
+    memmove(str,s,m);
     }
   else{
     length(0);
@@ -963,12 +1139,12 @@
   }
 
 
-// Assign first n characters of narrow character string s to this string
-FXString& FXString::assign(const FXnchar* s,FXint n){
-  register FXint m;
-  if(__likely(s && 0<(m=ncs2utf(s,n)))){
+// Assign narrow character string s to this string
+FXString& FXString::assign(const FXnchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=ncs2utf(s)))){
     length(m);
-    ncs2utf(str,s,m,n);
+    ncs2utf(str,s,m);
     }
   else{
     length(0);
@@ -977,12 +1153,12 @@
   }
 
 
-// Assign first n characters of wide character string s to this string
-FXString& FXString::assign(const FXwchar* s,FXint n){
-  register FXint m;
-  if(__likely(s && 0<(m=wcs2utf(s,n)))){
+// Assign wide character string s to this string
+FXString& FXString::assign(const FXwchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=wcs2utf(s)))){
     length(m);
-    wcs2utf(str,s,m,n);
+    wcs2utf(str,s,m);
     }
   else{
     length(0);
@@ -991,12 +1167,11 @@
   }
 
 
-// Assign input string to this string
-FXString& FXString::assign(const FXchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=strlen(s)))){
-    length(m);
-    memmove(str,s,m);
+// Assign first n characters of input string to this string
+FXString& FXString::assign(const FXchar* s,FXint n){
+  if(__likely(s && 0<n)){
+    length(n);
+    memmove(str,s,n);
     }
   else{
     length(0);
@@ -1005,12 +1180,12 @@
   }
 
 
-// Assign narrow character string s to this string
-FXString& FXString::assign(const FXnchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=ncs2utf(s)))){
+// Assign first n characters of narrow character string s to this string
+FXString& FXString::assign(const FXnchar* s,FXint n){
+  FXint m;
+  if(__likely(s && 0<(m=ncs2utf(s,n)))){
     length(m);
-    ncs2utf(str,s,m);
+    ncs2utf(str,s,m,n);
     }
   else{
     length(0);
@@ -1019,12 +1194,12 @@
   }
 
 
-// Assign wide character string s to this string
-FXString& FXString::assign(const FXwchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=wcs2utf(s)))){
+// Assign first n characters of wide character string s to this string
+FXString& FXString::assign(const FXwchar* s,FXint n){
+  FXint m;
+  if(__likely(s && 0<(m=wcs2utf(s,n)))){
     length(m);
-    wcs2utf(str,s,m);
+    wcs2utf(str,s,m,n);
     }
   else{
     length(0);
@@ -1042,7 +1217,7 @@
 
 // Insert character at position
 FXString& FXString::insert(FXint pos,FXchar c){
-  register FXint len=length();
+  FXint len=length();
   length(len+1);
   if(pos<=0){
     memmove(str+1,str,len);
@@ -1062,7 +1237,7 @@
 // Insert n characters c at specified position
 FXString& FXString::insert(FXint pos,FXchar c,FXint n){
   if(__likely(0<n)){
-    register FXint len=length();
+    FXint len=length();
     length(len+n);
     if(pos<=0){
       memmove(str+n,str,len);
@@ -1080,22 +1255,22 @@
   }
 
 
-
 // Insert string at position
-FXString& FXString::insert(FXint pos,const FXchar* s,FXint n){
-  if(__likely(s && 0<n)){
-    register FXint len=length();
-    length(len+n);
+FXString& FXString::insert(FXint pos,const FXchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=strlen(s)))){
+    FXint len=length();
+    length(len+m);
     if(pos<=0){
-      memmove(str+n,str,len);
-      memcpy(str,s,n);
+      memmove(str+m,str,len);
+      memcpy(str,s,m);
       }
     else if(pos>=len){
-      memcpy(str+len,s,n);
+      memcpy(str+len,s,m);
       }
     else{
-      memmove(str+pos+n,str+pos,len-pos);
-      memcpy(str+pos,s,n);
+      memmove(str+pos+m,str+pos,len-pos);
+      memcpy(str+pos,s,m);
       }
     }
   return *this;
@@ -1103,21 +1278,21 @@
 
 
 // Insert narrow character string at position
-FXString& FXString::insert(FXint pos,const FXnchar* s,FXint n){
-  register FXint m;
-  if(__likely(s && 0<(m=ncs2utf(s,n)))){
-    register FXint len=length();
+FXString& FXString::insert(FXint pos,const FXnchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=ncs2utf(s)))){
+    FXint len=length();
     length(len+m);
     if(pos<=0){
       memmove(str+m,str,len);
-      ncs2utf(str,s,m,n);
+      ncs2utf(str,s,m);
       }
     else if(pos>=len){
-      ncs2utf(str+len,s,m,n);
+      ncs2utf(str+len,s,m);
       }
     else{
       memmove(str+pos+m,str+pos,len-pos);
-      ncs2utf(str+pos,s,m,n);
+      ncs2utf(str+pos,s,m);
       }
     }
   return *this;
@@ -1125,43 +1300,43 @@
 
 
 // Insert wide character string at position
-FXString& FXString::insert(FXint pos,const FXwchar* s,FXint n){
-  register FXint m;
-  if(__likely(s && 0<(m=wcs2utf(s,n)))){
-    register FXint len=length();
+FXString& FXString::insert(FXint pos,const FXwchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=wcs2utf(s)))){
+    FXint len=length();
     length(len+m);
     if(pos<=0){
       memmove(str+m,str,len);
-      wcs2utf(str,s,m,n);
+      wcs2utf(str,s,m);
       }
     else if(pos>=len){
-      wcs2utf(str+len,s,m,n);
+      wcs2utf(str+len,s,m);
       }
     else{
       memmove(str+pos+m,str+pos,len-pos);
-      wcs2utf(str+pos,s,m,n);
+      wcs2utf(str+pos,s,m);
       }
     }
   return *this;
   }
 
 
+
 // Insert string at position
-FXString& FXString::insert(FXint pos,const FXchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=strlen(s)))){
-    register FXint len=length();
-    length(len+m);
+FXString& FXString::insert(FXint pos,const FXchar* s,FXint n){
+  if(__likely(s && 0<n)){
+    FXint len=length();
+    length(len+n);
     if(pos<=0){
-      memmove(str+m,str,len);
-      memcpy(str,s,m);
+      memmove(str+n,str,len);
+      memcpy(str,s,n);
       }
     else if(pos>=len){
-      memcpy(str+len,s,m);
+      memcpy(str+len,s,n);
       }
     else{
-      memmove(str+pos+m,str+pos,len-pos);
-      memcpy(str+pos,s,m);
+      memmove(str+pos+n,str+pos,len-pos);
+      memcpy(str+pos,s,n);
       }
     }
   return *this;
@@ -1169,21 +1344,21 @@
 
 
 // Insert narrow character string at position
-FXString& FXString::insert(FXint pos,const FXnchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=ncs2utf(s)))){
-    register FXint len=length();
+FXString& FXString::insert(FXint pos,const FXnchar* s,FXint n){
+  FXint m;
+  if(__likely(s && 0<(m=ncs2utf(s,n)))){
+    FXint len=length();
     length(len+m);
     if(pos<=0){
       memmove(str+m,str,len);
-      ncs2utf(str,s,m);
+      ncs2utf(str,s,m,n);
       }
     else if(pos>=len){
-      ncs2utf(str+len,s,m);
+      ncs2utf(str+len,s,m,n);
       }
     else{
       memmove(str+pos+m,str+pos,len-pos);
-      ncs2utf(str+pos,s,m);
+      ncs2utf(str+pos,s,m,n);
       }
     }
   return *this;
@@ -1191,21 +1366,21 @@
 
 
 // Insert wide character string at position
-FXString& FXString::insert(FXint pos,const FXwchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=wcs2utf(s)))){
-    register FXint len=length();
+FXString& FXString::insert(FXint pos,const FXwchar* s,FXint n){
+  FXint m;
+  if(__likely(s && 0<(m=wcs2utf(s,n)))){
+    FXint len=length();
     length(len+m);
     if(pos<=0){
       memmove(str+m,str,len);
-      wcs2utf(str,s,m);
+      wcs2utf(str,s,m,n);
       }
     else if(pos>=len){
-      wcs2utf(str+len,s,m);
+      wcs2utf(str+len,s,m,n);
       }
     else{
       memmove(str+pos+m,str+pos,len-pos);
-      wcs2utf(str+pos,s,m);
+      wcs2utf(str+pos,s,m,n);
       }
     }
   return *this;
@@ -1218,205 +1393,205 @@
   }
 
 
-// Append character c to this string
-FXString& FXString::append(FXchar c){
-  register FXint len=length();
+// Prepend character
+FXString& FXString::prepend(FXchar c){
+  FXint len=length();
   length(len+1);
-  strlen=c;
+  memmove(str+1,str,len);
+  str0=c;
   return *this;
   }
 
 
-// Append n characters c to this string
-FXString& FXString::append(FXchar c,FXint n){
+// Prepend string with n characters c
+FXString& FXString::prepend(FXchar c,FXint n){
   if(__likely(0<n)){
-    register FXint len=length();
+    FXint len=length();
     length(len+n);
-    memset(str+len,c,n);
+    memmove(str+n,str,len);
+    memset(str,c,n);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXchar* s,FXint n){
-  if(__likely(s && 0<n)){
-    register FXint len=length();
-    length(len+n);
-    memcpy(str+len,s,n);
+// Prepend string
+FXString& FXString::prepend(const FXchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=strlen(s)))){
+    FXint len=length();
+    length(len+m);
+    memmove(str+m,str,len);
+    memcpy(str,s,m);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXnchar* s,FXint n){
-  register FXint m;
-  if(__likely(s && 0<(m=ncs2utf(s,n)))){
-    register FXint len=length();
+// Prepend narrow character string
+FXString& FXString::prepend(const FXnchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=ncs2utf(s)))){
+    FXint len=length();
     length(len+m);
-    ncs2utf(str+len,s,m,n);
+    memmove(str+m,str,len);
+    ncs2utf(str,s,m);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXwchar* s,FXint n){
-  register FXint m;
-  if(__likely(s && 0<(m=wcs2utf(s,n)))){
-    register FXint len=length();
+// Prepend wide character string
+FXString& FXString::prepend(const FXwchar* s){
+  FXint m;
+  if(__likely(s && 0<(m=wcs2utf(s)))){
+    FXint len=length();
     length(len+m);
-    wcs2utf(str+len,s,m,n);
+    memmove(str+m,str,len);
+    wcs2utf(str,s,m);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=strlen(s)))){
-    register FXint len=length();
-    length(len+m);
-    memcpy(str+len,s,m);
+// Prepend string
+FXString& FXString::prepend(const FXchar* s,FXint n){
+  if(__likely(s && 0<n)){
+    FXint len=length();
+    length(len+n);
+    memmove(str+n,str,len);
+    memcpy(str,s,n);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXnchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=ncs2utf(s)))){
-    register FXint len=length();
+// Prepend narrow character string
+FXString& FXString::prepend(const FXnchar* s,FXint n){
+  FXint m;
+  if(__likely(s && 0<(m=ncs2utf(s,n)))){
+    FXint len=length();
     length(len+m);
-    ncs2utf(str+len,s,m);
+    memmove(str+m,str,len);
+    ncs2utf(str,s,m,n);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXwchar* s){
-  register FXint m;
-  if(__likely(s && 0<(m=wcs2utf(s)))){
-    register FXint len=length();
+// Prepend wide character string
+FXString& FXString::prepend(const FXwchar* s,FXint n){
+  FXint m;
+  if(__likely(s && 0<(m=wcs2utf(s,n)))){
+    FXint len=length();
     length(len+m);
-    wcs2utf(str+len,s,m);
+    memmove(str+m,str,len);
+    wcs2utf(str,s,m,n);
     }
   return *this;
   }
 
 
-// Append string to this string
-FXString& FXString::append(const FXString& s){
-  return append(s.str,s.length());
+// Prepend string
+FXString& FXString::prepend(const FXString& s){
+  return prepend(s.str,s.length());
   }
 
 
-// Prepend character
-FXString& FXString::prepend(FXchar c){
-  register FXint len=length();
+// Append character c to this string
+FXString& FXString::append(FXchar c){
+  FXint len=length();
   length(len+1);
-  memmove(str+1,str,len);
-  str0=c;
+  strlen=c;
   return *this;
   }
 
 
-// Prepend string with n characters c
-FXString& FXString::prepend(FXchar c,FXint n){
+// Append n characters c to this string
+FXString& FXString::append(FXchar c,FXint n){
   if(__likely(0<n)){
-    register FXint len=length();
+    FXint len=length();
     length(len+n);
-    memmove(str+n,str,len);
-    memset(str,c,n);
+    memset(str+len,c,n);
     }
   return *this;
   }
 
 
-// Prepend string
-FXString& FXString::prepend(const FXchar* s,FXint n){
+// Append string to this string
+FXString& FXString::append(const FXchar* s,FXint n){
   if(__likely(s && 0<n)){
-    register FXint len=length();
+    FXint len=length();
     length(len+n);
-    memmove(str+n,str,len);
-    memcpy(str,s,n);
+    memcpy(str+len,s,n);
     }
   return *this;
   }
 
 
-// Prepend narrow character string
-FXString& FXString::prepend(const FXnchar* s,FXint n){
-  register FXint m;
+// Append string to this string
+FXString& FXString::append(const FXnchar* s,FXint n){
+  FXint m;
   if(__likely(s && 0<(m=ncs2utf(s,n)))){
-    register FXint len=length();
+    FXint len=length();
     length(len+m);
-    memmove(str+m,str,len);
-    ncs2utf(str,s,m,n);
+    ncs2utf(str+len,s,m,n);
     }
   return *this;
   }
 
 
-// Prepend wide character string
-FXString& FXString::prepend(const FXwchar* s,FXint n){
-  register FXint m;
+// Append string to this string
+FXString& FXString::append(const FXwchar* s,FXint n){
+  FXint m;
   if(__likely(s && 0<(m=wcs2utf(s,n)))){
-    register FXint len=length();
+    FXint len=length();
     length(len+m);
-    memmove(str+m,str,len);
-    wcs2utf(str,s,m,n);
+    wcs2utf(str+len,s,m,n);
     }
   return *this;
   }
 
 
-// Prepend string
-FXString& FXString::prepend(const FXchar* s){
-  register FXint m;
+// Append string to this string
+FXString& FXString::append(const FXchar* s){
+  FXint m;
   if(__likely(s && 0<(m=strlen(s)))){
-    register FXint len=length();
+    FXint len=length();
     length(len+m);
-    memmove(str+m,str,len);
-    memcpy(str,s,m);
+    memcpy(str+len,s,m);
     }
   return *this;
   }
 
 
-// Prepend narrow character string
-FXString& FXString::prepend(const FXnchar* s){
-  register FXint m;
+// Append string to this string
+FXString& FXString::append(const FXnchar* s){
+  FXint m;
   if(__likely(s && 0<(m=ncs2utf(s)))){
-    register FXint len=length();
+    FXint len=length();
     length(len+m);
-    memmove(str+m,str,len);
-    ncs2utf(str,s,m);
+    ncs2utf(str+len,s,m);
     }
   return *this;
   }
 
 
-// Prepend wide character string
-FXString& FXString::prepend(const FXwchar* s){
-  register FXint m;
+// Append string to this string
+FXString& FXString::append(const FXwchar* s){
+  FXint m;
   if(__likely(s && 0<(m=wcs2utf(s)))){
-    register FXint len=length();
+    FXint len=length();
     length(len+m);
-    memmove(str+m,str,len);
-    wcs2utf(str,s,m);
+    wcs2utf(str+len,s,m);
     }
   return *this;
   }
 
 
-// Prepend string
-FXString& FXString::prepend(const FXString& s){
-  return prepend(s.str,s.length());
+// Append string to this string
+FXString& FXString::append(const FXString& s){
+  return append(s.str,s.length());
   }
 
 
@@ -1429,7 +1604,7 @@
 
 // Replace the r characters at pos with n characters c
 FXString& FXString::replace(FXint pos,FXint r,FXchar c,FXint n){
-  register FXint len=length();
+  FXint len=length();
   if(r<n){
     length(len+n-r);
     memmove(str+pos+n,str+pos+r,len-pos-r);
@@ -1443,9 +1618,27 @@
   }
 
 
+// Replace the r characters at pos with string s
+FXString& FXString::replace(FXint pos,FXint r,const FXchar* s){
+  return replace(pos,r,s,strlen(s));
+  }
+
+
+// Replace the r characters at pos with narrow character string s
+FXString& FXString::replace(FXint pos,FXint r,const FXnchar* s){
+  return replace(pos,r,s,strlen(s));
+  }
+
+
+// Replace the r characters at pos with wide character string s
+FXString& FXString::replace(FXint pos,FXint r,const FXwchar* s){
+  return replace(pos,r,s,strlen(s));
+  }
+
+
 // Replaces the r characters at pos with first n characters of string s
 FXString& FXString::replace(FXint pos,FXint r,const FXchar* s,FXint n){
-  register FXint len=length();
+  FXint len=length();
   if(r<n){
     length(len+n-r);
     memmove(str+pos+n,str+pos+r,len-pos-r);
@@ -1461,8 +1654,8 @@
 
 // Replaces the r characters at pos with first n characters of narrow character string s
 FXString& FXString::replace(FXint pos,FXint r,const FXnchar* s,FXint n){
-  register FXint m=ncs2utf(s,n);
-  register FXint len=length();
+  FXint m=ncs2utf(s,n);
+  FXint len=length();
   if(r<m){
     length(len+m-r);
     memmove(str+pos+m,str+pos+r,len-pos-r);
@@ -1478,8 +1671,8 @@
 
 // Replaces the r characters at pos with first n characters of wide character string s
 FXString& FXString::replace(FXint pos,FXint r,const FXwchar* s,FXint n){
-  register FXint m=wcs2utf(s,n);
-  register FXint len=length();
+  FXint m=wcs2utf(s,n);
+  FXint len=length();
   if(r<m){
     length(len+m-r);
     memmove(str+pos+m,str+pos+r,len-pos-r);
@@ -1493,24 +1686,6 @@
   }
 
 
-// Replace the r characters at pos with string s
-FXString& FXString::replace(FXint pos,FXint r,const FXchar* s){
-  return replace(pos,r,s,strlen(s));
-  }
-
-
-// Replace the r characters at pos with narrow character string s
-FXString& FXString::replace(FXint pos,FXint r,const FXnchar* s){
-  return replace(pos,r,s,strlen(s));
-  }
-
-
-// Replace the r characters at pos with wide character string s
-FXString& FXString::replace(FXint pos,FXint r,const FXwchar* s){
-  return replace(pos,r,s,strlen(s));
-  }
-
-
 // Replace part of string
 FXString& FXString::replace(FXint pos,FXint r,const FXString& s){
   return replace(pos,r,s.str,s.length());
@@ -1519,8 +1694,8 @@
 
 // Move range of m characters from src position to dst position
 FXString& FXString::move(FXint dst,FXint src,FXint n){
-  register FXint len=length();
-  if(0<n && 0<=src && src+n<=len){
+  FXint len=length();
+  if(__likely(0<n && 0<=src && src+n<=len)){
     if(dst<0){                                  // Move below begin
       if(dst<-n) dst=-n;
       length(len-dst);
@@ -1542,7 +1717,7 @@
 
 // Remove one character
 FXString& FXString::erase(FXint pos){
-  register FXint len=length();
+  FXint len=length();
   if(__likely(0<=pos && pos<len)){
     memmove(str+pos,str+pos+1,len-pos-1);
     length(len-1);
@@ -1553,14 +1728,12 @@
 
 // Remove section from buffer
 FXString& FXString::erase(FXint pos,FXint n){
-  if(0<n){
-    register FXint len=length();
-    if(pos<len && pos+n>0){
-      if(pos<0){n+=pos;pos=0;}
-      if(pos+n>len){n=len-pos;}
-      memmove(str+pos,str+pos+n,len-pos-n);
-      length(len-n);
-      }
+  FXint len=length();
+  if(__likely(0<n && 0<pos+n && pos<len)){
+    if(pos<0){n+=pos;pos=0;}
+    if(len<pos+n){n=len-pos;}
+    memmove(str+pos,str+pos+n,len-pos-n);
+    length(len-n);
     }
   return *this;
   }
@@ -1582,10 +1755,10 @@
 
 // Return number of occurrences of ch in string
 FXint FXString::contains(FXchar ch) const {
-  register FXint len=length();
-  register FXint c=ch;
-  register FXint m=0;
-  register FXint i=0;
+  FXint len=length();
+  FXint c=ch;
+  FXint m=0;
+  FXint i=0;
   while(i<len){
     if(stri==c){
       m++;
@@ -1598,9 +1771,9 @@
 
 // Return number of occurrences of string sub in string
 FXint FXString::contains(const FXchar* sub,FXint n) const {
-  register FXint len=length()-n;
-  register FXint m=0;
-  register FXint i=0;
+  FXint len=length()-n;
+  FXint m=0;
+  FXint i=0;
   while(i<=len){
     if(compare(str+i,sub,n)==0){
       m++;
@@ -1625,10 +1798,10 @@
 
 // Substitute one character by another
 FXString& FXString::substitute(FXchar org,FXchar sub,FXbool all){
-  register FXint len=length();
-  register FXint c=org;
-  register FXint s=sub;
-  register FXint i=0;
+  FXint len=length();
+  FXint c=org;
+  FXint s=sub;
+  FXint i=0;
   while(i<len){
     if(stri==c){
       stri=s;
@@ -1643,7 +1816,7 @@
 // Substitute one string by another
 FXString& FXString::substitute(const FXchar* org,FXint olen,const FXchar* rep,FXint rlen,FXbool all){
   if(0<olen){
-    register FXint pos=0;
+    FXint pos=0;
     while(pos<=length()-olen){
       if(compare(str+pos,org,olen)==0){
         replace(pos,olen,rep,rlen);
@@ -1672,7 +1845,7 @@
 
 // Convert to lower case
 FXString& FXString::lower(){
-  register FXint p,ow,nw;
+  FXint p,ow,nw;
   FXwchar w;
   for(p=0; p<length(); p+=nw){
     w=wc(p);
@@ -1687,7 +1860,7 @@
 
 // Convert to upper case
 FXString& FXString::upper(){
-  register FXint p,ow,nw;
+  FXint p,ow,nw;
   FXwchar w;
   for(p=0; p<length(); p+=nw){
     w=wc(p);
@@ -1703,9 +1876,9 @@
 // Simplify whitespace in string
 FXString& FXString::simplify(){
   if(str!=EMPTY){
-    register FXint s=0;
-    register FXint d=0;
-    register FXint e=length();
+    FXint s=0;
+    FXint d=0;
+    FXint e=length();
     while(s<e && Ascii::isSpace(strs)) s++;
     while(1){
       while(s<e && !Ascii::isSpace(strs)) strd++=strs++;
@@ -1722,8 +1895,8 @@
 // Remove leading and trailing whitespace
 FXString& FXString::trim(){
   if(str!=EMPTY){
-    register FXint s=0;
-    register FXint e=length();
+    FXint s=0;
+    FXint e=length();
     while(0<e && Ascii::isSpace(stre-1)) e--;
     while(s<e && Ascii::isSpace(strs)) s++;
     memmove(str,&strs,e-s);
@@ -1736,8 +1909,8 @@
 // Remove leading whitespace
 FXString& FXString::trimBegin(){
   if(str!=EMPTY){
-    register FXint s=0;
-    register FXint e=length();
+    FXint s=0;
+    FXint e=length();
     while(s<e && Ascii::isSpace(strs)) s++;
     memmove(str,str+s,e-s);
     length(e-s);
@@ -1749,7 +1922,7 @@
 // Remove trailing whitespace
 FXString& FXString::trimEnd(){
   if(str!=EMPTY){
-    register FXint e=length();
+    FXint e=length();
     while(0<e && Ascii::isSpace(stre-1)) e--;
     length(e);
     }
@@ -1759,7 +1932,7 @@
 
 // Get leftmost part
 FXString FXString::left(FXint n) const {
-  register FXint len=length();
+  FXint len=length();
   if(0<n){
     if(n>len) n=len;
     return FXString(str,n);
@@ -1770,7 +1943,7 @@
 
 // Get rightmost part
 FXString FXString::right(FXint n) const {
-  register FXint len=length();
+  FXint len=length();
   if(0<n){
     if(n>len) n=len;
     return FXString(str+len-n,n);
@@ -1781,10 +1954,10 @@
 
 // Get some part in the middle
 FXString FXString::mid(FXint pos,FXint n) const {
-  register FXint len=length();
-  if(0<n && 0<pos+n && pos<len){
+  FXint len=length();
+  if(__likely(0<n && 0<pos+n && pos<len)){
     if(pos<0){n+=pos;pos=0;}
-    if(n>len-pos){n=len-pos;}
+    if(len-pos<n){n=len-pos;}
     return FXString(str+pos,n);
     }
   return FXString::null;
@@ -1793,7 +1966,7 @@
 
 // Return partition of string separated by delimiter delim
 FXString FXString::section(FXchar delim,FXint start,FXint num) const {
-  register FXint len=length(),s,e;
+  FXint len=length(),s,e;
   s=0;
   if(0<start){
     while(s<len){
@@ -1814,8 +1987,8 @@
 
 // Return partition of string separated by delimiters in delim
 FXString FXString::section(const FXchar* delim,FXint n,FXint start,FXint num) const {
-  register FXint len=length(),s,e,i;
-  register FXchar c;
+  FXint len=length(),s,e,i;
+  FXchar c;
   s=0;
   if(0<start){
     while(s<len){
@@ -1861,8 +2034,8 @@
 
 // Return all characters before the nth occurrence of ch, searching forward
 FXString FXString::before(FXchar c,FXint n) const {
-  register FXint len=length();
-  register FXint p=0;
+  FXint len=length();
+  FXint p=0;
   if(0<n){
     while(p<len){
       if(strp==c && --n==0) break;
@@ -1875,7 +2048,7 @@
 
 // Return all characters before the nth occurrence of ch, searching backward
 FXString FXString::rbefore(FXchar c,FXint n) const {
-  register FXint p=length();
+  FXint p=length();
   if(0<n){
     while(0<p){
       p--;
@@ -1888,8 +2061,8 @@
 
 // Return all characters after the nth occurrence of ch, searching forward
 FXString FXString::after(FXchar c,FXint n) const {
-  register FXint len=length();
-  register FXint p=0;
+  FXint len=length();
+  FXint p=0;
   if(0<n){
     while(p<len){
       p++;
@@ -1902,8 +2075,8 @@
 
 // Return all characters after the nth occurrence of ch, searching backward
 FXString FXString::rafter(FXchar c,FXint n) const {
-  register FXint len=length();
-  register FXint p=len;
+  FXint len=length();
+  FXint p=len;
   if(0<n){
     while(0<p){
       if(strp-1==c && --n==0) break;
@@ -1916,9 +2089,9 @@
 
 // Find n-th occurrence of character, searching forward; return position or -1
 FXint FXString::find(FXchar c,FXint pos,FXint n) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p<0) p=0;
   if(n<=0) return p;
   while(p<len){
@@ -1931,9 +2104,9 @@
 
 // Find n-th occurrence of character, searching backward; return position or -1
 FXint FXString::rfind(FXchar c,FXint pos,FXint n) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p>=len) p=len-1;
   if(n<=0) return p;
   while(0<=p){
@@ -1946,9 +2119,9 @@
 
 // Find a character, searching forward; return position or -1
 FXint FXString::find(FXchar c,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p<0) p=0;
   while(p<len){ if(strp==cc){ return p; } ++p; }
   return -1;
@@ -1957,9 +2130,9 @@
 
 // Find a character, searching backward; return position or -1
 FXint FXString::rfind(FXchar c,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p>=len) p=len-1;
   while(0<=p){ if(strp==cc){ return p; } --p; }
   return -1;
@@ -1968,9 +2141,9 @@
 
 // Find a substring of length n, searching forward; return position or -1
 FXint FXString::find(const FXchar* substr,FXint n,FXint pos) const {
-  register FXint len=length();
+  FXint len=length();
   if(0<=pos && 0<n && n<=len){
-    register FXint c=substr0;
+    FXint c=substr0;
     len=len-n+1;
     while(pos<len){
       if(strpos==c){
@@ -1999,9 +2172,9 @@
 
 // Find a substring of length n, searching backward; return position or -1
 FXint FXString::rfind(const FXchar* substr,FXint n,FXint pos) const {
-  register FXint len=length();
+  FXint len=length();
   if(0<=pos && 0<n && n<=len){
-    register FXint c=substr0;
+    FXint c=substr0;
     len-=n;
     if(pos>len) pos=len;
     while(0<=pos){
@@ -2031,12 +2204,12 @@
 
 // Find first character in the set of size n, starting from pos; return position or -1
 FXint FXString::find_first_of(const FXchar* set,FXint n,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
+  FXint len=length();
+  FXint p=pos;
   if(p<0) p=0;
   while(p<len){
-    register FXint c=strp;
-    register FXint i=n;
+    FXint c=strp;
+    FXint i=n;
     while(--i>=0){ if(seti==c) return p; }
     p++;
     }
@@ -2058,9 +2231,9 @@
 
 // Find first character, starting from pos; return position or -1
 FXint FXString::find_first_of(FXchar c,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p<0) p=0;
   while(p<len){ if(strp==cc){ return p; } p++; }
   return -1;
@@ -2069,12 +2242,12 @@
 
 // Find last character in the set of size n, starting from pos; return position or -1
 FXint FXString::find_last_of(const FXchar* set,FXint n,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
+  FXint len=length();
+  FXint p=pos;
   if(p>=len) p=len-1;
   while(0<=p){
-    register FXint c=strp;
-    register FXint i=n;
+    FXint c=strp;
+    FXint i=n;
     while(--i>=0){ if(seti==c) return p; }
     p--;
     }
@@ -2096,9 +2269,9 @@
 
 // Find last character, starting from pos; return position or -1
 FXint FXString::find_last_of(FXchar c,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p>=len) p=len-1;
   while(0<=p){ if(strp==cc){ return p; } p--; }
   return -1;
@@ -2107,12 +2280,12 @@
 
 // Find first character NOT in the set of size n, starting from pos; return position or -1
 FXint FXString::find_first_not_of(const FXchar* set,FXint n,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
+  FXint len=length();
+  FXint p=pos;
   if(p<0) p=0;
   while(p<len){
-    register FXint c=strp;
-    register FXint i=n;
+    FXint c=strp;
+    FXint i=n;
     while(--i>=0){ if(seti==c) goto x; }
     return p;
 x:  p++;
@@ -2135,9 +2308,9 @@
 
 // Find first character NOT equal to c, starting from pos; return position or -1
 FXint FXString::find_first_not_of(FXchar c,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p<0) p=0;
   while(p<len){ if(strp!=cc){ return p; } p++; }
   return -1;
@@ -2146,12 +2319,12 @@
 
 // Find last character NOT in the set of size n, starting from pos; return position or -1
 FXint FXString::find_last_not_of(const FXchar* set,FXint n,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
+  FXint len=length();
+  FXint p=pos;
   if(p>=len) p=len-1;
   while(0<=p){
-    register FXint c=strp;
-    register FXint i=n;
+    FXint c=strp;
+    FXint i=n;
     while(--i>=0){ if(seti==c) goto x; }
     return p;
 x:  p--;
@@ -2174,9 +2347,9 @@
 
 // Find last character NOT equal to c, starting from pos; return position or -1
 FXint FXString::find_last_not_of(FXchar c,FXint pos) const {
-  register FXint len=length();
-  register FXint p=pos;
-  register FXint cc=c;
+  FXint len=length();
+  FXint p=pos;
+  FXint cc=c;
   if(p>=len) p=len-1;
   while(0<=p){ if(strp!=cc){ return p; } p--; }
   return -1;
@@ -2215,7 +2388,7 @@
     va_copy(ag,args);
     result=__vsnprintf(str,length(),fmt,ag);       // Try to see if existing buffer fits
     va_end(ag);
-    if(length()<result){                           // FOX's own __vsnprintf() truncates at buffer size, does NOT write end of string
+    if(length()<result){                           // FOX's own __vsnprintf() truncates at buffer size
       length(result);
       result=__vsnprintf(str,length(),fmt,args);   // Now try again with exactly the right size
       return result;
@@ -2275,7 +2448,7 @@
 
 // Convert from integer
 FXString& FXString::fromInt(FXint number,FXint base){
-  register FXuint nn=FXABS(number);
+  FXuint nn=FXABS(number);
   FXchar buf34,*p=buf+sizeof(buf);
   if(base<2 || base>16){ fxerror("FXString::fromInt: base out of range.\n"); }
   do{
@@ -2290,7 +2463,7 @@
 
 // Convert from unsigned integer
 FXString& FXString::fromUInt(FXuint number,FXint base){
-  register FXuint nn=number;
+  FXuint nn=number;
   FXchar buf34,*p=buf+sizeof(buf);
   if(base<2 || base>16){ fxerror("FXString::fromUInt: base out of range.\n"); }
   do{
@@ -2304,7 +2477,7 @@
 
 // Convert from long integer
 FXString& FXString::fromLong(FXlong number,FXint base){
-  register FXulong nn=FXABS(number);
+  FXulong nn=FXABS(number);
   FXchar buf66,*p=buf+sizeof(buf);
   if(base<2 || base>16){ fxerror("FXString::fromLong: base out of range.\n"); }
   do{
@@ -2319,7 +2492,7 @@
 
 // Convert from unsigned long integer
 FXString& FXString::fromULong(FXulong number,FXint base){
-  register FXulong nn=number;
+  FXulong nn=number;
   FXchar buf66,*p=buf+sizeof(buf);
   if(base<2 || base>16){ fxerror("FXString::fromULong: base out of range.\n"); }
   do{
@@ -2332,19 +2505,19 @@
 
 
 // Formatting for reals
-static const char conversionformat46={"%.*lf","%.*lE","%.*lG","%.*lf"};
+static const char conversionformat88={"%.*lF","%.*lE","%.*lG","%.*lF","%'.*lF","%'.*lE","%'.*lG","%'.*lF"};
 
 
 // Convert from float
 FXString& FXString::fromFloat(FXfloat number,FXint prec,FXint fmt){
-  format(conversionformatfmt&3,prec,(FXdouble)number);
+  format(conversionformatfmt&7,prec,(FXdouble)number);
   return *this;
   }
 
 
 // Convert from double
 FXString& FXString::fromDouble(FXdouble number,FXint prec,FXint fmt){
-  format(conversionformatfmt&3,prec,number);
+  format(conversionformatfmt&7,prec,number);
   return *this;
   }
 
@@ -2409,15 +2582,16 @@
   return result;
   }
 
+/*******************************************************************************/
 
-// Compute hash value of string
+// Compute FNV1a hash value of string
 FXuint FXString::hash(const FXchar* s){
-  register FXuint result=0;
-  register FXuchar c;
-  while((c=*s++)!=0){
-    result = ((result << 5) + result) ^ c;      // This should be a very good hash function:- just 4 collisions
-    }                                           // on the webster web2 dictionary of 234936 words, and no
-  return result;                                // collisions at all on the standard dict!
+  FXuint result=0x811C9DC5;
+  FXuchar c;
+  while((c=*s++)!='\0'){
+    result=(result^c)*0x01000193;
+    }
+  return result;
   }
 
 
@@ -2450,7 +2624,7 @@
 
 // Compare string and string
 FXint compare(const FXchar* s1,const FXchar* s2){
-  register FXint c1,c2;
+  FXint c1,c2;
   do{
     c1=(FXuchar) *s1++;
     c2=(FXuchar) *s2++;
@@ -2481,8 +2655,8 @@
 // Compare string and string, up to n
 FXint compare(const FXchar* s1,const FXchar* s2,FXint n){
   if(0<n){
-    register const FXchar* e1=s1+n;
-    register FXint c1,c2;
+    const FXchar* e1=s1+n;
+    FXint c1,c2;
     do{
       c1=(FXuchar) *s1++;
       c2=(FXuchar) *s2++;
@@ -2514,7 +2688,7 @@
 
 // Compare string and string case insensitive
 FXint comparecase(const FXchar* s1,const FXchar* s2){
-  register FXint c1,c2;
+  FXint c1,c2;
   do{
     c1=Unicode::toLower(wc(s1));
     c2=Unicode::toLower(wc(s2));
@@ -2548,9 +2722,9 @@
 // Compare string and string case insensitive, up to n
 FXint comparecase(const FXchar* s1,const FXchar* s2,FXint n){
   if(0<n){
-    register const FXchar* e1=s1+n;
-    register const FXchar* e2=s2+n;
-    register FXint c1,c2;
+    const FXchar* e1=s1+n;
+    const FXchar* e2=s2+n;
+    FXint c1,c2;
     do{
       c1=Unicode::toLower(wc(s1));
       c2=Unicode::toLower(wc(s2));
@@ -2620,11 +2794,11 @@
 
 // Compare string and string as versions numbers
 FXint compareversion(const FXchar *s1,const FXchar *s2){
-  register const FXuchar *p1=(const FXuchar*)s1;
-  register const FXuchar *p2=(const FXuchar*)s2;
-  register FXuchar c1,c2;
-  register FXint state;
-  register FXint diff;
+  const FXuchar *p1=(const FXuchar*)s1;
+  const FXuchar *p2=(const FXuchar*)s2;
+  FXuchar c1,c2;
+  FXint state;
+  FXint diff;
 
   c1 = *p1++;
   c2 = *p2++;
@@ -2671,11 +2845,11 @@
 
 // Compare case insensitive with natural interpretation
 FXint compareversioncase(const FXchar* s1,const FXchar* s2){
-  register const FXuchar *p1=(const FXuchar*)s1;
-  register const FXuchar *p2=(const FXuchar*)s2;
-  register FXuchar c1,c2;
-  register FXint state;
-  register FXint diff;
+  const FXuchar *p1=(const FXuchar*)s1;
+  const FXuchar *p2=(const FXuchar*)s2;
+  FXuchar c1,c2;
+  FXint state;
+  FXint diff;
 
   if(p1==p2) return 0;
 
@@ -2865,7 +3039,7 @@
 
 // Convert unix string to dos string
 FXString& unixToDos(FXString& str){
-  register FXint f=0,t=0;
+  FXint f=0,t=0;
   while(f<str.length() && strf){
     if(strf++=='\n') t++;
     t++;
@@ -2880,7 +3054,7 @@
 
 // Convert dos string to unix string
 FXString& dosToUnix(FXString& str){
-  register FXint f=0,t=0,c;
+  FXint f=0,t=0,c;
   while(f<str.length() && strf){
     if((c=strf++)!='\r') strt++=c;
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXStringDictionary.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXStringDictionary.cpp Changed

@@ -3,7 +3,7 @@
 *                  S t r i n g   D i c t i o n a r y    C l a s s               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -91,11 +91,10 @@
   FXASSERT((n-used())>0);       // At least one free slot
   if(elbat.no(n)){
     if(1<elbat.no() && 1<no()){
-      FXuval p,b,h,x;
-      FXival i;
+      FXuval p,b,h,x; FXival i;
       for(i=0; i<no(); ++i){                  // Hash existing entries into new table
-        p=b=h=tablei.hash;
         if(!tablei.key.empty()){
+          p=b=h=tablei.hash;
           while(elbat.tablex=p&(n-1).hash){ // Locate slot
             p=(p<<2)+p+b+1;
             b>>=BSHIFT;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSwitcher.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSwitcher.cpp Changed

@@ -3,7 +3,7 @@
 *                      S w i t c h   P a n e l   C l a s s                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -133,8 +133,8 @@
 
 // Get maximum child width
 FXint FXSwitcher::getDefaultWidth(){
-  register FXWindow* child;
-  register FXint i,w,wmax=0,wcur=0;
+  FXWindow* child;
+  FXint i,w,wmax=0,wcur=0;
   for(i=0,child=getFirst(); child; child=child->getNext(),i++){
     if(i==current) wcur=child->getDefaultWidth();
     if(wmax<(w=child->getDefaultWidth())) wmax=w;
@@ -146,8 +146,8 @@
 
 // Get maximum child height
 FXint FXSwitcher::getDefaultHeight(){
-  register FXWindow* child;
-  register FXint i,h,hmax=0,hcur=0;
+  FXWindow* child;
+  FXint i,h,hmax=0,hcur=0;
   for(i=0,child=getFirst(); child; child=child->getNext(),i++){
     if(i==current) hcur=child->getDefaultHeight();
     if(hmax<(h=child->getDefaultHeight())) hmax=h;
@@ -159,8 +159,8 @@
 
 // Recalculate layout
 void FXSwitcher::layout(){
-  register FXWindow *child;
-  register FXint i,x,y,w,h;
+  FXWindow *child;
+  FXint i,x,y,w,h;
   x=border+padleft;
   y=border+padtop;
   w=width-padright-padleft-(border<<1);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXSystem.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXSystem.cpp Changed

@@ -3,7 +3,7 @@
 *         M i s c e l l a n e o u s   S y s t e m   F u n c t i o n s           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -37,7 +37,19 @@
 
 /*
   Notes:
+
   - A bric-a-brack of various functions we could not place anywhere else.
+
+  - Some ISO 8601 Formats:
+
+     Date:                        2019-09-28
+     Date and time in UTC:        2019-09-28T15:33:50+00:00
+                                  2019-09-28T15:33:50Z
+                                  20190928T153350Z
+     Week:                        2019-W39
+     Date with week number:       2019-W39-6
+     Date without year:           --09-281
+     Ordinal date:                2019-271
 */
 
 
@@ -47,115 +59,10 @@
 
 namespace FX {
 
-
 // Furnish our own version
 extern FXAPI FXint __snprintf(FXchar* string,FXint length,const FXchar* format,...);
 
 
-// Many nanoseconds in a second
-const FXTime seconds=1000000000;
-
-// Default formatting string used for time formatting
-const char FXSystem::defaultTimeFormat="%m/%d/%Y %H:%M:%S";
-
-
-// Convert file time to string
-FXString FXSystem::localTime(FXTime value){
-  return FXSystem::localTime(defaultTimeFormat,value);
-  }
-
-
-// Convert file time to string
-FXString FXSystem::universalTime(FXTime value){
-  return FXSystem::universalTime(defaultTimeFormat,value);
-  }
-
-// FIXME === strptime
-
-// Convert file time to string as per strftime format
-FXString FXSystem::localTime(const FXchar *format,FXTime value){
-  time_t tmp=(time_t)(value/seconds);
-#if defined(WIN32)
-#if (_MSC_VER >= 1500)
-  struct tm tmv;
-  if(localtime_s(&tmv,&tmp)==0){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,&tmv);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#else
-  struct tm* ptm=localtime(&tmp);
-  if(ptm){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,ptm);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#endif
-#elif defined(HAVE_LOCALTIME_R)
-  struct tm tmresult;
-  struct tm* ptm=localtime_r(&tmp,&tmresult);
-  if(ptm){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,ptm);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#else
-  struct tm* ptm=localtime(&tmp);
-  if(ptm){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,ptm);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#endif
-  }
-
-
-// Convert file time to string as per strftime format
-FXString FXSystem::universalTime(const FXchar *format,FXTime value){
-  time_t tmp=(time_t)(value/seconds);
-#ifdef WIN32
-#if (_MSC_VER >= 1500)
-  struct tm tmv;
-  if(gmtime_s(&tmv,&tmp)==0){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,&tmv);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#else
-  struct tm* ptm=gmtime(&tmp);
-  if(ptm){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,ptm);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#endif
-#elif defined(HAVE_GMTIME_R)
-  struct tm tmresult;
-  struct tm* ptm=gmtime_r(&tmp,&tmresult);
-  if(ptm){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,ptm);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#else
-  struct tm* ptm=gmtime(&tmp);
-  if(ptm){
-    FXchar buffer512;
-    FXint len=strftime(buffer,sizeof(buffer),format,ptm);
-    return FXString(buffer,len);
-    }
-  return FXString::null;
-#endif
-  }
-
-
 // Get effective user id
 FXuint FXSystem::user(){
 #if defined(WIN32)
@@ -179,7 +86,7 @@
 // Return owner name from uid
 FXString FXSystem::userName(FXuint uid){
   FXchar result64;
-#ifndef WIN32
+#if !defined(WIN32)
 #ifdef HAVE_GETPWUID_R
   struct passwd pwdresult,*pwd;
   char buffer1024;
@@ -201,7 +108,7 @@
 // Return group name from gid
 FXString FXSystem::groupName(FXuint gid){
   FXchar result64;
-#ifndef WIN32
+#if !defined(WIN32)
 #ifdef HAVE_GETGRGID_R
   ::group grpresult;
   ::group *grp;
@@ -247,7 +154,7 @@
 
 // Get current effective group name
 FXString FXSystem::currentGroupName(){
-#ifndef WIN32
+#if !defined(WIN32)
 #ifdef HAVE_GETGRGID_R
   ::group grpresult;
   ::group *grp;
@@ -289,17 +196,24 @@
   if(!name.empty()){
 #if defined(WIN32)
 #ifdef UNICODE
-    FXnchar variable256,string1024;
-    utf2ncs(variable,name.text(),256);
-    DWORD len=GetEnvironmentVariableW(variable,string,1024);
-    return FXString(string,len);
+    // Windows limits total process environment space to 32767 bytes
+    FXnchar variable256,buffer32767; DWORD len;
+    utf2ncs(variable,name.text(),ARRAYNUMBER(variable));
+    if((len=GetEnvironmentVariableW(variable,buffer,ARRAYNUMBER(buffer)))>0){
+      return FXString(buffer,len);
+      }
 #else
-    FXchar string1024;
-    DWORD len=GetEnvironmentVariableA(name.text(),string,1024);
-    return FXString(string,len);
+    // Windows limits total process environment space to 32767 bytes
+    FXchar buffer32767; DWORD len;
+    if((len=GetEnvironmentVariableA(name.text(),buffer,ARRAYNUMBER(buffer)))>0){
+      return FXString(buffer,len);
+      }
 #endif
 #else
-    return FXString(getenv(name.text()));
+    const FXchar* value=getenv(name.text());
+    if(value){
+      return FXString(value);
+      }
 #endif
     }
   return FXString::null;
@@ -311,11 +225,12 @@
   if(!name.empty()){
 #if defined(WIN32)
 #if defined(UNICODE)
-    FXnchar variable256,string1024;
-    utf2ncs(variable,name.text(),256);
+    // Windows limits total process environment space to 32767 bytes
+    FXnchar variable256,buffer32767;
+    utf2ncs(variable,name.text(),ARRAYNUMBER(variable));
     if(!value.empty()){
-      utf2ncs(string,value.text(),1024);
-      return SetEnvironmentVariableW(variable,string)!=0;
+      utf2ncs(buffer,value.text(),ARRAYNUMBER(buffer));
+      return SetEnvironmentVariableW(variable,buffer)!=0;
       }
     return SetEnvironmentVariableW(variable,NULL)!=0;
 #else
@@ -412,34 +327,30 @@
 
 // Get executable path
 FXString FXSystem::getExecPath(){
-#if defined(WIN32)
-#ifdef UNICODE
-  FXnchar string1024;
-  DWORD len=GetEnvironmentVariableW(L"PATH",string,1024);
-  return FXString(string,len);
-#else
-  FXchar string1024;
-  DWORD len=GetEnvironmentVariableA("PATH",string,1024);
-  return FXString(string,len);
-#endif
-#else
-  return FXString(getenv("PATH"));
-#endif
+  return FXSystem::getEnvironment("PATH");
   }
 
 
 // Return known executable file extensions (Windows)
 FXString FXSystem::getExecExtensions(){
 #if defined(WIN32)
-#ifdef UNICODE
-  FXnchar string1024;
-  DWORD len=GetEnvironmentVariableW(L"PATHEXT",string,1024);
-  return FXString(string,len);
+  return FXSystem::getEnvironment("PATHEXT");
 #else
-  FXchar string1024;
-  DWORD len=GetEnvironmentVariableA("PATHEXT",string,1024);
-  return FXString(string,len);
+  return FXString::null;
 #endif
+  }
+
+
+// Get name of calling executable
+FXString FXSystem::getExecFilename(){
+#if defined(WIN32)
+  TCHAR bufferMAXPATHLEN;
+  DWORD len=GetModuleFileName(NULL,buffer,MAXPATHLEN);
+  return FXString(buffer,len);
+#elif defined(__linux__)
+  FXint pid=FXProcess::current();
+  FXString filename=FXString::value("/proc/%d/exe",pid);
+  return FXFile::symlink(filename);
 #else
   return FXString::null;
 #endif
@@ -491,39 +402,74 @@
     }
   return NULL
   }
-
 */
 
 // Get home directory for a given user
 FXString FXSystem::getUserDirectory(const FXString& user){
 #if defined(WIN32)
+#ifdef UNICODE
   if(user.empty()){
-    const FXchar *str1,*str2;
-    FXchar homeMAXPATHLEN;
-    DWORD size=MAXPATHLEN;
+    FXnchar path4096;
+    FXnchar drive256;
+    DWORD pathlen;
+    DWORD drivelen;
     HKEY hKey;
     LONG result;
-    if((str1=getenv("USERPROFILE"))!=NULL){
-      return FXString(str1);
+    if((pathlen=GetEnvironmentVariableW(L"USERPROFILE",path,ARRAYNUMBER(path)))>0){
+      return FXString(path,pathlen);
       }
-    if((str1=getenv("HOME"))!=NULL){
-      return FXString(str1);
+    if((pathlen=GetEnvironmentVariableW(L"HOME",path,ARRAYNUMBER(path)))>0){
+      return FXString(path,pathlen);
       }
-    if((str2=getenv("HOMEPATH"))!=NULL){      // This should be good for WinNT, Win2K according to MSDN
-      if((str1=getenv("HOMEDRIVE"))==NULL) str1="c:";
-      fxstrlcpy(home,str1,MAXPATHLEN);
-      fxstrlcat(home,str2,MAXPATHLEN);
-      return FXString(home);
+    if((pathlen=GetEnvironmentVariableW(L"HOMEPATH",path,ARRAYNUMBER(path)))>0){        // This should be good for WinNT, Win2K according to MSDN
+      FXString result("C:");
+      if((drivelen=GetEnvironmentVariableW(L"HOMEDRIVE",drive,ARRAYNUMBER(drive)))>0){
+        result.assign(drive,drivelen);
+        }
+      result.append(path,pathlen);
+      return result;
+      }
+    if(RegOpenKeyExW(HKEY_CURRENT_USER,L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",0,KEY_READ,&hKey)==ERROR_SUCCESS){
+      result=RegQueryValueExW(hKey,L"Personal",NULL,NULL,(LPBYTE)path,&pathlen);        // Change "Personal" to "Desktop" if you want...
+      RegCloseKey(hKey);
+      if(result==ERROR_SUCCESS){
+        return FXString(path,pathlen);
+        }
+      }
+    }
+  return FXString::null;
+#else
+  if(user.empty()){
+    FXchar path4096;
+    FXchar drive256;
+    DWORD pathlen;
+    DWORD drivelen;
+    HKEY hKey;
+    LONG result;
+    if((pathlen=GetEnvironmentVariableA("USERPROFILE",path,ARRAYNUMBER(buffer)))>0){
+      return FXString(path,pathlen);
+      }
+    if((pathlen=GetEnvironmentVariableA("HOME",path,ARRAYNUMBER(buffer)))>0){
+      return FXString(path,pathlen);
+      }
+    if((pathlen=GetEnvironmentVariableA("HOMEPATH",path,ARRAYNUMBER(path)))>0){         // This should be good for WinNT, Win2K according to MSDN
+      FXString result("C:");
+      if((drivelen=GetEnvironmentVariableA("HOMEDRIVE",drive,ARRAYNUMBER(drive)))>0){
+        result.assign(drive,drivelen);
+        }
+      result.append(path,pathlen);
+      return result;
       }
     if(RegOpenKeyExA(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",0,KEY_READ,&hKey)==ERROR_SUCCESS){
-      result=RegQueryValueExA(hKey,"Personal",NULL,NULL,(LPBYTE)home,&size);  // Change "Personal" to "Desktop" if you want...
+      result=RegQueryValueExA(hKey,"Personal",NULL,NULL,(LPBYTE)path,&pathlen);         // Change "Personal" to "Desktop" if you want...
       RegCloseKey(hKey);
       if(result==ERROR_SUCCESS){
-        return FXString(home);
+        return FXString(path,pathlen);
         }
       }
     }
   return FXString::null;
+#endif
 #elif defined(HAVE_GETPWNAM_R)
   struct passwd pwdresult,*pwd;
   const FXchar* str;
@@ -613,22 +559,6 @@
   }
 
 
-// Get name of calling executable
-FXString FXSystem::getExecFilename(){
-#if defined(WIN32)
-  TCHAR bufferMAXPATHLEN;
-  DWORD len=GetModuleFileName(NULL,buffer,MAXPATHLEN);
-  return FXString(buffer,len);
-#elif defined(__linux__)
-  FXint pid=FXProcess::current();
-  FXString filename=FXString::value("/proc/%d/exe",pid);
-  return FXFile::symlink(filename);
-#else
-  return FXString::null;
-#endif
-  }
-
-
 // Get DLL name for given base name
 FXString FXSystem::dllName(const FXString& name){
 #if defined(WIN32)

gogglesmm-1.2.2.tar.gz/cfox/lib/FXSystemTime.cpp Added

@@ -0,0 +1,497 @@
+/********************************************************************************
+*                                                                               *
+*                                T i m e   S t u f f                            *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "FXAtomic.h"
+#include "FXElement.h"
+#include "FXString.h"
+#include "FXSystem.h"
+
+
+/*
+  Notes:
+  - Handy functions for manipulating calendar time.
+*/
+
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+// Time units in terms of nanoseconds
+static const FXTime seconds=1000000000;
+static const FXTime minutes=60*seconds;
+static const FXTime hours=60*minutes;
+static const FXTime days=24*hours;
+
+
+// Default formatting string used for time formatting
+const FXchar FXSystem::defaultTimeFormat="%m/%d/%Y %H:%M:%S";
+
+
+// ISO 8601 time format (yyyy-mm-ddThh:mm:ss+hhmm) formatting string
+const FXchar FXSystem::isoTimeFormat="%FT%T%z";
+
+
+// Cumulative days of the year, for non-leap-years and leap-years
+static const FXint days_of_year213={
+  {0,31,59,90,120,151,181,212,243,273,304,334,365},
+  {0,31,60,91,121,152,182,213,244,274,305,335,366}
+  };
+
+
+// Is year a leap-year
+static FXint is_leap(FXint year){
+  return !(year%4) && ((year%100) || !(year%400));
+  }
+
+
+// Returns day of week in civil calendar 0, 6 -> Sun, Sat,
+// from z is number of days since 1970-01-01.
+static FXuint weekday_from_days(FXlong z){
+  return (FXuint)(z>=-4 ? (z+4)%7 : (z+5)%7+6);
+  }
+
+
+// From year, month (1..12), day (1..31) return year-day (1..366).
+static FXint yearday_from_date(FXint y,FXint m,FXint d){
+  return days_of_yearis_leap(y)m-1+d;
+  }
+
+/*******************************************************************************/
+
+// Returns number of days since civil 1970-01-01.  Negative values indicate
+// days prior to 1970-01-01.
+// y is year, m is month of year (1..12), d is day of month (1..31).
+FXlong FXSystem::daysFromCivil(FXint y,FXint m,FXint d){
+  y-=(m<=2);                                            // March
+  FXlong era=(y>=0?y:y-399)/400;                        // Era
+  FXuint yoe=(FXuint)(y-era*400);                       // 0, 399
+  FXuint doy=(153*(m+(m>2?-3:9))+2)/5+d-1;              // 0, 365
+  FXuint doe=yoe*365+yoe/4-yoe/100+doy;                 // 0, 146096
+  return era*146097+doe-719468;                         // Relative to epoch
+  }
+
+
+// Returns year/month/day in civil calendar.
+// z is number of days since 1970-01-01. Negative values indicate
+// days prior to 1970-01-01.
+// y is year, m is month of year (1..12), d is day of month (1..31).
+void FXSystem::civilFromDays(FXint& y,FXint& m,FXint& d,FXlong z){
+  z+=719468;                                            // Relative to era
+  FXlong era=(z>=0?z:z-146096)/146097;                  // Era
+  FXuint doe=(FXuint)(z-era*146097);                    // 0, 146096
+  FXuint yoe=(doe-doe/1460+doe/36524-doe/146096)/365;   // 0, 399
+  FXuint doy=doe-(365*yoe+yoe/4-yoe/100);               // 0, 365
+  FXuint mp=(5*doy+2)/153;                              // 0, 11
+  y=(FXint)(era*400+yoe);
+  d=doy-(153*mp+2)/5+1;                                 // 1, 31
+  m=mp+(mp<10?3:-9);                                    // 1, 12
+  y+=(m<=2);                                            // March
+  }
+
+/*******************************************************************************/
+
+// Compute nanoseconds since Unix Epoch from struct tm
+FXTime FXSystem::timeFromSystemTime(const Time& st){
+  FXint year=st.year;
+  FXint month=st.month;
+  FXint day=st.mday;
+  FXint hour=st.hour;
+  FXint min=st.min;
+  FXint sec=st.sec;
+  FXint nano=st.nano;
+  FXint leap;
+
+  // Validate nanoseconds
+  if(nano>seconds){
+    sec+=nano/seconds;
+    nano%=seconds;
+    }
+
+  // Validate seconds
+  if(sec>=60){
+    min+=sec/60;
+    sec%=60;
+    }
+
+  // Validate minutes
+  if(min>=60){
+    hour+=min/60;
+    min%=60;
+    }
+
+  // Validate days
+  if(hour>=24){
+    day+=hour/24;
+    hour%=24;
+    }
+
+  // Validate month
+  if(month>=13){
+    year+=(month-1)/12;
+    month=(month-1)%12+1;
+    }
+
+  // Is leap year
+  leap=is_leap(year);
+
+  // Validate day of month
+  while(day>days_of_yearleapmonth){
+    day-=days_of_yearleapmonth;
+    month+=1;
+    if(13<=month){
+      month=1;
+      year+=1;
+      leap=is_leap(year);
+      }
+    }
+
+  // Return nanoseconds since Epoch
+  return (((daysFromCivil(year,month,day)*24+hour)*60+min)*60+sec)*seconds+nano;
+  }
+
+
+// Return system time from utc in nanoseconds since Unix Epoch
+void FXSystem::systemTimeFromTime(Time& st,FXTime utc){
+
+  // Compute days from nanoseconds, rounding down
+  FXlong zz=(0<=utc ? utc : utc-(days-1))/days;
+
+  // Compute date from seconds
+  civilFromDays(st.year,st.month,st.mday,zz);
+
+  // Compute day of year
+  st.yday=yearday_from_date(st.year,st.month,st.mday);
+
+  // Compute day of week
+  st.wday=weekday_from_days(zz);
+
+  // Hours
+  utc=utc-zz*days;
+  st.hour=(FXint)(utc/hours);
+
+  // Minutes
+  utc=utc-st.hour*hours;
+  st.min=(FXint)(utc/minutes);
+
+  // Seconds
+  utc=utc-st.min*minutes;
+  st.sec=(FXint)(utc/seconds);
+
+  // Nanoseconds
+  utc=utc-st.sec*seconds;
+  st.nano=(FXint)utc;
+
+  // Offset utc
+  st.offset=0;
+  }
+
+/*******************************************************************************/
+
+
+// Time zone variables, set only once
+static volatile FXuint local_zone_set=0;
+
+#if defined(_WIN32)
+//
+// The Windows TIME_ZONE_INFORMATION struct contains:
+//
+//   struct TIME_ZONE_INFORMATION {
+//     LONG       Bias;                 // UTC = localtime + bias (minutes)
+//     WCHAR      StandardName32;     // Standard time name
+//     SYSTEMTIME StandardDate;         // Time when daylight saving to standard time occurs
+//     LONG       StandardBias;         // Value added to Bias during standard time (most zones = 0)
+//     WCHAR      DaylightName32;     // Daylight savings time name
+//     SYSTEMTIME DaylightDate;         // Time when standard time to daylight savings time occurs
+//     LONG       DaylightBias;         // Value added to Bias during daylight savings time (most zones = -60)
+//     };
+//
+// While the Windows SYSTEMTIME struct contains:
+//
+//   struct SYSTEMTIME {
+//     WORD wYear;                      // Year, 1601..
+//     WORD wMonth;                     // Month, january..december (1..12)
+//     WORD wDayOfWeek;                 // Day of week, sunday..monday (0..7)
+//     WORD wDay;                       // Day of month, (1..31) SEE NOTES BELOW
+//     WORD wHour;                      // Hour (0..23)
+//     WORD wMinute;                    // Minutes (0..59)
+//     WORD wSecond;                    // Seconds (0..59)
+//     WORD wMilliseconds;              // Milliseconds (0..999)
+//     };
+//
+static TIME_ZONE_INFORMATION tzi;
+#endif
+
+
+// Call tzset() only once
+static void setuplocaltimezone(){
+  if(atomicSet(&local_zone_set,1)==0){
+#if defined(_WIN32)
+    GetTimeZoneInformation(&tzi);
+#else
+    tzset();
+#endif
+    }
+  }
+
+
+// Return offset between standard local time zone to UTC, in nanoseconds
+FXTime FXSystem::localTimeZoneOffset(){
+  setuplocaltimezone();
+#if defined(_WIN32)
+  return minutes*tzi.Bias;              // +minutes*tzi.StandardBias;
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+  return 0;     // FIXME
+#else
+  return seconds*timezone;
+#endif
+  }
+
+
+// Return offset daylight savings time to standard time, in nanoseconds
+FXTime FXSystem::daylightSavingsOffset(){
+  setuplocaltimezone();
+#if defined(_WIN32)
+  return minutes*tzi.DaylightBias;      // Or difference between standard and daylight bias.
+#else
+  return -hours*daylight;
+#endif
+  }
+
+
+// Return time zone name (or daylight savings time time zone name)
+FXString FXSystem::localTimeZoneName(FXbool dst){
+  setuplocaltimezone();
+#if defined(_WIN32)
+  return FXString(dst?tzi.DaylightName:tzi.StandardName);
+#else
+  return FXString(tznamedst);
+#endif
+  }
+
+
+#if defined(WIN32)
+
+// Convert utc (ns) since 01/01/1970 to 100ns since 01/01/1601
+static inline FXTime fxwintime(FXTime utc){
+  return utc/FXLONG(100)+FXLONG(116444736000000000);
+  }
+
+
+// Compare incoming date cur against changeover date chg; there are
+// two ways to compare the numbers.
+// When chg.wYear!=0, the change over occurs only once on the indicated
+// absolute time.
+// If chg.wYear==0, the switch between standard and daylight savings time
+// occurs yearly, on the nth occurrence of wDayOfWeek, where n is given
+// in the wDay variable of the TIME_ZONE_INFORMATION StandardDate or
+// DaylightDate struct.
+static FXint compare_zone_switch_over(const SYSTEMTIME& cur,const SYSTEMTIME& chg){
+  static const FXint month_lengths12={31,28,31,30,31,30,31,31,30,31,30,31};
+  FXint cursecs,chgsecs,chgday,first,last;
+
+  // Absolute date
+  if(chg.wYear){
+    if(cur.wYear==chg.wYear){
+      if(cur.wMonth==chg.wMonth){
+        if(cur.wDay==chg.wDay){
+          cursecs=(cur.wHour*60+cur.wMinute)*60+cur.wSecond;
+          chgsecs=(chg.wHour*60+chg.wMinute)*60+chg.wSecond;
+          return cursecs-chgsecs;
+          }
+        return cur.wDay-chg.wDay;
+        }
+      return cur.wMonth-chg.wMonth;
+      }
+    return cur.wYear-chg.wYear;
+    }
+
+  // Relative date
+  if(cur.wMonth==chg.wMonth){
+
+    // Calculate the day of the first wDayOfWeek in the month
+    first=(6+chg.wDayOfWeek-cur.wDayOfWeek+cur.wDay)%7+1;
+
+    // Check needed for the 5th weekday of the month
+    last=month_lengthscur.wMonth-1+(cur.wMonth==2 && is_leap(cur.wYear));
+
+    // Switch at the nth occurrence (value in chg.wDay) of certain day of week
+    chgday=first+7*(chg.wDay-1);
+    if(chgday>last) chgday-=7;
+
+    chgsecs=((chgday*24+chg.wHour)*60+chg.wMinute)*60+chg.wSecond;
+    cursecs=((cur.wDay*24+cur.wHour)*60+cur.wMinute)*60+cur.wSecond;
+    return cursecs-chgsecs;
+    }
+  return (FXint)cur.wMonth-(FXint)chg.wMonth;
+  }
+
+
+// Determine if daylight savings in effect
+// The daylight savings time switch is tied to local time, and local
+// time's year is tied to time zone.  However, time zone is a function
+// of the local year time zone info can change from year to year.
+// We assume that the time zone is relatively stable, but we may
+// call GetTimeZoneInformationForYear() in a future revision to
+// obtain only DST/STD time switches, which are changed more rapidly.
+static FXint daylightSavingsState(FXTime utc,FXbool local){
+
+  // Expanded date/time
+  SYSTEMTIME loc;
+
+  // Assume local time
+  FXTime ftloc=utc;
+  FXTime ftdst=utc;
+  FXTime ftstd=utc;
+
+  // If UTC, convert to local using
+  if(!local){
+    ftloc=ftloc-tzi.Bias*minutes;
+    ftdst=ftloc-tzi.DaylightBias*minutes;
+    ftstd=ftloc-tzi.StandardBias*minutes;
+    }
+
+  // Convert to windows time
+  ftloc=fxwintime(ftloc);
+
+  // Get expanded date/time
+  FileTimeToSystemTime((const FILETIME*)&ftloc,&loc);
+
+  // If wMonth is zero then no daylight savings in effect
+  if(tzi.DaylightDate.wMonth && tzi.StandardDate.wMonth){
+
+    // Convert UNIX Epoch to windows time
+    ftdst=fxwintime(ftdst);
+    ftstd=fxwintime(ftstd);
+
+    // Expanded date/time
+    SYSTEMTIME dst;
+    SYSTEMTIME std;
+
+    // Get expanded date/time
+    FileTimeToSystemTime((const FILETIME*)&ftdst,&dst);
+    FileTimeToSystemTime((const FILETIME*)&ftstd,&std);
+
+    // Daylight savings time prior to switch to standard time
+    FXbool before_std_date=(compare_zone_switch_over(dst,tzi.StandardDate)<0);
+
+    // Standard time after switch to daylight savings time
+    FXbool after_dst_date=(compare_zone_switch_over(std,tzi.DaylightDate)>=0);
+
+    // Northern hemisphere
+    if(tzi.DaylightDate.wMonth<tzi.StandardDate.wMonth){
+      if(before_std_date && after_dst_date) return 1;
+      }
+
+    // Southern hemisphere
+    else{
+      if(before_std_date || after_dst_date) return 1;
+      }
+    }
+  return 0;
+  }
+
+#endif
+
+
+// Return 1 if daylight savings time is active at utc in nanoseconds since Unix Epoch
+FXTime FXSystem::daylightSavingsActive(FXTime utc){
+  setuplocaltimezone();
+#if defined(_WIN32)
+  return daylightSavingsState(utc,false);
+#elif defined(HAVE_LOCALTIME_R)
+  struct tm tmresult;
+  time_t tmp=(time_t)(utc/seconds);
+  struct tm* ptm=localtime_r(&tmp,&tmresult);
+  FXTRACE((100,"FXSystem::daylightSavingsActive(%lld) = %d\n",utc,ptm && ptm->tm_isdst!=0));
+  return ptm && ptm->tm_isdst!=0;
+#else
+  time_t tmp=(time_t)(utc/seconds);
+  struct tm* ptm=localtime(&tmp);
+  FXTRACE((100,"FXSystem::daylightSavingsActive(%lld) = %d\n",utc,ptm && ptm->tm_isdst!=0));
+  return ptm && ptm->tm_isdst!=0;
+#endif
+  }
+
+/*******************************************************************************/
+
+// Format utc in nanoseconds since Unix Epoch to date-time string using given format
+FXString FXSystem::universalTime(FXTime utc,const FXchar *format){
+  FXSystem::Time st={0,0,0,0,0,0,0,0,0,0};
+  FXSystem::systemTimeFromTime(st,utc);
+  return FXSystem::systemTimeFormat(st,format);
+  }
+
+
+// Parse utc date-time string to UTC nanoseconds since Unix Epoch using given format
+// Assume string is time in UTC, unless a time zone offset was parsed; in that
+// case, adjust the time according to the zone offset.
+FXTime FXSystem::universalTime(const FXchar* string,const FXchar* format){
+  FXSystem::Time st={0,0,0,0,0,0,0,0,0,0};
+  if(FXSystem::systemTimeParse(st,string,format)){
+    return FXSystem::timeFromSystemTime(st)+st.offset*seconds;
+    }
+  return forever;
+  }
+
+
+// Parse date-time string to UTC nanoseconds since Unix Epoch using given format
+FXTime FXSystem::universalTime(const FXString& string,const FXchar* format){
+  return FXSystem::universalTime(string.text(),format);
+  }
+
+/*******************************************************************************/
+
+// Format utc in nanoseconds since Unix Epoch to local date-time string using given format
+FXString FXSystem::localTime(FXTime utc,const FXchar *format){
+  FXTime zoneoffset=FXSystem::localTimeZoneOffset()+FXSystem::daylightSavingsOffset()*FXSystem::daylightSavingsActive(utc);
+  FXSystem::Time st={0,0,0,0,0,0,0,0,0,(FXint)(zoneoffset/seconds)};
+  FXSystem::systemTimeFromTime(st,utc-zoneoffset);
+  return FXSystem::systemTimeFormat(st,format);
+  }
+
+
+// Parse local date-time string to UTC nanoseconds since Unix Epoch using given format
+// Assume string is time in local time, unless a time zone offset was parsed; in that
+// case, adjust the time according to the zone offset.
+FXTime FXSystem::localTime(const FXchar* string,const FXchar* format){
+  FXSystem::Time st={0,0,0,0,0,0,0,0,0,0};
+  if(FXSystem::systemTimeParse(st,string,format)){
+    //FXTime zoneoffset=FXSystem::localTimeZoneOffset()+FXSystem::daylightSavingsOffset()*FXSystem::daylightSavingsActive(FXThread::time());
+    return FXSystem::timeFromSystemTime(st)+st.offset*seconds;
+    }
+  return forever;
+  }
+
+
+// Parse local date-time string to UTC nanoseconds since Unix Epoch using given format
+FXTime FXSystem::localTime(const FXString& string,const FXchar* format){
+  return FXSystem::localTime(string.text(),format);
+  }
+
+}
+

gogglesmm-1.2.2.tar.gz/cfox/lib/FXSystemTimeFormat.cpp Added

@@ -0,0 +1,454 @@
+/********************************************************************************
+*                                                                               *
+*                   C o n v e r t   T i m e   T o   S t r i n g                 *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "fxunicode.h"
+#include "FXElement.h"
+#include "FXString.h"
+#include "FXSystem.h"
+
+
+/*
+  Notes:
+  - Convert FXSystem::Time to a string, similar to UNIX strftime().
+
+  - Format string may contain the following special conversion specifiers:
+
+      %%        A literal '%' character.
+      %n        A newline character.
+      %t        A tab character.
+
+      %E        Use alternative format.
+      %O        Use alternative format.
+
+      %C        The century number (year/100) as a 2-digit integer.
+
+      %Y        The year as a decimal number including the century (range 0000-9999).
+      %y        The year as a decimal number without a century (range 00 to 99).
+      %G        The ISO 8601 week-based year with century (range 0000-9999).
+      %g        ISO 8601 week-based year without century (range 00 to 99).
+
+      %b        Abbreviated month name.
+      %h        Abbreviated month name.
+      %B        Full month name (in locale).
+      %m        The month as a decimal number (range 01 to 12).
+
+      %a        Abbreviated day of the week.
+      %A        Full name of the day of the week.
+      %w        The day of the week as a decimal, range 0 to 6, Sunday being 0.
+      %u        The day of the week as a decimal, range 1 to 7, Monday being 1.
+
+      %U        The week number of the current year as a decimal number, range 00 to 53, starting with
+                the first Sunday as the first day of week 01.
+      %W        The week number of the current year as a decimal number, range 00 to 53, starting with
+                the first Monday as the first day of week 01.
+      %V        The ISO 8601 week number (where week 1 is the first week that has at least 4 days in the new
+                year) of the current year as a decimal number (range 01 to 53).
+
+      %d        Day of the month as a decimal number (range 01 to 31).
+      %e        Day of the month as a decimal number (range 1 to 31), with single digits preceded by a blank.
+
+      %j        The day of the year as a decimal number (range 001 to 366).
+
+      %p        Either "AM" or "PM", depending on time value.
+      %P        Lowercase: "am" or "pm", depending on time value.
+
+      %H        The hour using a 24-hour clock (range 00 to 23).
+      %k        The hour using a 24-hour clock (range 0 to 23), with single digits preceded by a blank.
+
+      %I        The hour using a 12-hour clock (range 01 to 12).
+      %l        The hour using a 12-hour clock (range 1 to 12), with single digits preceded by a blank.
+
+      %M        The minute as a decimal number (range 00 to 59).
+
+      %S        The second as a decimal number (range 00 to 60). The range is up to 60 to allow for
+                occasional leap seconds.
+
+      %s        The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
+                DISCREPANCY between FOX and standard library version: FOX does NOT add offset
+                to local time when interpreting broken-down time "FXSystem::Time"; thus passing
+                1/1/1970 00:00:00 in "FXSystem::Time", FOX version will always print "0".
+                Its more consistent with the actual printout of the other flags.
+
+      %c        Preferred date and time representation (in locale)
+
+      %D        Equivalent to %m/%d/%y.
+
+      %F        Equivalent to %Y-%m-%d  (the ISO 8601 date format).
+
+      %r        The time in a.m. or p.m. notation (%I:%M:%S %p) (in locale)
+      %R        The time in 24-hour notation (%H:%M).
+      %T        The time in 24-hour notation (%H:%M:%S).
+
+      %x        The preferred date representation without the time (%b %a %d) (in locale).
+
+      %X        The preferred time representation without the date (%k:%M:%S) (in locale).
+
+      %z        The +hhmm  or -hhmm  numeric timezone (that is, the hour and minute offset from UTC).
+
+      %Z        The timezone name or abbreviation.
+
+  - FOX extensions:
+
+      %fm       Fractional seconds: milli-seconds (000-999).
+
+      %fu       Fractional seconds: micro-seconds (000000-999999).
+
+      %fn       Fractional seconds: nano-seconds (000000000-999999999).
+
+*/
+
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+
+// Furnish our own version
+extern FXAPI FXint __snprintf(FXchar* string,FXint length,const FXchar* format,...);
+
+
+// Short weekdays
+static const FXchar *const sweekdays7={
+  "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+  };
+
+// Long weekdays
+static const FXchar *const weekdays7={
+  "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+  };
+
+// Short months
+static const FXchar *const smonths12={
+  "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+  };
+
+// Long months
+static const FXchar *const months12={
+  "January", "February", "March",     "April",   "May",      "June",
+  "July",    "August",   "September", "October", "November", "December"
+  };
+
+// am/pm
+static const FXchar *const ampm2={
+  "am", "pm"
+  };
+
+// AM/PM
+static const FXchar *const AMPM2={
+  "AM", "PM"
+  };
+
+
+// Generate digs worth of digits from number x
+static FXchar* intoa(FXchar* dest,FXuint x,FXuint digs,FXchar pad){
+  FXchar *ptr=dest+digs;
+  *ptr='\0';
+  while(dest<ptr){
+    *--ptr=(x%10)+'0';
+    x/=10;
+    if(x==0) break;
+    }
+  while(dest<ptr){
+    *--ptr=pad;
+    }
+  return ptr;
+  }
+
+
+// Is year a leap-year
+static FXint is_leap(FXint year){
+  return !(year%4) && ((year%100) || !(year%400));
+  }
+
+
+// ISO 8601 week number, first week with >= 4 days
+static FXint iso_week(const FXSystem::Time& st){
+  FXint week,dec31,jan1;
+
+  // Week number starting 1st monday (hint: break at thursday!)
+  week=(st.yday+6-(st.wday+6)%7+3)/7;
+
+  // Week belongs to previous year; figure out if that was a 52-week
+  // year or a 53-week year: if 31 December of previous year is a Thursday,
+  // or Friday of a leap year, then the previous year has 53 weeks.
+  if(week==0){
+    week=52;
+    dec31=(7+st.wday-st.yday)%7;        // Weekday before jan1
+    if(dec31==4 || (dec31==5 && is_leap(st.year%400-1))) week++;
+    }
+
+  // Week belongs potentially belongs to the next year; figure out if
+  // that is the case: if 1 January is not a Thursday, and not a Wednesday
+  // of a leap year, then this year had only 52 weeks, and the week belongs
+  // to the next year.
+  else if(week==53){
+    jan1=(371+st.wday-st.yday+1)%7;     // Weekday on jan1
+    if(jan1!=4 && (jan1!=3 || !is_leap(st.year))) week=1;
+    }
+  return week;
+  }
+
+
+// ISO 8601 year, i.e. year in which week number falls
+static FXint iso_year(const FXSystem::Time& st){
+  FXint year=st.year;
+  if(st.yday<3 && iso_week(st)!=1) year--;
+  else if(st.yday>360 && iso_week(st)==1) year++;
+  return year;
+  }
+
+
+// Format system time to string, generating up to length characters of the result.
+// Return number of characters that would have been needed to store the full result.
+static FXint systemTimeFormatRecursive(const FXSystem::Time& st,FXchar* string,FXint length,const FXchar* format){
+  const FXchar* src;
+  FXchar buf32;
+  FXint result,ch,val,n;
+  FXlong sec;
+  FXchar pad;
+
+  // Process format string
+  result=0;
+  while((ch=*format++)!='\0'){
+
+    // Check for format-characters
+    if(ch=='%'){
+
+      // Get next format character
+nxt:  ch=*format++;
+      pad='0';
+
+      // Parse format specifier
+      switch(ch){
+      case '%':                 // Literal '%' character
+        goto nml;
+      case 'n':                 // Newline character
+        ch='\n';
+        goto nml;
+      case 't':                 // Tab character
+        ch='\t';
+        goto nml;
+      case 'E':                 // Use alternative format
+      case 'O':
+      case '#':
+        goto nxt;
+      case 'p':                 // AM/PM
+        src=AMPMst.hour/12;
+        goto app;
+      case 'P':                 // am/pm
+        src=ampmst.hour/12;
+        goto app;
+      case 'a':                 // Short weekday name
+        src=sweekdaysst.wday;
+        goto app;
+      case 'A':                 // Full weekday name
+        src=weekdaysst.wday;
+        goto app;
+      case 'h':
+      case 'b':                 // Short month name
+        src=smonthsst.month-1;
+        goto app;
+      case 'B':                 // Full month name
+        src=monthsst.month-1;
+        goto app;
+      case 'j':                 // Day of year (001-366)
+        src=intoa(buf,st.yday,3,'0');
+        goto app;
+      case 'g':                 // ISO week-based year without century
+        src=intoa(buf,iso_year(st)%100,2,'0');
+        goto app;
+      case 'G':                 // ISO week-based year with century
+        src=intoa(buf,iso_year(st),4,'0');
+        goto app;
+      case 'y':                 // Year not including century
+        val=st.year%100;
+        goto num;
+      case 'Y':                 // Year including century
+        src=intoa(buf,st.year,4,'0');
+        goto app;
+      case 'C':                 // Century
+        val=st.year/100;
+        goto num;
+      case 'w':                 // Numerical week day (0=Sunday,...6)
+        ch='0'+st.wday;
+        goto nml;
+      case 'u':                 // Numerical week day (1=Monday,...7)
+        ch=st.wday?st.wday+'0':'7';
+        goto nml;
+      case 'U':                 // Week number, starting 1st Sunday (00..53)
+        val=(st.yday+6-st.wday)/7;
+        goto num;
+      case 'W':                 // Week number, starting 1st Monday (00..53)
+        val=(st.yday+6-(st.wday+6)%7)/7;
+        goto num;
+      case 'V':                 // ISO week number (01..53)
+        val=iso_week(st);
+        goto num;
+      case 'Z':                 // Time zone (abbreviated) name
+//        tzset();                        // FIXME
+//        src=tzname0;
+//        src="Z";
+        src="GMT";
+        goto app;
+      case 'z':                 // Offset +hhmm or -hhmm from UTC
+        __snprintf(buf,sizeof(buf),"%+03d%02d",st.offset/3600,(Math::iabs(st.offset)/60)%60);
+        src=buf;
+        goto app;
+      case 'e':                 // Day of the month (leading blank)
+        pad=' ';
+      case 'd':                 // Day of the month (leading 0)
+        val=st.mday;
+        goto num;
+      case 'k':                 // Hours using a 24-hour clock (leading blank)
+        pad=' ';
+      case 'H':                 // Hours using a 24-hour clock (leading 0)
+        val=st.hour;
+        goto num;
+      case 'l':                 // Hours using a 12-hour clock (leading blank)
+        pad=' ';
+      case 'I':                 // Hours using a 12-hour clock (leading 0)
+        val=st.hour;
+        if(val==0) val=12;      // 12-hour clock starts as "12:00 am", not "00:00 am"
+        else if(val>12) val-=12;
+        goto num;
+      case 'm':                 // Numerical month
+        val=st.month;
+        goto num;
+      case 'M':                 // Minutes
+        val=st.min;
+        goto num;
+      case 'S':                 // Seconds
+        val=st.sec;
+        goto num;
+      case 's':                 // Seconds since Unix Epoch
+        sec=timeFromSystemTime(st)/1000000000;
+        __snprintf(buf,sizeof(buf),"%lld",sec);
+        src=buf;
+        goto app;
+      case 'f':                 // Fraction
+        ch=*format++;
+        if(ch=='m'){            // Milliseconds (000-999)
+          src=intoa(buf,(st.nano+500000)/1000000,3,'0');
+          goto app;
+          }
+        if(ch=='u'){            // Microseconds (000000-999999)
+          src=intoa(buf,(st.nano+500)/1000,6,'0');
+          goto app;
+          }
+        if(ch=='n'){            // Nanoseconds (000000000-999999999)
+          src=intoa(buf,st.nano,9,'0');
+          goto app;
+          }
+        goto x;
+      case 'D':
+        n=systemTimeFormatRecursive(st,string,length-result,"%m/%d/%y");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'F':
+        n=systemTimeFormatRecursive(st,string,length-result,"%Y-%m-%d");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'c':
+        n=systemTimeFormatRecursive(st,string,length-result,"%b %a %d %k:%M:%S %Z %Y");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'r':
+        n=systemTimeFormatRecursive(st,string,length-result,"%I:%M:%S %p");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'R':
+        n=systemTimeFormatRecursive(st,string,length-result,"%H:%M");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'x':
+        n=systemTimeFormatRecursive(st,string,length-result,"%b %a %d");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'X':
+        n=systemTimeFormatRecursive(st,string,length-result,"%k:%M:%S");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      case 'T':
+        n=systemTimeFormatRecursive(st,string,length-result,"%H:%M:%S");
+        if(result+n<length){ string+=n; }
+        result+=n;
+        continue;
+      default:
+        goto x;
+      }
+
+      // Convert number val
+num:  src=intoa(buf,val,2,pad);
+
+      // Append to string
+app:  while((ch=*src++)!='\0'){
+        if(result<length){ *string++=ch; }
+        result++;
+        }
+
+      // Next character
+      continue;
+      }
+
+    // Normal characters
+nml:if(result<length){ *string++=ch; }
+    result++;
+    }
+
+  // Last character
+x:if(result<length){
+    *string='\0';
+    }
+
+  // Done
+  return result;
+  }
+
+
+// Format system time to string
+FXString FXSystem::systemTimeFormat(const Time& st,const FXchar* format){
+  FXString result;
+  if(format && *format){
+    FXint len=systemTimeFormatRecursive(st,result.text(),result.length(),format);       // Try to see if existing buffer fits
+    if(result.length()<len){
+      result.length(len);
+      len=systemTimeFormatRecursive(st,result.text(),result.length(),format);           // Again with exactly the right size
+      }
+    result.length(len);
+    }
+  return result;
+  }
+
+}

gogglesmm-1.2.2.tar.gz/cfox/lib/FXSystemTimeParse.cpp Added

@@ -0,0 +1,762 @@
+/********************************************************************************
+*                                                                               *
+*                  C o n v e r t   S t r i n g   T o   T i m e                  *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "fxunicode.h"
+#include "FXElement.h"
+#include "FXString.h"
+#include "FXSystem.h"
+
+
+/*
+  Notes:
+  - Convert a string to FXSystem::Time similar to UNIX strptime().
+
+  - Format string may contain the following special conversion specifiers:
+
+      %%        The % character.
+
+      %n        Arbitrary whitespace.
+      %t        Arbitrary whitespace.
+
+      %E        Use alternative format.
+      %O        Use alternative format.
+
+      %C        The century number (0-99).
+
+      %Y        The year, including century (for example, 1991).
+      %y        The year within century (0-99). When a century is not otherwise specified, values in
+                the range 69-99 refer to years in the twentieth century (1969-1999); values in the
+                range 00-68 refer to years in the twenty-first century (2000-2068).
+      %G        The year corresponding to the ISO week number. (For example, 1991.)
+      %g        The year corresponding to the ISO week number, but without the century (0-99).
+
+      %b        The month name, abbreviated or full.
+      %B        The month name, abbreviated or full.
+      %h        The month name, abbreviated or full.
+      %m        The month number (1-12).
+
+      %a        The name of the day of the week, abbreviated or full.
+      %A        The name of the day of the week, abbreviated or full.
+      %w        The day of the week as a decimal number (0-6), Sunday being 0.
+      %u        The day of the week as a decimal number (1-7), Monday being 1.
+
+      %d        The day of month (1-31).
+      %e        The day of month (1-31).
+
+      %j        The day number in the year (1-366).
+
+      %p        The locale's equivalent of AM or PM. (Note: there may be none.)
+
+      %H        The hour (0-23).
+      %k        The hour (0-23).
+
+      %I        The hour on a 12-hour clock (1-12).
+      %l        The hour on a 12-hour clock (1-12).
+
+      %M        The minute (0-59).
+
+      %S        The second (0-60; 60 may occur for leap seconds; earlier also 61 was allowed).
+
+      %s        The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000 (UTC).
+
+      %c        The date and time representation for the current locale.
+
+      %D        Equivalent to %m/%d/%y. (This is the American style date, very confusing
+                to non-Americans, especially since %d/%m/%y  is widely used in Europe.
+                The ISO 8601 standard format is %Y-%m-%d.)
+
+      %r        The 12-hour clock time (using the locale's AM or PM). In the POSIX locale
+                equivalent to %I:%M:%S %p. If t_fmt_ampm  is empty in the LC_TIME  part of
+                the current locale, then the behavior is undefined.
+
+      %R        Equivalent to %H:%M.
+
+      %T        Equivalent to %H:%M:%S.
+
+      %U        The week number with Sunday the first day of the week (0-53). The first Sunday of
+                January is the first day of week 1.
+
+      %W        The week number with Monday the first day of the week (0-53). The first Monday of
+                January is the first day of week 1.
+
+
+      %x        The date, using the locale's date format.
+
+      %X        The time, using the locale's time format.
+
+      %F        Equivalent to %Y-%m-%d, the ISO 8601 date format.
+
+      %V        The ISO 8601:1988 week number as a decimal number (1-53). If the week (starting on
+                Monday) containing 1 January has four or more days in the new year, then it is
+                considered week 1. Otherwise, it is the last week of the previous year, and the
+                next week is week 1.
+
+      %z        An RFC-822/ISO 8601 standard timezone specification.
+
+      %Z        The timezone name.
+
+  - FOX extensions:
+
+      %fm       Fractional seconds: milli-seconds (000-999).
+
+      %fu       Fractional seconds: micro-seconds (000000-999999).
+
+      %fn       Fractional seconds: nano-seconds (000000000-999999999).
+
+  - We can parse ISO week number (1..53) and ISO day of week (1..7) and get
+    year day, day of month, month, and week day back from that.
+    Algorithm is according to https://en.wikipedia.org/wiki/ISO_week_date.
+    There are a few tweaks, due to 0=sunday:
+
+      yday=week*7 + (wday+6)%7 - (day_of_week_jan4(year)+6)%7 - 3;
+
+    Short explanation of the algorithm. For the year, the ISO calendar
+    starts week 1 as the week containing january 4th, or (alternatively),
+    the first week containing thursday, or first week with >= 4 days in
+    the new year.
+
+    We use the first definition, and calculate the day of the week (with
+    sunday=0) on January 4th (dowjan4). The amount to back up is based
+    on a monday-starting week, so we back up by (dowjan4+6)%7, plus
+    an extra 3 days for the beginning of the year.
+
+    Then we simply add the week number and weekday, (similarly converted
+    to monday-starting by performing (wday+6)%7).
+
+    The resulting yday may have to be adjusted; if < 1, the date falls
+    into the previous year, and we correct yday and year accordingly.
+    If > days_in_year(year), then the date falls into the next year,
+    and we correct yday and year as needed.  Otherwise, we use yday
+    and year as computed.
+
+*/
+
+#ifndef LLONG_MAX
+#define LLONG_MAX  FXLONG(9223372036854775807)
+#endif
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+
+// Elements successfully parsed
+enum {
+  SET_CENT=1,
+  SET_YEAR=2,
+  SET_MON=4,
+  SET_WEEK=8,
+  SET_YDAY=16,
+  SET_MDAY=32,
+  SET_WDAY=64,
+  SET_12HR=128,
+  SET_24HR=256,
+  SET_MIN=512,
+  SET_SEC=1024,
+  SET_OFF=2048,
+  SET_TZ=4096,
+  SET_ALTE=8192,
+  SET_ALTO=16384,
+  SET_ALTH=32768,
+  SET_PM=65536,
+  SET_ISO=131072
+  };
+
+
+// Short weekdays
+static const FXchar *const sweekdays7={
+  "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+  };
+
+// Long weekdays
+static const FXchar *const weekdays7={
+  "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+  };
+
+// Short months
+static const FXchar *const smonths12={
+  "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+  "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+  };
+
+// Long months
+static const FXchar *const months12={
+  "January", "February", "March",     "April",   "May",      "June",
+  "July",    "August",   "September", "October", "November", "December"
+  };
+
+
+// am/pm
+static const FXchar *const ampm2={
+  "am", "pm"
+  };
+
+
+// US standard timezones
+static const FXchar *const USSTD6={
+  "EST","CST","MST","PST","AKST","HST"
+  };
+
+// US daylight savings timezones
+static const FXchar *const USDST5={
+  "EDT","CDT","MDT","PDT","AKDT"
+  };
+
+// Names for UTC
+static const FXchar *const GMT={
+  "GMT","UTC", "UT", "Z"
+  };
+
+
+// Start of month
+static const FXint start_of_month213={
+  {0,31,59,90,120,151,181,212,243,273,304,334,365},
+  {0,31,60,91,121,152,182,213,244,274,305,335,366}
+  };
+
+
+// Military time zone offsets (A-I,J,K-Z)
+static const FXint militaryzoneoffsets={
+  -3600, -7200, -10800, -14400, -18000, -21600, -25200, -28800, -32400, 0, -36000, -39600, -43200,
+   3600,  7200,  10800,  14400,  18000,  21600,  25200,  28800,  32400,     36000,  39600,  43200, 0
+  };
+
+
+// Find string str in a list list of nlist strings, and set number num accordingly
+static const FXchar *findstring(FXint& result,const FXchar *string,const FXchar *const *list,FXint nlist){
+  for(FXint i=0; i<nlist; i++){
+    FXuval len=strlen(listi);
+    if(comparecase(listi,string,len)==0){
+      result=i;
+      return string+len;
+      }
+    }
+  return NULL;
+  }
+
+
+// Convert nanoseconds fraction of second, up to 9 digits 0...999999999
+static const FXchar *convertnanoseconds(FXint& result,const FXchar *string,FXint digs){
+  FXint w=100000000;
+  result=0;
+  if('0'<=*string && *string<='9' && digs){     // Need at least 1 digit
+    do{
+      result+=(*string++-'0')*w;
+      w/=10;                                  
+      }
+    while('0'<=*string && *string<='9' && --digs);
+    return string;
+    }
+  return NULL;
+  }
+
+
+
+// Convert string of digits, but ensure number is lo..hi
+static const FXchar *convertstring(FXint& result,const FXchar *string,FXint lo,FXint hi){
+  FXint digs=hi;
+  result=0;
+  while(*string==' ' || *string=='\t'){         // Some numerics may have leading blanks
+    string++;
+    }
+  if('0'<=*string && *string<='9' && digs){     // But then we absolutely need a digit
+    do{
+      result=result*10+(*string++-'0');
+      digs/=10;                                 // Counting down digits
+      }
+    while('0'<=*string && *string<='9' && digs && result*10<=hi);
+    if(lo<=result && result<=hi){
+      return string;
+      }
+    }
+  return NULL;
+  }
+
+
+// Is leap year
+static FXint is_leap(FXint year){
+  return !(year%4) && ((year%100) || !(year%400));
+  }
+
+
+// Days for year
+static FXint days_in_year(FXint year){
+  return 365+is_leap(year);
+  }
+
+
+// Calculate the week day of the first day of a year, for Gregorian calendar.
+// Simplified version of Tomohiko Sakamoto's method for Gregorian Calendar.
+static FXint day_of_week_jan1(FXint year){
+  year-=1;
+  return (year+year/4-year/100+year/400+1)%7;
+  }
+
+
+// Calculate the week day of the 4th day of a year, for Gregorian calendar.
+// Simplified version of Tomohiko Sakamoto's method for Gregorian Calendar.
+static FXint day_of_week_jan4(FXint year){
+  year-=1;
+  return (year+year/4-year/100+year/400+4)%7;
+  }
+
+
+// Calculate the day of the week from year, month (1..12), and day of the month (1..31).
+// Tomohiko Sakamoto's method for Gregorian Calendar.
+static FXint day_of_week(FXint year,FXint month,FXint day){
+  static const FXint table={0,3,2,5,0,3,5,1,4,6,2,4};
+  year-=(month<3);
+  return (year+year/4-year/100+year/400+tablemonth-1+day)%7;
+  }
+
+
+// Convert string to time according to format.
+static const FXchar* systemTimeParseRecursive(FXSystem::Time& st,FXuint& set,const FXchar* string,const FXchar* format){
+  const FXTime seconds=1000000000;
+  const FXchar *s;
+  FXint startofweek=0;
+  FXint week=0;
+  FXint leap=0;
+  FXint pm=0;
+  FXint num,ext,neg;
+  FXlong sse;
+  FXchar ch;
+
+  // Parse format
+  while((ch=*format++)!='\0'){
+
+    // Check format characters
+    if(ch=='%'){
+
+      // Get next format character
+nxt:  ch=*format++;
+      switch(ch){
+      case '%':                 // Just match '%'
+        if(*string!='%') return NULL;
+        string++;
+        continue;
+      case 'n':                 // Any kind of white-space
+      case 't':
+        while(Ascii::isSpace(*string)) string++;
+        continue;
+      case 'E':                 // "%E?" alternative conversion modifier
+        set|=SET_ALTE;
+        goto nxt;
+      case 'O':                 // "%O?" alternative conversion modifier
+        set|=SET_ALTO;
+        goto nxt;
+      case '#':
+        set|=SET_ALTH;
+        goto nxt;
+      case 'P':                 // AM/PM 0..1
+      case 'p':
+        string=findstring(pm,string,ampm,2);
+        if(!string) return NULL;
+        set|=SET_PM;
+        continue;
+      case 'a':
+      case 'A':                 // Weekday 0..6
+        if((s=findstring(st.wday,string,weekdays,7))!=NULL){    // Longest first
+          string=s;
+          set|=SET_WDAY;
+          continue;
+          }
+        if((s=findstring(st.wday,string,sweekdays,7))!=NULL){   // Then shorter
+          string=s;
+          set|=SET_WDAY;
+          continue;
+          }
+        return NULL;
+      case 'B':                 // Month 1..12
+      case 'b':
+      case 'h':
+        if((s=findstring(num,string,months,12))!=NULL){         // Longest first
+          st.month=num+1;
+          string=s;
+          set|=SET_MON;
+          continue;
+          }
+        if((s=findstring(num,string,smonths,12))!=NULL){        // Then shorter
+          st.month=num+1;
+          string=s;
+          set|=SET_MON;
+          continue;
+          }
+        return NULL;
+      case 'j':                 // The day of year 1..366
+        string=convertstring(st.yday,string,1,366);
+        if(!string) return NULL;
+        set|=SET_YDAY;
+        continue;
+      case 'g':                 // Year corresponding to the ISO week, w/o century
+        string=convertstring(num,string,0,99);
+        if(!string) return NULL;
+        if(set&SET_CENT){       // Keep century, set the years
+          st.year=(st.year/100)*100+num;
+          }
+        else{                   // Set year, guess the century
+          st.year=(num<69)?num+1900:num+2000;
+          }
+        set|=SET_YEAR|SET_ISO;
+        continue;
+      case 'G':                 // Year corresponding to the ISO week, with century
+        string=convertstring(st.year,string,0,9999);
+        if(!string) return NULL;
+        set|=SET_CENT|SET_YEAR|SET_ISO;
+        continue;
+      case 'y':                 // Year without century
+        string=convertstring(num,string,0,99);
+        if(!string) return NULL;
+        if(set&SET_CENT){       // Keep century, set the years
+          st.year=(st.year/100)*100+num;
+          }
+        else{                   // Set year, guess the century
+          st.year=(num<69)?num+1900:num+2000;
+          }
+        set|=SET_YEAR;
+        continue;
+      case 'Y':                 // Year with century 0..9999
+        string=convertstring(st.year,string,0,9999);
+        if(!string) return NULL;
+        set|=SET_CENT|SET_YEAR;
+        continue;
+      case 'C':                 // Century number 0..99
+        string=convertstring(num,string,0,99);
+        if(!string) return NULL;
+        if(set&SET_YEAR){       // Keep the years, set the century
+          st.year=st.year%100+num*100;
+          }
+        else{
+          st.year=num*100;      // Set the century
+          }
+        set|=SET_CENT;
+        continue;
+      case 'w':                 // The day of week, sunday = 0
+        string=convertstring(st.wday,string,0,6);
+        if(!string) return NULL;
+        startofweek=0;
+        set|=SET_WDAY;
+        continue;
+      case 'u':                 // The day of week, monday = 1
+        string=convertstring(num,string,1,7);
+        if(!string) return NULL;
+        st.wday=num%7;
+        startofweek=1;
+        set|=SET_WDAY;
+        continue;
+      case 'U':                 // Week number, starting 1st Sunday (00..53)
+        string=convertstring(week,string,0,53);
+        if(!string) return NULL;
+        startofweek=0;          // SUN
+        set|=SET_WEEK;
+        continue;
+      case 'W':                  // Week number, starting 1st Monday (00..53)
+        string=convertstring(week,string,0,53);
+        if(!string) return NULL;
+        startofweek=1;          // MON
+        set|=SET_WEEK;
+        continue;
+      case 'V':                 // Week number, ISO 8601:1988 (01..53)
+        string=convertstring(week,string,1,53);
+        if(!string) return NULL;
+        startofweek=1;          // MON
+        set|=SET_WEEK|SET_ISO;
+        continue;
+      case 'Z':                 // Time zone
+        while(*string==' ' || *string=='\t') string++;
+        if('a'<=(*string|0x20) && (*string|0x20)<='z' && *(string+1)<=' '){     // Military time zone offset
+          st.offset=militaryzoneoffsets(*string|0x20)-'a';                    // Offset in seconds
+          if((*string|0x20)=='j'){                                              // Local timezone offset
+            st.offset=-FXSystem::localTimeZoneOffset()/seconds;
+            }
+          string++;
+          set|=SET_OFF;
+          continue;
+          }
+        if((s=findstring(num,string,USSTD,ARRAYNUMBER(USSTD)))!=NULL){          // Standard time
+          string=s;
+          st.offset=-3600*(num+5);
+          set|=SET_OFF;
+          continue;
+          }
+        if((s=findstring(num,string,USDST,ARRAYNUMBER(USDST)))!=NULL){          // Daylight savings time
+          string=s;
+          st.offset=-3600*(num+4);
+          set|=SET_OFF;
+          continue;
+          }
+        if((s=findstring(num,string,GMT,ARRAYNUMBER(GMT)))!=NULL){              // GMT
+          string=s;
+          st.offset=0;
+          set|=SET_OFF;
+          continue;
+          }
+        while(*string && *string!=' ' && *string!='\t'){                        // Parse over it, for now..
+          string++;
+          }
+        continue;
+      case 'z':                 // Time zone offset
+        while(*string==' ' || *string=='\t') string++;
+        if((*string|0x20)=='z' && *(string+1)<=' '){    // (Z|z) Zulu time indicator
+          string++;
+          st.offset=0;                                  // Assign to gmt offset
+          set|=SET_OFF;
+          continue;
+          }
+        if((neg=*string=='-') || *string=='+'){         // (+|-)HH(:?MM)? Offset hours and minutes
+          string++;
+          if('0'<=*string && *string<='9'){
+            num=*string++-'0';
+            if('0'<=*string && *string<='9'){
+              num*=10;
+              num+=*string++-'0';
+              num*=3600;                                // Convert hours to seconds
+              if(*string==':' || ('0'<=*string && *string<='9')){
+                if(*string==':') string++;
+                if('0'<=*string && *string<='9'){
+                  ext=*string++-'0';
+                  if('0'<=*string && *string<='9'){
+                    ext*=10;
+                    ext+=*string++-'0';
+                    if(ext>=60) return NULL;            // More than 60 minutes
+                    ext*=60;                            // Convert minutes to seconds
+                    num+=ext;                           // Add to the rest
+                    }
+                  else{
+                    return NULL;                        // 1 minute digit only!
+                    }
+                  }
+                else{
+                  return NULL;                          // 0 minute digits at all!
+                  }
+                }
+              if(neg) num=-num;
+              st.offset=num;                            // Assign to gmt offset
+              set|=SET_OFF;
+              continue;
+              }
+            }
+          }
+        return NULL;
+      case 'e':                 // Day of month 1..31
+      case 'd':
+        string=convertstring(st.mday,string,1,31);
+        if(!string) return NULL;
+        set|=SET_MDAY;
+        continue;
+      case 'k':                 // The hour using a 24 hour clock
+      case 'H':
+        string=convertstring(st.hour,string,0,23);
+        if(!string) return NULL;
+        set|=SET_24HR;
+        continue;
+      case 'l':                 // The hour using a 12 hour clock
+      case 'I':
+        string=convertstring(st.hour,string,0,12);
+        if(!string) return NULL;
+        st.hour%=12;
+        set|=SET_12HR;
+        continue;
+      case 'm':                 // Month 1..12
+        string=convertstring(st.month,string,1,12);
+        if(!string) return NULL;
+        set|=SET_MON;
+        continue;
+      case 'M':                 // Minutes 0..59
+        string=convertstring(st.min,string,0,59);
+        if(!string) return NULL;
+        set|=SET_MIN;
+        continue;
+      case 'S':                 // Seconds 0..61
+        string=convertstring(st.sec,string,0,61);
+        if(!string) return NULL;
+        set|=SET_SEC;
+        continue;
+      case 's':                 // Seconds since Unix Epoch
+        if(*string<'0' || '9'<*string) return NULL;
+        sse=0;
+        do{
+          num=*string++-'0';
+          if(sse>=(LLONG_MAX/10)){
+            if(sse>(LLONG_MAX/10)) return NULL;
+            if(num>(LLONG_MAX%10)) return NULL;
+            }
+          sse=sse*10+num;
+          }
+        while('0'<=*string && *string<='9');
+        systemTimeFromTime(st,sse*seconds);
+        set|=SET_CENT|SET_YEAR|SET_MON|SET_YDAY|SET_MDAY|SET_WDAY|SET_24HR|SET_MIN|SET_SEC|SET_OFF;
+        continue;
+      case 'f':                 // Fraction
+        ch=*format++;
+        if(ch=='m'){            // Milliseconds
+          string=convertnanoseconds(st.nano,string,3);
+          if(!string) return NULL;
+          continue;
+          }
+        if(ch=='u'){            // Microseconds 
+          string=convertnanoseconds(st.nano,string,6);
+          if(!string) return NULL;
+          continue;
+          }
+        if(ch=='n'){            // Nanoseconds
+          string=convertnanoseconds(st.nano,string,9);
+          if(!string) return NULL;
+          continue;
+          }
+        return NULL;
+      case 'D':                 // The date as "%m/%d/%y"
+        string=systemTimeParseRecursive(st,set,string,"%m/%d/%y");
+        if(!string) return NULL;
+        continue;
+      case 'F':                 // The date as "%Y-%m-%d"
+        string=systemTimeParseRecursive(st,set,string,"%Y-%m-%d");
+        if(!string) return NULL;
+        continue;
+      case 'c':                 // Date and time, using the locale's format
+        string=systemTimeParseRecursive(st,set,string,"%b %a %d %k:%M:%S %Z %Y");
+        if(!string) return NULL;
+        continue;
+      case 'r':                 // The time in 12-hour clock representation
+        string=systemTimeParseRecursive(st,set,string,"%I:%M:%S %p");
+        if(!string) return NULL;
+        continue;
+      case 'R':                 // The time as "%H:%M"
+        string=systemTimeParseRecursive(st,set,string,"%H:%M");
+        if(!string) return NULL;
+        continue;
+      case 'x':                 // The date, using the locale's format
+        string=systemTimeParseRecursive(st,set,string,"%b %a %d");
+        if(!string) return NULL;
+        continue;
+      case 'X':                 // The time, using the locale's format
+        string=systemTimeParseRecursive(st,set,string,"%k:%M:%S");
+        if(!string) return NULL;
+        continue;
+      case 'T':                 // The time as "%H:%M:%S"
+        string=systemTimeParseRecursive(st,set,string,"%H:%M:%S");
+        if(!string) return NULL;
+        continue;
+      default:                  // Error: not supported
+        return NULL;
+        }
+      return NULL;
+      }
+
+    // Match whitespace
+    if(ch==' ' || ch=='\t'){
+      while(Ascii::isSpace(*string)) string++;
+      continue;
+      }
+
+    // Match other characters
+    if(ch!=*string) return NULL;
+    string++;
+    }
+
+  // Apply PM if 12-hour clock
+  if((set&SET_PM)&&(set&SET_12HR)){
+    st.hour+=12*pm;
+    }
+
+  // Some things may be calculated
+  if(set&SET_YEAR){
+
+    // If we have month and day-of-month, we can calculate day-of-year
+    if((set&SET_MON) && (set&SET_MDAY)){
+      if(!(set&SET_YDAY)){
+        leap=is_leap(st.year);
+        st.yday=start_of_monthleapst.month-1+st.mday; // 1..366
+        set|=SET_YDAY;
+        }
+      }
+
+    // If we have week and day-of-week, we can calculate day-of-year
+    if((set&SET_WEEK) && (set&SET_WDAY)){
+      if(!(set&SET_YDAY)){
+        if(set&SET_ISO){        // ISO week number
+          st.yday=week*7+(st.wday+6)%7-(day_of_week_jan4(st.year)+6)%7-3;
+          if(st.yday<1){
+            st.yday=st.yday+days_in_year(st.year-1);
+            st.year-=1;
+            }
+          else if(st.yday>days_in_year(st.year)){
+            st.yday=st.yday-days_in_year(st.year);
+            st.year+=1;
+            }
+          }
+        else{                   // Simple week number
+          st.yday=(week-1)*7+(7-day_of_week_jan1(st.year)+startofweek)%7+(st.wday-startofweek+7)%7+1;
+          }
+        set|=SET_YDAY;
+        }
+      }
+
+    // If we have day-of-year, we can calculate month, day-of-month, and day-of-week
+    if(set&SET_YDAY){
+      if(!(set&SET_MON)){
+        leap=is_leap(st.year);
+        st.month=13;
+        while(st.yday<=start_of_monthleapst.month-1) --st.month;
+        if(12<st.month){
+          st.yday-=start_of_monthleap12;
+          st.year++;
+          st.month=1;
+          }
+        set|=SET_MON;
+        }
+      if(!(set&SET_MDAY)){
+        leap=is_leap(st.year);
+        st.mday=st.yday-start_of_monthleapst.month-1;
+        set|=SET_MDAY;
+        }
+      if(!(set&SET_WDAY)){
+        st.wday=(day_of_week_jan1(st.year)+st.yday-1)%7;
+        set|=SET_WDAY;
+        }
+      }
+    }
+  return string;
+  }
+
+
+// Parse system time from string, returning number of characters parsed
+FXint FXSystem::systemTimeParse(Time& st,const FXchar* string,const FXchar* format){
+  const FXchar* ptr; FXuint set=0;
+  if((ptr=systemTimeParseRecursive(st,set,string,format))!=NULL){
+    return ptr-string;
+    }
+  return 0;
+  }
+
+
+// Parse system time from string, returning number of characters parsed
+FXint FXSystem::systemTimeParse(Time& st,const FXString& string,const FXchar* format){
+  return FXSystem::systemTimeParse(st,string.text(),format);
+  }
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTGAIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTGAIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTGAImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTGAImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTIFIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTIFIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTIFImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTIFImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTabBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTabBar.cpp Changed

@@ -3,7 +3,7 @@
 *                          T a b   B a r   W i d g e t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -96,9 +96,9 @@
 
 // Get width
 FXint FXTabBar::getDefaultWidth(){
-  register FXint w,wtabs,maxtabw,t,ntabs;
-  register FXuint hints;
-  register FXWindow *child;
+  FXint w,wtabs,maxtabw,t,ntabs;
+  FXuint hints;
+  FXWindow *child;
 
   // Left or right tabs
   if(options&TABBOOK_SIDEWAYS){
@@ -134,9 +134,9 @@
 
 // Get height
 FXint FXTabBar::getDefaultHeight(){
-  register FXint h,htabs,maxtabh,t,ntabs;
-  register FXuint hints;
-  register FXWindow *child;
+  FXint h,htabs,maxtabh,t,ntabs;
+  FXuint hints;
+  FXWindow *child;
 
   // Left or right tabs
   if(options&TABBOOK_SIDEWAYS){
@@ -172,10 +172,10 @@
 
 // Recalculate layout
 void FXTabBar::layout(){
-  register FXint i,px,py,pw,ph,x,y,xx,yy,w,h,maxtabw,maxtabh,cumw,cumh,newcurrent;
-  register FXWindow *raisetab=NULL;
-  register FXWindow *tab;
-  register FXuint hints;
+  FXint i,px,py,pw,ph,x,y,xx,yy,w,h,maxtabw,maxtabh,cumw,cumh,newcurrent;
+  FXWindow *raisetab=NULL;
+  FXWindow *tab;
+  FXuint hints;
 
   newcurrent=-1;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTabBook.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTabBook.cpp Changed

@@ -3,7 +3,7 @@
 *                         T a b   B o o k   W i d g e t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -90,9 +90,9 @@
 
 // Get width
 FXint FXTabBook::getDefaultWidth(){
-  register FXint w,wtabs,maxtabw,wpnls,t,ntabs;
-  register FXWindow *tab,*pane;
-  register FXuint hints;
+  FXint w,wtabs,maxtabw,wpnls,t,ntabs;
+  FXWindow *tab,*pane;
+  FXuint hints;
 
   // Left or right tabs
   if(options&TABBOOK_SIDEWAYS){
@@ -135,9 +135,9 @@
 
 // Get height
 FXint FXTabBook::getDefaultHeight(){
-  register FXint h,htabs,maxtabh,hpnls,t,ntabs;
-  register FXWindow *tab,*pane;
-  register FXuint hints;
+  FXint h,htabs,maxtabh,hpnls,t,ntabs;
+  FXWindow *tab,*pane;
+  FXuint hints;
 
   // Left or right tabs
   if(options&TABBOOK_SIDEWAYS){
@@ -180,11 +180,11 @@
 
 // Recalculate layout
 void FXTabBook::layout(){
-  register FXint i,xx,yy,x,y,w,h,px,py,pw,ph,maxtabw,maxtabh,cumw,cumh,newcurrent;
-  register FXWindow *raisepane=NULL;
-  register FXWindow *raisetab=NULL;
-  register FXWindow *pane,*tab;
-  register FXuint hints;
+  FXint i,xx,yy,x,y,w,h,px,py,pw,ph,maxtabw,maxtabh,cumw,cumh,newcurrent;
+  FXWindow *raisepane=NULL;
+  FXWindow *raisetab=NULL;
+  FXWindow *pane,*tab;
+  FXuint hints;
 
   newcurrent=-1;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTabItem.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTabItem.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTable.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTable.cpp Changed

@@ -3,7 +3,7 @@
 *                            T a b l e   W i d g e t                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -222,8 +222,8 @@
 
 // Draw background behind the cell
 void FXTableItem::drawBackground(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXbool hg=table->isHorzGridShown();
-  register FXbool vg=table->isVertGridShown();
+  FXbool hg=table->isHorzGridShown();
+  FXbool vg=table->isVertGridShown();
   dc.fillRectangle(x+vg,y+hg,w-vg,h-hg);
   }
 
@@ -231,8 +231,8 @@
 // Draw hatch pattern
 void FXTableItem::drawPattern(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
   if(state&0x1f00){
-    register FXbool hg=table->isHorzGridShown();
-    register FXbool vg=table->isVertGridShown();
+    FXbool hg=table->isHorzGridShown();
+    FXbool vg=table->isVertGridShown();
     dc.setStipple((FXStipplePattern)((state&0x1f00)>>8),x,y);
     dc.setFillStyle(FILL_STIPPLED);
     dc.setForeground(table->getStippleColor());
@@ -245,9 +245,9 @@
 // Draw borders
 void FXTableItem::drawBorders(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
   if(state&(LBORDER|RBORDER|TBORDER|BBORDER)){
-    register FXint bb=table->getCellBorderWidth();
-    register FXbool hg=table->isHorzGridShown();
-    register FXbool vg=table->isVertGridShown();
+    FXint bb=table->getCellBorderWidth();
+    FXbool hg=table->isHorzGridShown();
+    FXbool vg=table->isVertGridShown();
     dc.setForeground(table->getCellBorderColor());
     if(state&LBORDER) dc.fillRectangle(x,y,bb,h+hg);
     if(state&RBORDER) dc.fillRectangle(x+w+vg-bb,y,bb,h+hg);
@@ -259,14 +259,14 @@
 
 // Draw content; grid lines count on left/top side but not on right/bottom side
 void FXTableItem::drawContent(const FXTable* table,FXDC& dc,FXint x,FXint y,FXint w,FXint h) const {
-  register FXint tx,ty,tw,th,ix,iy,iw,ih,s,beg,end,t,xx,yy;
-  register FXbool hg=table->isHorzGridShown();
-  register FXbool vg=table->isVertGridShown();
-  register FXint ml=table->getMarginLeft()+vg;
-  register FXint mt=table->getMarginTop()+hg;
-  register FXint mr=table->getMarginRight();
-  register FXint mb=table->getMarginBottom();
-  register FXFont *font=table->getFont();
+  FXint tx,ty,tw,th,ix,iy,iw,ih,s,beg,end,t,xx,yy;
+  FXbool hg=table->isHorzGridShown();
+  FXbool vg=table->isVertGridShown();
+  FXint ml=table->getMarginLeft()+vg;
+  FXint mt=table->getMarginTop()+hg;
+  FXint mr=table->getMarginRight();
+  FXint mb=table->getMarginBottom();
+  FXFont *font=table->getFont();
   FXString lbl=getText();
   FXIcon  *icn=getIcon();
 
@@ -373,8 +373,8 @@
 
 // Create input control for editing this item
 FXWindow* FXTableItem::getControlFor(FXTable* table){
-  register FXTextField *field;
-  register FXuint justify=0;
+  FXTextField *field;
+  FXuint justify=0;
   field=new FXTextField(table,1,NULL,0,TEXTFIELD_ENTER_ONLY,0,0,0,0,table->getMarginLeft(),table->getMarginRight(),table->getMarginTop(),table->getMarginBottom());
   if(state&LEFT) justify|=JUSTIFY_LEFT;
   if(state&RIGHT) justify|=JUSTIFY_RIGHT;
@@ -395,7 +395,7 @@
 
 // Set value from input control
 void FXTableItem::setFromControl(FXWindow* control){
-  register FXTextField *field=static_cast<FXTextField*>(control);
+  FXTextField *field=static_cast<FXTextField*>(control);
   setText(field->getText());
   }
 
@@ -491,10 +491,10 @@
 
 // Get width of item
 FXint FXTableItem::getWidth(const FXTable* table) const {
-  register FXFont *font=table->getFont();
-  register FXint beg,end,tw,iw,s,w,t;
-  register FXint ml=table->getMarginLeft();
-  register FXint mr=table->getMarginRight();
+  FXFont *font=table->getFont();
+  FXint beg,end,tw,iw,s,w,t;
+  FXint ml=table->getMarginLeft();
+  FXint mr=table->getMarginRight();
   FXString lbl=getText();
   FXIcon  *icn=getIcon();
   tw=iw=beg=s=0;
@@ -517,10 +517,10 @@
 
 // Get height of item
 FXint FXTableItem::getHeight(const FXTable* table) const {
-  register FXFont *font=table->getFont();
-  register FXint beg,end,th,ih,h;
-  register FXint mt=table->getMarginTop();
-  register FXint mb=table->getMarginBottom();
+  FXFont *font=table->getFont();
+  FXint beg,end,th,ih,h;
+  FXint mt=table->getMarginTop();
+  FXint mb=table->getMarginBottom();
   FXString lbl=getText();
   FXIcon  *icn=getIcon();
   th=ih=beg=0;
@@ -590,8 +590,8 @@
 
 // Create input control for editing this item
 FXWindow* FXComboTableItem::getControlFor(FXTable* table){
-  register FXComboBox *combo;
-  register FXuint justify=0;
+  FXComboBox *combo;
+  FXuint justify=0;
   combo=new FXComboBox(table,1,NULL,0,COMBOBOX_STATIC,0,0,0,0,table->getMarginLeft(),table->getMarginRight(),table->getMarginTop(),table->getMarginBottom());
   if(state&LEFT) justify|=JUSTIFY_LEFT;
   if(state&RIGHT) justify|=JUSTIFY_RIGHT;
@@ -613,7 +613,7 @@
 
 // Set value from input control
 void FXComboTableItem::setFromControl(FXWindow* control){
-  register FXComboBox *combo=static_cast<FXComboBox*>(control);
+  FXComboBox *combo=static_cast<FXComboBox*>(control);
   setText(combo->getText());
   }
 
@@ -876,13 +876,13 @@
   item=cellsrow*ncols+col;
   if(item){
 
-    FXTRACE((1,"item r:%2d c:%2d\n",row,col));
+    FXTRACE((100,"item r:%2d c:%2d\n",row,col));
 
     // Current span of item
     getSpanningRange(row,col,sr,er,sc,ec);
 
-    FXTRACE((1,"old shape r:%2d..%-2d c:%2d..%-2d\n",sr,er,sc,ec));
-    FXTRACE((1,"new shape r:%2d..%-2d c:%2d..%-2d\n",fr,lr,fc,lc));
+    FXTRACE((100,"old shape r:%2d..%-2d c:%2d..%-2d\n",sr,er,sc,ec));
+    FXTRACE((100,"new shape r:%2d..%-2d c:%2d..%-2d\n",fr,lr,fc,lc));
 
     // Cancel editing
     if(sr<=input.fm.row && sc<=input.fm.col && input.to.row<=er && input.to.col<=ec){
@@ -895,10 +895,10 @@
     FXMINMAX(llrer,hlrer,lr,er);
     FXMINMAX(llcec,hlcec,lc,ec);
 
-    FXTRACE((1,"box 1: r:%2d..%-2d c:%2d..%-2d\n",lfrsr,hfrsr,lfcsc,llcec));
-    FXTRACE((1,"box 2: r:%2d..%-2d c:%2d..%-2d\n",lfrsr,llrer,llcec,hlcec));
-    FXTRACE((1,"box 3: r:%2d..%-2d c:%2d..%-2d\n",llrer,hlrer,hfcsc,hlcec));
-    FXTRACE((1,"box 4: r:%2d..%-2d c:%2d..%-2d\n",hfrsr,hlrer,lfcsc,hfcsc));
+    FXTRACE((100,"box 1: r:%2d..%-2d c:%2d..%-2d\n",lfrsr,hfrsr,lfcsc,llcec));
+    FXTRACE((100,"box 2: r:%2d..%-2d c:%2d..%-2d\n",lfrsr,llrer,llcec,hlcec));
+    FXTRACE((100,"box 3: r:%2d..%-2d c:%2d..%-2d\n",llrer,hlrer,hfcsc,hlcec));
+    FXTRACE((100,"box 4: r:%2d..%-2d c:%2d..%-2d\n",hfrsr,hlrer,lfcsc,hfcsc));
 
     // FIXME interference check
 
@@ -956,7 +956,7 @@
 
 // Return spanning range of cell at row, col, rows fr..lr and columns fc..lc
 void FXTable::getSpanningRange(FXint row,FXint col,FXint& fr,FXint& lr,FXint& fc,FXint& lc) const {
-  register FXTableItem *item;
+  FXTableItem *item;
   fr=lr=row;
   fc=lc=col;
   if((item=cellsrow*ncols+col)!=NULL){
@@ -976,14 +976,14 @@
 
 // Return true if its a horizontally spanning cell
 FXbool FXTable::isItemHorizontalSpanning(FXint row,FXint col) const {
-  register FXTableItem *item=cellsrow*ncols+col;
+  FXTableItem *item=cellsrow*ncols+col;
   return item && ((0<col && cellsrow*ncols+col-1==item) || (col<ncols-1 && cellsrow*ncols+col+1==item));
   }
 
 
 // Return true if its a vertically spanning cell
 FXbool FXTable::isItemVerticalSpanning(FXint row,FXint col) const {
-  register FXTableItem *item=cellsrow*ncols+col;
+  FXTableItem *item=cellsrow*ncols+col;
   return item && ((0<row && cells(row-1)*ncols+col==item) || (row<nrows-1 && cells(row+1)*ncols+col==item));
   }
 
@@ -1077,14 +1077,14 @@
 
 // Get default width
 FXint FXTable::getDefaultWidth(){
-  register FXint rw=(rowHeader->getLayoutHints()&LAYOUT_FIX_WIDTH) ? rowHeader->getWidth() : rowHeader->getDefaultWidth();
+  FXint rw=(rowHeader->getLayoutHints()&LAYOUT_FIX_WIDTH) ? rowHeader->getWidth() : rowHeader->getDefaultWidth();
   return 0<visiblecols ? visiblecols*defColWidth+vgrid+rw : FXScrollArea::getDefaultWidth()+rw;
   }
 
 
 // Get default height
 FXint FXTable::getDefaultHeight(){
-  register FXint ch=(colHeader->getLayoutHints()&LAYOUT_FIX_HEIGHT) ? colHeader->getHeight() : colHeader->getDefaultHeight();
+  FXint ch=(colHeader->getLayoutHints()&LAYOUT_FIX_HEIGHT) ? colHeader->getHeight() : colHeader->getDefaultHeight();
   return 0<visiblerows ? visiblerows*defRowHeight+hgrid+ch : FXScrollArea::getDefaultHeight()+ch;
   }
 
@@ -1138,7 +1138,7 @@
 
 // Recalculate layout determines item locations and sizes
 void FXTable::layout(){
-  register FXint roww,colh,x,y,w,h;
+  FXint roww,colh,x,y,w,h;
 
   // Size up column header height
   colh=(colHeader->getLayoutHints()&LAYOUT_FIX_HEIGHT) ? colHeader->getHeight() : colHeader->getDefaultHeight();
@@ -1192,7 +1192,7 @@
 
 // Force position to become fully visible
 void FXTable::makePositionVisible(FXint row,FXint col){
-  register FXint xlo,xhi,ylo,yhi,px,py,vw,vh;
+  FXint xlo,xhi,ylo,yhi,px,py,vw,vh;
   if(xid){
     px=pos_x;
     py=pos_y;
@@ -1217,7 +1217,7 @@
 
 // True if item (partially) visible
 FXbool FXTable::isItemVisible(FXint row,FXint col) const {
-  register FXint xl,xr,yt,yb;
+  FXint xl,xr,yt,yb;
   if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::isItemVisible: index out of range.\n",getClassName()); }
   xl=colHeader->getItem(col)->getPos();
   xr=colHeader->getItem(col)->getSize()+xl;
@@ -1251,7 +1251,7 @@
 // Change item text
 void FXTable::setItemText(FXint row,FXint col,const FXString& text,FXbool notify){
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::setItemText: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1271,7 +1271,7 @@
 // Get item text
 FXString FXTable::getItemText(FXint row,FXint col) const {
   if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::getItemText: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   return item ? item->getText() : FXString::null;
   }
 
@@ -1279,7 +1279,7 @@
 // Change item's tooltip text
 void FXTable::setItemTipText(FXint row,FXint col,const FXString& text){
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::setItemTipText: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1291,7 +1291,7 @@
 // Get item's tooltip text
 FXString FXTable::getItemTipText(FXint row,FXint col) const {
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::getItemTipText: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   return item ? item->getTipText() : FXString::null;
   }
 
@@ -1299,7 +1299,7 @@
 // Set item icon
 void FXTable::setItemIcon(FXint row,FXint col,FXIcon* icon,FXbool owned,FXbool notify){
   if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::setItemIcon: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1319,7 +1319,7 @@
 // Get item icon
 FXIcon* FXTable::getItemIcon(FXint row,FXint col) const {
   if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::getItemIcon: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   return item ? item->getIcon() : NULL;
   }
 
@@ -1327,7 +1327,7 @@
 // Set item data
 void FXTable::setItemData(FXint row,FXint col,FXptr ptr){
   if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::setItemData: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1339,7 +1339,7 @@
 // Get item data
 FXptr FXTable::getItemData(FXint row,FXint col) const {
   if(row<0 || col<0 || nrows<=row || ncols<=col){ fxerror("%s::getItemData: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   return item ? item->getData() : NULL;
   }
 
@@ -1360,7 +1360,7 @@
 // Enable one item
 FXbool FXTable::enableItem(FXint row,FXint col){
   if(0<=row && 0<=col && row<nrows && col<ncols){
-    register FXTableItem* item=cellsrow*ncols+col;
+    FXTableItem* item=cellsrow*ncols+col;
     if(item==NULL){
       cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
       if(isItemSelected(row,col)) item->setSelected(true);
@@ -1378,7 +1378,7 @@
 // Disable one item
 FXbool FXTable::disableItem(FXint row,FXint col){
   if(0<=row && 0<=col && row<nrows && col<ncols){
-    register FXTableItem* item=cellsrow*ncols+col;
+    FXTableItem* item=cellsrow*ncols+col;
     if(item==NULL){
       cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
       if(isItemSelected(row,col)) item->setSelected(true);
@@ -1396,7 +1396,7 @@
 // Change item justification
 void FXTable::setItemJustify(FXint row,FXint col,FXuint justify){
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::setItemJustify: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1418,7 +1418,7 @@
 // Change relative position of icon and text of item
 void FXTable::setItemIconPosition(FXint row,FXint col,FXuint m){
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::setItemIconPosition: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1440,7 +1440,7 @@
 // Change item border style
 void FXTable::setItemBorders(FXint row,FXint col,FXuint borders){
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::setItemBorders: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1462,7 +1462,7 @@
 // Change item background stipple style
 void FXTable::setItemStipple(FXint row,FXint col,FXStipplePattern pattern){
   if(row<0 || nrows<=row || col<0 || ncols<=col){ fxerror("%s::setItemStipple: index out of range.\n",getClassName()); }
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(true);
@@ -1483,8 +1483,8 @@
 
 // Extract cells from given range as text
 void FXTable::extractText(FXchar*& text,FXint& size,FXint startrow,FXint endrow,FXint startcol,FXint endcol,const FXchar* cs,const FXchar* rs) const {
-  register FXint ncs,nrs,sz,r,c;
-  register FXchar *ptr;
+  FXint ncs,nrs,sz,r,c;
+  FXchar *ptr;
   FXString string;
 
   // Verify arguments
@@ -1542,7 +1542,7 @@
 
 // Extract cells from given range as text
 void FXTable::extractText(FXString& text,FXint startrow,FXint endrow,FXint startcol,FXint endcol,const FXchar* cs,const FXchar* rs) const {
-  register FXint ncs,nrs,sz,r,c,p;
+  FXint ncs,nrs,sz,r,c,p;
   FXString string;
 
   // Verify arguments
@@ -1595,7 +1595,7 @@
 
 // Count rows and columns of a block of text
 void FXTable::countText(FXint& nr,FXint& nc,const FXchar* text,FXint size,const FXchar* cs,const FXchar* rs) const {
-  register FXint c=0,i=0,item=0;
+  FXint c=0,i=0,item=0;
 
   // Verify arguments
   if(size<0 || text==NULL || cs==NULL || rs==NULL){ fxerror("%s::countText: bad argument.\n",getClassName()); }
@@ -1640,7 +1640,7 @@
 
 // Overlay text over given cell range
 void FXTable::overlayText(FXint startrow,FXint endrow,FXint startcol,FXint endcol,const FXchar* text,FXint size,const FXchar* cs,const FXchar* rs,FXbool notify){
-  register FXint beg=0,end=0,r,c;
+  FXint beg=0,end=0,r,c;
 
   // Verify arguments
   if(size<0 || text==NULL || cs==NULL || rs==NULL){ fxerror("%s::overlayText: bad argument.\n",getClassName()); }
@@ -1698,7 +1698,7 @@
 
 // Set current item
 void FXTable::setCurrentItem(FXint row,FXint col,FXbool notify){
-  register FXTableItem* item;
+  FXTableItem* item;
 
   // Verify input indices
   row=FXCLAMP(-1,row,nrows-1);
@@ -1906,7 +1906,7 @@
 
 // Get input control to edit the item
 FXWindow* FXTable::getControlForItem(FXint row,FXint col){
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(false);
@@ -1917,7 +1917,7 @@
 
 // Set the item from the input control
 void FXTable::setItemFromControl(FXint row,FXint col,FXWindow* control){
-  register FXTableItem* item=cellsrow*ncols+col;
+  FXTableItem* item=cellsrow*ncols+col;
   if(item==NULL){
     cellsrow*ncols+col=item=createItem(FXString::null,NULL,NULL);
     if(isItemSelected(row,col)) item->setSelected(false);
@@ -2396,8 +2396,8 @@
 
 // Draw single cell, possibly spanning multiple rows,columns
 void FXTable::drawCell(FXDC& dc,FXint sr,FXint er,FXint sc,FXint ec){
-  register FXTableItem *item=cellssr*ncols+sc;
-  register FXint xl,xr,yt,yb;
+  FXTableItem *item=cellssr*ncols+sc;
+  FXint xl,xr,yt,yb;
 
   // Verify some stuff
   FXASSERT(0<=sc && sc<=ec && ec<ncols);
@@ -2447,7 +2447,7 @@
 
 // Draw range of cells
 void FXTable::drawRange(FXDC& dc,FXint rlo,FXint rhi,FXint clo,FXint chi){
-  register FXTableItem *item;
+  FXTableItem *item;
   FXint r,c,sr,er,sc,ec;
   for(r=rlo; r<=rhi; r++){
     for(c=clo; c<=chi; c++){
@@ -2467,8 +2467,8 @@
 
 // Draw horizontal grid lines
 void FXTable::drawHGrid(FXDC& dc,FXint rlo,FXint rhi,FXint clo,FXint chi){
-  register FXTableItem *item,*meti;
-  register FXint r,c,xx,yy,ww,hh;
+  FXTableItem *item,*meti;
+  FXint r,c,xx,yy,ww,hh;
   dc.setForeground(gridColor);
   for(c=clo; c<=chi; c++){
     meti=item=NULL;
@@ -2491,8 +2491,8 @@
 
 // Draw horizontal vertical lines
 void FXTable::drawVGrid(FXDC& dc,FXint rlo,FXint rhi,FXint clo,FXint chi){
-  register FXTableItem *item,*meti;
-  register FXint r,c,xx,yy,ww,hh;
+  FXTableItem *item,*meti;
+  FXint r,c,xx,yy,ww,hh;
   dc.setForeground(gridColor);
   for(r=rlo; r<=rhi; r++){
     meti=item=NULL;
@@ -2515,7 +2515,7 @@
 
 // Draw table fragment
 void FXTable::drawContents(FXDC& dc,FXint x,FXint y,FXint w,FXint h){
-  register FXint fr,lr,fc,lc;
+  FXint fr,lr,fc,lc;
 
   // Find dirty part of table; note we need to back up to one row and
   // one column before the current cell, because of overlapping of
@@ -3398,8 +3398,8 @@
 
 // Change table size to nr x nc
 void FXTable::setTableSize(FXint nr,FXint nc,FXbool notify){
-  register FXTableItem *item;
-  register FXint r,c;
+  FXTableItem *item;
+  FXint r,c;
 
   // Must be in range
   if(nr<0 || nc<0){ fxerror("%s::setTableSize: argument out of range.\n",getClassName()); }
@@ -3481,8 +3481,8 @@
 
 // Insert a row
 void FXTable::insertRows(FXint row,FXint nr,FXbool notify){
-  register FXint oldrow=current.row;
-  register FXint r,c,n;
+  FXint oldrow=current.row;
+  FXint r,c,n;
   FXTableItem **oldcells=cells;
 
   // Nothing to do
@@ -3573,8 +3573,8 @@
 
 // Insert a column
 void FXTable::insertColumns(FXint col,FXint nc,FXbool notify){
-  register FXint oldcol=current.col;
-  register FXint r,c,n;
+  FXint oldcol=current.col;
+  FXint r,c,n;
   FXTableItem **oldcells=cells;
 
   // Nothing to do
@@ -3665,9 +3665,9 @@
 
 // Remove rows of cells
 void FXTable::removeRows(FXint row,FXint nr,FXbool notify){
-  register FXint oldrow=current.row;
-  register FXTableItem *item;
-  register FXint r,c,n;
+  FXint oldrow=current.row;
+  FXTableItem *item;
+  FXint r,c,n;
   FXTableItem **oldcells=cells;
 
   // Nothing to do
@@ -3770,9 +3770,9 @@
 
 // Remove columns of cells
 void FXTable::removeColumns(FXint col,FXint nc,FXbool notify){
-  register FXint oldcol=current.col;
-  register FXTableItem *item;
-  register FXint r,c,n;
+  FXint oldcol=current.col;
+  FXTableItem *item;
+  FXint r,c,n;
   FXTableItem **oldcells=cells;
 
   // Nothing to do
@@ -3875,7 +3875,7 @@
 
 // Extract item from table
 FXTableItem* FXTable::extractItem(FXint row,FXint col,FXbool notify){
-  register FXTableItem *result;
+  FXTableItem *result;
   FXint r,c,sr,er,sc,ec;
 
   // Must be in range
@@ -3951,7 +3951,7 @@
 
 // Clear all cells in the given range
 void FXTable::removeRange(FXint startrow,FXint endrow,FXint startcol,FXint endcol,FXbool notify){
-  register FXint r,c;
+  FXint r,c;
 
   // Verify range
   if(startrow<0 || startcol<0 || nrows<=endrow || ncols<=endcol){ fxerror("%s::removeRange: index out of range.\n",getClassName()); }
@@ -3967,8 +3967,8 @@
 
 // Clear all items from table
 void FXTable::clearItems(FXbool notify){
-  register FXTableItem *item;
-  register FXint r,c;
+  FXTableItem *item;
+  FXint r,c;
 
   // End editing
   if(0<=input.fm.row && 0<=input.fm.col){
@@ -4027,7 +4027,7 @@
 
 // Change column header height mode to fixed or variable
 void FXTable::setColumnHeaderMode(FXuint hint){
-  register FXuint hints=(colHeader->getLayoutHints()&~LAYOUT_FIX_HEIGHT) | (hint&LAYOUT_FIX_HEIGHT);
+  FXuint hints=(colHeader->getLayoutHints()&~LAYOUT_FIX_HEIGHT) | (hint&LAYOUT_FIX_HEIGHT);
   colHeader->setLayoutHints(hints);
   }
 
@@ -4039,7 +4039,7 @@
 
 // Change row header width mode to fixed or variable
 void FXTable::setRowHeaderMode(FXuint hint){
-  register FXuint hints=(rowHeader->getLayoutHints()&~LAYOUT_FIX_WIDTH) | (hint&LAYOUT_FIX_WIDTH);
+  FXuint hints=(rowHeader->getLayoutHints()&~LAYOUT_FIX_WIDTH) | (hint&LAYOUT_FIX_WIDTH);
   rowHeader->setLayoutHints(hints);
   }
 
@@ -4140,8 +4140,8 @@
 
 // Return minimum row height
 FXint FXTable::getMinRowHeight(FXint row) const {
-  register FXTableItem *item;
-  register FXint h,c,t;
+  FXTableItem *item;
+  FXint h,c,t;
   if(row<0 || row>=nrows){ fxerror("%s::getMinRowHeight: row out of range\n",getClassName()); }
   for(c=0,h=0; c<ncols; c++){
     item=cellsrow*ncols+c;
@@ -4155,8 +4155,8 @@
 
 // Return minimum column width
 FXint FXTable::getMinColumnWidth(FXint col) const {
-  register FXTableItem *item;
-  register FXint w,r,t;
+  FXTableItem *item;
+  FXint w,r,t;
   if(col<0 || col>=ncols){ fxerror("%s::getMinColumnWidth: column out of range\n",getClassName()); }
   for(r=0,w=0; r<nrows; r++){
     item=cellsr*ncols+col;
@@ -4170,7 +4170,7 @@
 
 // Fit row heights to contents
 void FXTable::fitRowsToContents(FXint row,FXint nr){
-  register FXint r;
+  FXint r;
   for(r=row; r<row+nr; r++){
     setRowHeight(r,getMinRowHeight(r));
     }
@@ -4179,7 +4179,7 @@
 
 // Fit column widths to contents
 void FXTable::fitColumnsToContents(FXint col,FXint nc){
-  register FXint c;
+  FXint c;
   for(c=col; c<col+nc; c++){
     setColumnWidth(c,getMinColumnWidth(c));
     }
@@ -4585,7 +4585,7 @@
 
 // Save data
 void FXTable::save(FXStream& store) const {
-  register FXint i;
+  FXint i;
   FXScrollArea::save(store);
   store << nrows;
   store << ncols;
@@ -4615,7 +4615,7 @@
 
 // Load data
 void FXTable::load(FXStream& store){
-  register FXint i;
+  FXint i;
   FXScrollArea::load(store);
   store >> nrows;
   store >> ncols;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTaskGroup.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTaskGroup.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXText.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXText.cpp Changed

@@ -3,7 +3,7 @@
 *                   M u l t i - L i n e   T e x t   W i d g e t                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -57,30 +57,50 @@
 
 /*
   Notes:
-  - Line start array is one longer than number of visible lines.
-  - Control characters in the buffer are OK (e.g. ^L)
-  - Drag cursor should be same as normal one until drag starts!
-  - Change of cursor only implies makePositionVisible() if done by user.
   - Generally, assume the following definitions in terms of how things work:
 
-    position    Character position in the buffer; should avoid pointing to
+      position  Character position in the buffer; should avoid pointing to
                 places other than the start of a UTF8 character.
-    indent      logical character-index (not byte index) from the start of a line.
-    line        A newline terminated sequence of characters. A line may be wrapped
+      indent    logical character-index (not byte index) from the start of
+                a line.
+      line      A newline terminated sequence of characters. A line may be wrapped
                 to multiple rows on the screen.
-    row         Sequence of characters wrapped at the wrap-margin, therefore not
+      row       Sequence of characters wrapped at the wrap-margin, therefore not
                 necessarily ending at a newline
-    column      Logical column from start of the line.
+      column    Logical column from start of the line.
 
+  - Line start array is one longer than number of visible lines; therefore,
+    the length of each visible line is just visrowsi+1-visrowsi.
+  - Control characters in the buffer are allowed, and are represented as sequences
+    like '^L'.
+  - Wrapped lines contain at least 1 character; this is necessary in order to ensure
+    the text widget has finite number of rows.
+  - Viewport definition is established with virtual functions; overloadinging them
+    in subclasses allows for custom items in subclassed FXText widgets.
+
+      +------------------------------------------------+<-- 0
+      |                                                |
+      +----+--------------------------------------+----+<-- getVisibleY()
+      |    |                                      |    |
+      |    |           T e x t                    |    |
+      |    |                                      |    |
+      |    |                                      |    |
+      +----+--------------------------------------+----+<-- getVisibleHeight()
+      |                                                |
+      +------------------------------------------------+<-- height
+      ^    ^                                      ^    ^
+      |    |                                      |    |
+      0    |                                      |    width
+         getVisibleX()             getVisibleWidth()
 
   - Buffer layout:
 
-    Content  :  A  B  C  .  .  .  .  .  .  .  .  D  E  F  G
-    Position :  0  1  2 			                   3  4  5  6    length=7
-    Addresss :  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14    buffersize=7+11-3=15
-                         ^		               	 ^
-	           	       	 |			                |
-	     	                gapstart=3	           gapend=11      gaplen=11-3=8
+      Content  :  A  B  C  .  .  .  .  .  .  .  .  D  E  F  G
+      Position :  0  1  2                          3  4  5  6    length=7
+      Addresss :  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14    buffersize=7+11-3=15
+                           ^                       ^
+                           |                       |
+                           gapstart=3              gapend=11     gaplen=11-3=8
 
     The gap is moved around the buffer so newly added text can be entered into the gap;
     when the gap becomes too small, the buffer is resized.
@@ -89,78 +109,51 @@
 
     The tail end of the visrows array will look like:
 
-    visrow0= 0: "Q R S T U V W \n"
-    visrow1= 8: "X Y Z"
-    visrow2=11: <no text>
-    visrow3=11: <no text>            length = 11
+      visrow0= 0: "Q R S T U V W \n"
+      visrow1= 8: "X Y Z"
+      visrow2=11: <no text>
+      visrow3=11: <no text>            length = 11
 
     The last legal position is length = 11.
 
-  - While resizing window, keep track of a position which should remain visible, i.e.
-    toppos=rowStart(position).  The position is changed same as toppos, except during
-    resize.
-  - When changing text, if we're looking at the tail end of the buffer, avoid jumping
-    the top lines when the content hight shrinks.
-  - Add undo capability. (First undo will turn mod flag back off).
-  - Add incremental search, search/replace, selection search.
-  - Style table stuff.
-  - Need to allow for one single routine to update style buffer same as text buffer
-  - Maybe put all keyboard bindings into accelerator table.
-  - Variable cursorcol should take tabcolumns into account.
-  - Italic fonts are bit problematic on border between selected/unselected text
-    due to kerning.
-  - Tab should work as tabcolumns columns when computing a column.
-  - Need rectangular selection capability.
-  - Perhaps split off buffer management into separate text buffer class (allows for
-    multiple views).
-  - Improve book keeping based on line/column numbers, not rows/characters.
+  - While resizing window, we keep track of a position which should remain visible at the
+    top of the visible buffer (keeppos).  Due to wrapping, the exact value of toppos may
+    change but its always the case that keeppos is visible.
+  - When changing text, try keep the top part of the visible buffer stationary, to avoid
+    jumping text while typing.
   - If there is a style table, the style buffer is used as index into the style table,
     allowing for up to 255 styles (style index==0 is the default style).
     The style member in the FXHiliteStyle struct is used for underlining, strikeouts,
     and other effects.
-    If there is NO style table but there is a style buffer, the style buffer can still
-    be used for underlining, strikeouts, and other effects.
-  - Sending SEL_CHANGED is pretty useless; should only be sent AFTER text change,
-    and void* should contain some sensible info.
+  - Italic fonts are bit problematic on border between selected/unselected text
+    due to kerning.
+  - Possibly split off buffer management into separate text buffer class (allows for
+    multiple views).
+  - Maybe put all keyboard bindings into accelerator table.
+  - Perhaps change text and style buffer to FXString for further complexity reduction.
   - When in overstrike mode and having a selection, entering a character should
     replace the selection, not delete the selection and then overstrike the character
     after the selection.
   - When pasting or dropping whole lines, insert at begin of line instead of at cursor;
     question:- how to know we're pasting whole lines?
-  - Need block cursor when in overstrike mode.
   - Inserting lots of stuff should show cursor.
-  - Perhaps change text and style buffer to FXString for further complexity reduction.
-  - Viewport definition:
-
-        +------------------------------------------------+<-- 0
-        |                                                |
-        +----+--------------------------------------+----+<-- getVisibleY()
-        |    |                                      |    |
-        |    |           T e x t                    |    |
-        |    |                                      |    |
-        |    |                                      |    |
-        +----+--------------------------------------+----+<-- getVisibleHeight()
-        |                                                |
-        +------------------------------------------------+<-- height
-        ^    ^                                      ^    ^
-        |    |                                      |    |
-        0    |                                      |    width
-           getVisibleX()             getVisibleWidth()
-
-   - For now, right, top, and bottom bars are zero; subclasses may override
-     and add space for text annotations.
-   - Possible (minor) improvement to wrap(): don't break after space unless
-     at least non-space was seen before that space.  This will cause a line
-     to have at least some non-blank characters on it.
+  - For now, right, top, and bottom bars are zero; subclasses may override
+    and add space for text annotations.
+  - Possible (minor) improvement to wrap(): don't break after space unless
+    at least non-space was seen before that space.  This will cause a line
+    to have at least some non-blank characters on it.
 */
 
 
-#define MINSIZE         80              // Minimum gap size
+#define MINSIZE         100             // Minimum gap size
+#define MAXSIZE         4000            // Minimum gap size
 #define NVISROWS        20              // Initial visible rows
 #define MAXTABCOLUMNS   32              // Maximum tab column setting
 
 #define TEXT_MASK       (TEXT_FIXEDWRAP|TEXT_WORDWRAP|TEXT_OVERSTRIKE|TEXT_READONLY|TEXT_NO_TABS|TEXT_AUTOINDENT|TEXT_SHOWACTIVE|TEXT_SHOWMATCH)
 
+#define CC(x,in)        (((x)=='\t')?tabcolumns-in%tabcolumns:1)        // Count Columns
+
 using namespace FX;
 
 /*******************************************************************************/
@@ -224,10 +217,10 @@
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_BOTTOM,FXText::onCmdCursorBottom),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_HOME,FXText::onCmdCursorHome),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_END,FXText::onCmdCursorEnd),
-  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_RIGHT,FXText::onCmdCursorRight),
-  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_LEFT,FXText::onCmdCursorLeft),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_UP,FXText::onCmdCursorUp),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_DOWN,FXText::onCmdCursorDown),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_LEFT,FXText::onCmdCursorLeft),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_RIGHT,FXText::onCmdCursorRight),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_PAGEUP,FXText::onCmdCursorPageUp),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_PAGEDOWN,FXText::onCmdCursorPageDown),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_WORD_LEFT,FXText::onCmdCursorWordLeft),
@@ -236,14 +229,18 @@
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_BOTTOM,FXText::onCmdCursorShiftBottom),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_HOME,FXText::onCmdCursorShiftHome),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_END,FXText::onCmdCursorShiftEnd),
-  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_RIGHT,FXText::onCmdCursorShiftRight),
-  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_LEFT,FXText::onCmdCursorShiftLeft),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_UP,FXText::onCmdCursorShiftUp),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_DOWN,FXText::onCmdCursorShiftDown),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_LEFT,FXText::onCmdCursorShiftLeft),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_RIGHT,FXText::onCmdCursorShiftRight),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_PAGEUP,FXText::onCmdCursorShiftPageUp),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_PAGEDOWN,FXText::onCmdCursorShiftPageDown),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_WORD_LEFT,FXText::onCmdCursorShiftWordLeft),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_SHIFT_WORD_RIGHT,FXText::onCmdCursorShiftWordRight),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_ALT_UP,FXText::onCmdCursorAltUp),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_ALT_DOWN,FXText::onCmdCursorAltDown),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_ALT_LEFT,FXText::onCmdCursorAltLeft),
+  FXMAPFUNC(SEL_COMMAND,FXText::ID_CURSOR_ALT_RIGHT,FXText::onCmdCursorAltRight),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_SCROLL_UP,FXText::onCmdScrollUp),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_SCROLL_DOWN,FXText::onCmdScrollDown),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_SCROLL_TOP,FXText::onCmdScrollTop),
@@ -286,7 +283,7 @@
   FXMAPFUNC(SEL_COMMAND,FXText::ID_JOIN_LINES,FXText::onCmdJoinLines),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_GOTO_MATCHING,FXText::onCmdGotoMatching),
   FXMAPFUNC(SEL_COMMAND,FXText::ID_SELECT_MATCHING,FXText::onCmdSelectMatching),
-  FXMAPFUNCS(SEL_COMMAND,FXText::ID_SELECT_BRACE,FXText::ID_SELECT_ANG,FXText::onCmdSelectBlock),
+  FXMAPFUNCS(SEL_COMMAND,FXText::ID_SELECT_BRACE,FXText::ID_SELECT_ANG,FXText::onCmdSelectEnclosing),
   FXMAPFUNCS(SEL_COMMAND,FXText::ID_LEFT_BRACE,FXText::ID_LEFT_ANG,FXText::onCmdBlockBeg),
   FXMAPFUNCS(SEL_COMMAND,FXText::ID_RIGHT_BRACE,FXText::ID_RIGHT_ANG,FXText::onCmdBlockEnd),
   FXMAPFUNCS(SEL_COMMAND,FXText::ID_SHIFT_LEFT,FXText::ID_SHIFT_TABRIGHT,FXText::onCmdShiftText),
@@ -317,9 +314,6 @@
 
 /*******************************************************************************/
 
-// Absolute value
-static inline FXint fxabs(FXint a){ return a<0?-a:a; }
-
 
 // For deserialization
 FXText::FXText(){
@@ -336,11 +330,11 @@
   toprow=0;
   keeppos=0;
   select.startpos=0;
-  select.endpos=0;
+  select.endpos=-1;
   select.startcol=0;
   select.endcol=-1;
   hilite.startpos=0;
-  hilite.endpos=0;
+  hilite.endpos=-1;
   hilite.startcol=0;
   hilite.endcol=-1;
   anchorpos=0;
@@ -404,11 +398,11 @@
   toprow=0;
   keeppos=0;
   select.startpos=0;
-  select.endpos=0;
+  select.endpos=-1;
   select.startcol=0;
   select.endcol=-1;
   hilite.startpos=0;
-  hilite.endpos=0;
+  hilite.endpos=-1;
   hilite.startcol=0;
   hilite.endcol=-1;
   anchorpos=0;
@@ -457,6 +451,23 @@
   }
 
 
+// Create window
+void FXText::create(){
+  FXScrollArea::create();
+  font->create();
+  tabwidth=tabcolumns*font->getTextWidth(" ",1);
+  barwidth=barcolumns*font->getTextWidth("8",1);
+  recalc();
+  }
+
+
+// Detach window
+void FXText::detach(){
+  FXScrollArea::detach();
+  font->detach();
+  }
+
+
 // If window can have focus
 FXbool FXText::canFocus() const {
   return true;
@@ -476,17 +487,6 @@
   }
 
 
-// Out of focus chain
-void FXText::killFocus(){
-  FXScrollArea::killFocus();
-  setDefault(maybe);
-  flags|=FLAG_UPDATE;
-  if(getApp()->hasInputMethod()){
-    destroyComposeContext();
-    }
-  }
-
-
 // Enable the window
 void FXText::enable(){
   if(!(flags&FLAG_ENABLED)){
@@ -505,27 +505,61 @@
   }
 
 
-// Create window
-void FXText::create(){
-  FXScrollArea::create();
-  font->create();
-  tabwidth=tabcolumns*font->getTextWidth(" ",1);
-  barwidth=barcolumns*font->getTextWidth("8",1);
-  recalc();
+// Out of focus chain
+void FXText::killFocus(){
+  FXScrollArea::killFocus();
+  setDefault(maybe);
+  flags|=FLAG_UPDATE;
+  if(getApp()->hasInputMethod()){
+    destroyComposeContext();
+    }
   }
 
 
-// Detach window
-void FXText::detach(){
-  FXScrollArea::detach();
-  font->detach();
+// Return true if editable
+FXbool FXText::isEditable() const {
+  return (options&TEXT_READONLY)==0;
+  }
+
+
+// Set widget is editable or not
+void FXText::setEditable(FXbool edit){
+  options^=((edit-1)^options)&TEXT_READONLY;
+  }
+
+
+// Return true if text is in overstrike mode
+FXbool FXText::isOverstrike() const {
+  return (options&TEXT_OVERSTRIKE)!=0;
+  }
+
+
+// Set overstrike mode
+void FXText::setOverstrike(FXbool over){
+  options^=((0-over)^options)&TEXT_OVERSTRIKE;
+  }
+
+
+// Check if w is delimiter
+FXbool FXText::isdelimiter(FXwchar w) const {
+  FXchar wcs5={'\0','\0','\0','\0','\0'};
+  if(__unlikely(128<=w)){
+    wc2utf(wcs,w);
+    return (strstr(delimiters,wcs)!=NULL);
+    }
+  return (strchr(delimiters,w)!=NULL);
   }
 
 /*******************************************************************************/
 
-// Move the gap; gap is never moved inside utf character
+// Move the gap; gap is never moved inside utf character.
+// Afterward, new characters may be inserted at position simply
+// by dropping them at the start of the gap, thereby shrinking
+// the gap as each character is inserted.  No big block moves
+// are required until the gap has become too small for the next
+// insert operation.
 void FXText::movegap(FXint pos){
-  register FXint gaplen=gapend-gapstart;
+  FXint gaplen=gapend-gapstart;
   FXASSERT(0<=pos && pos<=length);
   FXASSERT(0<=gapstart && gapstart<=length);
   if(gapstart<pos){
@@ -543,73 +577,43 @@
   }
 
 
-// Size gap
+// Grow or shrink the gap size, keeping gap start at the same position.
 void FXText::sizegap(FXint sz){
-  register FXint gaplen=gapend-gapstart;
+  FXint gaplen=gapend-gapstart;
+  FXASSERT(0<=sz);
   FXASSERT(0<=gapstart && gapstart<=length);
-  if(sz>=gaplen){
-    sz+=MINSIZE;
-    if(!resizeElms(buffer,length+sz)){
-      fxerror("%s::sizegap: out of memory.\n",getClassName());
-      }
+  if(sz>gaplen){
+    if(!resizeElms(buffer,length+sz)){ fxerror("%s::sizegap: out of memory.\n",getClassName()); }
     moveElms(&buffergapstart+sz,&buffergapend,length-gapstart);
     if(sbuffer){
-      if(!resizeElms(sbuffer,length+sz)){
-        fxerror("%s::sizegap: out of memory.\n",getClassName());
-        }
+      if(!resizeElms(sbuffer,length+sz)){ fxerror("%s::sizegap: out of memory.\n",getClassName()); }
       moveElms(&sbuffergapstart+sz,&sbuffergapend,length-gapstart);
       }
     gapend=gapstart+sz;
     }
-  }
-
-
-// Squeeze out the gap by moving it to the end of the buffer
-void FXText::squeezegap(){
-  if(gapstart!=length){
-    moveElms(&buffergapstart,&buffergapend,length-gapstart);
-    if(sbuffer){moveElms(&sbuffergapstart,&sbuffergapend,length-gapstart);}
-    gapend=length+gapend-gapstart;
-    gapstart=length;
+  else if(sz<gaplen){
+    moveElms(&buffergapstart+sz,&buffergapend,length-gapstart);
+    if(!resizeElms(buffer,length+sz)){ fxerror("%s::sizegap: out of memory.\n",getClassName()); }
+    if(sbuffer){
+      moveElms(&sbuffergapstart+sz,&sbuffergapend,length-gapstart);
+      if(!resizeElms(sbuffer,length+sz)){ fxerror("%s::sizegap: out of memory.\n",getClassName()); }
+      }
+    gapend=gapstart+sz;
     }
   }
 
 /*******************************************************************************/
 
-// Make a valid position, at the start of a wide character
-FXint FXText::validPos(FXint pos) const {
-  const FXchar* ptr=&buffer(gapend-gapstart)&((~pos+gapstart)>>31);
-  if(pos<=0) return 0;
-  if(pos>=length) return length;
-  return (FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos), pos;
-  }
-
-
-// Decrement; a wide character does not cross the gap, so if pos is at
-// or below below the gap, we read from the segment below the gap
-FXint FXText::dec(FXint pos) const {
-  const FXchar* ptr=&buffer(gapend-gapstart)&((gapstart-pos)>>31);
-  return (--pos<=0 || FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos), pos;
-  }
-
-
-// Increment; since a wide character does not cross the gap, if we
-// start under the gap the last character accessed is below the gap
-FXint FXText::inc(FXint pos) const {
-  const FXchar* ptr=&buffer(gapend-gapstart)&((~pos+gapstart)>>31);
-  return (++pos>=length || FXISUTF8(ptrpos) || ++pos>=length || FXISUTF8(ptrpos) || ++pos>=length || FXISUTF8(ptrpos) || ++pos), pos;
-  }
-
-/*******************************************************************************/
-
 // Get byte
 FXint FXText::getByte(FXint pos) const {
+  FXASSERT(0<=pos && pos<=length);
   return (FXuchar)bufferpos+((gapend-gapstart)&((~pos+gapstart)>>31));
   }
 
 
 // Get character, assuming that gap never inside utf8 encoding
 FXwchar FXText::getChar(FXint pos) const {
+  FXASSERT(0<=pos && pos<=length);
   const FXuchar* ptr=(FXuchar*)&bufferpos+((gapend-gapstart)&((~pos+gapstart)>>31));
   FXwchar w=ptr0;
   if(__unlikely(0xC0<=w)){ w=(w<<6)^ptr1^0x3080;
@@ -621,21 +625,36 @@
 
 // Get length of wide character at position pos
 FXint FXText::getCharLen(FXint pos) const {
-  FXuchar c=bufferpos+((gapend-gapstart)&((~pos+gapstart)>>31));
-//  unsigned char m=(c>=0xC0)+(c>=0xE0)+(c>=0xF0)+1u;
-//  return m;
-  return ((0xE5000000>>((c>>4)<<1))&3)+1;
-//  return FXString::utfBytesc;
+  FXASSERT(0<=pos && pos<=length);
+  return FXUTF8LEN(bufferpos+((gapend-gapstart)&((~pos+gapstart)>>31)));
   }
 
 
 // Get style
 FXint FXText::getStyle(FXint pos) const {
+  FXASSERT(0<=pos && pos<=length);
   return (FXuchar)sbufferpos+((gapend-gapstart)&((~pos+gapstart)>>31));
   }
 
 /*******************************************************************************/
 
+// Decrement; a wide character does not cross the gap, so if pos is at
+// or below below the gap, we read from the segment below the gap
+FXint FXText::dec(FXint pos) const {
+  const FXchar* ptr=&buffer(gapend-gapstart)&((gapstart-pos)>>31);
+  return (--pos<=0 || FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos), pos;
+  }
+
+
+// Increment; since a wide character does not cross the gap, if we
+// start under the gap the last character accessed is below the gap
+FXint FXText::inc(FXint pos) const {
+  const FXchar* ptr=&buffer(gapend-gapstart)&((~pos+gapstart)>>31);
+  return (++pos>=length || FXISUTF8(ptrpos) || ++pos>=length || FXISUTF8(ptrpos) || ++pos>=length || FXISUTF8(ptrpos) || ++pos), pos;
+  }
+
+/*******************************************************************************/
+
 // Its a little bit more complex than this:
 // We need to deal with diacritics, i.e. non-spacing stuff.  When wrapping, scan till
 // the next starter-character the one with charCombining(c)==0.  Then measure the
@@ -656,7 +675,7 @@
 
 // Calculate X offset from line start to pos
 FXint FXText::xoffset(FXint start,FXint pos) const {
-  register FXint w=0;
+  FXint w=0;
   FXASSERT(0<=start && start<=pos && pos<=length);
   while(start<pos){
     w+=charWidth(getChar(start),w);
@@ -670,8 +689,8 @@
 // Position returned is start of next line, i.e. after newline
 // or after space where line got broken during line wrapping.
 FXint FXText::wrap(FXint start) const {
-  register FXint lw,cw,p,s;
-  register FXwchar ch;
+  FXint lw,cw,p,s;
+  FXwchar ch;
   FXASSERT(0<=start && start<=length);
   lw=0;
   p=s=start;
@@ -693,6 +712,72 @@
 
 /*******************************************************************************/
 
+// Find row number from position
+// If position falls in visible area, scan visrows for the proper row;
+// otherwise, count rows from start of row containing position to the
+// first visible line, or from the last visible line to the position.
+FXint FXText::rowFromPos(FXint pos) const {
+  FXint row=0;
+  if(pos<visrows0){                                                   // Above visible buffer
+    if(pos<=0) return 0;
+    return toprow-countRows(rowStart(pos),visrows0);
+    }
+  if(visrowsnvisrows<pos){                                            // Below visible buffer
+    if(pos>=length) return nrows-1;
+    return toprow+nvisrows-1+countRows(visrowsnvisrows-1,rowStart(pos));
+    }
+  while(row+1<nvisrows && visrowsrow+1<=pos && visrowsrow<visrowsrow+1) row++;
+  FXASSERT(0<=row && row<nvisrows);
+  FXASSERT(visrowsrow<=pos && pos<=visrowsrow+1);
+  return toprow+row;
+  }
+
+
+// Find row start position from row number
+// If row falls in visible area, we can directly return the row start position;
+// otherwise, we scan backward from first visible line, or forward from last
+// visible line, checking for start or end of buffer of course.
+FXint FXText::posFromRow(FXint row) const {
+  if(row<toprow){
+    if(row<0) return 0;
+    return prevRow(visrows0,toprow-row);
+    }
+  if(row>=toprow+nvisrows){
+    if(row>=nrows) return length;
+    return nextRow(visrowsnvisrows-1,row-toprow-nvisrows+1);
+    }
+  return visrowsrow-toprow;
+  }
+
+
+// Determine logical indent of position pos relative to line start.
+// Stop at the end of the line (not row).
+FXint FXText::columnFromPos(FXint start,FXint pos) const {
+  FXint column=0; FXuchar c;
+  FXASSERT(0<=start && pos<=length);
+  while(start<pos && (c=getByte(start))!='\n'){
+    column+=CC(c,column);
+    start+=getCharLen(start);
+    }
+  return column;
+  }
+
+
+// Determine position of logical indent relative to line start.
+// Stop at the end of the line (not row).
+FXint FXText::posFromColumn(FXint start,FXint col) const {
+  FXint column=0; FXuchar c;
+  FXASSERT(0<=start && start<=length);
+  while(start<length && (c=getByte(start))!='\n'){
+    column+=CC(c,column);
+    if(col<column) break;
+    start+=getCharLen(start);
+    }
+  return start;
+  }
+
+/*******************************************************************************/
+
 // Return position of begin of paragraph
 FXint FXText::lineStart(FXint pos) const {
   FXASSERT(0<=pos && pos<=length);
@@ -745,7 +830,7 @@
 
 // Return row start
 FXint FXText::rowStart(FXint pos) const {
-  register FXint p,t;
+  FXint p,t;
   FXASSERT(0<=pos && pos<=length);
   if(options&TEXT_WORDWRAP){
     p=pos;
@@ -768,7 +853,7 @@
 
 // Return row end
 FXint FXText::rowEnd(FXint pos) const {
-  register FXint p,t;
+  FXint p,t;
   FXASSERT(0<=pos && pos<=length);
   if(options&TEXT_WORDWRAP){
     p=pos;
@@ -795,7 +880,7 @@
 
 // Move to next row given start of line
 FXint FXText::nextRow(FXint pos,FXint nr) const {
-  register FXint p,t;
+  FXint p,t;
   FXASSERT(0<=pos && pos<=length);
   if(0<nr){
     if(options&TEXT_WORDWRAP){
@@ -824,7 +909,7 @@
 
 // Move to previous row given start of line
 FXint FXText::prevRow(FXint pos,FXint nr) const {
-  register FXint p,q,t;
+  FXint p,q,t;
   FXASSERT(0<=pos && pos<=length);
   if(0<nr){
     if(options&TEXT_WORDWRAP){
@@ -863,86 +948,9 @@
 
 /*******************************************************************************/
 
-// Find row number from position
-// If position falls in visible area, scan visrows for the proper row;
-// otherwise, count rows from start of row containing position to the
-// first visible line, or from the last visible line to the position.
-FXint FXText::rowFromPos(FXint pos) const {
-  FXint row=0;
-  if(pos<visrows0){                                                   // Above visible buffer
-    if(pos<=0) return 0;
-    return toprow-countRows(rowStart(pos),visrows0);
-    }
-  if(pos>=visrowsnvisrows && visrowsnvisrows>visrowsnvisrows-1){  // Below visible buffer AND there are more lines
-    if(pos>=length) return nrows-1;
-    return toprow+nvisrows+countRows(visrowsnvisrows,pos);
-    }
-  while(row+1<nvisrows && visrowsrow+1<=pos && visrowsrow<visrowsrow+1) row++;
-  FXASSERT(0<=row && row<nvisrows);
-  FXASSERT(visrowsrow<=pos && pos<=visrowsrow+1);
-  return toprow+row;
-  }
-
-
-// Find row start position from row number
-// If row falls in visible area, we can directly return the row start position;
-// otherwise, we scan backward from first visible line, or forward from last
-// visible line, checking for start or end of buffer of course.
-FXint FXText::posFromRow(FXint row) const {
-  if(row<toprow){
-    if(row<0) return 0;
-    return prevRow(visrows0,toprow-row);
-    }
-  if(row>=toprow+nvisrows){
-    if(row>=nrows) return length;
-    return nextRow(visrowsnvisrows-1,row-toprow-nvisrows+1);
-    }
-  return visrowsrow-toprow;
-  }
-
-
-// Determine logical indent of position pos relative to line start.
-// Stop at the end of the line (not row).
-FXint FXText::columnFromPos(FXint start,FXint pos) const {
-  FXint column=0; FXuchar c;
-  FXASSERT(0<=start && pos<=length);
-  while(start<pos && (c=getByte(start))!='\n'){
-    column+=(c=='\t')?tabcolumns-column%tabcolumns:1;
-    start+=getCharLen(start);
-    }
-  return column;
-  }
-
-
-// Determine position of logical indent relative to line start.
-// Stop at the end of the line (not row).
-FXint FXText::posFromColumn(FXint start,FXint col) const {
-  FXint column=0; FXuchar c;
-  FXASSERT(0<=start && start<=length);
-  while(start<length && (c=getByte(start))!='\n'){
-    column+=(c=='\t')?tabcolumns-column%tabcolumns:1;
-    if(col<column) break;
-    start+=getCharLen(start);
-    }
-  return start;
-  }
-
-/*******************************************************************************/
-
-// Check if w is delimiter
-FXbool FXText::isdelimiter(FXwchar w) const {
-  FXchar wcs5={'\0','\0','\0','\0','\0'};
-  if(__unlikely(128<=w)){
-    wc2utf(wcs,w);
-    return (strstr(delimiters,wcs)!=NULL);
-    }
-  return (strchr(delimiters,w)!=NULL);
-  }
-
-
 // Find end of previous word
 FXint FXText::leftWord(FXint pos) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=pos && pos<=length);
   if(0<pos){
     pos=dec(pos);
@@ -973,7 +981,7 @@
 
 // Find begin of next word
 FXint FXText::rightWord(FXint pos) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=pos && pos<=length);
   if(pos<length){
     ch=getChar(pos);
@@ -1004,7 +1012,7 @@
 
 // Find begin of a word
 FXint FXText::wordStart(FXint pos) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=pos && pos<=length);
   if(0<pos){
     ch=(pos<length)?getChar(pos):' ';
@@ -1037,7 +1045,7 @@
 
 // Find end of word
 FXint FXText::wordEnd(FXint pos) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=pos && pos<=length);
   if(pos<length){
     ch=getChar(pos);
@@ -1067,70 +1075,51 @@
   return pos;
   }
 
+
+// Make a valid position, at the start of a wide character
+FXint FXText::validPos(FXint pos) const {
+  const FXchar* ptr=&buffer(gapend-gapstart)&((~pos+gapstart)>>31);
+  if(pos<=0) return 0;
+  if(pos>=length) return length;
+  return (FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos<=0 || FXISUTF8(ptrpos) || --pos), pos;
+  }
+
 /*******************************************************************************/
 
 // Count number of columns; start should be on a row start
 FXint FXText::countCols(FXint start,FXint end) const {
-  register FXint nc=0,in=0;
-  register FXwchar ch;
-  FXASSERT(0<=start && end<=length);
+  FXint result=0;
+  FXint in=0;
+  FXwchar c;
+  FXASSERT(0<=start && start<=end && end<=length);
   while(start<end){
-    ch=getChar(start);
-    if(ch=='\n'){ start++; if(in>nc) nc=in; in=0; continue; }
-    if(ch=='\t'){ start++; in+=(tabcolumns-nc%tabcolumns); continue; }
+    c=getChar(start);
+    if(c=='\n'){ start++; result=FXMAX(result,in); in=0; continue; }
+    if(c=='\t'){ start++; in+=(tabcolumns-in%tabcolumns); continue; }
     start+=getCharLen(start);
     in++;
     }
-  if(in>nc) nc=in;
-  return nc;
+  result=FXMAX(result,in);
+  return result;
   }
 
 
-// Count number of rows; start should be on a row start
+// Count number of rows; start and end should be on a row start
 FXint FXText::countRows(FXint start,FXint end) const {
   FXint result=0;
-  FXint p=start;
-  FXint q=start;
-  FXint s=start;
-  FXint w=0;
-  FXint cw;
-  FXwchar c;
-  FXASSERT(0<=start && end<=length+1);
   if(options&TEXT_WORDWRAP){
-    while(p<end){
-      c=getChar(p);
-      if(c=='\n'){                    // Break at newline
-        q=p=s=p+1;
-        result++;
-        w=0;
-        continue;
-        }
-      cw=charWidth(c,w);
-      if(w+cw>wrapwidth){             // Break due to wrap
-        result++;
-        w=0;
-        if(q<s){                      // Break past last space seen
-          p=q=s;
-          continue;
-          }
-        if(p==q){                     // Always at least one character on each line!
-          p+=getCharLen(p);
-          }
-        q=s=p;
-        continue;
-        }
-      w+=cw;
-      p+=getCharLen(p);
-      if(Unicode::isSpace(c)) s=p;    // Remember potential break point!
+    while(start<end){
+      start=wrap(start);
+      result++;
       }
     }
   else{
-    while(p<end){
-      c=getByte(p++);
-      if(c=='\n'){ q=p; result++; }
+    while(start<end){
+      if(getByte(start++)=='\n'){
+        result++;
+        }
       }
     }
-  result+=(q<p);        // Last line non-empty
   return result;
   }
 
@@ -1138,13 +1127,12 @@
 // Count number of newlines
 FXint FXText::countLines(FXint start,FXint end) const {
   FXint result=0;
-  FXint p=start;
-  FXint q=start;
-  FXASSERT(0<=start && end<=length+1);
-  while(p<end){
-    if(getByte(p++)=='\n'){ q=p; result++; }
+  FXASSERT(0<=start && start<=end && end<=length);
+  while(start<end){
+    if(getByte(start++)=='\n'){
+      result++;
+      }
     }
-  result+=(q<p);        // Last line non-empty
   return result;
   }
 
@@ -1153,20 +1141,20 @@
 // Measure lines; start and end should be on a row start
 FXint FXText::measureText(FXint start,FXint end,FXint& wmax,FXint& hmax) const {
   FXint result=0;
-  FXint p=start;
-  FXint q=start;
   FXint s=start;
+  FXint b=start;
   FXint w=0;
   FXint cw;
   FXwchar c;
-  FXASSERT(0<=start && end<=length+1);
+  FXASSERT(0<=start && start<=end && end<=length);
   if(options&TEXT_WORDWRAP){
     wmax=wrapwidth;
-    while(p<end){
-      c=getChar(p);
+    while(start<end){
+      c=getChar(start);
       if(c=='\n'){                      // Break at newline
-        q=s=p=p+1;
         result++;
+        start++;
+        s=b=start;
         w=0;
         continue;
         }
@@ -1174,56 +1162,55 @@
       if(w+cw>wrapwidth){               // Break due to wrap
         result++;
         w=0;
-        if(s>q){                        // Break past last space seen
-          q=p=s;
+        if(s<b){                        // Break past last space seen
+          s=start=b;
           continue;
           }
-        if(p==q){                       // Always at least one character on each line!
-          p+=getCharLen(p);
+        if(start==s){                   // Always at least one character on each line!
+          start+=getCharLen(start);
           }
-        q=s=p;
+        s=b=start;
         continue;
         }
       w+=cw;
-      p+=getCharLen(p);
-      if(Unicode::isSpace(c)) s=p;      // Remember potential break point!
+      start+=getCharLen(start);
+      if(Unicode::isSpace(c)) b=start;  // Remember potential break point!
       }
     }
   else{
     wmax=0;
-    while(p<end){
-      c=getChar(p);
+    while(start<end){
+      c=getChar(start);
       if(c=='\n'){                      // Break at newline
-        if(w>wmax) wmax=w;
+        wmax=FXMAX(wmax,w);
         result++;
-        q=++p;
+        start++;
         w=0;
         continue;
         }
       w+=charWidth(c,w);
-      p+=getCharLen(p);
+      start+=getCharLen(start);
       }
-    if(w>wmax) wmax=w;
+    wmax=FXMAX(wmax,w);
     }
-  result+=(q<p);                        // Last line non-empty
   hmax=result*font->getFontHeight();
   return result;
   }
 
 
-// Recalculate line starts
+// Recalculate line starts, by re-wrapping affected
+// lines within the visible range of the text buffer.
 void FXText::calcVisRows(FXint startline,FXint endline){
-  register FXint pos;
-  FXASSERT(nvisrows>0);
-  startline=FXCLAMP(0,startline,nvisrows);
-  endline=FXCLAMP(0,endline,nvisrows);
+  FXASSERT(0<nvisrows);
+  if(startline<1){
+    visrows0=toppos;
+    startline=1;
+    }
+  if(endline>nvisrows){
+    endline=nvisrows;
+    }
   if(startline<=endline){
-    FXASSERT(0<=toppos && toppos<=length);
-    if(startline==0){
-      visrows0=toppos;
-      startline=1;
-      }
-    pos=visrowsstartline-1;
+    FXint pos=visrowsstartline-1;
     if(options&TEXT_WORDWRAP){
       while(startline<=endline && pos<length){
         pos=wrap(pos);
@@ -1249,7 +1236,7 @@
 // and line numbers, so if any of these things change it has to be redone.
 void FXText::recompute(){
   FXint hh=font->getFontHeight();
-  FXint ww1,hh1,ww2,hh2;
+  FXint botrow,ww1,hh1,ww2,hh2;
 
   // The keep position is where we want to have the top of the buffer be;
   // make sure this is still inside the text buffer!
@@ -1264,12 +1251,19 @@
   // the rest.  This avoids measuring the entire text twice, which is
   // quite expensive.
   toprow=measureText(0,toppos,ww1,hh1);
-  nrows=toprow+measureText(toppos,length+1,ww2,hh2);
 
-  // The width of the buffer is the maximum of the chunks measured above,
-  // while the height is their sum.
+  FXTRACE((150,"measureText(%d,%d,%d,%d) = %d\n",0,toppos,ww1,hh1,toprow));
+
+  botrow=measureText(toppos,length,ww2,hh2);
+
+  FXTRACE((150,"measureText(%d,%d,%d,%d) = %d\n",toppos,length,ww2,hh2,botrow));
+
+  // Update text dimensions in terms of pixels and rows; note one extra
+  // row always added, as there is always at least one row, even though
+  // it may be empty of any characters.
   textWidth=FXMAX(ww1,ww2);
-  textHeight=hh1+hh2;
+  textHeight=hh1+hh2+hh;
+  nrows=toprow+botrow+1;
 
   // Adjust position, keeping same fractional position. Do this AFTER having
   // determined toprow, which may have changed due to wrapping changes.
@@ -1342,25 +1336,21 @@
   FXint cursorstartpos;
   FXint anchorstartpos;
 
-  // Compute new wrap width, which is either based on the wrap columns
-  // or on the width of the window.  If a vertical scroll bar MAY be
-  // visible, assume it IS so we don't get sudden surprises.
+  // Compute new wrap width, which is either based on the wrap columns or on the
+  // width of the window.  If a vertical scroll bar MAY be visible, assume it IS
+  // so we don't get sudden surprises.
+  // For mono-spaced fonts, wrapwidth is a integral multiple of font width.
   if(options&TEXT_FIXEDWRAP){
     wrapwidth=wrapcolumns*font->getTextWidth("x",1);
     }
   else{
     wrapwidth=width-barwidth-marginleft-marginright;
     if(!(options&VSCROLLER_NEVER)) wrapwidth-=vertical->getDefaultWidth();
+    if(font->isFontMono()) wrapwidth=fw*(wrapwidth/fw);
     }
 
-  // If we're wrapping, and wrap width changed, we may need to reflow.
-  // When using fixed pitch font, only reflow if the window resized by a
-  // whole number of characters.  Otherwise, reflow every time.
-  if((options&TEXT_WORDWRAP) && (wrapwidth!=oww)){
-    if(!font->isFontMono() || (wrapwidth/fw!=oww/fw)) flags|=FLAG_RECALC;
-    }
-
-  FXTRACE((150,"layout: oww=%d wrapwidth=%d\n",oww,wrapwidth));
+  // If we're wrapping, and wrap width changed, we may need to reflow the text.
+  if((options&TEXT_WORDWRAP) && (wrapwidth!=oww)) flags|=FLAG_RECALC;
 
   // Adjust scrollbars; if necessary, remeasure reflowed text
   // This places the scrollbars, and thus sets the visible area.
@@ -1382,23 +1372,21 @@
   vertical->setLine(fh);
   horizontal->setLine(fw);
 
-  FXTRACE((150,"layout: nrows=%d nvisrows=%d\n",nrows,nvisrows));
-
   // Hopefully, all is still in range
-  FXASSERT(0<=toprow && toprow<nrows);
+  FXASSERT(0<=toprow && toprow<=nrows);
   FXASSERT(0<=toppos && toppos<=length);
 
   // Update cursor location parameters
   cursorstartpos=rowStart(cursorpos);
   cursorrow=rowFromPos(cursorstartpos);
   cursorcol=columnFromPos(cursorstartpos,cursorpos);
-  cursorvcol=cursorcol;  // FIXME MAYBE
+  cursorvcol=cursorcol;
 
   // Update anchor location parameters
   anchorstartpos=rowStart(anchorpos);
   anchorrow=rowFromPos(anchorstartpos);
   anchorcol=columnFromPos(anchorstartpos,anchorpos);
-  anchorvcol=anchorcol; // FIXME MAYBE
+  anchorvcol=anchorcol;
 
   // Force repaint
   update();
@@ -1418,7 +1406,7 @@
 
 // Search forward for match
 FXint FXText::matchForward(FXint pos,FXint end,FXwchar l,FXwchar r,FXint level) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=end && end<=length);
   FXASSERT(0<=pos && pos<=length);
   while(pos<end){
@@ -1438,7 +1426,7 @@
 
 // Search backward for match
 FXint FXText::matchBackward(FXint pos,FXint beg,FXwchar l,FXwchar r,FXint level) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=beg && beg<=length);
   FXASSERT(0<=pos && pos<=length);
   while(beg<=pos){
@@ -1492,266 +1480,6 @@
 
 /*******************************************************************************/
 
-// Retabbify a string
-// Assume original starting column of the string was indent, and the output
-// starting column is outdent; this affects accounting of the tab-stops in the
-// input string, and of the output string relative to the first character.
-// Along the way, extra columns may be inserted or removed as per shift.
-// If shift=0, indent=0, and outdent=0, this routine has the effect of harmonizing
-// the output of white space according to the current tab setting ("clean indent").
-// For now, we assume all unicoce characters to be one column.
-// Lines containing only white space are collapsed to just a newline.
-FXString FXText::tabbify(const FXchar* str,FXint len,FXint indent,FXint outdent,FXint shift,FXbool tab) const {
-  FXString result;
-  FXint isc,iec,osc,oec,ntabs,p,q; 
-  FXuchar c;
-  p=q=0;
-  isc=iec=indent;
-  osc=oec=outdent;
-  while(p<len){
-    c=strp++;
-    if(c==' '){ iec++; continue; }                      // Count input columns
-    if(c=='\t'){ iec+=tabcolumns-iec%tabcolumns; continue; }
-    if(c=='\n'){ isc=iec=indent; osc=oec=outdent; q++; continue; }
-    oec=osc+(iec-isc);
-    if(osc==outdent){ oec=FXMAX(oec+shift,0); }         // Add extra columns for shift (may be negative or zero)
-    if(tab){
-      ntabs=oec/tabcolumns-osc/tabcolumns;              // How many tabs to emit
-      if(ntabs){
-        q+=ntabs;
-        osc=(oec/tabcolumns)*tabcolumns;                // Advance starting column to the last tabstop
-        }
-      }
-    q+=oec-osc;                                         // How many spaces to emit to reach ending column
-    isc=++iec;                                          // Advance input columns
-    osc=++oec;                                          // Advance output columns
-    q++;                                                // Advance utf8 character
-    if(c<0xC0) continue;
-    q++; p++;
-    if(c<0xE0) continue;
-    q++; p++;
-    if(c<0xF0) continue;
-    q++; p++;
-    }
-  result.length(q);                                     // Resize to exact length
-  p=q=0;
-  isc=iec=indent;
-  osc=oec=outdent;
-  while(p<len){
-    c=strp++;
-    if(c==' '){ iec++; continue; }                      // Count input columns
-    if(c=='\t'){ iec+=tabcolumns-iec%tabcolumns; continue; }
-    if(c=='\n'){ isc=iec=indent; osc=oec=outdent; resultq++='\n'; continue; }
-    oec=osc+(iec-isc);
-    if(osc==outdent){ oec=FXMAX(oec+shift,0); }         // Add extra columns for shift (may be negative or zero)
-    if(tab){
-      ntabs=oec/tabcolumns-osc/tabcolumns;              // How many tabs to emit
-      if(ntabs){
-        do{ resultq++='\t'; }while(--ntabs);
-        osc=(oec/tabcolumns)*tabcolumns;                // Advance starting column to the last tabstop
-        }
-      }
-    while(osc<oec){ resultq++=' '; osc++; }           // Emit spaces to reach ending column
-    isc=++iec;                                          // Advance input columns
-    osc=++oec;                                          // Advance output columns
-    resultq++=c;                                      // Copy utf8 character
-    if(c<0xC0) continue;
-    resultq++=strp++;
-    if(c<0xE0) continue;
-    resultq++=strp++;
-    if(c<0xF0) continue;
-    resultq++=strp++;
-    }
-  FXASSERT(q<=result.length());
-  return result;
-  }
-
-
-FXString FXText::tabbify(const FXString& str,FXint indent,FXint outdent,FXint shift,FXbool tab) const {
-  return tabbify(str.text(),str.length(),indent,outdent,shift,tab);
-  }
-
-
-// Find number of rows in string
-FXint FXText::countTextLines(const FXchar* text,FXint n) const {
-  FXint result=0;
-  FXint i=0;
-  while(i<n){
-    result+=(texti=='\n');
-    i++;
-    }
-  return result;
-  }
-
-
-// Find number of columns in string
-FXint FXText::countTextColumns(const FXchar* text,FXint n) const {
-  FXint result=0;
-  FXint cols=0;
-  FXint i=0;
-  FXchar c;
-  while(i<n){
-    c=texti;
-    if(c=='\n'){ i++; result=FXMAX(result,cols); cols=0; continue; }
-    if(c=='\t'){ i++; cols+=tabcolumns-cols%tabcolumns; continue; }
-    i+=FXString::utfBytes(FXuchar)c;
-    cols++;
-    }
-  result=FXMAX(result,cols);
-  return result;
-  }
-
-/*******************************************************************************/
-
-// Remove block of columns
-// For each line, scan to startcol, marking this position and indent level.
-// Copy the text encountered up to this point. Then scan to endcol, maring that
-// position and indent level.
-// If any text remains on the line, append it to the output, after adjusting indent
-// level and padding and retabbing it based on marked indent levels.
-FXint FXText::removeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,FXbool notify){
-  if(startpos<endpos && startcol<=endcol){
-    FXString text=extractText(startpos,endpos-startpos);
-    FXString repl;
-    FXint is,ie,s,e,p,ex,w;
-    for(s=0; s<text.length(); s=e){
-      for(e=s; e<text.length() && texte!='\n'; ++e){ }
-      for(is=0,p=s; p<e && is+(w=((textp=='\t')?tabcolumns-is%tabcolumns:1))<=startcol; p=text.inc(p)){
-        is+=w;
-        }
-      repl.append(&texts,p-s);
-      for(ie=is; p<e && ie<endcol; p=text.inc(p)){
-        ie+=(textp=='\t')?tabcolumns-ie%tabcolumns:1;
-        }
-      if(p<e){
-        ex=ie-endcol+startcol-is;
-        repl.append(tabbify(&textp,e-p,ie,is,FXMAX(ex,0),!(options&TEXT_NO_TABS)));
-        }
-      if(texte=='\n'){
-        repl.append('\n');
-        ++e;
-        }
-      }
-    replaceText(startpos,endpos-startpos,repl,notify);
-    return repl.length();
-    }
-  return 0;
-  }
-
-
-// Extract block of columns
-// For each line, scan to startcol, marking the position and indent level.
-// Then scan to endcol, and copy this range of text to the output, adding
-// extra space at the front if needed to adjust to the correct indent level.
-FXString FXText::extractTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol) const {
-  if(startpos<endpos && startcol<=endcol){
-    FXString orig=extractText(startpos,endpos-startpos);
-    FXString result;
-    FXint is,ie,s,e,p,w;
-    for(s=0; s<orig.length(); s=e){
-      for(e=s; e<orig.length() && orige!='\n'; ++e){ }
-      for(is=0; s<e && is+(w=((origs=='\t')?tabcolumns-is%tabcolumns:1))<=startcol; s=orig.inc(s)){
-        is+=w;
-        }
-      if(s<e){
-        for(ie=is,p=s; p<e && ie<endcol; p=orig.inc(p)){
-          ie+=(origp=='\t')?tabcolumns-ie%tabcolumns:1;
-          }
-        result.append(tabbify(&origs,p-s,is,0,startcol-is,!(options&TEXT_NO_TABS)));
-        }
-      if(orige=='\n'){
-        result.append('\n');
-        ++e;
-        }
-      }
-    return result;
-    }
-  return FXString::null;
-  }
-
-
-// Replace block of columns with text
-void FXText::replaceTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXbool notify){
-  if(startpos<endpos && startcol<=endcol){
-    FXint ninscols=countTextColumns(text.text(),text.length());
-    FXString orig=extractText(startpos,endpos-startpos);
-    FXString repl;
-    FXint os,oe,ns,ne,is,nie,oie,ex,p,q,w;
-    
-    FXTRACE((1,"startpos=%d\n",startpos));
-    FXTRACE((1,"endpos=%d\n",endpos));
-    FXTRACE((1,"startcol=%d\n",startcol));
-    FXTRACE((1,"endcol=%d\n",endcol));
-
-    for(os=ns=0; os<orig.length(); os=oe,ns=ne){
-      for(oe=os; oe<orig.length() && origoe!='\n'; ++oe){ }
-      for(ne=ns; ne<text.length() && textne!='\n'; ++ne){ }
-      for(is=0,p=os; p<oe && is+(w=((origp=='\t')?tabcolumns-is%tabcolumns:1))<=startcol; p=orig.inc(p)){ 
-        is+=w;
-        }
-      repl.append(&origos,p-os);
-      repl.append(tabbify(&textns,ne-ns,is,startcol,0,!(options&TEXT_NO_TABS)));
-
-      q=p;
-      
-      // Figure indent at end of new line
-      for(nie=is; q<ne && nie<ninscols; q=repl.inc(q)){
-        nie+=(replq=='\t')?tabcolumns-nie%tabcolumns:1;
-        }
-
-      // Skip over replaced columns
-      for(oie=is; p<oe && oie<endcol; p=orig.inc(p)){
-        oie+=(origp=='\t')?tabcolumns-oie%tabcolumns:1;
-        }
-
-      // Anything left past last removed column?
-      if(p<oe){
-        ex=oie-nie;
-        repl.append(tabbify(&textp,oe-p,oie,nie,FXMAX(ex,0),!(options&TEXT_NO_TABS)));
-        }
-        
-      // Add newline
-      if(origoe=='\n'){
-        repl.append('\n');
-        ++oe;
-        }
-      }
-FXTRACE((1,"repl=\n%s\n",repl.text()));      
-    replaceText(startpos,endpos-startpos,repl,notify);
-    }
-  }
-
-
-// Shift block of lines from position start up to end by given indent
-FXint FXText::shiftText(FXint startpos,FXint endpos,FXint shift,FXbool notify){
-  FXASSERT(0<=startpos);
-  FXASSERT(endpos<=length);
-  if(startpos<endpos){
-    FXString orig=extractText(startpos,endpos-startpos);
-    FXString repl=tabbify(orig.text(),orig.length(),0,0,shift,!(options&TEXT_NO_TABS));
-    replaceText(startpos,endpos-startpos,repl,notify);
-    return repl.length();
-    }
-  return 0;
-  }
-
-
-// Shift case of text
-FXint FXText::caseShift(FXint startpos,FXint endpos,FXint upper,FXbool notify){
-  if(startpos<endpos){
-    FXString orig=extractText(startpos,endpos-startpos);
-    switch(upper){
-      case 1: orig.upper(); break;
-      case 0: orig.lower(); break;
-      }
-    replaceText(startpos,endpos-startpos,orig,notify);
-    return orig.length();
-    }
-  return 0;
-  }
-
-/*******************************************************************************/
-
 // Search for text
 FXbool FXText::findText(const FXString& string,FXint* beg,FXint* end,FXint start,FXuint flgs,FXint npar){
   FXint rexmode=FXRex::Normal;
@@ -1769,7 +1497,7 @@
   if(rex.parse(string,rexmode)==FXRex::ErrOK){
 
     // Make all characters contiguous in the buffer
-    squeezegap();
+    movegap(length);
 
     // Search forward
     if(flgs&SEARCH_FORWARD){
@@ -1802,7 +1530,6 @@
 /*******************************************************************************/
 
 // Localize position at x,y
-// Find the row first, then
 FXint FXText::getPosAt(FXint x,FXint y) const {
   FXint linebeg,lineend,row,cx=0,cw,p;
   FXwchar c;
@@ -1820,6 +1547,7 @@
     lineend=nextRow(linebeg);
     }
   else{                                 // Inside visible area
+    FXASSERT(row-toprow<nvisrows);
     linebeg=visrowsrow-toprow;
     lineend=visrowsrow-toprow+1;
     }
@@ -1859,6 +1587,7 @@
     lineend=nextRow(linebeg);
     }
   else{                                 // Inside visible area
+    FXASSERT(row-toprow<nvisrows);
     linebeg=visrowsrow-toprow;
     lineend=visrowsrow-toprow+1;
     }
@@ -1888,14 +1617,13 @@
 // Also, control-characters are problematic as they're rendered as ^A,
 // thus, take up two columns even for fixed-pitch fonts.
 FXint FXText::getRowColumnAt(FXint x,FXint y,FXint& row,FXint& col) const {
-  register FXint spacew=font->getCharWidth(' ');
-  register FXint caretw=font->getCharWidth('^');
-  register FXint linebeg,lineend,cx=0,cw,cc,p;
-  register FXwchar c;
+  FXint spacew=font->getCharWidth(' ');
+  FXint caretw=font->getCharWidth('^');
+  FXint linebeg,lineend,cx=0,cw,cc,p;
+  FXwchar c;
   x=x-pos_x-marginleft-getVisibleX();
   y=y-pos_y-margintop-getVisibleY();
   row=y/font->getFontHeight();          // Row is easy to find
-  row=FXCLAMP(0,row,nrows-1);           // Keep inside the legal range
   col=0;                                // Find column later
   if(row<toprow){                       // Above visible area
     linebeg=prevRow(visrows0,toprow-row);
@@ -1906,6 +1634,7 @@
     lineend=nextRow(linebeg);
     }
   else{                                 // Inside visible area
+    FXASSERT(row-toprow<nvisrows);
     linebeg=visrowsrow-toprow;
     lineend=visrowsrow-toprow+1;
     }
@@ -1963,24 +1692,24 @@
 
 // Calculate X position of pos
 FXint FXText::getXOfPos(FXint pos) const {
-  register FXint base=rowStart(pos);
+  FXint base=rowStart(pos);
   return getVisibleX()+marginleft+pos_x+xoffset(base,pos);
   }
 
 
 // Determine Y from position pos
 FXint FXText::getYOfPos(FXint pos) const {
-  register FXint h=font->getFontHeight();
+  FXint h=font->getFontHeight();
   return getVisibleY()+margintop+pos_y+rowFromPos(pos)*h;
   }
 
 
 // Return screen x-coordinate of row and column
 FXint FXText::getXOfRowColumn(FXint row,FXint col) const {
-  register FXint spacew=font->getCharWidth(' ');
-  register FXint caretw=font->getCharWidth('^');
-  register FXint linebeg,lineend,tcol=0,twid=0,tadj=0,cx=0,cc=0,cw,p;
-  register FXwchar c;
+  FXint spacew=font->getCharWidth(' ');
+  FXint caretw=font->getCharWidth('^');
+  FXint linebeg,lineend,tcol=0,twid=0,tadj=0,cx=0,cc=0,cw,p;
+  FXwchar c;
   if(row<toprow){                       // Above visible area
     linebeg=prevRow(visrows0,toprow-row);
     lineend=nextRow(linebeg);
@@ -2041,25 +1770,33 @@
 
 /*******************************************************************************/
 
-// Position is selected if selected range is non-empty, the position is inside this
-// range, and either there is no column range or the column is within the range.
-// Note that column value is not tested unless there's a rectangular selection.
-FXbool FXText::isPosSelected(FXint pos,FXint col) const {
-  return (select.startpos<select.endpos) && (select.startpos<=pos) && (pos<=select.endpos) && ((select.startcol>select.endcol) || ((select.startcol<=col) && (col<select.endcol)));
+// Make line containing pos the top visible line
+void FXText::setTopLine(FXint pos){
+  setPosition(pos_x,-rowFromPos(pos)*font->getFontHeight());
   }
 
 
-// See if position is in the selection, and the selection is non-empty
-FXbool FXText::isPosSelected(FXint pos) const {
-/*
-  if((select.startpos<select.endpos) && (select.startpos<=pos) && (pos<=select.endpos)){
-    if(select.startcol>select.endcol) return true;
-    FXint col=columnFromPos(lineStart(pos),pos);
-    return (select.startcol<=col) && (col<select.endcol);
-    }
-  return false;
-*/
-  return select.startpos<select.endpos && select.startpos<=pos && pos<=select.endpos;   // FIXME block selection...
+// Get top line
+FXint FXText::getTopLine() const {
+  return visrows0;
+  }
+
+
+// Make line containing pos the bottom visible line
+void FXText::setBottomLine(FXint pos){
+  setPosition(pos_x,getVisibleHeight()-marginbottom-margintop-font->getFontHeight()-rowFromPos(pos)*font->getFontHeight());
+  }
+
+
+// Get bottom line
+FXint FXText::getBottomLine() const {
+  return visrowsnvisrows-1;
+  }
+
+
+// Center line containing pos to center of the screen
+void FXText::setCenterLine(FXint pos){
+  setPosition(pos_x,((getVisibleHeight()-marginbottom-margintop)/2)-rowFromPos(pos)*font->getFontHeight());
   }
 
 
@@ -2112,46 +1849,16 @@
   }
 
 
-// Make line containing pos the top visible line
-void FXText::setTopLine(FXint pos){
-  setPosition(pos_x,-rowFromPos(pos)*font->getFontHeight());
-  }
-
-
-// Make line containing pos the bottom visible line
-void FXText::setBottomLine(FXint pos){
-  setPosition(pos_x,getVisibleHeight()-marginbottom-margintop-font->getFontHeight()-rowFromPos(pos)*font->getFontHeight());
-  }
-
-
-// Center line containing pos to center of the screen
-void FXText::setCenterLine(FXint pos){
-  setPosition(pos_x,((getVisibleHeight()-marginbottom-margintop)/2)-rowFromPos(pos)*font->getFontHeight());
-  }
-
-
-// Get top line
-FXint FXText::getTopLine() const {
-  return visrows0;
-  }
-
-
-// Get bottom line
-FXint FXText::getBottomLine() const {
-  return visrowsnvisrows-1;
-  }
-
-
 // Move content
 void FXText::moveContents(FXint x,FXint y){
-  register FXint delta=-y/font->getFontHeight()-toprow;
-  register FXint vx=getVisibleX();
-  register FXint vy=getVisibleY();
-  register FXint vw=getVisibleWidth();
-  register FXint vh=getVisibleHeight();
-  register FXint dx=x-pos_x;
-  register FXint dy=y-pos_y;
-  register FXint i;
+  FXint delta=-y/font->getFontHeight()-toprow;
+  FXint vx=getVisibleX();
+  FXint vy=getVisibleY();
+  FXint vw=getVisibleWidth();
+  FXint vh=getVisibleHeight();
+  FXint dx=x-pos_x;
+  FXint dy=y-pos_y;
+  FXint i;
 
   // Erase fragments of cursor overhanging margins
   eraseCursorOverhang();
@@ -2198,7 +1905,7 @@
   keeppos=toppos;
 
   // Hopefully, all is still in range
-  FXASSERT(0<=toprow && toprow<nrows);
+  FXASSERT(0<=toprow && toprow<=nrows);
   FXASSERT(0<=toppos && toppos<=length);
 
   // Scroll stuff in the bar only vertically
@@ -2218,14 +1925,14 @@
   pos=validPos(pos);
   if(cursorpos!=pos){
     if(isEditable()) drawCursor(0);
-    if(options&TEXT_SHOWACTIVE){updateRows(cursorrow,cursorrow);}
+    if(options&TEXT_SHOWACTIVE){ updateRow(cursorrow); }
     FXint cursorstartpos=rowStart(pos);
     cursorrow=rowFromPos(cursorstartpos);
     cursorcol=columnFromPos(cursorstartpos,pos);
     cursorvcol=cursorcol;
     cursorpos=pos;
     prefcol=-1;
-    if(options&TEXT_SHOWACTIVE){updateRows(cursorrow,cursorrow);}
+    if(options&TEXT_SHOWACTIVE){ updateRow(cursorrow); }
     if(isEditable()) drawCursor(FLAG_CARET);
     if(target && notify){
       target->tryHandle(this,FXSEL(SEL_CHANGED,message),(void*)(FXival)cursorpos);
@@ -2329,25 +2036,29 @@
 // and nrdel old rows have been replaced with nrins new rows. Recalculate the
 // visrows array and ancillary buffer positioning information.
 void FXText::mutation(FXint pos,FXint ncins,FXint ncdel,FXint nrins,FXint nrdel){
-  register FXint th=font->getFontHeight();
-  register FXint vx=getVisibleX();
-  register FXint vy=getVisibleY();
-  register FXint vw=getVisibleWidth();
-  register FXint vh=getVisibleHeight();
-  register FXint ncdelta=ncins-ncdel;
-  register FXint nrdelta=nrins-nrdel;
-  register FXint line,i,y;
+  FXint th=font->getFontHeight();
+  FXint vx=getVisibleX();
+  FXint vy=getVisibleY();
+  FXint vw=getVisibleWidth();
+  FXint vh=getVisibleHeight();
+  FXint ncdelta=ncins-ncdel;
+  FXint nrdelta=nrins-nrdel;
+  FXint line,i,y;
 
   FXTRACE((150,"BEFORE: pos=%d ncins=%d ncdel=%d nrins=%d nrdel=%d toppos=%d toprow=%d nrows=%d nvisrows=%d length=%d\n",pos,ncins,ncdel,nrins,nrdel,toppos,toprow,nrows,nvisrows,length));
 
-  // Changes below top of buffer
+  FXASSERT(0<=ncins && 0<=ncdel);
+  FXASSERT(0<=nrins && 0<=nrdel);
+  FXASSERT(0<=pos && pos<=length);
+
+  // Changed text begins below first visible line
   if(visrows0<=pos){
 
-    // Changes in bottom part of visible buffer
+    // Changed text begins above last visible line
     if(pos<=visrowsnvisrows){
 
-      // Line is in visible part of buffer
-      line=rowFromPos(pos)-toprow;
+      // Scan to find line containing start of change
+      for(line=0; line+1<nvisrows && visrowsline+1<=pos && visrowsline<visrowsline+1; line++){ }
       FXASSERT(0<=line && line<nvisrows);
 
       // More lines
@@ -2389,14 +2100,14 @@
       }
     }
 
-  // Changes above bottom of buffer
+  // Changed text ends above last visible line
   else if(pos+ncdel<visrowsnvisrows){
 
-    // Changes in top visible part of buffer
+    // Changed text ends below first visible line
     if(visrows0<pos+ncdel){
 
-      // Line is in visible part of buffer
-      line=rowFromPos(pos+ncdel)-toprow;
+      // Scan to find line containing end of change
+      for(line=nvisrows; pos+ncdel<visrowsline; line--){ }
       FXASSERT(0<=line && line<nvisrows);
 
       // Enough text to keep bottom part of buffer
@@ -2405,7 +2116,7 @@
         toppos=prevRow(visrowsline+ncdelta,line);
         keeppos=toppos;
         FXASSERT(0<=toprow);
-        FXASSERT(nextRow(0,toprow)==toppos);
+        //FXASSERT(nextRow(0,toprow)==toppos);
         pos_y-=nrdelta*th;
         for(i=line; i<=nvisrows; i++) visrowsi=visrowsi+ncdelta;
         calcVisRows(0,line);
@@ -2413,7 +2124,7 @@
         if(nrdelta) update(0,vy,vx,vh);         // Repaint line numbers
         }
 
-      // Not enough text in buffer to avoid scrolling
+      // To few lines left, scroll to top of document
       else{
         toprow=0;
         toppos=0;
@@ -2424,13 +2135,13 @@
         }
       }
 
-    // Changes above visible part of buffer
+    // Changed text ends above first visible line
     else{
       toprow+=nrdelta;
       toppos+=ncdelta;
       keeppos=toppos;
       FXASSERT(0<=toprow);
-      FXASSERT(nextRow(0,toprow)==toppos);
+      //FXASSERT(nextRow(0,toprow)==toppos);
       for(i=0; i<=nvisrows; i++) visrowsi+=ncdelta;
       FXASSERT(0<=visrows0);
       FXASSERT(visrowsnvisrows<=length);
@@ -2439,7 +2150,7 @@
       }
     }
 
-  // Changes affect all of visible buffer
+  // Changed text begins above first and ends below last visible line
   else{
     toprow=FXMAX(0,FXMIN(toprow,nrows-nvisrows));
     toppos=nextRow(0,toprow);
@@ -2452,44 +2163,46 @@
   }
 
 
-// Adjust selection for change in text
+// Adjust selection for change in text, if there is a selection
 static void adjustSelection(FXTextSelection& sel,FXint pos,FXint ndel,FXint nins){
 //#define SELECTION_SNIPPED 1
-  if(pos+ndel<=sel.startpos){   // No overlap with change, just adjust positions
-    sel.startpos+=nins-ndel;
-    sel.endpos+=nins-ndel;
-    }
-  else if(pos<=sel.startpos){
-    if(pos+ndel<=sel.endpos){   // First part of selection inside change
+  if(sel.startpos<=sel.endpos){
+    if(pos+ndel<=sel.startpos){         // No overlap with change, just adjust positions
+      sel.startpos+=nins-ndel;
       sel.endpos+=nins-ndel;
+      }
+    else if(pos<=sel.startpos){
+      if(pos+ndel<=sel.endpos){         // First part of selection inside change
+        sel.endpos+=nins-ndel;
 #ifdef SELECTION_SNIPPED
-      sel.startpos=pos+nins;            // Selection starts at end of change
+        sel.startpos=pos+nins;          // Snip selection
 #else
-      sel.startpos=pos;                 // Selection starts at begin of change
+        sel.startpos=pos;               // Expand selection
 #endif
-      }
-    else{                       // Whole of selection inside change
+        }
+      else{                             // Whole of selection inside change
 #ifdef SELECTION_SNIPPED
-      sel.startpos=pos;                 // Selection is now empty
-      sel.endpos=pos;
-      sel.startcol=0;
-      sel.endcol=-1;
+        sel.startpos=0;                 // Snip selection to empty
+        sel.endpos=-1;
+        sel.startcol=0;
+        sel.endcol=-1;
 #else
-      sel.startpos=pos;                 // Selection is now equal to change
-      sel.endpos=pos+nins;
+        sel.startpos=pos;               // Expand selection to change
+        sel.endpos=pos+nins;
 #endif
+        }
       }
-    }
-  else if(pos<sel.endpos){
-    if(pos+ndel<=sel.endpos){   // Selection covers change completely
-      sel.endpos+=nins-ndel;
-      }
-    else{                       // Last part of selection inside change
+    else if(pos<sel.endpos){
+      if(sel.endpos<=pos+ndel){         // Last part of selection inside change
 #ifdef SELECTION_SNIPPED
-      sel.endpos=pos;                   // Selection ends at start of change
+        sel.endpos=pos;                 // Snip selection
 #else
-      sel.endpos=pos+nins;              // Selection ends at end of change
+        sel.endpos=pos+nins;            // Expand selection
 #endif
+        }
+      else{                             // Whole of range inside selection
+        sel.endpos+=nins-ndel;
+        }
       }
     }
   }
@@ -2498,7 +2211,7 @@
 // Backs up to the begin of the line preceding the line containing pos, or the
 // start of the line containing pos if the preceding line terminated in a newline.
 FXint FXText::changeBeg(FXint pos) const {
-  register FXint p1,p2,t;
+  FXint p1,p2,t;
   FXASSERT(0<=pos && pos<=length);
   p1=p2=lineStart(pos);
   if(options&TEXT_WORDWRAP){
@@ -2520,22 +2233,22 @@
     if(getByte(pos)=='\n') return pos+1;
     pos++;
     }
-  return length+1;
+  return length;
   }
 
 
 // Replace m characters at pos by n characters
-void FXText::replace(FXint pos,FXint m,const FXchar *text,FXint n,FXint style){
-  FXint nrdel,nrins,ncdel,ncins,wbeg,wend,del,wdel,hdel,wins,hins,cursorstartpos,anchorstartpos;
+void FXText::replace(FXint pos,FXint del,const FXchar *text,FXint ins,FXint style){
+  FXint nrdel,nrins,ncdel,ncins,wbeg,wend,diff,wdel,hdel,wins,hins,cursorstartpos,anchorstartpos;
 
-  FXTRACE((150,"pos=%d mdel=%d nins=%d\n",pos,m,n));
+  FXTRACE((150,"pos=%d del=%d ins=%d\n",pos,del,ins));
 
   // Delta in characters
-  del=n-m;
+  diff=ins-del;
 
   // Bracket potentially affected character range for wrapping purposes
   wbeg=changeBeg(pos);
-  wend=changeEnd(pos+m);
+  wend=changeEnd(pos+del);
 
   // Measure stuff before change
   nrdel=measureText(wbeg,wend,wdel,hdel);
@@ -2543,23 +2256,30 @@
 
   FXTRACE((150,"wbeg=%d wend=%d nrdel=%d ncdel=%d length=%d nrows=%d wdel=%d hdel=%d\n",wbeg,wend,nrdel,ncdel,length,nrows,wdel,hdel));
 
-  // Modify the buffer
-  sizegap(del);
+  // Move the gap to current position
   movegap(pos);
-  copyElms(&bufferpos,text,n);
-  if(sbuffer){fillElms(&sbufferpos,style,n);}
-  gapstart+=n;
-  gapend+=m;
-  length+=del;
+
+  // Grow the gap if needed
+  if(diff>(gapend-gapstart)){ sizegap(diff+MINSIZE); }
+
+  // Modify the buffer
+  copyElms(&bufferpos,text,ins);
+  if(sbuffer){fillElms(&sbufferpos,style,ins);}
+  gapstart+=ins;
+  gapend+=del;
+  length+=diff;
+
+  // Shrink the gap to avoid getting too large
+  if(MAXSIZE<(gapend-gapstart)){ sizegap(MAXSIZE); }
 
   // Measure stuff after change
-  nrins=measureText(wbeg,wend+n-m,wins,hins);
-  ncins=wend+n-m-wbeg;
+  nrins=measureText(wbeg,wend+diff,wins,hins);
+  ncins=wend+diff-wbeg;
 
   // Adjust number of rows now
   nrows+=nrins-nrdel;
 
-  FXTRACE((150,"wbeg=%d wend+n-m=%d nrins=%d ncins=%d length=%d nrows=%d wins=%d hins=%d\n",wbeg,wend+n-m,nrins,ncins,length,nrows,wins,hins));
+  FXTRACE((150,"wbeg=%d wend+diff=%d nrins=%d ncins=%d length=%d nrows=%d wins=%d hins=%d\n",wbeg,wend+diff,nrins,ncins,length,nrows,wins,hins));
 
   // Update visrows array and other stuff
   mutation(wbeg,ncins,ncdel,nrins,nrdel);
@@ -2569,39 +2289,45 @@
   textWidth=FXMAX(textWidth,wins);
 
   // Fix selection ranges
-  adjustSelection(select,pos,m,n);
-  adjustSelection(hilite,pos,m,n);
-
-  // Anchor position beyond changed text
-  if(wend<=anchorpos){
-    anchorpos+=del;                                     // Adjust position
-    anchorrow+=nrins-nrdel;                             // Adjust row
-    }
-
-  // Anchor position inside change
-  else if(wbeg<=anchorpos){
-    if(pos+m<=anchorpos) anchorpos+=del;                // Beyond changed text
-    else if(pos<=anchorpos) anchorpos=pos+n;            // Inside changed text
-    anchorstartpos=rowStart(anchorpos);
-    anchorrow=rowFromPos(anchorstartpos);
-    anchorcol=columnFromPos(anchorstartpos,anchorpos);
-    anchorvcol=anchorcol;       // FIXME MAYBE
-    }
+  adjustSelection(select,pos,del,ins);
+  adjustSelection(hilite,pos,del,ins);
 
-  // Cursor position beyond changed text
-  if(wend<=cursorpos){
-    cursorpos+=del;                                     // Adjust position
-    cursorrow+=nrins-nrdel;                             // Adjust row
+  // Keep anchorpos at same place relative to its surrounding text.
+  // When inside the changed region, move it to the end of the change.
+  if(wbeg<=anchorpos){
+    if(anchorpos<=wend){
+      if(pos+del<=anchorpos) anchorpos+=diff;           // Beyond changed text
+      else if(pos<=anchorpos) anchorpos=pos+ins;        // To end of changed text
+      FXASSERT(0<=anchorpos && anchorpos<=length);
+      anchorstartpos=rowStart(anchorpos);
+      FXASSERT(0<=anchorstartpos && anchorstartpos<=length);
+      anchorrow=rowFromPos(anchorstartpos);
+      anchorcol=columnFromPos(anchorstartpos,anchorpos);
+      anchorvcol=anchorcol;
+      }
+    else{
+      anchorpos+=diff;                                  // Adjust position
+      anchorrow+=nrins-nrdel;                           // Adjust row
+      }
     }
 
-  // Cursor position inside change
-  else if(wbeg<=cursorpos){
-    if(pos+m<=cursorpos) cursorpos+=del;                // Beyond changed text
-    else if(pos<=cursorpos) cursorpos=pos+n;            // Inside changed text
-    cursorstartpos=rowStart(cursorpos);
-    cursorrow=rowFromPos(cursorstartpos);
-    cursorcol=columnFromPos(cursorstartpos,cursorpos);
-    cursorvcol=cursorcol;       // FIXME MAYBE
+  // Keep cursorpos at same place relative to its surrounding text.
+  // When inside the changed region, move it to the end of the change.
+  if(wbeg<=cursorpos){
+    if(cursorpos<=wend){
+      if(pos+del<=cursorpos) cursorpos+=diff;           // Beyond changed text
+      else if(pos<=cursorpos) cursorpos=pos+ins;        // To end of changed text
+      FXASSERT(0<=cursorpos && cursorpos<=length);
+      cursorstartpos=rowStart(cursorpos);
+      FXASSERT(0<=cursorstartpos && cursorstartpos<=length);
+      cursorrow=rowFromPos(cursorstartpos);
+      cursorcol=columnFromPos(cursorstartpos,cursorpos);
+      cursorvcol=cursorcol;
+      }
+    else{
+      cursorpos+=diff;                                  // Adjust position
+      cursorrow+=nrins-nrdel;                           // Adjust row
+      }
     }
 
   // Hopefully it all still makes sense
@@ -2621,43 +2347,43 @@
 /*******************************************************************************/
 
 // Change the text in the buffer to new text
-void FXText::setText(const FXchar* text,FXint n,FXbool notify){
-  setStyledText(text,n,0,notify);
+FXint FXText::setText(const FXchar* text,FXint num,FXbool notify){
+  return setStyledText(text,num,0,notify);
   }
 
 
 // Change all of the text
-void FXText::setText(const FXString& text,FXbool notify){
-  setStyledText(text,0,notify);
+FXint FXText::setText(const FXString& text,FXbool notify){
+  return setStyledText(text.text(),text.length(),0,notify);
   }
 
 
 // Change the text in the buffer to new text
-void FXText::setStyledText(const FXchar* text,FXint n,FXint style,FXbool notify){
+FXint FXText::setStyledText(const FXchar* text,FXint num,FXint style,FXbool notify){
   FXTextChange textchange;
-  if(n<0){ fxerror("%s::setStyledText: bad argument.\n",getClassName()); }
-  if(!resizeElms(buffer,n+MINSIZE)){
+  if(num<0){ fxerror("%s::setStyledText: bad argument.\n",getClassName()); }
+  if(!resizeElms(buffer,num+MINSIZE)){
     fxerror("%s::setStyledText: out of memory.\n",getClassName());
     }
-  copyElms(buffer,text,n);
+  copyElms(buffer,text,num);
   if(sbuffer){
-    if(!resizeElms(sbuffer,n+MINSIZE)){
+    if(!resizeElms(sbuffer,num+MINSIZE)){
       fxerror("%s::setStyledText: out of memory.\n",getClassName());
       }
-    fillElms(sbuffer,style,n);
+    fillElms(sbuffer,style,num);
     }
-  gapstart=n;
+  gapstart=num;
   gapend=gapstart+MINSIZE;
-  length=n;
+  length=num;
   toppos=0;
   toprow=0;
   keeppos=0;
   select.startpos=0;
-  select.endpos=0;
+  select.endpos=-1;
   select.startcol=0;
   select.endcol=-1;
   hilite.startpos=0;
-  hilite.endpos=0;
+  hilite.endpos=-1;
   hilite.startcol=0;
   hilite.endcol=-1;
   anchorpos=0;
@@ -2674,7 +2400,7 @@
   modified=false;
   textchange.pos=0;
   textchange.ndel=0;
-  textchange.nins=n;
+  textchange.nins=num;
   textchange.ins=(FXchar*)text;
   textchange.del=(FXchar*)"";
   if(notify && target){
@@ -2684,266 +2410,807 @@
   recalc();
   layout();
   update();
+  return num;
   }
 
 
 // Change all of the text
-void FXText::setStyledText(const FXString& text,FXint style,FXbool notify){
-  setStyledText(text.text(),text.length(),style,notify);
+FXint FXText::setStyledText(const FXString& text,FXint style,FXbool notify){
+  return setStyledText(text.text(),text.length(),style,notify);
   }
 
+/*******************************************************************************/
 
 // Replace text by other text
-void FXText::replaceText(FXint pos,FXint m,const FXchar *text,FXint n,FXbool notify){
-  replaceStyledText(pos,m,text,n,0,notify);
+FXint FXText::replaceText(FXint pos,FXint del,const FXchar *text,FXint ins,FXbool notify){
+  return replaceStyledText(pos,del,text,ins,0,notify);
   }
 
 
 // Replace text by other text
-void FXText::replaceText(FXint pos,FXint m,const FXString& text,FXbool notify){
-  replaceStyledText(pos,m,text,0,notify);
+FXint FXText::replaceText(FXint pos,FXint del,const FXString& text,FXbool notify){
+  return replaceStyledText(pos,del,text.text(),text.length(),0,notify);
   }
 
 
 // Replace m characters at pos by n characters
-void FXText::replaceStyledText(FXint pos,FXint m,const FXchar *text,FXint n,FXint style,FXbool notify){
+FXint FXText::replaceStyledText(FXint pos,FXint del,const FXchar *text,FXint ins,FXint style,FXbool notify){
   FXTextChange textchange;
-  if(n<0 || m<0 || pos<0 || length<pos+m){ fxerror("%s::replaceStyledText: bad argument.\n",getClassName()); }
+  if(ins<0 || del<0 || pos<0 || length<pos+del){ fxerror("%s::replaceStyledText: bad argument.\n",getClassName()); }
   textchange.pos=pos;
-  textchange.ndel=m;
-  textchange.nins=n;
+  textchange.ndel=del;
+  textchange.nins=ins;
   textchange.ins=(FXchar*)text;
-  allocElms(textchange.del,m);
-  extractText(textchange.del,pos,m);
-  replace(pos,m,text,n,style);
+  allocElms(textchange.del,del);
+  extractText(textchange.del,pos,del);
+  replace(pos,del,text,ins,style);
   if(notify && target){
     target->tryHandle(this,FXSEL(SEL_REPLACED,message),(void*)&textchange);
     target->tryHandle(this,FXSEL(SEL_CHANGED,message),(void*)(FXival)cursorpos);
     }
   freeElms(textchange.del);
+  return ins;
   }
 
 
 // Replace m characters at pos by n characters
-void FXText::replaceStyledText(FXint pos,FXint m,const FXString& text,FXint style,FXbool notify){
-  replaceStyledText(pos,m,text.text(),text.length(),style,notify);
+FXint FXText::replaceStyledText(FXint pos,FXint del,const FXString& text,FXint style,FXbool notify){
+  return replaceStyledText(pos,del,text.text(),text.length(),style,notify);
+  }
+
+/*******************************************************************************/
+
+// Count characters
+static FXint countchars(const FXchar* beg,const FXchar* end,FXchar ch){
+  FXint result=0;
+  while(beg<end){
+    result+=(*beg++==ch);
+    }
+  return result;
+  }
+
+
+// Maximum number of columns in a string
+static FXint maxcolumns(const FXchar* beg,const FXchar* end,FXint tabcols){
+  FXint result=0,cols=0; FXuchar c;
+  while(beg<end){
+    c=*beg++;
+    if(c=='\n'){                                // End of the line; keep track of the longest
+      result=FXMAX(result,cols);
+      cols=0;
+      continue;
+      }
+    if(c=='\t'){                                // Advance by number of tab columns
+      cols+=tabcols-cols%tabcols;
+      continue;
+      }
+    cols++;
+    if(c<0xC0) continue;
+    beg++;
+    if(c<0xE0) continue;
+    beg++;
+    if(c<0xF0) continue;
+    beg++;
+    }
+  result=FXMAX(result,cols);                    // In case of unterminated last line
+  return result;
+  }
+
+
+// Expand tabs to spaces
+// Parse a character at a time, replacing tabs with the equivalent amount of spaces.
+static FXchar *detab(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,FXint tabcols=8){
+  FXint ie=0; FXuchar c;
+  while(src<srcend && dst<dstend){
+    c=*dst++=*src++;
+    if(c=='\t'){                                // Generate spaces till tab-column
+      dst--;
+      do{*dst++=' ';}while(++ie%tabcols);
+      continue;
+      }
+    if(c=='\n'){                                // Reset columns
+      ie=0;
+      continue;
+      }
+    ie++;                                       // One UTF8 character
+    if(c<0xC0) continue;
+    *dst++=*src++;
+    if(c<0xE0) continue;
+    *dst++=*src++;
+    if(c<0xF0) continue;
+    *dst++=*src++;
+    }
+  FXASSERT(dst<=dstend);
+  FXASSERT(src<=srcend);
+  return dst;
+  }
+
+
+// Compress spaces to tabs
+// Parse a character at a time, replacing runs of more than 2 spaces with tabs.
+static FXchar* entab(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,FXint tabcols=8){
+  FXint is=0,ie=0,ts; FXuchar c;
+  while(src<srcend && dst<dstend){
+    c=*dst++=*src++;
+    if(c==' '){                                 // Accumulate spaces
+      ie+=1;
+      if((ie-is)<3) continue;                   // Run of less than 3
+      ts=is+tabcols-is%tabcols;
+      if(ie<ts) continue;                       // Not crossing tabstop
+      dst-=(ie-is);                             // Back up to first space of run
+      *dst++='\t';                              // Write a tab there
+      is=ts;                                    // Advance to tabstop
+      dst+=(ie-is);                             // Skip over spaces
+      continue;
+      }
+    if(c=='\t'){                                // Keep the tab
+      dst-=(ie-is+1);                           // Back up to first space of the run
+      *dst++='\t';                              // Replace by tab
+      ie+=tabcols-ie%tabcols;                   // New tab-column
+      is+=tabcols-is%tabcols;
+      if(is==ie) continue;                      // Reached tabstop
+      *dst++='\t';
+      is+=tabcols-is%tabcols;
+      continue;
+      }
+    if(c=='\n'){                                // Reset columns
+      is=ie=0;
+      continue;
+      }
+    is=++ie;                                    // One UTF8 character
+    if(c<0xC0) continue;
+    *dst++=*src++;
+    if(c<0xE0) continue;
+    *dst++=*src++;
+    if(c<0xF0) continue;
+    *dst++=*src++;
+    }
+  FXASSERT(dst<=dstend);
+  FXASSERT(src<=srcend);
+  return dst;
+  }
+
+
+// Copy one utf8 character
+static inline void wccopy(FXchar*& dst,const FXchar*& src){
+  FXuchar c=*dst++=*src++;
+  if(c>=0xC0){
+    *dst++=*src++;
+    if(c>=0xE0){
+      *dst++=*src++;
+      if(c>=0xF0){
+        *dst++=*src++;
+        }
+      }
+    }
+  }
+
+
+// Skip one utf8 character
+static inline void wcskip(const FXchar*& src){
+  FXuchar c=*src++;
+  if(c>=0xC0){
+    src++;
+    if(c>=0xE0){
+      src++;
+      if(c>=0xF0){
+        src++;
+        }
+      }
+    }
+  }
+
+
+// Copy columns up from col to endcol
+static FXint copycols(FXchar*& dst,FXchar* dstend,const FXchar*& src,const FXchar* srcend,FXint ncols=2147483647){
+  FXint nc=ncols;
+  while(dst<dstend && 0<nc && src<srcend && *src!='\n'){
+    wccopy(dst,src);
+    nc--;
+    }
+  return ncols-nc;
+  }
+
+
+// Skip columns from col to endcol
+static FXint skipcols(const FXchar*& src,const FXchar* srcend,FXint ncols=2147483647){
+  FXint nc=ncols;
+  while(0<nc && src<srcend && *src!='\n'){
+    wcskip(src);
+    nc--;
+    }
+  return ncols-nc;
+  }
+
+
+// Padd output until endcol
+static FXint padcols(FXchar*& dst,FXchar* dstend,FXint ncols=0){
+  FXint nc=ncols;
+  while(dst<dstend && 0<nc){
+    *dst++=' ';
+    nc--;
+    }
+  return ncols-nc;
+  }
+
+
+// Remove columns startcol up to endcol from src; assume input has been detabbed.
+// For each line, copy up to startcol; then skip characters up to endcol,
+// and copy the remainder of the line, up to and including newline, if any.
+static FXchar* removecolumns(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,FXint startcol,FXint endcol){
+  while(dst<dstend && src<srcend){
+    copycols(dst,dstend,src,srcend,startcol);                   // Copy up to startcol
+    skipcols(src,srcend,endcol-startcol);                       // Skip to endcol
+    copycols(dst,dstend,src,srcend);                            // Copy to line end
+    if(dst<dstend && src<srcend && *src=='\n'){                 // Copy newline
+      *dst++=*src++;
+      }
+    }
+  FXASSERT(src<=srcend);
+  FXASSERT(dst<=dstend);
+  return dst;
+  }
+
+
+// Replicate text at src n times to dst
+static FXchar* replicatecolumns(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,FXint nr){
+  while(dst<dstend && 0<nr){
+    const FXchar *ptr=src;
+    while(dst<dstend && ptr<srcend && *ptr!='\n'){
+      wccopy(dst,ptr);
+      }
+    if(dst<dstend && --nr>0){
+      *dst++='\n';
+      }
+    }
+  FXASSERT(dst<=dstend);
+  return dst;
+  }
+
+
+// Extract block of columns of text from input; assume input has been detabbed.
+// For each line, scan to startcol, then copy characters up to endcol to the
+// destination. If there are fewer than startcol columns on the line, just
+// copy a newline to indicate an empty column on that particular line.
+static FXchar* extractcolumns(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,FXint startcol,FXint endcol){
+  while(dst<dstend && src<srcend){
+    skipcols(src,srcend,startcol);                              // Skip to startcol
+    copycols(dst,dstend,src,srcend,endcol-startcol);            // Copy up to endcol
+    skipcols(src,srcend);                                       // Skip to line end
+    if(dst<dstend && src<srcend && *src=='\n'){                 // Copy newline
+      *dst++=*src++;
+      }
+    }
+  FXASSERT(src<=srcend);
+  FXASSERT(dst<=dstend);
+  return dst;
+  }
+
+
+// Insert same text at given column on each line.
+static FXchar* insertcolumns(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,const FXchar *ins,const FXchar* insend,FXint startcol,FXint inscols){
+  FXint sc;
+  while(dst<dstend && src<srcend){
+    sc=copycols(dst,dstend,src,srcend,startcol);                // Copy to startcol
+    if(ins<insend && *ins!='\n'){                               // Inserted block non-empty
+      sc+=padcols(dst,dstend,startcol-sc);                      // Pad up to startcol where insert starts
+      sc+=copycols(dst,dstend,ins,insend,inscols);              // Insert string, up to newline
+      }
+    if(src<srcend && *src!='\n'){                               // Stuff past endcol
+      padcols(dst,dstend,startcol+inscols-sc);                  // Pad to startcol+ninscols
+      copycols(dst,dstend,src,srcend);                          // Copy the rest
+      }
+    if(dst<dstend && src<srcend && *src=='\n'){                 // Copy newline
+      *dst++=*src++;
+      }
+    }
+  FXASSERT(src<=srcend);
+  FXASSERT(ins<=insend);
+  FXASSERT(dst<=dstend);
+  return dst;
+  }
+
+
+// Replace block of columns of text with new ones; assume both source text and inserted text has been detabbed.
+// Copies up to inscols of new text into the destination column
+static FXchar* replacecolumns(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,const FXchar *ins,const FXchar* insend,FXint startcol,FXint endcol,FXint inscols){
+  FXint sc,c;
+  while(dst<dstend && (src<srcend || ins<insend)){
+    sc=copycols(dst,dstend,src,srcend,startcol);                // Copy to startcol
+    skipcols(src,srcend,endcol-startcol);                       // Skip to endcol
+    if(ins<insend && *ins!='\n'){                               // Inserted block non-empty
+      sc+=padcols(dst,dstend,startcol-sc);                      // Pad up to startcol
+      sc+=copycols(dst,dstend,ins,insend,inscols);              // Copy inserted block, up to inscols
+      }
+    if(src<srcend && *src!='\n'){                               // Stuff past endcol
+      padcols(dst,dstend,startcol+inscols-sc);                  // Pad to startcol+ninscols
+      copycols(dst,dstend,src,srcend);                          // Copy the rest
+      }
+    c=0;
+    if(dst<dstend && ins<insend && *ins=='\n'){                 // Advance over line end
+      *dst=*ins++; c=1;
+      }
+    if(dst<dstend && src<srcend && *src=='\n'){
+      *dst=*src++; c=1;
+      }
+    dst+=c;
+    }
+  FXASSERT(src<=srcend);
+  FXASSERT(ins<=insend);
+  FXASSERT(dst<=dstend);
+  return dst;
+  }
+
+
+// Overstrike columns starting at startcol with new text; assume inputs have been detabbed.
+static FXchar* overstrikecolumns(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend,const FXchar* ovr,const FXchar* ovrend,FXint startcol){
+  FXint sc,ec; FXuchar c;
+  while(dst<dstend && src<srcend){
+    sc=ec=copycols(dst,dstend,src,srcend,startcol);     // Copy up to startcol
+    if(ovr<ovrend && *ovr!='\n'){                       // Overstrike block is non-empty
+      ec+=padcols(dst,dstend,startcol-ec);              // Pad up to column where overstrike starts
+      ec+=copycols(dst,dstend,ovr,ovrend);              // Copy new overstruck block
+      }
+    if(src<srcend && *src!='\n'){                       // More stuff past startcol
+      sc+=skipcols(src,srcend,ec-sc);                   // Skip past overstruck text
+      copycols(dst,dstend,src,srcend);                  // Copy the rest
+      }
+    c=0;
+    if(dst<dstend && src<srcend && *src=='\n'){         // Advance over line end
+      *dst=*src++; c=1;
+      }
+    if(dst<dstend && ovr<ovrend && *ovr=='\n'){
+      *dst=*ovr++; c=1;
+      }
+    dst+=c;
+    }
+  FXASSERT(src<=srcend);
+  FXASSERT(ovr<=ovrend);
+  FXASSERT(dst<=dstend);
+  return dst;
+  }
+
+/*******************************************************************************/
+
+// Replace block of columns with text
+FXint FXText::replaceTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint num,FXbool notify){
+  return replaceStyledTextBlock(startpos,endpos,startcol,endcol,text,num,0,notify);
+  }
+
+
+// Replace block of columns with text
+FXint FXText::replaceTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXbool notify){
+  return replaceStyledTextBlock(startpos,endpos,startcol,endcol,text.text(),text.length(),0,notify);
   }
 
 
+// Replace block of columns with text
+// Calculating the size of the scratch array to assemble the replacing text is a bit
+// complicated; it is best understood graphically:
+//
+//             col-0          startcol
+//             |              |
+//             |              | endcol
+//             |              | |
+//             V              v v
+// startpos--->X--------------+-+----+-------------+  ^          ^
+//             |              |      |             |  |          |
+//             | A       A'   | R R' |  B          |  |norgrows  |
+//             |              |      |             |  |          |
+//             +--------------+      +-------------+  v          |
+// endpos------X              |      |                           |ninsrows
+//             |              |      |                           |
+//             | C            |      |                           |
+//             |              |      |                           |
+//             |              |      |                           |
+//             +--------------+-+----+                           v
+//
+//                            <------>
+//                            ninscols
+//
+// Here A, B are the parts of the original text, A being the part before the selected
+// block and B the part after (or inside) the selected block.  R is the newly added
+// text, which may be more or fewer lines than the selected block.  C is any additional
+// lines added in case the newly added text includes more lines than the selection.
+// Note that A, B, and R may have lines of varying lengths some lines may have no
+// part in section B, for example.
+//
+// The total amount of allocated space should account for:
+//
+//   1) Original text (A + B), plus possibly expanded tabs,
+//   2) Inserted text (R), plus possibly expanded tabs,
+//   3) Extra padding (A') after some lines in (A), up to startcol,
+//   4) Padding of empty lines (C), if any, up to startcol,
+//   5) Padding of (R), (R') up to startcol+ninscols.
+//   6) The block being removed
+//
+// Some lines in A,B, and R are longer than others. Rather than calculating the exact
+// amount of padding needed, its simpler just to over-estimate in a way which is guaranteed
+// to be enough; this is done by just addding the whole rectangle; so we just add an extra
+// (startcol+ninscols)*max(ninsrows,norgrows) as total padding for A,C, and R.
+//
+FXint FXText::replaceStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint num,FXint style,FXbool notify){
+  if(startpos<=endpos && startcol<=endcol){
+    FXint norgrows,norgtabs,ninsrows,ninstabs,ninscols;
+    FXchar *insend,*orgend,*repend;
+    FXString org,rep,ins;
+    extractText(rep,startpos,endpos-startpos);
+    norgrows=countchars(&rep0,&reprep.length(),'\n')+1;
+    norgtabs=countchars(&rep0,&reprep.length(),'\t');
+    ninsrows=countchars(text,text+num,'\n')+1;
+    ninstabs=countchars(text,text+num,'\t');
+    ninscols=maxcolumns(text,text+num,tabcolumns);
+    ins.length(num+ninstabs*tabcolumns);
+    org.length(endpos-startpos+norgtabs*tabcolumns);
+    insend=detab(&ins0,&insins.length(),text,text+num,tabcolumns);
+    orgend=detab(&org0,&orgorg.length(),&rep0,&reprep.length(),tabcolumns);
+
+//    (orgend-&org0) + (startcol+ninscols+1)*Math::imax(ninsrows,norgrows) + (insend-&ins0)
+
+    rep.length(endpos-startpos+num+(norgtabs+ninstabs)*tabcolumns+(startcol+ninscols+1)*FXMAX(ninsrows,norgrows));
+    repend=replacecolumns(&rep0,&reprep.length(),&org0,orgend,&ins0,insend,startcol,endcol,ninscols);
+    if(!(options&TEXT_NO_TABS)){
+      repend=entab(&rep0,repend,&rep0,repend,tabcolumns);
+      }
+    return replaceStyledText(startpos,endpos-startpos,&rep0,repend-&rep0,style,notify);
+    }
+  return 0;
+  }
+
+
+// Replace block of columns with text
+FXint FXText::replaceStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXint style,FXbool notify){
+  return replaceStyledTextBlock(startpos,endpos,startcol,endcol,text.text(),text.length(),style,notify);
+  }
+
+/*******************************************************************************/
+
+// Overstrike text block
+FXint FXText::overstrikeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint n,FXbool notify){
+  return overstrikeStyledTextBlock(startpos,endpos,startcol,endcol,text,n,0,notify);
+  }
+
+
+// Overstrike text block
+FXint FXText::overstrikeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXbool notify){
+  return overstrikeStyledTextBlock(startpos,endpos,startcol,endcol,text.text(),text.length(),0,notify);
+  }
+
+
+// Overstrike styled text block
+FXint FXText::overstrikeStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXchar *text,FXint n,FXint style,FXbool notify){
+  if(startpos<=endpos && startcol<=endcol){
+    FXint norgrows,norgtabs,novrrows,novrtabs,novrcols;
+    FXchar *ovrend,*orgend,*repend;
+    FXString org,rep,ovr;
+
+    extractText(rep,startpos,endpos-startpos);
+
+    norgrows=countchars(&rep0,&reprep.length(),'\n')+1;
+    norgtabs=countchars(&rep0,&reprep.length(),'\t');
+
+    novrrows=countchars(text,text+n,'\n')+1;
+    novrtabs=countchars(text,text+n,'\t');
+    novrcols=maxcolumns(text,text+n,tabcolumns);
+
+    ovr.length(n+novrtabs*tabcolumns);
+    org.length(endpos-startpos+norgtabs*tabcolumns);
+
+    ovrend=detab(&ovr0,&ovrovr.length(),text,text+n,tabcolumns);
+    orgend=detab(&org0,&orgorg.length(),&rep0,&reprep.length(),tabcolumns);
+
+//    Math::imax((orgend-&org0),(startcol+novrcols+1)*Math::imax(novrrows,norgrows)+(ovrend-&ovr0))
+
+    // Estimate sux
+    rep.length(endpos-startpos+n+(norgtabs+novrtabs)*tabcolumns+(startcol+novrcols+1)*FXMAX(novrrows,norgrows));
+
+    repend=overstrikecolumns(&rep0,&reprep.length(),&org0,orgend,&ovr0,ovrend,startcol);
+
+    if(!(options&TEXT_NO_TABS)){
+      repend=entab(&rep0,repend,&rep0,repend,tabcolumns);
+      }
+    return replaceStyledText(startpos,endpos-startpos,&rep0,repend-&rep0,style,notify);
+    }
+  return 0;
+  }
+
+
+// Overstrike styled text block
+FXint FXText::overstrikeStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,const FXString& text,FXint style,FXbool notify){
+  return overstrikeStyledTextBlock(startpos,endpos,startcol,endcol,text.text(),text.length(),style,notify);
+  }
+
+
+/*******************************************************************************/
+
 // Add text at the end
-void FXText::appendText(const FXchar *text,FXint n,FXbool notify){
-  appendStyledText(text,n,0,notify);
+FXint FXText::appendText(const FXchar *text,FXint num,FXbool notify){
+  return appendStyledText(text,num,0,notify);
   }
 
 
 // Add text at the end
-void FXText::appendText(const FXString& text,FXbool notify){
-  appendStyledText(text,0,notify);
+FXint FXText::appendText(const FXString& text,FXbool notify){
+  return appendStyledText(text.text(),text.length(),0,notify);
   }
 
 
 // Add text at the end
-void FXText::appendStyledText(const FXchar *text,FXint n,FXint style,FXbool notify){
+FXint FXText::appendStyledText(const FXchar *text,FXint num,FXint style,FXbool notify){
   FXTextChange textchange;
-  if(n<0){ fxerror("%s::appendStyledText: bad argument.\n",getClassName()); }
+  if(num<0){ fxerror("%s::appendStyledText: bad argument.\n",getClassName()); }
   textchange.pos=length;
   textchange.ndel=0;
-  textchange.nins=n;
+  textchange.nins=num;
   textchange.ins=(FXchar*)text;
   textchange.del=(FXchar*)"";
-  replace(length,0,text,n,style);
+  replace(length,0,text,num,style);
   if(notify && target){
     target->tryHandle(this,FXSEL(SEL_INSERTED,message),(void*)&textchange);
     target->tryHandle(this,FXSEL(SEL_CHANGED,message),(void*)(FXival)cursorpos);
     }
+  return num;
   }
 
 
 // Add text at the end
-void FXText::appendStyledText(const FXString& text,FXint style,FXbool notify){
-  appendStyledText(text.text(),text.length(),style,notify);
+FXint FXText::appendStyledText(const FXString& text,FXint style,FXbool notify){
+  return appendStyledText(text.text(),text.length(),style,notify);
   }
 
+/*******************************************************************************/
 
 // Insert some text at pos
-void FXText::insertText(FXint pos,const FXchar *text,FXint n,FXbool notify){
-  insertStyledText(pos,text,n,0,notify);
+FXint FXText::insertText(FXint pos,const FXchar *text,FXint num,FXbool notify){
+  return insertStyledText(pos,text,num,0,notify);
   }
 
 
 // Insert some text at pos
-void FXText::insertText(FXint pos,const FXString& text,FXbool notify){
-  insertStyledText(pos,text,0,notify);
+FXint FXText::insertText(FXint pos,const FXString& text,FXbool notify){
+  return insertStyledText(pos,text.text(),text.length(),0,notify);
   }
 
 
 // Insert some text at pos
-void FXText::insertStyledText(FXint pos,const FXchar *text,FXint n,FXint style,FXbool notify){
+FXint FXText::insertStyledText(FXint pos,const FXchar *text,FXint num,FXint style,FXbool notify){
   FXTextChange textchange;
-  if(n<0 || pos<0 || length<pos){ fxerror("%s::insertStyledText: bad argument.\n",getClassName()); }
+  if(num<0 || pos<0 || length<pos){ fxerror("%s::insertStyledText: bad argument.\n",getClassName()); }
   textchange.pos=pos;
   textchange.ndel=0;
-  textchange.nins=n;
+  textchange.nins=num;
   textchange.ins=(FXchar*)text;
   textchange.del=(FXchar*)"";
-  replace(pos,0,text,n,style);
+  replace(pos,0,text,num,style);
   if(notify && target){
     target->tryHandle(this,FXSEL(SEL_INSERTED,message),(void*)&textchange);
     target->tryHandle(this,FXSEL(SEL_CHANGED,message),(void*)(FXival)cursorpos);
     }
+  return num;
   }
 
 
 // Insert some text at pos
-void FXText::insertStyledText(FXint pos,const FXString& text,FXint style,FXbool notify){
-  insertStyledText(pos,text.text(),text.length(),style,notify);
+FXint FXText::insertStyledText(FXint pos,const FXString& text,FXint style,FXbool notify){
+  return insertStyledText(pos,text.text(),text.length(),style,notify);
   }
 
+/*******************************************************************************/
 
-// Remove some text at pos
-void FXText::removeText(FXint pos,FXint n,FXbool notify){
-  FXTextChange textchange;
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::removeText: bad argument.\n",getClassName()); }
-  textchange.pos=pos;
-  textchange.ndel=n;
-  textchange.nins=0;
-  textchange.ins=(FXchar*)"";
-  allocElms(textchange.del,n);
-  extractText(textchange.del,pos,n);
-  replace(pos,n,NULL,0,0);
-  if(notify && target){
-    target->tryHandle(this,FXSEL(SEL_DELETED,message),(void*)&textchange);
-    target->tryHandle(this,FXSEL(SEL_CHANGED,message),(void*)(FXival)cursorpos);
+// Insert text columns at startcol in line starting at startpos to endpos
+FXint FXText::insertTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXchar *text,FXint num,FXbool notify){
+  return insertStyledTextBlock(startpos,endpos,startcol,text,num,0,notify);
+  }
+
+
+// Insert text columns at startcol in line starting at startpos to endpos
+FXint FXText::insertTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXString& text,FXbool notify){
+  return insertStyledTextBlock(startpos,endpos,startcol,text.text(),text.length(),0,notify);
+  }
+
+
+// Insert text columns at startcol in line starting at startpos to endpos with given style
+FXint FXText::insertStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXchar *text,FXint num,FXint style,FXbool notify){
+  if(startpos<=endpos){
+    FXint norgrows,norgtabs,ninstabs,ninscols;
+    FXchar *orgend,*repend;
+    FXString org,rep;
+    extractText(rep,startpos,endpos-startpos);
+    norgrows=countchars(&rep0,&reprep.length(),'\n')+1;
+    norgtabs=countchars(&rep0,&reprep.length(),'\t');
+    org.length(endpos-startpos+norgtabs*tabcolumns);
+    orgend=detab(&org0,&orgorg.length(),&rep0,&reprep.length(),tabcolumns);
+    ninstabs=countchars(text,text+num,'\t');
+    ninscols=maxcolumns(text,text+num,tabcolumns);
+    rep.length(orgend-&org0+norgrows*(num+ninstabs*tabcolumns));
+    repend=insertcolumns(&rep0,&reprep.length(),&org0,orgend,text,text+num,startcol,ninscols);
+    if(!(options&TEXT_NO_TABS)){
+      repend=entab(&rep0,repend,&rep0,repend,tabcolumns);
+      }
+    return replaceStyledText(startpos,endpos-startpos,&rep0,repend-&rep0,style,notify);
     }
-  freeElms(textchange.del);
+  return 0;
   }
 
 
-// Remove all text from the buffer
-void FXText::clearText(FXbool notify){
-  removeText(0,length,notify);
+// Insert text columns at startcol in line starting at startpos to endpos with given style
+FXint FXText::insertStyledTextBlock(FXint startpos,FXint endpos,FXint startcol,const FXString& text,FXint style,FXbool notify){
+  return insertStyledTextBlock(startpos,endpos,startcol,text.text(),text.length(),style,notify);
   }
 
+/*******************************************************************************/
 
 // Change style of text range
-void FXText::changeStyle(FXint pos,FXint n,FXint style){
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::changeStyle: bad argument.\n",getClassName()); }
+FXint FXText::changeStyle(FXint pos,FXint num,FXint style){
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::changeStyle: bad argument.\n",getClassName()); }
   if(sbuffer){
-    if(pos+n<=gapstart){
-      fillElms(sbuffer+pos,style,n);
+    if(pos+num<=gapstart){
+      fillElms(sbuffer+pos,style,num);
       }
     else if(gapstart<=pos){
-      fillElms(sbuffer+pos-gapstart+gapend,style,n);
+      fillElms(sbuffer+pos-gapstart+gapend,style,num);
       }
     else{
       fillElms(sbuffer+pos,style,gapstart-pos);
-      fillElms(sbuffer+gapend,style,pos+n-gapstart);
+      fillElms(sbuffer+gapend,style,pos+num-gapstart);
       }
-    updateRange(pos,pos+n);
+    updateRange(pos,pos+num);
     }
+  return num;
   }
 
 
 // Change style of text range from style-array
-void FXText::changeStyle(FXint pos,const FXchar* style,FXint n){
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::changeStyle: bad argument.\n",getClassName()); }
+FXint FXText::changeStyle(FXint pos,const FXchar* style,FXint num){
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::changeStyle: bad argument.\n",getClassName()); }
   if(sbuffer && style){
-    if(pos+n<=gapstart){
-      copyElms(sbuffer+pos,style,n);
+    if(pos+num<=gapstart){
+      copyElms(sbuffer+pos,style,num);
       }
     else if(gapstart<=pos){
-      copyElms(sbuffer+gapend-gapstart+pos,style,n);
+      copyElms(sbuffer+gapend-gapstart+pos,style,num);
       }
     else{
       copyElms(sbuffer+pos,style,gapstart-pos);
-      copyElms(sbuffer+gapend,style+gapstart-pos,pos+n-gapstart);
+      copyElms(sbuffer+gapend,style+gapstart-pos,pos+num-gapstart);
       }
-    updateRange(pos,pos+n);
+    updateRange(pos,pos+num);
     }
+  return num;
   }
 
 
 // Change style of text range from style-array
-void FXText::changeStyle(FXint pos,const FXString& style){
-  changeStyle(pos,style.text(),style.length());
+FXint FXText::changeStyle(FXint pos,const FXString& style){
+  return changeStyle(pos,style.text(),style.length());
+  }
+
+/*******************************************************************************/
+
+// Remove some text at pos
+FXint FXText::removeText(FXint pos,FXint num,FXbool notify){
+  FXTextChange textchange;
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::removeText: bad argument.\n",getClassName()); }
+  textchange.pos=pos;
+  textchange.ndel=num;
+  textchange.nins=0;
+  textchange.ins=(FXchar*)"";
+  allocElms(textchange.del,num);
+  extractText(textchange.del,pos,num);
+  replace(pos,num,NULL,0,0);
+  if(notify && target){
+    target->tryHandle(this,FXSEL(SEL_DELETED,message),(void*)&textchange);
+    target->tryHandle(this,FXSEL(SEL_CHANGED,message),(void*)(FXival)cursorpos);
+    }
+  freeElms(textchange.del);
+  return num;
+  }
+
+
+// Remove columns startcol to endcol from lines starting at startpos to endpos
+FXint FXText::removeTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol,FXbool notify){
+  if(startpos<=endpos && startcol<=endcol){
+    FXchar *orgend,*repend;
+    FXString src,org,rep;
+    FXint nsrctabs;
+    extractText(src,startpos,endpos-startpos);
+    nsrctabs=countchars(&src0,&srcsrc.length(),'\t');
+    org.length(endpos-startpos+nsrctabs*tabcolumns);
+    orgend=detab(&org0,&orgorg.length(),&src0,&srcsrc.length(),tabcolumns);
+    rep.length(orgend-&org0);
+    repend=removecolumns(&rep0,&reprep.length(),&org0,orgend,startcol,endcol);
+    if(!(options&TEXT_NO_TABS)){
+      repend=entab(&rep0,repend,&rep0,repend,tabcolumns);
+      }
+    return replaceStyledText(startpos,endpos-startpos,&rep0,repend-&rep0,0,notify);
+    }
+  return 0;
   }
 
+/*******************************************************************************/
+
+// Remove all text from the buffer
+FXint FXText::clearText(FXbool notify){
+  return removeText(0,length,notify);
+  }
+
+/*******************************************************************************/
 
 // Grab range of text
-void FXText::extractText(FXchar *text,FXint pos,FXint n) const {
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::extractText: bad argument.\n",getClassName()); }
-  if(pos+n<=gapstart){
-    copyElms(text,buffer+pos,n);
+void FXText::extractText(FXchar *text,FXint pos,FXint num) const {
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::extractText: bad argument.\n",getClassName()); }
+  if(pos+num<=gapstart){
+    copyElms(text,buffer+pos,num);
     }
   else if(gapstart<=pos){
-    copyElms(text,buffer+gapend-gapstart+pos,n);
+    copyElms(text,buffer+gapend-gapstart+pos,num);
     }
   else{
     copyElms(text,buffer+pos,gapstart-pos);
-    copyElms(text+gapstart-pos,buffer+gapend,pos+n-gapstart);
+    copyElms(text+gapstart-pos,buffer+gapend,pos+num-gapstart);
     }
   }
 
 
 // Return n bytes of contents of text buffer from position pos
-FXString FXText::extractText(FXint pos,FXint n) const {
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::extractText: bad argument.\n",getClassName()); }
+FXString FXText::extractText(FXint pos,FXint num) const {
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::extractText: bad argument.\n",getClassName()); }
   FXString result;
-  result.length(n);
-  if(pos+n<=gapstart){
-    result.replace(0,n,buffer+pos,n);
+  result.length(num);
+  if(pos+num<=gapstart){
+    result.replace(0,num,buffer+pos,num);
     }
   else if(gapstart<=pos){
-    result.replace(0,n,buffer+gapend-gapstart+pos,n);
+    result.replace(0,num,buffer+gapend-gapstart+pos,num);
     }
   else{
     result.replace(0,gapstart-pos,buffer+pos,gapstart-pos);
-    result.replace(gapstart-pos,pos+n-gapstart,buffer+gapend,pos+n-gapstart);
+    result.replace(gapstart-pos,pos+num-gapstart,buffer+gapend,pos+num-gapstart);
     }
   return result;
   }
 
 
 // Grab range of style
-void FXText::extractText(FXString& text,FXint pos,FXint n) const {
-  text.length(n);
-  extractText(text.text(),pos,n);
+void FXText::extractText(FXString& text,FXint pos,FXint num) const {
+  text.length(num);
+  extractText(text.text(),pos,num);
   }
 
 
 // Grab range of style
-void FXText::extractStyle(FXchar *style,FXint pos,FXint n) const {
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::extractStyle: bad argument.\n",getClassName()); }
+void FXText::extractStyle(FXchar *style,FXint pos,FXint num) const {
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::extractStyle: bad argument.\n",getClassName()); }
   if(sbuffer){
-    if(pos+n<=gapstart){
-      copyElms(style,sbuffer+pos,n);
+    if(pos+num<=gapstart){
+      copyElms(style,sbuffer+pos,num);
       }
     else if(gapstart<=pos){
-      copyElms(style,sbuffer+gapend-gapstart+pos,n);
+      copyElms(style,sbuffer+gapend-gapstart+pos,num);
       }
     else{
       copyElms(style,sbuffer+pos,gapstart-pos);
-      copyElms(style+gapstart-pos,sbuffer+gapend,pos+n-gapstart);
+      copyElms(style+gapstart-pos,sbuffer+gapend,pos+num-gapstart);
       }
     }
   }
 
 
 // Return n bytes of style info from buffer from position pos
-FXString FXText::extractStyle(FXint pos,FXint n) const {
-  if(n<0 || pos<0 || length<pos+n){ fxerror("%s::extractStyle: bad argument.\n",getClassName()); }
+FXString FXText::extractStyle(FXint pos,FXint num) const {
+  if(num<0 || pos<0 || length<pos+num){ fxerror("%s::extractStyle: bad argument.\n",getClassName()); }
   FXString result;
   if(sbuffer){
-    result.length(n);
-    if(pos+n<=gapstart){
-      result.replace(0,n,sbuffer+pos,n);
+    result.length(num);
+    if(pos+num<=gapstart){
+      result.replace(0,num,sbuffer+pos,num);
       }
     else if(gapstart<=pos){
-      result.replace(0,n,sbuffer+gapend-gapstart+pos,n);
+      result.replace(0,num,sbuffer+gapend-gapstart+pos,num);
       }
     else{
       result.replace(0,gapstart-pos,sbuffer+pos,gapstart-pos);
-      result.replace(gapstart-pos,pos+n-gapstart,sbuffer+gapend,pos+n-gapstart);
+      result.replace(gapstart-pos,pos+num-gapstart,sbuffer+gapend,pos+num-gapstart);
       }
     }
   return result;
@@ -2951,15 +3218,46 @@
 
 
 // Grab range of style
-void FXText::extractStyle(FXString& style,FXint pos,FXint n) const {
-  style.length(n);
-  extractStyle(style.text(),pos,n);
+void FXText::extractStyle(FXString& style,FXint pos,FXint num) const {
+  style.length(num);
+  extractStyle(style.text(),pos,num);
+  }
+
+
+// Extract block of columns
+void FXText::extractTextBlock(FXString& text,FXint startpos,FXint endpos,FXint startcol,FXint endcol) const {
+  if(startpos<endpos && startcol<=endcol){
+    FXchar *textend;
+    FXString src;
+    FXint ntabs;
+    extractText(src,startpos,endpos-startpos);
+    ntabs=countchars(&src0,&srcendpos-startpos,'\t');
+    text.length(endpos-startpos+ntabs*tabcolumns);
+    textend=detab(&text0,&texttext.length(),&src0,&srcendpos-startpos,tabcolumns);
+    textend=extractcolumns(&text0,textend,&text0,textend,startcol,endcol);
+    if(!(options&TEXT_NO_TABS)){
+      textend=entab(&text0,textend,&text0,textend,tabcolumns);
+      }
+    text.trunc(textend-&text0);
+    }
+  else{
+    text.clear();
+    }
   }
 
 
+// Extract block of columns
+FXString FXText::extractTextBlock(FXint startpos,FXint endpos,FXint startcol,FXint endcol) const {
+  FXString text;
+  extractTextBlock(text,startpos,endpos,startcol,endcol);
+  return text;
+  }
+
+/*******************************************************************************/
+
 // Retrieve text into buffer
-void FXText::getText(FXchar* text,FXint n) const {
-  extractText(text,0,n);
+void FXText::getText(FXchar* text,FXint num) const {
+  extractText(text,0,num);
   }
 
 
@@ -2974,45 +3272,28 @@
   return extractText(0,getLength());
   }
 
-
-// Get selected text
-FXString FXText::getSelectedText() const {
-  FXString result;
-  if(select.startpos<select.endpos){
-    if(select.startcol<=select.endcol){
-      result=extractTextBlock(select.startpos,select.endpos,select.startcol,select.endcol);
-      }
-    else{
-      result=extractText(select.startpos,select.endpos-select.startpos);
-      }
-    }
-  return result;
-  }
-
 /*******************************************************************************/
 
 // End of overstruck character range
-FXint FXText::overstruck(FXint start,FXint end,const FXchar *text,FXint n){
-  if(!memchr(text,'\n',n)){
-    register FXint sindent,nindent,oindent,p;
-    register FXwchar ch;
+FXint FXText::overstruck(FXint start,FXint end,const FXchar *text,FXint num){
+  if(!memchr(text,'\n',num)){
+    FXint sindent,nindent,oindent,p;
     const FXchar *ptr;
+    FXwchar ch;
 
     // Measure indent at pos
-    for(p=lineStart(start),sindent=0; p<start; p+=getCharLen(p)){
-      sindent+=(getChar(p)=='\t') ? (tabcolumns-sindent%tabcolumns) : 1;
-      }
+    sindent=columnFromPos(lineStart(start),start);
 
     // Measure indent at end of (first line of the) new text
-    for(ptr=text,nindent=sindent; ptr<text+n; ptr=wcinc(ptr)){
-      nindent+=(wc(ptr)=='\t') ? (tabcolumns-nindent%tabcolumns) : 1;
+    for(ptr=text,nindent=sindent; ptr<text+num; ptr=wcinc(ptr)){
+      nindent+=CC(*ptr,nindent);
       }
 
     // Now figure out how much text to replace
     for(p=start,oindent=sindent; p<length; p+=getCharLen(p)){
       ch=getChar(p);
       if(ch=='\n') break;                // Stuff past the newline just gets inserted
-      oindent+=(ch=='\t') ? (tabcolumns-oindent%tabcolumns) : 1;
+      oindent+=CC(ch,oindent);
       if(oindent>=nindent){              // Replace string fits inside here
         if(oindent==nindent) p+=getCharLen(p);
         break;
@@ -3023,32 +3304,33 @@
   return end;
   }
 
+/*******************************************************************************/
 
-// Insert text at cursor
-void FXText::enterText(const FXchar *text,FXint n,FXbool notify){       // FIXME fix for block mode
-  FXint start=cursorpos;
-  FXint end=cursorpos;
-
-  // Replace selected characters
-  if(isPosSelected(cursorpos)){ // FIXME could be
-    start=select.startpos;
-    end=select.endpos;
-    }
-
-  // Replace overstruck characters
-  if(isOverstrike()){
-    end=overstruck(start,end,text,n);
+// Shift block of lines from position start up to end by given indent
+FXint FXText::shiftText(FXint startpos,FXint endpos,FXint shift,FXbool notify){
+  if(startpos<endpos){
+    FXString org=extractText(startpos,endpos-startpos);
+    FXString rep=FXString::tabbify(org,tabcolumns,0,0,shift,!(options&TEXT_NO_TABS));
+    return replaceStyledText(startpos,endpos-startpos,rep,0,notify);
     }
-
-  // Replace text
-  replaceText(start,end-start,text,n,notify);
-  moveCursor(start+n,notify);
+  return 0;
   }
 
+/*******************************************************************************/
 
-// Insert text at cursor
-void FXText::enterText(const FXString& text,FXbool notify){
-  enterText(text.text(),text.length(),notify);
+// Shift case of text
+FXint FXText::caseShift(FXint startpos,FXint endpos,FXint upper,FXbool notify){
+  if(startpos<endpos){
+    FXString text;
+    extractText(text,startpos,endpos-startpos);
+    switch(upper){
+      case 1: text.upper(); break;
+      case 0: text.lower(); break;
+      }
+    replaceText(startpos,endpos-startpos,text,notify);
+    return text.length();
+    }
+  return 0;
   }
 
 /*******************************************************************************/
@@ -3062,23 +3344,23 @@
 // Set selection
 FXbool FXText::setSelection(FXint pos,FXint len,FXbool notify){
   FXDragType types4={stringType,textType,utf8Type,utf16Type};
-  FXint ss=validPos(pos);
-  FXint se=validPos(pos+len);
-  if(select.startpos!=ss || select.endpos!=se){
+  FXint spos=validPos(pos);
+  FXint epos=validPos(pos+len);
+  if(select.startpos!=spos || select.endpos!=epos){
     FXint what4;
 
     // Update affected areas
-    if((se<=select.startpos) || (select.endpos<=ss) || (select.startcol<=select.endcol)){
+    if((epos<=select.startpos) || (select.endpos<=spos)){
       updateRange(select.startpos,select.endpos);
-      updateRange(ss,se);
+      updateRange(spos,epos);
       }
     else{
-      updateRange(ss,select.startpos);
-      updateRange(select.endpos,se);
+      updateRange(select.startpos,spos);
+      updateRange(select.endpos,epos);
       }
 
     // Release selection
-    if(ss==se){
+    if(spos>=epos){
       if(hasSelection()) releaseSelection();
       if(notify && target){
         what0=select.startpos;
@@ -3087,16 +3369,14 @@
         what3=select.endcol-select.startcol;
         target->tryHandle(this,FXSEL(SEL_DESELECTED,message),(void*)what);
         }
+      select.startpos=0;
+      select.endpos=-1;
+      select.startcol=0;
+      select.endcol=-1;
       }
 
-    // Update selection
-    select.startpos=ss;
-    select.endpos=se;
-    select.startcol=0;
-    select.endcol=-1;
-
     // Acquire selection
-    if(ss!=se){
+    else{
       if(!hasSelection()) acquireSelection(types,4);
       if(notify && target){
         what0=select.startpos;
@@ -3105,6 +3385,10 @@
         what3=select.endcol-select.startcol;
         target->tryHandle(this,FXSEL(SEL_SELECTED,message),(void*)what);
         }
+      select.startpos=spos;
+      select.endpos=epos;
+      select.startcol=0;
+      select.endcol=-1;
       }
     return true;
     }
@@ -3114,7 +3398,7 @@
 
 // Extend selection
 FXbool FXText::extendSelection(FXint pos,FXuint sel,FXbool notify){
-  register FXint p=validPos(pos),ss=0,se=0;
+  FXint p=validPos(pos),ss=0,se=0;
   switch(sel){
     case SelectChars:                   // Selecting characters
       if(p<=anchorpos){
@@ -3164,17 +3448,17 @@
 // Select block of characters within given box
 FXbool FXText::setBlockSelection(FXint trow,FXint lcol,FXint brow,FXint rcol,FXbool notify){
   FXDragType types4={stringType,textType,utf8Type,utf16Type};
-  FXint spos=posFromRow(trow);
-  FXint epos=posFromRow(brow+1);
+  FXint spos=lineStart(posFromRow(trow));
+  FXint epos=lineEnd(posFromRow(brow));
   if(select.startpos!=spos || select.endpos!=epos || select.startcol!=lcol || select.endcol!=rcol){
     FXint what4;
 
     // Update affected areas
-    updateRange(select.startpos,select.endpos);
-    updateRange(spos,epos);
+    updateLines(select.startpos,select.endpos);
+    updateLines(spos,epos);
 
     // Release selection
-    if(spos==epos || lcol==rcol){
+    if(spos>epos || lcol>rcol){
       if(hasSelection()) releaseSelection();
       if(notify && target){
         what0=select.startpos;
@@ -3183,21 +3467,14 @@
         what3=select.endcol-select.startcol;
         target->tryHandle(this,FXSEL(SEL_DESELECTED,message),(void*)what);
         }
+      select.startpos=0;
+      select.endpos=-1;
+      select.startcol=0;
+      select.endcol=-1;
       }
 
-    // Update selection
-    select.startpos=spos;
-    select.endpos=epos;
-    select.startcol=lcol;
-    select.endcol=rcol;
-
-    FXTRACE((1,"sel.startpos = %d\n",select.startpos));
-    FXTRACE((1,"sel.endpos   = %d\n",select.endpos));
-    FXTRACE((1,"sel.startcol = %d\n",select.startcol));
-    FXTRACE((1,"sel.endcol   = %d\n",select.endcol));
-
     // Acquire selection
-    if(spos!=epos && lcol!=rcol){
+    else{
       if(!hasSelection()) acquireSelection(types,4);
       if(notify && target){
         what0=select.startpos;
@@ -3206,7 +3483,12 @@
         what3=select.endcol-select.startcol;
         target->tryHandle(this,FXSEL(SEL_SELECTED,message),(void*)what);
         }
+      select.startpos=spos;
+      select.endpos=epos;
+      select.startcol=lcol;
+      select.endcol=rcol;
       }
+    FXTRACE((150,"select: startpos=%d endpos=%d startcol=%d endcol=%d\n",select.startpos,select.endpos,select.startcol,select.endcol));
     return true;
     }
   return false;
@@ -3222,9 +3504,34 @@
   }
 
 
+// Position is selected if inside character range AND character range non-empty AND no columns
+// selected, OR inside character range AND inside column range AND column range non-empty.
+FXbool FXText::isPosSelected(FXint pos,FXint col) const {
+  return (select.startpos<=pos && pos<=select.endpos) && (((select.startpos<select.endpos) && (select.startcol>select.endcol)) || ((select.startcol<=col) && (col<=select.endcol) && (select.startcol<select.endcol)));
+  }
+
+
+// Position is selected if inside character range AND character range non-empty.
+FXbool FXText::isPosSelected(FXint pos) const {
+  return (select.startpos<=pos) && (pos<=select.endpos) && (select.startpos<select.endpos);
+  }
+
+
+// Get selected text
+FXString FXText::getSelectedText() const {
+  if((select.startcol<select.endcol) && (select.startpos<=select.endpos)){
+    return extractTextBlock(select.startpos,select.endpos,select.startcol,select.endcol);
+    }
+  if((select.startcol>select.endcol) && (select.startpos<select.endpos)){
+    return extractText(select.startpos,select.endpos-select.startpos);
+    }
+  return FXString::null;
+  }
+
+
 // Kill the selection
 FXbool FXText::killSelection(FXbool notify){
-  if(select.startpos<select.endpos){
+  if(select.startpos<=select.endpos){
     FXint what4;
     if(hasSelection()) releaseSelection();
     if(notify && target){
@@ -3236,7 +3543,7 @@
       }
     updateRange(select.startpos,select.endpos);
     select.startpos=0;
-    select.endpos=0;
+    select.endpos=-1;
     select.startcol=0;
     select.endcol=-1;
     return true;
@@ -3244,11 +3551,12 @@
   return false;
   }
 
+/*******************************************************************************/
 
 // Copy selection to clipboard
 FXbool FXText::copySelection(){
   FXDragType types4={stringType,textType,utf8Type,utf16Type};
-  if(select.startpos<select.endpos){
+  if(select.startpos<=select.endpos){
     if(acquireClipboard(types,ARRAYNUMBER(types))){
       clipped=getSelectedText();
       return true;
@@ -3269,32 +3577,16 @@
 
 // Delete selection
 FXbool FXText::deleteSelection(FXbool notify){
-  if(select.startpos<select.endpos){
-    if(select.startcol<=select.endcol){
-      removeTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,notify);
-      moveCursor(select.startpos,notify);       // FIXME or at the end?
-      }
-    else{
-      removeText(select.startpos,select.endpos-select.startpos,notify);
-      moveCursor(select.startpos,notify);
-      }
+  FXint pos,m;
+  if((select.startcol<select.endcol) && (select.startpos<=select.endpos)){
+    m=removeTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,notify);
+    pos=posFromColumn(lineStart(select.startpos+m),select.startcol);
+    moveCursor(pos,notify);   // FIXME keep cursor on same line, but at end of column
     return true;
     }
-  return false;
-  }
-
-
-// Replace selection by other text
-FXbool FXText::replaceSelection(const FXString& text,FXbool notify){
-  if(select.startpos<select.endpos){
-    if(select.startcol<=select.endcol){
-      replaceTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,text,notify);
-      moveCursor(select.startpos,notify);       // FIXME or at the end?
-      }
-    else{
-      replaceText(select.startpos,select.endpos-select.startpos,text,notify);
-      moveCursor(select.startpos+text.length(),notify);
-      }
+  if((select.startcol>select.endcol) && (select.startpos<select.endpos)){
+    removeText(select.startpos,select.endpos-select.startpos,notify);
+    moveCursor(cursorpos,notify);
     return true;
     }
   return false;
@@ -3303,82 +3595,28 @@
 
 // Delete pending selection
 FXbool FXText::deletePendingSelection(FXbool notify){
-  return isPosSelected(cursorpos) && deleteSelection(notify);
+  return isPosSelected(cursorpos,cursorvcol) && deleteSelection(notify);
   }
 
 
-/*
-
-
-// Insert text at cursor
-void FXText::enterText(const FXchar *text,FXint n,FXbool notify){       // FIXME fix for block mode
-  FXint start=cursorpos;
-  FXint end=cursorpos;
-
-  // Replace selected characters
-  if(isPosSelected(cursorpos,cursorvcol)){
-    if(select.startcol<=select.endcol){
-      FXString string(text,n);
-      replaceTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,string,true);
-      moveCursorRowColumn(cursorrow,cursorvcol,true);   // FIXME or cursorvol?
-      }
-    else{
-      start=select.startpos;
-      end=select.endpos;
-      
-      // Replace overstruck characters
-      if(isOverstrike()){
-        end=overstruck(start,end,text,n);
-        }
+// Paste primary ("middle-mouse") selection
+FXbool FXText::pasteSelection(FXbool notify){
 
-      // Replace text
-      replaceText(start,end-start,text,n,notify);
-      moveCursor(start+n,notify);
-      }
-    }
-  }
-*/
-
-// Paste primary selection
-FXbool FXText::pasteSelection(FXbool notify){                                   // FIXME fix for block mode
-
-  // Avoid paste inside selection
-  if(select.startpos==select.endpos || cursorpos<=select.startpos || select.endpos<=cursorpos){
-    FXint start=cursorpos;
-    FXint end=cursorpos;
+  // Don't paste inside selection
+  if((select.startpos>select.endpos) || (cursorpos<=select.startpos) || (select.endpos<=cursorpos)){
     FXString string;
 
-    // First, try UTF-8
-    if(getDNDData(FROM_SELECTION,utf8Type,string)){
-      if(isOverstrike()){
-        end=overstruck(start,end,string.text(),string.length());
-        }
-      replaceText(start,end-start,string,notify);
-      makePositionVisible(cursorpos);
-      setCursorPos(cursorpos,notify);
-      setAnchorPos(cursorpos);
-      flashMatching();
-      return true;
-      }
+    // Try UTF-8, then UTF-16, then 8859-1
+    if(getDNDData(FROM_SELECTION,utf8Type,string) || getDNDData(FROM_SELECTION,utf16Type,string) || getDNDData(FROM_SELECTION,stringType,string)){
+      FXint start=cursorpos;
+      FXint end=cursorpos;
 
-    // Next, try UTF-16
-    if(getDNDData(FROM_SELECTION,utf16Type,string)){
+      // Overstrike mode, extent
       if(isOverstrike()){
         end=overstruck(start,end,string.text(),string.length());
         }
-      replaceText(start,end-start,string,notify);
-      makePositionVisible(cursorpos);
-      setCursorPos(cursorpos,notify);
-      setAnchorPos(cursorpos);
-      flashMatching();
-      return true;
-      }
 
-    // Finally, try good old 8859-1
-    if(getDNDData(FROM_SELECTION,stringType,string)){
-      if(isOverstrike()){
-        end=overstruck(start,end,string.text(),string.length());
-        }
+      // Replace text and move cursor
       replaceText(start,end-start,string,notify);
       makePositionVisible(cursorpos);
       setCursorPos(cursorpos,notify);
@@ -3395,51 +3633,86 @@
 FXbool FXText::pasteClipboard(FXbool notify){
   FXString string;
 
-  // First, try UTF-8
-  if(getDNDData(FROM_CLIPBOARD,utf8Type,string)){
-#ifdef WIN32
-    dosToUnix(string);
-#endif
-    enterText(string,notify);
-    return true;
-    }
+  // Try UTF-8, then UTF-16, then 8859-1
+  if(getDNDData(FROM_CLIPBOARD,utf8Type,string) || getDNDData(FROM_CLIPBOARD,utf16Type,string) || getDNDData(FROM_CLIPBOARD,stringType,string)){
+    FXint pos=cursorpos,cols,m;
 
-  // Next, try UTF-16
-  if(getDNDData(FROM_CLIPBOARD,utf16Type,string)){
+    // Convert newlines
 #ifdef WIN32
     dosToUnix(string);
 #endif
-    enterText(string,notify);
+
+    // Replace selected characters
+    if(isPosSelected(cursorpos,cursorvcol)){
+      if(select.startcol<=select.endcol){
+        cols=maxcolumns(string.text(),string.text()+string.length(),tabcolumns);
+        m=replaceTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,string,notify);
+        pos=posFromColumn(lineStart(select.startpos+m),select.startcol+cols);
+        }
+      else{
+        m=replaceText(select.startpos,select.endpos-select.startpos,string,notify);
+        pos=select.startpos+m;
+        }
+      }
+
+    // Insert or overstrike
+    else{
+
+      // Overstrike
+      if(isOverstrike()){
+        m=overstruck(pos,pos,string.text(),string.length());
+        }
+      else{
+        m=pos;
+        }
+      m=replaceText(pos,m-pos,string,notify);
+      pos=pos+m;
+      }
+
+    // Move cursor to pos
+    moveCursor(pos,notify);
     return true;
     }
+  return false;
+  }
 
-  // Next, try good old Latin-1
-  if(getDNDData(FROM_CLIPBOARD,stringType,string)){
-#ifdef WIN32
-    dosToUnix(string);
-#endif
-    enterText(string,notify);
+
+// Replace selection by other text
+FXbool FXText::replaceSelection(const FXString& text,FXbool notify){
+  if(select.startpos<=select.endpos){
+    FXint pos=select.startpos,m,cols;
+    if(select.startcol<=select.endcol){
+      cols=maxcolumns(text.text(),text.text()+text.length(),tabcolumns);
+      m=replaceTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,text,notify);
+      pos=posFromColumn(lineStart(pos+m),select.startcol+cols);
+      }
+    else{
+      m=replaceText(select.startpos,select.endpos-select.startpos,text,notify);
+      pos=pos+m;
+      }
+    moveCursor(pos,notify);
     return true;
     }
   return false;
   }
 
+/*******************************************************************************/
 
 // Set highlight
 FXbool FXText::setHighlight(FXint pos,FXint len){
-  register FXint hs=validPos(pos);
-  register FXint he=validPos(pos+len);
-  if(hs!=hilite.startpos || he!=hilite.endpos){
-    if(he<=hilite.startpos || hilite.endpos<=hs){
+  FXint spos=validPos(pos);
+  FXint epos=validPos(pos+len);
+  if(spos!=hilite.startpos || epos!=hilite.endpos){
+    if(epos<=hilite.startpos || hilite.endpos<=spos){
       updateRange(hilite.startpos,hilite.endpos);
-      updateRange(hs,he);
+      updateRange(spos,epos);
       }
     else{
-      updateRange(hs,hilite.startpos);
-      updateRange(hilite.endpos,he);
+      updateRange(hilite.startpos,spos);
+      updateRange(hilite.endpos,epos);
       }
-    hilite.startpos=hs;
-    hilite.endpos=he;
+    hilite.startpos=spos;
+    hilite.endpos=epos;
     hilite.startcol=0;
     hilite.endcol=-1;
     return true;
@@ -3450,10 +3723,10 @@
 
 // Unhighlight the text
 FXbool FXText::killHighlight(){
-  if(hilite.startpos<hilite.endpos){
+  if(hilite.startpos<=hilite.endpos){
     updateRange(hilite.startpos,hilite.endpos);
     hilite.startpos=0;
-    hilite.endpos=0;
+    hilite.endpos=-1;
     hilite.startcol=0;
     hilite.endcol=-1;
     return true;
@@ -3485,7 +3758,8 @@
   th=font->getFontHeight();
   cursory=getVisibleY()+margintop+pos_y+cursorrow*th;
   if(getVisibleY()+margintop<cursory+th && cursory<=getVisibleY()+getVisibleHeight()-marginbottom){
-    FXASSERT(0<=cursorrow-toprow && cursorrow-toprow<nvisrows);
+    FXASSERT(toprow<=cursorrow && cursorrow<toprow+nvisrows);
+    FXASSERT(0<=visrowscursorrow-toprow && visrowscursorrow-toprow<=cursorpos && cursorpos<=length);
     tw=font->getCharWidth((cursorpos<length) && ((c=getChar(cursorpos))>=' ')?c:' ');
     cursorx=getVisibleX()+marginleft+pos_x+xoffset(visrowscursorrow-toprow,cursorpos)-1;
     if(getVisibleX()<=cursorx+tw+2 && cursorx-2<=getVisibleX()+getVisibleWidth()){
@@ -3513,7 +3787,8 @@
   th=font->getFontHeight();
   cursory=getVisibleY()+margintop+pos_y+cursorrow*th;
   if(getVisibleY()+margintop<cursory+th && cursory<=getVisibleY()+getVisibleHeight()-marginbottom){
-    FXASSERT(0<=cursorrow-toprow && cursorrow-toprow<nvisrows);
+    FXASSERT(toprow<=cursorrow && cursorrow<toprow+nvisrows);
+    FXASSERT(0<=visrowscursorrow-toprow && visrowscursorrow-toprow<=cursorpos && cursorpos<=length);
     tw=font->getCharWidth((cursorpos<length) && ((c=getChar(cursorpos))>=' ')?c:' ');
     cursorx=getVisibleX()+marginleft+pos_x+xoffset(visrowscursorrow-toprow,cursorpos)-1;
     if(getVisibleX()<=cursorx+tw+2 && cursorx-2<=getVisibleX()+getVisibleWidth()){
@@ -3571,9 +3846,9 @@
 
 // Draw fragment of text in given style
 void FXText::drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint,FXint,FXint pos,FXint n,FXuint style) const {
-  register FXuint index=(style&STYLE_MASK);
-  register FXuint usedstyle=style;                                              // Style flags from style buffer
-  register FXColor color;
+  FXuint index=(style&STYLE_MASK);
+  FXuint usedstyle=style;                                              // Style flags from style buffer
+  FXColor color;
   FXchar str2;
   color=0;
   if(hilitestyles && index){                                                    // Get colors from style table
@@ -3631,12 +3906,12 @@
 
 // Fill fragment of background in given style
 void FXText::fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style) const {
-  register FXuint index=(style&STYLE_MASK);
-  register FXuint usedstyle=style;                                              // Style flags from style buffer
-  register FXColor bgcolor,fgcolor;
+  FXuint index=(style&STYLE_MASK);
+  FXuint usedstyle=style;                              // Style flags from style buffer
+  FXColor bgcolor,fgcolor;
   bgcolor=fgcolor=0;
-  if(hilitestyles && index){                                                    // Get colors from style table
-    usedstyle=hilitestylesindex-1.style;                                      // Style flags now from style table
+  if(hilitestyles && index){                                    // Get colors from style table
+    usedstyle=hilitestylesindex-1.style;                      // Style flags now from style table
     if(style&STYLE_SELECTED){
       bgcolor=hilitestylesindex-1.selectBackColor;
       fgcolor=hilitestylesindex-1.selectForeColor;
@@ -3651,23 +3926,27 @@
     else{
       bgcolor=hilitestylesindex-1.normalBackColor;
       }
-    if(fgcolor==0){                                                             // Fall back to normal foreground color
+    if(fgcolor==0){                                             // Fall back to normal foreground color
       fgcolor=hilitestylesindex-1.normalForeColor;
       }
     }
-  if(bgcolor==0){                                                               // Fall back to default background colors
+  if(bgcolor==0){                                               // Fall back to default background colors
     if(style&STYLE_SELECTED) bgcolor=selbackColor;
     else if(style&STYLE_HILITE) bgcolor=hilitebackColor;
     else if(style&STYLE_ACTIVE) bgcolor=activebackColor;
     else bgcolor=backColor;
     }
-  if(fgcolor==0){                                                               // Fall back to default foreground colors
+  if(fgcolor==0){                                               // Fall back to default foreground colors
     if(style&STYLE_SELECTED) fgcolor=seltextColor;
     else if(style&STYLE_HILITE) fgcolor=hilitetextColor;
-    if(fgcolor==0) fgcolor=textColor;                                           // Fall back to text color
+    if(fgcolor==0) fgcolor=textColor;                           // Fall back to text color
     }
   dc.setForeground(bgcolor);
   dc.fillRectangle(x,y,w,h);
+  if(style&STYLE_INSERT){                                       // Vertical insertion point
+    dc.setForeground(cursorColor);                              // Use cursor color for now
+    dc.fillRectangle(x,y,1,h);
+    }
   if(usedstyle&STYLE_UNDERLINE){
     dc.setForeground(fgcolor);
     dc.fillRectangle(x,y+font->getFontAscent()+1,w,1);
@@ -3679,43 +3958,61 @@
   }
 
 
-// Obtain text style at position pos; note pos may be outside of text
-// to allow for rectangular selections!
+// Obtain text style given line range, row, column, and position
+// Note that for block selections, the column may be outside the text, but need
+// to be on non-empty lines.
 FXuint FXText::styleOf(FXint beg,FXint end,FXint row,FXint col,FXint pos) const {
   FXuint style=0;
-  FXuchar c;
 
-  // Selected part of text
-  if(select.startpos<=pos && pos<select.endpos){
-    if((select.startcol>select.endcol) || (select.startcol<=col && col<select.endcol)) style|=STYLE_SELECTED;
-    }
+  // Current active line
+  if((row==cursorrow) && (options&TEXT_SHOWACTIVE)) style|=STYLE_ACTIVE;
 
-  // Highlighted part of text
-  if(hilite.startpos<=pos && pos<hilite.endpos){
-    if((hilite.startcol>hilite.endcol) || (hilite.startcol<=col && col<hilite.endcol)) style|=STYLE_HILITE;
-    }
+  // Need non-empty line
+  if(beg<end){
 
-  // Current active line
-  if((options&TEXT_SHOWACTIVE) && (row==cursorrow)) style|=STYLE_ACTIVE;
+    // Selected range or block
+    if(select.startpos<=pos){
+      if(select.startcol>select.endcol){
+        if(pos<select.endpos) style|=STYLE_SELECTED;
+        }
+      else if(pos<=select.endpos){
+        if(select.startcol<=col && col<select.endcol) style|=STYLE_SELECTED;
+        if(select.startcol==col && select.endcol==col) style|=STYLE_INSERT;
+        }
+      }
+
+    // Highlighted range or block
+    if(hilite.startpos<=pos){
+      if(hilite.startcol>hilite.endcol){
+        if(pos<hilite.endpos) style|=STYLE_HILITE;
+        }
+      else if(pos<=hilite.endpos){
+        if(hilite.startcol<=col && col<hilite.endcol) style|=STYLE_HILITE;
+        }
+      }
 
-  // Blank part of line
-  if(end<=pos) return style;
+    // Inside text
+    if(pos<end){
 
-  // Special style for control characters
-  c=getByte(pos);
+      // Get character
+      FXuchar c=getByte(pos);
 
-  // Get value from style buffer
-  if(sbuffer) style|=getStyle(pos);
+      // Get value from style buffer
+      if(sbuffer) style|=getStyle(pos);
 
-  // Tab or whitespace
-  if(c=='\t') return style;
-  if(c==' ') return style;
+      // Tab or whitespace
+      if(c=='\t') return style;
+      if(c==' ') return style;
 
-  // Control codes
-  if(c<' ') return style|STYLE_TEXT|STYLE_CONTROL;
+      // Control codes
+      if(c<' ') style|=STYLE_CONTROL;
 
-  // Normal character
-  return style|STYLE_TEXT;
+      // Normal character
+      style|=STYLE_TEXT;
+      }
+    }
+
+  return style;
   }
 
 
@@ -3734,23 +4031,24 @@
   FXint linebreak=lineend;
   FXint tcol=0,twid=0,tadj=0;
   FXint cw,cc,pc,cx,px,cp,pp;
-  FXuint curstyle;
-  FXuint newstyle;
+  FXuint curstyle,newstyle;
   FXwchar c;
 
   FXASSERT(toprow<=row && row<toprow+nvisrows);
   FXASSERT(0<=linebeg && lineend<=length);
 
-  // Back off past break-character, i.e. space or newline (if any)
-  if(linebeg<linebreak){
-    pp=dec(linebreak);
-    if(Unicode::isSpace(getChar(pp))) linebreak=pp;
+  // If last character on a line is newline or space, back off by one
+  // character position, and interpret all subsequent columns as spaces.
+  if(linebeg<lineend){
+    linebreak=dec(lineend);
+    FXASSERT(linebeg<=linebreak);
+    if(!Unicode::isSpace(getChar(linebreak))){
+      linebreak=lineend;
+      }
     }
 
-  // If in wrap mode, count columns from true start of line till wrapped
-  // start of the line, for rectangular selections
-  //cc=(options&TEXT_WORDWRAP) ? columnFromPos(lineStart(linebeg),linebeg) : 0;
-  cc=0;                                         // Column 0 is at row start for now!
+  // Reset running variables
+  cc=0;
   cx=tx;
   cp=linebeg;
 
@@ -3771,14 +4069,14 @@
       cp+=getCharLen(cp);
       continue;
       }
-    if(c!='\t'){                                // Control character
-      cx+=caretw+font->getCharWidth(c|0x40);
-      cc+=1;
+    if(c=='\t'){                                // Tab character
+      cx+=tabwidth-(cx-tx)%tabwidth;
+      cc+=tabcolumns-cc%tabcolumns;
       cp+=1;
       continue;
       }
-    cx+=tabwidth-(cx-tx)%tabwidth;              // Tab character
-    cc+=tabcolumns-cc%tabcolumns;
+    cx+=caretw+font->getCharWidth(c|0x40);      // Control character
+    cc+=1;
     cp+=1;
     }
   while(cx<leftclip);
@@ -3799,12 +4097,12 @@
       if(curstyle&STYLE_TEXT) drawBufferText(dc,px,ty,cx-px,th,pp,cp-pp,curstyle);
       curstyle=newstyle;
       pp=cp;
+      pc=cc;
       px=cx;
       }
     if(cp>=linebreak){                          // Character past end of line
       cx+=spacew;
       cc+=1;
-      //cx=riteclip;
       continue;
       }
     c=getChar(cp);
@@ -3814,23 +4112,23 @@
       cp+=getCharLen(cp);
       continue;
       }
-    if(c!='\t'){                                // Control character
-      cx+=caretw+font->getCharWidth(c|0x40);
+    if(c=='\t'){                                // Tab character
+      if(tcol==0){
+        cw=tabwidth-(cx-tx)%tabwidth;
+        tcol=tabcolumns-cc%tabcolumns;
+        twid=cw/tcol;
+        tadj=cw-twid*tcol;
+        }
+      cx+=twid+(tadj>0);                        // Mete out columns comprising the tab character
+      tcol-=1;
+      tadj-=1;
       cc+=1;
-      cp+=1;
+      cp+=(tcol==0);
       continue;
       }
-    if(tcol==0){                                // Tab character
-      cw=tabwidth-(cx-tx)%tabwidth;
-      tcol=tabcolumns-cc%tabcolumns;
-      twid=cw/tcol;
-      tadj=cw-twid*tcol;
-      }
-    cx+=twid+(tadj>0);                          // Mete out columns comprising the tab character
-    tcol-=1;
-    tadj-=1;
+    cx+=caretw+font->getCharWidth(c|0x40);      // Control character
     cc+=1;
-    cp+=(tcol==0);
+    cp+=1;
     }
   while(cx<riteclip);
 
@@ -3844,13 +4142,13 @@
 // Erase margins, then draw text one line at a time to reduce flicker.
 // Only draw if intersection of bar area and dirty rectangle is non-empty
 void FXText::drawContents(FXDCWindow& dc) const {
-  register FXint vx=getVisibleX();
-  register FXint vy=getVisibleY();
-  register FXint vw=getVisibleWidth();
-  register FXint vh=getVisibleHeight();
+  FXint vx=getVisibleX();
+  FXint vy=getVisibleY();
+  FXint vw=getVisibleWidth();
+  FXint vh=getVisibleHeight();
   dc.setClipRectangle(vx,vy,vw,vh);
   if(0<dc.getClipWidth() && 0<dc.getClipHeight()){
-    register FXint th,row,trow,brow;
+    FXint th,row,trow,brow;
     dc.setForeground(backColor);
     if(dc.getClipY()<=vy+margintop){
       dc.fillRectangle(vx,vy,vw,margintop);
@@ -3882,12 +4180,12 @@
 // and then drawing numbers on top; this leads to less flicker.
 // Only draw if intersection of bar area and dirty rectangle is non-empty
 void FXText::drawNumbers(FXDCWindow& dc) const {
-  register FXint vx=getVisibleX();
-  register FXint vy=getVisibleY();
-  register FXint vh=getVisibleHeight();
+  FXint vx=getVisibleX();
+  FXint vy=getVisibleY();
+  FXint vh=getVisibleHeight();
   dc.setClipRectangle(0,vy,vx,vh);
   if(0<dc.getClipWidth() && 0<dc.getClipHeight()){
-    register FXint tw,th,trow,brow,row,n;
+    FXint tw,th,trow,brow,row,n;
     FXchar number20;
     dc.setForeground(barColor);
     if(dc.getClipY()<=vy+margintop){
@@ -3914,15 +4212,25 @@
   }
 
 
-// Repaint range of rows
-void FXText::updateRows(FXint startrow,FXint endrow) const {
-  FXint ty,by;
-  FXASSERT(startrow<=endrow);
-  if(startrow<=toprow+nvisrows && toprow<=endrow){
-    if(startrow<toprow) startrow=toprow;
-    if(endrow>toprow+nvisrows) endrow=toprow+nvisrows;
-    ty=getVisibleY()+margintop+pos_y+startrow*font->getFontHeight();
-    by=getVisibleY()+margintop+pos_y+endrow*font->getFontHeight()+font->getFontHeight();
+// Repaint the row
+void FXText::updateRow(FXint row) const {
+  if(toprow<=row && row<=toprow+nvisrows){
+    update(getVisibleX(),getVisibleY()+margintop+pos_y+row*font->getFontHeight(),getVisibleWidth(),font->getFontHeight());
+    }
+  }
+
+
+// Update whole lines
+void FXText::updateLines(FXint startpos,FXint endpos) const {
+  FXint b,e,tr,br,ty,by;
+  FXMINMAX(b,e,startpos,endpos);
+  if(b<=visrowsnvisrows && visrows0<e){
+    if(b<visrows0) b=visrows0;
+    if(e>visrowsnvisrows-1) e=visrowsnvisrows-1;
+    tr=rowFromPos(b);
+    br=rowFromPos(e);
+    ty=getVisibleY()+margintop+pos_y+tr*font->getFontHeight();
+    by=getVisibleY()+margintop+pos_y+br*font->getFontHeight()+font->getFontHeight();
     update(getVisibleX(),ty,getVisibleWidth(),by-ty);
     }
   }
@@ -4117,20 +4425,20 @@
 
 // Update somebody who works on the selection
 long FXText::onUpdHaveSelection(FXObject* sender,FXSelector,void*){
-  sender->handle(this,(select.startpos<select.endpos)?FXSEL(SEL_COMMAND,ID_ENABLE):FXSEL(SEL_COMMAND,ID_DISABLE),NULL);
+  sender->handle(this,(select.startpos<=select.endpos)?FXSEL(SEL_COMMAND,ID_ENABLE):FXSEL(SEL_COMMAND,ID_DISABLE),NULL);
   return 1;
   }
 
 
 // Update somebody who works on the selection and change the text
 long FXText::onUpdHaveEditableSelection(FXObject* sender,FXSelector,void*){
-  sender->handle(this,isEditable() && (select.startpos<select.endpos)?FXSEL(SEL_COMMAND,ID_ENABLE):FXSEL(SEL_COMMAND,ID_DISABLE),NULL);
+  sender->handle(this,isEditable() && (select.startpos<=select.endpos)?FXSEL(SEL_COMMAND,ID_ENABLE):FXSEL(SEL_COMMAND,ID_DISABLE),NULL);
   return 1;
   }
 
 
 // Start input method editor
-long FXText::onIMEStart(FXObject* sender,FXSelector,void* ptr){
+long FXText::onIMEStart(FXObject*,FXSelector,void*){
   if(isEditable()){
     if(getComposeContext()){
       FXint th=font->getFontHeight();
@@ -4221,8 +4529,6 @@
 // Handle drag-and-drop motion
 long FXText::onDNDMotion(FXObject* sender,FXSelector sel,void* ptr){
   FXEvent* event=(FXEvent*)ptr;
-  FXDragAction action;
-  FXint pos,row,col;
 
   // Scroll into view
   if(startAutoScroll(event,true)) return 1;
@@ -4235,10 +4541,11 @@
 
     // Is target editable?
     if(isEditable()){
-      action=inquireDNDAction();
+      FXDragAction action=inquireDNDAction();
 
       // Check for legal DND action
       if(action==DRAG_COPY || action==DRAG_MOVE){
+        FXint pos,row,col;
 
         // Get the suggested drop position
         pos=getRowColumnAt(event->win_x,event->win_y,row,col);
@@ -4313,13 +4620,13 @@
 // Service requested DND data
 long FXText::onDNDRequest(FXObject* sender,FXSelector sel,void* ptr){
   FXEvent *event=(FXEvent*)ptr;
-  FXString string;
 
   // Perhaps the target wants to supply its own data
   if(FXScrollArea::onDNDRequest(sender,sel,ptr)) return 1;
 
   // Recognize the request?
   if(event->target==stringType || event->target==textType || event->target==utf8Type || event->target==utf16Type){
+    FXString string;
 
     // Get selected fragment
     string=getSelectedText();
@@ -4381,9 +4688,9 @@
     }
   updateRange(select.startpos,select.endpos);
   select.startpos=0;
-  select.endpos=0;
+  select.endpos=-1;
   select.startcol=0;
-  select.endcol=0;
+  select.endcol=-1;
   return 1;
   }
 
@@ -4491,20 +4798,21 @@
     graby=event->win_y-pos_y;
     if(event->click_count==1){
       pos=getRowColumnAt(event->win_x,event->win_y,row,col);
-      if(event->state&CONTROLMASK){     // Drag select block
-        if(event->state&SHIFTMASK){     // Shift-select block
+//FXTRACE((1,"getRowColumnAt: pos=%d row=%d col=%d nrows=%d length=%d\n",pos,row,col,nrows,length));
+      if((event->state&CONTROLMASK) && !(options&TEXT_WORDWRAP)){
+        if(event->state&SHIFTMASK){                     // Shift-select block
           moveCursorRowColumnAndSelect(row,col,true);
           }
-        else{                           // Drag select block
+        else{                                           // Drag select block
           moveCursorRowColumn(row,col,true);
           }
         mode=MOUSE_BLOCK;
         }
       else{
-        if(event->state&SHIFTMASK){     // Shift-select characters
+        if(event->state&SHIFTMASK){                     // Shift-select range
           moveCursorAndSelect(pos,SelectChars,true);
           }
-        else{                           // Drag select characters
+        else{                                           // Drag select range
           moveCursor(pos,true);
           }
         mode=MOUSE_CHARS;
@@ -4625,7 +4933,7 @@
       return 1;
     case MOUSE_CHARS:
       if(startAutoScroll(event,false)) return 1;
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         pos=getPosAt(event->win_x,event->win_y);
         setCursorPos(pos,true);
@@ -4634,7 +4942,7 @@
       return 1;
     case MOUSE_WORDS:
       if(startAutoScroll(event,false)) return 1;
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         pos=getPosContaining(event->win_x,event->win_y);
         setCursorPos(pos,true);
@@ -4643,7 +4951,7 @@
       return 1;
     case MOUSE_LINES:
       if(startAutoScroll(event,false)) return 1;
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         pos=getPosAt(event->win_x,event->win_y);
         setCursorPos(pos,true);
@@ -4652,7 +4960,7 @@
       return 1;
     case MOUSE_BLOCK:
       if(startAutoScroll(event,false)) return 1;
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         getRowColumnAt(event->win_x,event->win_y,row,col);
         setCursorRowColumn(row,col,true);
@@ -4687,7 +4995,7 @@
   FXScrollArea::onAutoScroll(sender,sel,ptr);
   switch(mode){
     case MOUSE_CHARS:
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         pos=getPosAt(event->win_x,event->win_y);
         extendSelection(pos,SelectChars,true);
@@ -4695,7 +5003,7 @@
         }
       return 1;
     case MOUSE_WORDS:
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         pos=getPosContaining(event->win_x,event->win_y);
         extendSelection(pos,SelectWords,true);
@@ -4703,7 +5011,7 @@
         }
       return 1;
     case MOUSE_LINES:
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         pos=getPosAt(event->win_x,event->win_y);
         extendSelection(pos,SelectLines,true);
@@ -4711,7 +5019,7 @@
         }
       return 1;
     case MOUSE_BLOCK:
-      if((fxabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(fxabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
+      if((Math::iabs(event->win_x-grabx-pos_x)>getApp()->getDragDelta())||(Math::iabs(event->win_y-graby-pos_y)>getApp()->getDragDelta())){
         killHighlight();
         getRowColumnAt(event->win_x,event->win_y,row,col);
         extendBlockSelection(row,col,true);
@@ -4744,9 +5052,9 @@
 
 // Keyboard press
 long FXText::onKeyPress(FXObject*,FXSelector,void* ptr){
-  FXEvent* event=(FXEvent*)ptr;
   flags&=~FLAG_TIP;
   if(isEnabled()){
+    FXEvent* event=(FXEvent*)ptr;
     FXTRACE((200,"%s::onKeyPress keysym=0x%04x state=%04x\n",getClassName(),event->code,event->state));
     if(target && target->tryHandle(this,FXSEL(SEL_KEYPRESS,message),ptr)) return 1;
     flags&=~FLAG_UPDATE;
@@ -4765,6 +5073,9 @@
         else if(event->state&SHIFTMASK){
           handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_SHIFT_UP),NULL);
           }
+        else if(event->state&ALTMASK){
+          handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_ALT_UP),NULL);
+          }
         else{
           handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_UP),NULL);
           }
@@ -4777,6 +5088,9 @@
         else if(event->state&SHIFTMASK){
           handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_SHIFT_DOWN),NULL);
           }
+        else if(event->state&ALTMASK){
+          handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_ALT_DOWN),NULL);
+          }
         else{
           handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_DOWN),NULL);
           }
@@ -4795,6 +5109,9 @@
           if(event->state&SHIFTMASK){
             handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_SHIFT_LEFT),NULL);
             }
+          else if(event->state&ALTMASK){
+            handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_ALT_LEFT),NULL);
+            }
           else{
             handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_LEFT),NULL);
             }
@@ -4814,6 +5131,9 @@
           if(event->state&SHIFTMASK){
             handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_SHIFT_RIGHT),NULL);
             }
+          else if(event->state&ALTMASK){
+            handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_ALT_RIGHT),NULL);
+            }
           else{
             handle(this,FXSEL(SEL_COMMAND,ID_CURSOR_RIGHT),NULL);
             }
@@ -4971,8 +5291,8 @@
 
 // Keyboard release
 long FXText::onKeyRelease(FXObject*,FXSelector,void* ptr){
-  FXEvent* event=(FXEvent*)ptr;
   if(isEnabled()){
+    FXEvent* event=(FXEvent*)ptr;
     FXTRACE((200,"%s::onKeyRelease keysym=0x%04x state=%04x\n",getClassName(),event->code,event->state));
     if(target && target->tryHandle(this,FXSEL(SEL_KEYRELEASE,message),ptr)) return 1;
     switch(event->code){
@@ -5051,8 +5371,8 @@
 
 // Page up
 long FXText::onCmdCursorPageUp(FXObject*,FXSelector,void*){
-  FXint lines=getVisibleHeight()/font->getFontHeight();
   FXint col=(0<=prefcol) ? prefcol : cursorcol;
+  FXint lines=FXMAX(nvisrows-2,1);
   setTopLine(prevRow(toppos,lines));
   moveCursor(posFromColumn(prevRow(cursorpos,lines),col),true);
   prefcol=col;
@@ -5062,8 +5382,8 @@
 
 // Page down
 long FXText::onCmdCursorPageDown(FXObject*,FXSelector,void*){
-  FXint lines=getVisibleHeight()/font->getFontHeight();
   FXint col=(0<=prefcol) ? prefcol : cursorcol;
+  FXint lines=FXMAX(nvisrows-2,1);
   setTopLine(nextRow(toppos,lines));
   moveCursor(posFromColumn(nextRow(cursorpos,lines),col),true);
   prefcol=col;
@@ -5147,8 +5467,8 @@
 
 // Process cursor shift+page up
 long FXText::onCmdCursorShiftPageUp(FXObject*,FXSelector,void*){
-  FXint lines=getVisibleHeight()/font->getFontHeight();
   FXint col=(0<=prefcol) ? prefcol : cursorcol;
+  FXint lines=FXMAX(nvisrows-2,1);
   setTopLine(prevRow(toppos,lines));
   moveCursorAndSelect(posFromColumn(prevRow(cursorpos,lines),col),SelectChars,true);
   prefcol=col;
@@ -5158,8 +5478,8 @@
 
 // Process cursor shift+page down
 long FXText::onCmdCursorShiftPageDown(FXObject*,FXSelector,void*){
-  FXint lines=getVisibleHeight()/font->getFontHeight();
   FXint col=(0<=prefcol) ? prefcol : cursorcol;
+  FXint lines=FXMAX(nvisrows-2,1);
   setTopLine(nextRow(toppos,lines));
   moveCursorAndSelect(posFromColumn(nextRow(cursorpos,lines),col),SelectChars,true);
   prefcol=col;
@@ -5181,6 +5501,38 @@
   }
 
 
+// Process cursor alt-up
+long FXText::onCmdCursorAltUp(FXObject*,FXSelector,void*){      // FIXME
+  FXint col=(0<=prefcol) ? prefcol : cursorvcol;
+  moveCursorRowColumnAndSelect(cursorrow-1,col,true);
+  prefcol=col;
+  return 1;
+  }
+
+
+// Process cursor alt-down
+long FXText::onCmdCursorAltDown(FXObject*,FXSelector,void*){
+  FXint col=(0<=prefcol) ? prefcol : cursorvcol;
+  moveCursorRowColumnAndSelect(cursorrow+1,col,true);
+  prefcol=col;
+  return 1;
+  }
+
+
+// Process cursor alt-left
+long FXText::onCmdCursorAltLeft(FXObject*,FXSelector,void*){
+  moveCursorRowColumnAndSelect(cursorrow,cursorvcol-1,true);
+  return 1;
+  }
+
+
+// Process cursor alt-right
+long FXText::onCmdCursorAltRight(FXObject*,FXSelector,void*){
+  moveCursorRowColumnAndSelect(cursorrow,cursorvcol+1,true);
+  return 1;
+  }
+
+
 // Scroll up one line
 long FXText::onCmdScrollUp(FXObject*,FXSelector,void*){
   setTopLine(prevRow(toppos));
@@ -5219,7 +5571,53 @@
 // Insert a string
 long FXText::onCmdInsertString(FXObject*,FXSelector,void* ptr){
   if(isEditable()){
-    enterText((const FXchar*)ptr,strlen((const FXchar*)ptr),true);
+    FXchar* txt=(FXchar*)ptr;
+    FXint len=strlen(txt);
+    FXint beg=cursorpos;
+    FXint end=cursorpos;
+    FXint row=cursorrow;
+    FXint col=cursorvcol;
+    FXint ins;
+
+    // If cursor position is in selection, then replace selection.
+    if(isPosSelected(cursorpos,cursorvcol)){
+      beg=select.startpos;
+      end=select.endpos;
+      col=select.startcol;
+
+      // Replace block selection; also handle vertical column
+      if((select.startcol<=select.endcol) && (select.startpos<=select.endpos)){   // FIXME vertical cursor vs replace selection
+        FXint ncins=maxcolumns(txt,txt+len,tabcolumns);
+        FXint ncdel=select.endcol-select.startcol;
+        FXint nlines=countLines(beg,end);
+        FXString rep('\0',len*nlines+len+nlines);
+FXTRACE((1,"len=%d\n",len));
+FXTRACE((1,"nlines=%d\n",nlines));
+FXTRACE((1,"ncins=%d\n",ncins));
+FXTRACE((1,"ncdel=%d\n",ncdel));
+FXTRACE((1,"col=%d\n",col));
+        replicatecolumns(&rep0,&reprep.length(),txt,txt+len,(nlines+1));
+        ins=replaceTextBlock(beg,end,select.startcol,select.endcol,rep,true);
+        setCursorRowColumn(row,col+ncins,true);
+        return 1;
+        }
+
+      // Replace range selection
+      if((select.startcol>select.endcol) && (select.startpos<select.endpos)){
+        ins=replaceText(beg,end-beg,txt,len,true);
+        moveCursor(beg+ins,true);
+        return 1;
+        }
+      }
+
+    // Insert or overstrike
+    if(isOverstrike()){
+      end=overstruck(beg,end,txt,len);
+      }
+
+    // Replace range with incoming text
+    ins=replaceText(beg,end-beg,txt,len,true);
+    moveCursor(beg+ins,true);
     return 1;
     }
   getApp()->beep();
@@ -5227,10 +5625,44 @@
   }
 
 
+#if 0
+// Insert a string
+long FXText::onCmdInsertString(FXObject*,FXSelector,void* ptr){
+  if(isEditable()){
+    FXchar* txt=(FXchar*)ptr;
+    FXint len=strlen(txt);
+    FXint beg=cursorpos;
+    FXint end=cursorpos;
+    FXint ins,cols;
+    if(isPosSelected(cursorpos,cursorvcol)){
+      beg=select.startpos;
+      end=select.endpos;
+      if(select.startcol<=select.endcol){
+        cols=maxcolumns(txt,txt+len,tabcolumns);
+//      m=replaceTextBlock(select.startpos,select.endpos,select.startcol,select.endcol,text,n,notify);
+        ins=insertTextBlock(beg,end,select.startcol,txt,len,true);
+        select.startcol=select.endcol=select.startcol+cols;
+        beg=posFromColumn(lineStart(beg+ins),select.startcol);
+        setCursorPos(beg,true);
+        return 1;
+        }
+      ins=replaceText(beg,end-beg,txt,len,true);
+      moveCursor(beg+ins,true);
+      return 1;
+      }
+    if(isOverstrike()) end=overstruck(beg,end,txt,len);
+    ins=replaceText(beg,end-beg,txt,len,true);
+    moveCursor(beg+ins,true);
+    return 1;
+    }
+  getApp()->beep();
+  return 1;
+  }
+#endif
+
 // Insert newline with optional autoindent
 long FXText::onCmdInsertNewline(FXObject*,FXSelector,void*){
-  if(options&TEXT_AUTOINDENT) return handle(this,FXSEL(SEL_COMMAND,ID_INSERT_NEWLINE_INDENT),NULL);
-  return handle(this,FXSEL(SEL_COMMAND,ID_INSERT_NEWLINE_ONLY),NULL);
+  return handle(this,(options&TEXT_AUTOINDENT)?FXSEL(SEL_COMMAND,ID_INSERT_NEWLINE_INDENT):FXSEL(SEL_COMMAND,ID_INSERT_NEWLINE_ONLY),NULL);
   }
 
 
@@ -5244,10 +5676,8 @@
 long FXText::onCmdInsertNewlineIndent(FXObject*,FXSelector,void*){
   FXint pos=isPosSelected(cursorpos) ? select.startpos : cursorpos;
   FXint start=lineStart(pos);
-  FXint n;
-  FXString string;
-  extractText(string,start,pos-start);
-  n=string.find_first_not_of(" \t\v");
+  FXString string=extractText(start,pos-start);
+  FXint n=string.find_first_not_of(" \t\v");
   if(0<=n) string.trunc(n);
   string.prepend('\n');
   return handle(this,FXSEL(SEL_COMMAND,ID_INSERT_STRING),(void*)string.text());
@@ -5256,8 +5686,7 @@
 
 // Insert optional soft-tab
 long FXText::onCmdInsertTab(FXObject*,FXSelector,void*){
-  if(options&TEXT_NO_TABS) return handle(this,FXSEL(SEL_COMMAND,ID_INSERT_SOFTTAB),NULL);
-  return handle(this,FXSEL(SEL_COMMAND,ID_INSERT_HARDTAB),NULL);
+  return handle(this,(options&TEXT_NO_TABS)?FXSEL(SEL_COMMAND,ID_INSERT_SOFTTAB):FXSEL(SEL_COMMAND,ID_INSERT_HARDTAB),NULL);
   }
 
 
@@ -5375,7 +5804,7 @@
 
 
 // Select entire enclosing block
-long FXText::onCmdSelectBlock(FXObject*,FXSelector sel,void*){
+long FXText::onCmdSelectEnclosing(FXObject*,FXSelector sel,void*){
   FXint what=FXSELID(sel)-ID_SELECT_BRACE;
   FXint level=1;
   FXint beg,end;
@@ -5539,17 +5968,20 @@
 /*******************************************************************************/
 
 // Shift selected lines left or right, or clean indent
-long FXText::onCmdShiftText(FXObject*,FXSelector sel,void*){    // FIXME fix for block mode
+// Try keep the cursor on same row and (adjusted) column as before
+long FXText::onCmdShiftText(FXObject*,FXSelector sel,void*){
   if(isEditable()){
-    FXint startpos,endpos,indent,len;
+    FXint startpos,endpos,len;
+    FXint curc=getCursorColumn();
+    FXint curr=getCursorRow();
+    FXint indent=0;
     switch(FXSELID(sel)){
       case ID_SHIFT_LEFT: indent=-1; break;
       case ID_SHIFT_RIGHT: indent=1; break;
       case ID_SHIFT_TABLEFT: indent=-tabcolumns; break;
       case ID_SHIFT_TABRIGHT: indent=tabcolumns; break;
-      default: indent=0; break;
       }
-    if(select.startpos<select.endpos){
+    if(select.startpos<=select.endpos){
       startpos=lineStart(select.startpos);
       endpos=nextLine(select.endpos-1);
       }
@@ -5560,8 +5992,8 @@
       }
     len=shiftText(startpos,endpos,indent,true);
     setSelection(startpos,len,true);
-    setAnchorPos(startpos);
-    setCursorPos(startpos+len,true);
+    setAnchorRowColumn(curr,FXMAX(curc+indent,0));
+    setCursorRowColumn(curr,FXMAX(curc+indent,0),true);
     }
   else{
     getApp()->beep();
@@ -5572,11 +6004,13 @@
 /*******************************************************************************/
 
 // Make selected text upper case
-long FXText::onCmdChangeCase(FXObject*,FXSelector sel,void*){   // FIXME fix for block mode
+long FXText::onCmdChangeCase(FXObject*,FXSelector sel,void*){
   if(isEditable()){
-    FXint startpos,endpos,mode,len;
-    mode=(FXSELID(sel)==ID_UPPER_CASE);
-    if(select.startpos<select.endpos){
+    FXint startpos,endpos,len;
+    FXint upper=(FXSELID(sel)==ID_UPPER_CASE);
+    FXint curc=getCursorColumn();
+    FXint curr=getCursorRow();
+    if(select.startpos<=select.endpos){
       startpos=select.startpos;
       endpos=select.endpos;
       }
@@ -5584,10 +6018,10 @@
       startpos=cursorpos;
       endpos=inc(cursorpos);
       }
-    len=caseShift(startpos,endpos,mode,true);
+    len=caseShift(startpos,endpos,upper,true);
     setSelection(startpos,len,true);
-    setAnchorPos(startpos);
-    setCursorPos(cursorpos,true);
+    setAnchorRowColumn(curr,curc);
+    setCursorRowColumn(curr,curc,true);
     }
   else{
     getApp()->beep();
@@ -5601,12 +6035,8 @@
 long FXText::onCmdCopyLine(FXObject*,FXSelector,void*){
   if(isEditable()){
     FXString text;
-    FXint start;
-    FXint end;
-    FXASSERT(0<=select.startpos);
-    FXASSERT(select.startpos<=select.endpos);
-    FXASSERT(select.endpos<=length);
-    if(select.startpos<select.endpos){
+    FXint start,end;
+    if(select.startpos<=select.endpos){
       start=lineStart(select.startpos);
       end=lineEnd(select.endpos-1);
       }
@@ -5635,11 +6065,8 @@
 // newline at the appropriate spot.
 long FXText::onCmdMoveLineUp(FXObject*,FXSelector,void*){
   if(isEditable()){
-    FXint    curbeg,curend,prvbeg,pos;
-    FXASSERT(0<=select.startpos);
-    FXASSERT(select.startpos<=select.endpos);
-    FXASSERT(select.endpos<=length);
-    if(select.startpos<select.endpos){
+    FXint curbeg,curend,prvbeg,pos;
+    if(select.startpos<=select.endpos){
       curbeg=lineStart(select.startpos);
       curend=lineEnd(select.endpos-1);
       }
@@ -5676,10 +6103,7 @@
 long FXText::onCmdMoveLineDown(FXObject*,FXSelector,void*){
   if(isEditable()){
     FXint curbeg,curend,nxtend,pos;
-    FXASSERT(0<=select.startpos);
-    FXASSERT(select.startpos<=select.endpos);
-    FXASSERT(select.endpos<=length);
-    if(select.startpos<select.endpos){
+    if(select.startpos<=select.endpos){
       curbeg=lineStart(select.startpos);
       curend=nextLine(select.endpos-1);
       }
@@ -5839,6 +6263,57 @@
 
 /*******************************************************************************/
 
+// Change text style
+void FXText::setTextStyle(FXuint style){
+  FXuint opts=((style^options)&TEXT_MASK)^options;
+  if(options!=opts){
+    options=opts;
+    recalc();
+    update();
+    }
+  }
+
+
+// Get text style
+FXuint FXText::getTextStyle() const {
+  return (options&TEXT_MASK);
+  }
+
+
+// Change the font
+void FXText::setFont(FXFont* fnt){
+  if(!fnt){ fxerror("%s::setFont: NULL font specified.\n",getClassName()); }
+  if(font!=fnt){
+    font=fnt;
+    tabwidth=tabcolumns*font->getTextWidth(" ",1);
+    barwidth=barcolumns*font->getTextWidth("8",1);
+    if(getComposeContext()) getComposeContext()->setFont(font);
+    recalc();
+    update();
+    }
+  }
+
+
+// Change number of visible rows
+void FXText::setVisibleRows(FXint rows){
+  if(rows<0) rows=0;
+  if(vrows!=rows){
+    vrows=rows;
+    recalc();
+    }
+  }
+
+
+// Change number of visible columns
+void FXText::setVisibleColumns(FXint cols){
+  if(cols<0) cols=0;
+  if(vcols!=cols){
+    vcols=cols;
+    recalc();
+    }
+  }
+
+
 // Change top margin
 void FXText::setMarginTop(FXint mt){
   if(margintop!=mt){
@@ -5879,14 +6354,12 @@
   }
 
 
-// Change the font
-void FXText::setFont(FXFont* fnt){
-  if(!fnt){ fxerror("%s::setFont: NULL font specified.\n",getClassName()); }
-  if(font!=fnt){
-    font=fnt;
-    tabwidth=tabcolumns*font->getTextWidth(" ",1);
+// Change number of columns used for line numbers
+void FXText::setBarColumns(FXint cols){
+  if(cols<=0) cols=0;
+  if(cols!=barcolumns){
+    barcolumns=cols;
     barwidth=barcolumns*font->getTextWidth("8",1);
-    if(getComposeContext()) getComposeContext()->setFont(font);
     recalc();
     update();
     }
@@ -5916,18 +6389,6 @@
   }
 
 
-// Change number of columns used for line numbers
-void FXText::setBarColumns(FXint cols){
-  if(cols<=0) cols=0;
-  if(cols!=barcolumns){
-    barcolumns=cols;
-    barwidth=barcolumns*font->getTextWidth("8",1);
-    recalc();
-    update();
-    }
-  }
-
-
 // Set text color
 void FXText::setTextColor(FXColor clr){
   if(clr!=textColor){
@@ -5981,6 +6442,15 @@
     }
   }
 
+// Set cursor color
+void FXText::setCursorColor(FXColor clr){
+  if(clr!=cursorColor){
+    cursorColor=clr;
+    update();
+    }
+  }
+
+
 // Change line number color
 void FXText::setNumberColor(FXColor clr){
   if(clr!=numberColor){
@@ -5989,7 +6459,6 @@
     }
   }
 
-
 // Change bar color
 void FXText::setBarColor(FXColor clr){
   if(clr!=barColor){
@@ -5999,56 +6468,6 @@
   }
 
 
-// Set cursor color
-void FXText::setCursorColor(FXColor clr){
-  if(clr!=cursorColor){
-    cursorColor=clr;
-    update();
-    }
-  }
-
-
-// Change text style
-void FXText::setTextStyle(FXuint style){
-  FXuint opts=((style^options)&TEXT_MASK)^options;
-  if(options!=opts){
-    options=opts;
-    recalc();
-    update();
-    }
-  }
-
-
-// Get text style
-FXuint FXText::getTextStyle() const {
-  return (options&TEXT_MASK);
-  }
-
-
-// Return true if editable
-FXbool FXText::isEditable() const {
-  return (options&TEXT_READONLY)==0;
-  }
-
-
-// Set widget is editable or not
-void FXText::setEditable(FXbool edit){
-  options^=((edit-1)^options)&TEXT_READONLY;
-  }
-
-
-// Return true if text is in overstrike mode
-FXbool FXText::isOverstrike() const {
-  return (options&TEXT_OVERSTRIKE)!=0;
-  }
-
-
-// Set overstrike mode
-void FXText::setOverstrike(FXbool over){
-  options^=((0-over)^options)&TEXT_OVERSTRIKE;
-  }
-
-
 // Set styled text mode
 FXbool FXText::setStyled(FXbool styled){
   if(styled && !sbuffer){
@@ -6070,26 +6489,6 @@
   }
 
 
-// Change number of visible rows
-void FXText::setVisibleRows(FXint rows){
-  if(rows<0) rows=0;
-  if(vrows!=rows){
-    vrows=rows;
-    recalc();
-    }
-  }
-
-
-// Change number of visible columns
-void FXText::setVisibleColumns(FXint cols){
-  if(cols<0) cols=0;
-  if(vcols!=cols){
-    vcols=cols;
-    recalc();
-    }
-  }
-
-
 // Save object to stream
 void FXText::save(FXStream& store) const {
   FXScrollArea::save(store);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTextCodec.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTextCodec.cpp Changed

@@ -3,7 +3,7 @@
 *                   U n i c o d e   T e x t   C o d e c                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by L.Johnson & J.van der Zijp.  All Rights Reserved.  *
+* Copyright (C) 2002,2020 by L.Johnson & J.van der Zijp.  All Rights Reserved.  *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -75,7 +75,7 @@
 
 // Count number of utf8 characters needed to convert multi-byte characters from src
 FXint FXTextCodec::mb2utflen(const FXchar* src,FXint nsrc) const {
-  register FXint nr,len=0;
+  FXint nr,len=0;
   FXwchar w;
   while(0<nsrc){
     nr=mb2wc(w,src,nsrc);
@@ -97,7 +97,7 @@
 
 // Convert multi-byte characters from src to utf8 characters at dst
 FXint FXTextCodec::mb2utf(FXchar* dst,FXint ndst,const FXchar* src,FXint nsrc) const {
-  register FXint nr,nw,len=0;
+  FXint nr,nw,len=0;
   FXwchar w;
   while(0<nsrc && 0<ndst){
     nr=mb2wc(w,src,nsrc);
@@ -128,7 +128,7 @@
 
 // Convert multi-byte characters from src to utf8 string
 FXString FXTextCodec::mb2utf(const FXchar* src,FXint nsrc) const {
-  register FXint len=mb2utflen(src,nsrc);
+  FXint len=mb2utflen(src,nsrc);
   FXString result;
   if(0<len){
     result.length(len);
@@ -168,7 +168,7 @@
 
 // Count multi-byte characters characters needed to convert utf8 from src
 FXint FXTextCodec::utf2mblen(const FXchar* src,FXint nsrc) const {
-  register FXint nr,len=0;
+  FXint nr,len=0;
   FXchar buffer64;
   FXwchar w;
   while(0<nsrc){
@@ -191,7 +191,7 @@
 
 // Convert utf8 characters at src to multi-byte characters at dst
 FXint FXTextCodec::utf2mb(FXchar* dst,FXint ndst,const FXchar* src,FXint nsrc) const {
-  register FXint nr,nw,len=0;
+  FXint nr,nw,len=0;
   FXwchar w;
   while(0<nsrc && 0<ndst){
     nr=FX::wclen(src);
@@ -223,8 +223,8 @@
 
 // Convert utf8 characters at src to multi-byte string
 FXString FXTextCodec::utf2mb(const FXchar* src,FXint nsrc) const {
-  register FXint len=utf2mblen(src,nsrc)+utf2mblen(FXString::null,1);   // Reserve extra space for explicit conversion of end-of-string
-  register FXint end;
+  FXint len=utf2mblen(src,nsrc)+utf2mblen(FXString::null,1);   // Reserve extra space for explicit conversion of end-of-string
+  FXint end;
   FXString result;
   result.length(len);
   end=utf2mb(&result0,len,src,nsrc);                                  // Convert the text itself

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTextField.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTextField.cpp Changed

@@ -3,7 +3,7 @@
 *                         T e x t   F i e l d   O b j e c t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -312,7 +312,7 @@
 
 // Find end of previous word
 FXint FXTextField::leftWord(FXint pos) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=pos && pos<=contents.length());
   if(0<pos){
     pos=contents.dec(pos);
@@ -343,7 +343,7 @@
 
 // Find begin of next word
 FXint FXTextField::rightWord(FXint pos) const {
-  register FXwchar ch;
+  FXwchar ch;
   FXASSERT(0<=pos && pos<=contents.length());
   if(pos<contents.length()){
     ch=contents.wc(pos);
@@ -374,7 +374,7 @@
 
 // Find begin of a word
 FXint FXTextField::wordStart(FXint pos) const {
-  register FXint p;
+  FXint p;
   FXASSERT(0<=pos && pos<=contents.length());
   if(pos==contents.length() || Unicode::isSpace(contents.wc(pos))){
     while(0<=(p=contents.dec(pos)) && Unicode::isSpace(contents.wc(p))) pos=p;
@@ -409,10 +409,10 @@
 
 // Find index from coord
 FXint FXTextField::index(FXint x) const {
-  register FXint rr=width-border-padright;
-  register FXint ll=border+padleft;
-  register FXint mm=(ll+rr)/2;
-  register FXint pos,xx,cw;
+  FXint rr=width-border-padright;
+  FXint ll=border+padleft;
+  FXint mm=(ll+rr)/2;
+  FXint pos,xx,cw;
   if(options&TEXTFIELD_PASSWD){
     cw=font->getTextWidth("*",1);
     if(options&JUSTIFY_RIGHT) xx=rr-cw*contents.count();
@@ -440,10 +440,10 @@
 
 // Find coordinate from index
 FXint FXTextField::coord(FXint i) const {
-  register FXint rr=width-border-padright;
-  register FXint ll=border+padleft;
-  register FXint mm=(ll+rr)/2;
-  register FXint pos;
+  FXint rr=width-border-padright;
+  FXint ll=border+padleft;
+  FXint mm=(ll+rr)/2;
+  FXint pos;
   FXASSERT(0<=i && i<=contents.length());
   if(options&JUSTIFY_RIGHT){
     if(options&TEXTFIELD_PASSWD){
@@ -476,7 +476,7 @@
 // Return true if position is visible
 FXbool FXTextField::isPosVisible(FXint pos) const {
   if(0<=pos && pos<=contents.length()){
-    register FXint x=coord(contents.validate(pos));
+    FXint x=coord(contents.validate(pos));
     return border+padleft<=x && x<=width-border-padright;
     }
   return false;
@@ -485,11 +485,11 @@
 
 // Force position to become fully visible; we assume layout is correct
 void FXTextField::makePositionVisible(FXint pos){
-  register FXint rr=width-border-padright;
-  register FXint ll=border+padleft;
-  register FXint ww=rr-ll;
-  register FXint oldshift=shift;
-  register FXint xx;
+  FXint rr=width-border-padright;
+  FXint ll=border+padleft;
+  FXint ww=rr-ll;
+  FXint oldshift=shift;
+  FXint xx;
   if(!xid) return;
   pos=contents.validate(FXCLAMP(0,pos,contents.length()));
   if(options&JUSTIFY_RIGHT){
@@ -524,10 +524,10 @@
 
 // Fix scroll amount after text changes or widget resize
 void FXTextField::layout(){
-  register FXint rr=width-border-padright;
-  register FXint ll=border+padleft;
-  register FXint ww=rr-ll;
-  register FXint tw;
+  FXint rr=width-border-padright;
+  FXint ll=border+padleft;
+  FXint ww=rr-ll;
+  FXint tw;
   if(!xid) return;
 
   // Figure text width
@@ -570,12 +570,12 @@
   if(cursor!=pos){
     drawCursor(0);
     cursor=pos;
-    if(isEditable() && hasFocus()) drawCursor(FLAG_CARET);    
+    if(isEditable() && hasFocus()) drawCursor(FLAG_CARET);
     }
 
   // After mouse click in widget, this assure we update the cursor pos in the InputMethod
   if(getComposeContext()) {
-    register FXint cursorx=coord(cursor)-1;
+    FXint cursorx=coord(cursor)-1;
     getComposeContext()->setSpot(cursorx,height-padbottom-border);
     }
 
@@ -740,6 +740,17 @@
   }
 
 
+// Kill the selection
+FXbool FXTextField::killSelection(){
+  if(hasSelection()){
+    releaseSelection();
+    update(border,border,width-(border<<1),height-(border<<1));
+    return true;
+    }
+  return false;
+  }
+
+
 // Copy selection to clipboard
 FXbool FXTextField::copySelection(){
   FXDragType types4={stringType,textType,utf8Type,utf16Type};
@@ -778,6 +789,12 @@
   }
 
 
+// Delete pending selection
+FXbool FXTextField::deletePendingSelection(FXbool notify){
+  return isPosSelected(cursor) && deleteSelection(notify);
+  }
+
+
 // Replace selection by other text
 FXbool FXTextField::replaceSelection(const FXString& text,FXbool notify){
   if(hasSelection()){
@@ -791,12 +808,6 @@
   }
 
 
-// Delete pending selection
-FXbool FXTextField::deletePendingSelection(FXbool notify){
-  return isPosSelected(cursor) && deleteSelection(notify);
-  }
-
-
 // Paste primary selection
 FXbool FXTextField::pasteSelection(FXbool notify){
   FXString string;
@@ -855,17 +866,6 @@
   return false;
   }
 
-
-// Kill the selection
-FXbool FXTextField::killSelection(){
-  if(hasSelection()){
-    releaseSelection();
-    update(border,border,width-(border<<1),height-(border<<1));
-    return true;
-    }
-  return false;
-  }
-
 /*******************************************************************************/
 
 // Draw the cursor
@@ -885,7 +885,7 @@
 
 // Paint cursor glyph
 void FXTextField::paintCursor(FXDCWindow& dc) const {
-  register FXint cursorx=coord(cursor)-1;
+  FXint cursorx=coord(cursor)-1;
   if(border<=cursorx+3 && cursorx-2<width-border){
     dc.setClipRectangle(border,border,width-(border<<1),height-(border<<1));
     dc.setForeground(cursorColor);
@@ -903,12 +903,12 @@
 
 // Erase cursor glyph
 void FXTextField::eraseCursor(FXDCWindow& dc) const {
-  register FXint cursorx=coord(cursor)-1;
+  FXint cursorx=coord(cursor)-1;
   if(border<=cursorx+3 && cursorx-2<width-border){
-    register FXint xlo=FXMAX(cursorx-2,border);
-    register FXint xhi=FXMIN(cursorx+3,width-border);
-    register FXint cl=contents.dec(cursor,2);
-    register FXint ch=contents.inc(cursor,2);
+    FXint xlo=FXMAX(cursorx-2,border);
+    FXint xhi=FXMIN(cursorx+3,width-border);
+    FXint cl=contents.dec(cursor,2);
+    FXint ch=contents.inc(cursor,2);
     dc.setFont(font);
     dc.setClipRectangle(xlo,border,xhi-xlo,height-(border<<1));
     dc.setForeground(backColor);
@@ -928,8 +928,8 @@
 
 // Draw text fragment in password mode
 void FXTextField::drawPWDTextFragment(FXDCWindow& dc,FXint x,FXint y,FXint fm,FXint to) const {
-  register FXint cw=font->getTextWidth("*",1);
-  register FXint i;
+  FXint cw=font->getTextWidth("*",1);
+  FXint i;
   y+=font->getFontAscent();
   x+=cw*contents.index(fm);
   for(i=fm; i<to; i=contents.inc(i),x+=cw){ dc.drawText(x,y,"*",1); }
@@ -938,10 +938,10 @@
 
 // Draw range of text
 void FXTextField::drawTextRange(FXDCWindow& dc,FXint fm,FXint to) const {
-  register FXint sx,ex,xx,yy,cw,hh,ww,si,ei,lx,rx,t;
-  register FXint rr=width-border-padright;
-  register FXint ll=border+padleft;
-  register FXint mm=(ll+rr)/2;
+  FXint sx,ex,xx,yy,cw,hh,ww,si,ei,lx,rx,t;
+  FXint rr=width-border-padright;
+  FXint ll=border+padleft;
+  FXint mm=(ll+rr)/2;
 
   if(to<=fm) return;
 
@@ -1333,7 +1333,7 @@
   if(isEditable()){
     if(getComposeContext()){
       // Not sure if this is needed
-      register FXint cursorx=coord(cursor)-1;
+      FXint cursorx=coord(cursor)-1;
       getComposeContext()->setSpot(cursorx,height-padbottom-border);
       }
     return 1;
@@ -1587,13 +1587,13 @@
 
 // Automatic scroll
 long FXTextField::onAutoScroll(FXObject*,FXSelector,void* ptr){
-  register FXEvent* event=(FXEvent*)ptr;
+  FXEvent* event=(FXEvent*)ptr;
   if(flags&FLAG_PRESSED){
-    register FXint newcursor=cursor;
-    register FXint ll=border+padleft;
-    register FXint rr=width-border-padright;
-    register FXint ww=rr-ll;
-    register FXint tw;
+    FXint newcursor=cursor;
+    FXint ll=border+padleft;
+    FXint rr=width-border-padright;
+    FXint ww=rr-ll;
+    FXint tw;
 
     if(options&TEXTFIELD_PASSWD)
       tw=font->getTextWidth("*",1)*contents.count();
@@ -1698,9 +1698,9 @@
 
 // Pressed a key
 long FXTextField::onKeyPress(FXObject*,FXSelector,void* ptr){
-  FXEvent* event=(FXEvent*)ptr;
   flags&=~FLAG_TIP;
   if(isEnabled()){
+    FXEvent* event=(FXEvent*)ptr;
     FXTRACE((200,"%s::onKeyPress keysym=0x%04x state=%04x\n",getClassName(),event->code,event->state));
     if(target && target->tryHandle(this,FXSEL(SEL_KEYPRESS,message),ptr)) return 1;
     flags&=~FLAG_UPDATE;
@@ -1848,8 +1848,8 @@
 
 // Key Release
 long FXTextField::onKeyRelease(FXObject*,FXSelector,void* ptr){
-  FXEvent* event=(FXEvent*)ptr;
   if(isEnabled()){
+    FXEvent* event=(FXEvent*)ptr;
     FXTRACE((200,"%s::onKeyRelease keysym=0x%04x state=%04x\n",getClassName(),((FXEvent*)ptr)->code,((FXEvent*)ptr)->state));
     if(target && target->tryHandle(this,FXSEL(SEL_KEYRELEASE,message),ptr)) return 1;
     switch(event->code){
@@ -1954,7 +1954,7 @@
 
 // Verify tentative input.
 long FXTextField::onVerify(FXObject*,FXSelector,void* ptr){
-  register FXchar *p=(FXchar*)ptr;
+  FXchar *p=(FXchar*)ptr;
 
   // Limit number of columns
   if(options&TEXTFIELD_LIMITED){

gogglesmm-1.2.1.tar.gz/cfox/lib/FXThread.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXThread.cpp Changed

@@ -3,7 +3,7 @@
 *                          T h r e a d   S u p p o r t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -23,6 +23,7 @@
 #include "fxdefs.h"
 #include "fxmath.h"
 #include "FXException.h"
+#include "FXString.h"
 #include "FXRunnable.h"
 #include "FXAutoThreadStorageKey.h"
 #include "FXThread.h"
@@ -103,8 +104,8 @@
 // FXThread to return error-code of -1.
 #if defined(WIN32)
 unsigned int CALLBACK FXThread::function(void* ptr){
-  register FXThread *thread=(FXThread*)ptr;
-  register FXint code=-1;
+  FXThread *thread=(FXThread*)ptr;
+  FXint code=-1;
   self(thread);
   try{
     code=thread->run();
@@ -123,8 +124,8 @@
   }
 #else
 void* FXThread::function(void* ptr){
-  register FXThread *thread=(FXThread*)ptr;
-  register FXint code=-1;
+  FXThread *thread=(FXThread*)ptr;
+  FXint code=-1;
   self(thread);
   pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,NULL);
   pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS,NULL);
@@ -284,12 +285,28 @@
   }
 
 
+#if defined(WIN32)
+
+// Convert 100ns since 01/01/1601 to ns since 01/01/1970
+static inline FXTime fxunixtime(FXTime ft){
+  return (ft-FXLONG(116444736000000000))*FXLONG(100);
+  }
+
+// Convert ns since 01/01/1970 to 100ns since 01/01/1601
+static inline FXTime fxwintime(FXTime ut){
+  return ut/FXLONG(100)+FXLONG(116444736000000000);
+  }
+
+#endif
+
+
 // Get time in nanoseconds since Epoch
 FXTime FXThread::time(){
 #if defined(WIN32)
   FXTime now;
+  FXASSERT(sizeof(FXTime)==sizeof(FILETIME));
   GetSystemTimeAsFileTime((FILETIME*)&now);
-  return (now-FXLONG(116444736000000000))*FXLONG(100);
+  return fxunixtime(now);
 #elif (_POSIX_C_SOURCE >= 199309L)
   const FXTime seconds=1000000000;
   struct timespec ts;
@@ -305,12 +322,75 @@
   }
 
 
+#if defined(WIN32)
+static FXTime frequency=0;
+#endif
+
+// Get steady time in nanoseconds since some arbitrary start time
+FXTime FXThread::steadytime(){
+#if defined(WIN32)
+  const FXTime seconds=1000000000;
+  FXTime now,s,f;
+  FXASSERT(sizeof(FXTime)==sizeof(LARGE_INTEGER));
+  if(__unlikely(frequency==0)){
+    ::QueryPerformanceFrequency((LARGE_INTEGER*)&frequency);
+    }
+  FXASSERT(frequency<FXLONG(9223372036));               // Overflow possible if CPU speed exceeds 9.2GHz
+  ::QueryPerformanceCounter((LARGE_INTEGER*)&now);
+  s=now/frequency;
+  f=now%frequency;
+  return seconds*s + ((seconds*f)/frequency);
+#elif (_POSIX_C_SOURCE >= 199309L)
+  const FXTime seconds=1000000000;
+  struct timespec ts;
+  clock_gettime(CLOCK_MONOTONIC,&ts);
+  return ts.tv_sec*seconds+ts.tv_nsec;
+#else
+  const FXTime seconds=1000000000;
+  const FXTime microseconds=1000;
+  struct timeval tv;
+  gettimeofday(&tv,NULL);
+  return tv.tv_sec*seconds+tv.tv_usec*microseconds;
+#endif
+  }
+
+
+// We want to use NtDelayExecution() because it allows for both absolute as well as
+// interval wait times. In addition, it is more accurate than the other system calls.
+// Unfortunately, this is an undocumented NTDLL API; we can use it anyway by using
+// GetProcAddress() on the NTDLL module to dig up its location.
+#if defined(WIN32)
+
+// Typedef a pointer to NtDelayExecution()
+typedef DWORD (WINAPI *PFN_NTDELAYEXECUTION)(BOOLEAN Alertable,LARGE_INTEGER* DelayInterval);
+
+// Declare the stub function
+static DWORD WINAPI NtDelayExecutionStub(BOOLEAN Alertable,LARGE_INTEGER* DelayInterval);
+
+// Pointer to NtDelayExecution, initially pointing to the stub function
+static PFN_NTDELAYEXECUTION fxNtDelayExecution=NtDelayExecutionStub;
+
+// The stub gets the address of actual function, sets the function pointer, then calls
+// actual function; next time around actual function will be called directly.
+static DWORD WINAPI NtDelayExecutionStub(BOOLEAN Alertable,LARGE_INTEGER* DelayInterval){
+  if(fxNtDelayExecution==NtDelayExecutionStub){
+    HMODULE ntdllDll=GetModuleHandleA("ntdll.dll");
+    FXASSERT(ntdllDll);
+    fxNtDelayExecution=(PFN_NTDELAYEXECUTION)GetProcAddress(ntdllDll,"NtDelayExecution");
+    FXASSERT(fxNtDelayExecution);
+    }
+  return fxNtDelayExecution(Alertable,DelayInterval);
+  }
+
+#endif
+
+
 // Make the calling thread sleep for a number of nanoseconds
 void FXThread::sleep(FXTime nsec){
 #if defined(WIN32)
-  const FXTime milliseconds=1000000;
-  if(milliseconds<=nsec){
-    Sleep((DWORD)(nsec/milliseconds));
+  if(100<=nsec){
+    FXTime jiffies=-nsec/FXLONG(100);
+    fxNtDelayExecution((BOOLEAN)false,(LARGE_INTEGER*)&jiffies);
     }
 #elif (_POSIX_C_SOURCE >= 199309L)
   const FXTime seconds=1000000000;
@@ -333,14 +413,41 @@
 #endif
   }
 
+/*
+
+HANDLE CreateWaitableTimerEx(LPSECURITY_ATTRIBUTES lpTimerAttributes,
+                             LPCWSTR               lpTimerName,
+                             DWORD                 dwFlags,
+                             DWORD                 dwDesiredAccess);
+
+BOOL SetWaitableTimer(HANDLE               hTimer,
+                      const LARGE_INTEGER *lpDueTime,   // UTC if >0
+                      LONG                 lPeriod,
+                      PTIMERAPCROUTINE     pfnCompletionRoutine,
+                      LPVOID               lpArgToCompletionRoutine,
+                      BOOL                 fResume);
+
+BOOL SetWaitableTimerEx(HANDLE               hTimer,
+                        const LARGE_INTEGER *lpDueTime, // UTC if >0
+                        LONG                 lPeriod,
+                        PTIMERAPCROUTINE     pfnCompletionRoutine,
+                        LPVOID               lpArgToCompletionRoutine,
+                        PREASON_CONTEXT      WakeContext,
+                        ULONG                TolerableDelay);
+
+BOOL CancelWaitableTimer(HANDLE hTimer);
+
+DWORD WaitForSingleObject(HANDLE hHandle,DWORD  dwMilliseconds);
 
-// Wake at appointed time
+*/
+
+
+// Wake at appointed absolute time
 void FXThread::wakeat(FXTime nsec){
 #if defined(WIN32)
-  const FXTime milliseconds=1000000;
-  nsec-=FXThread::time();
-  if(milliseconds<=nsec){
-    Sleep((DWORD)(nsec/milliseconds));
+  FXTime jiffies=fxwintime(nsec);
+  if(0<=jiffies){
+    fxNtDelayExecution((BOOLEAN)false,(LARGE_INTEGER*)&jiffies);
     }
 #elif (_XOPEN_SOURCE >= 600) || (_POSIX_C_SOURCE >= 200112L)
   const FXTime seconds=1000000000;
@@ -377,7 +484,8 @@
 // Return thread id of caller
 FXThreadID FXThread::current(){
 #if defined(WIN32)
-  return (FXThreadID)GetCurrentThreadId();
+//return (FXThreadID)GetCurrentThreadId();
+  return (FXThreadID)GetCurrentThread();
 #else
   return (FXThreadID)pthread_self();
 #endif
@@ -386,44 +494,43 @@
 
 // Return number of processors
 FXint FXThread::processors(){
-#if defined(WIN32)
+#if defined(WIN32)                                              // Windows
   SYSTEM_INFO info={{0}};
   GetSystemInfo(&info);
   return info.dwNumberOfProcessors;
-#elif defined(_SC_NPROCESSORS_ONLN)
+#elif defined(_SC_NPROCESSORS_ONLN)                             // Linux
   int result;
   if((result=sysconf(_SC_NPROCESSORS_ONLN))>0){
     return result;
     }
-  return 1;
-#elif defined(__IRIX__) && defined(_SC_NPROC_ONLN)
+#elif defined(HAVE_SYS_SYSCTL_H)                                // FreeBSD/NetBSD/OpenBSD/MacOSX
+  int mib4;
   int result;
-  if((result=sysconf(_SC_NPROC_ONLN))>0){
+  size_t len;
+  mib0=CTL_HW;
+  mib1=HW_AVAILCPU;
+  len=sizeof(result);
+  if(sysctl(mib,2,&result,&len,NULL,0)!=-1){
     return result;
     }
-  return 1;
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-  int result=1;
-  size_t len=sizeof(result);
-  if(sysctlbyname("hw.ncpu",&result,&len,NULL,0)!=-1){
+  mib0=CTL_HW;
+  mib1=HW_NCPU;
+  len=sizeof(result);
+  if(sysctl(mib,2,&result,&len,NULL,0)!=-1){
     return result;
     }
-  return 1;
-#elif defined(HW_NCPU)
-  int result=1;
-  int mib2={CTL_HW,HW_NCPU};
-  size_t len=sizeof(result);
-  if(sysctl(mib,2,&result,&len,NULL,0)!=-1){
+#elif defined(__IRIX__) && defined(_SC_NPROC_ONLN)              // IRIX
+  int result;
+  if((result=sysconf(_SC_NPROC_ONLN))>0){
     return result;
     }
-  return 1;
-#elif defined(hpux) || defined(__hpux) || defined(_hpux)
+#elif defined(hpux) || defined(__hpux) || defined(_hpux)        // HPUX
   struct pst_dynamic psd;
   if(!pstat_getdynamic(&psd,sizeof(psd),(size_t)1,0)){
     return (int)psd.psd_proc_cnt;
     }
-  return 1;
 #endif
+  return 1;
   }
 
 
@@ -763,6 +870,104 @@
   }
 
 
+#if defined(WIN32)
+
+// Declare the function signatures
+typedef HRESULT (WINAPI *PFN_SETTHREADDESCRIPTION)(HANDLE hThread,const WCHAR* desc);
+typedef HRESULT (WINAPI *PFN_GETTHREADDESCRIPTION)(HANDLE hThread,WCHAR** desc);
+
+// Declare the stub functions
+static HRESULT WINAPI SetThreadDescriptionStub(HANDLE hThread,const WCHAR* desc);
+static HRESULT WINAPI GetThreadDescriptionStub(HANDLE hThread,WCHAR** desc);
+
+// Pointers to functions, initially pointing to the stub functions
+static PFN_SETTHREADDESCRIPTION fxSetThreadDescription=SetThreadDescriptionStub;
+static PFN_GETTHREADDESCRIPTION fxGetThreadDescription=GetThreadDescriptionStub;
+
+
+// Set thread name (needs late-model Windows 10)
+static HRESULT WINAPI SetThreadDescriptionStub(HANDLE hThread,const WCHAR* desc){
+  if(fxSetThreadDescription==SetThreadDescriptionStub){
+    HMODULE hnddll=GetModuleHandleA("kernel32.dll");
+    fxSetThreadDescription=(PFN_SETTHREADDESCRIPTION)GetProcAddress(hnddll,"SetThreadDescription");
+    }
+  if(fxSetThreadDescription){
+    return fxSetThreadDescription(hThread,desc);
+    }
+  return -1;
+  }
+
+
+// Get thread name (needs late-model Windows 10)
+static HRESULT WINAPI GetThreadDescriptionStub(HANDLE hThread,WCHAR** desc){
+  if(fxGetThreadDescription==GetThreadDescriptionStub){
+    HMODULE hnddll=GetModuleHandleA("kernel32.dll");
+    fxGetThreadDescription=(PFN_GETTHREADDESCRIPTION)GetProcAddress(hnddll,"GetThreadDescription");
+    }
+  if(fxGetThreadDescription){
+    return fxGetThreadDescription(hThread,desc);
+    }
+  return -1;
+  }
+
+#endif
+
+
+
+// Change thread description
+FXbool FXThread::description(const FXString& desc){
+  if(tid){
+#if defined(WIN32)
+    FXnchar udesc256;
+    utf2ncs(udesc,desc.text(),ARRAYNUMBER(udesc));
+    return 0<=fxSetThreadDescription((HANDLE)tid,udesc);
+#elif defined(__APPLE__)
+    return pthread_setname_np(desc.text())==0;
+#elif defined(__NetBSD__)
+    return pthread_setname_np(tid,"%s",desc.text())==0;
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+    pthread_set_name_np(tid,desc.text());
+    return true;
+#elif defined(HAVE_PTHREAD_SETNAME_NP)
+    return pthread_setname_np(tid,desc.text())==0;
+#endif
+    }
+  return false;
+  }
+
+
+// Return thread description
+FXString FXThread::description() const {
+  if(tid){
+#if defined(WIN32)
+    FXnchar* udesc;
+    if(0<=fxGetThreadDescription((HANDLE)tid,&udesc)){
+      FXchar desc256;
+      ncs2utf(desc,udesc,ARRAYNUMBER(desc));
+      ::LocalFree(udesc);
+      return desc;
+      }
+#elif defined(__APPLE__)
+    FXchar desc256;
+    if(pthread_getname_np(*((pthread_t*)&tid),desc,ARRAYNUMBER(desc))==0){
+      return desc;
+      }
+#elif defined(__NetBSD__)
+    FXchar desc256;
+    if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){
+      return desc;
+      }
+#elif defined(HAVE_PTHREAD_GETNAME_NP)
+    FXchar desc256;
+    if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){
+      return desc;
+      }
+#endif
+    }
+  return FXString::null;
+  }
+
+
 // Suspend thread
 FXbool FXThread::suspend(){
 #if defined(WIN32)

gogglesmm-1.2.1.tar.gz/cfox/lib/FXThreadPool.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXThreadPool.cpp Changed

@@ -3,7 +3,7 @@
 *                             T h r e a d   P o o l                             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2006,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2006,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -178,7 +178,7 @@
 
 // Start thread pool
 FXuint FXThreadPool::start(FXuint count){
-  register FXuint result=0;
+  FXuint result=0;
   FXTRACE((150,"FXThreadPool::start(%u)\n",count));
   if(atomicBoolCas(&running,0,2)){
 
@@ -302,7 +302,7 @@
 FXbool FXThreadPool::stop(){
   FXTRACE((150,"FXThreadPool::stop()\n"));
   if(atomicBoolCas(&running,1,2)){
-    register FXint w=threads.count();
+    FXint w=threads.count();
 
     // Help out processing tasks while waiting
     wait();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXToggleButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXToggleButton.cpp Changed

@@ -3,7 +3,7 @@
 *                   T o g g l e    B u t t o n    O b j e c t                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -101,15 +101,15 @@
 // Construct and init
 FXToggleButton::FXToggleButton(FXComposite* p,const FXString& text1,const FXString& text2,FXIcon* icon1,FXIcon* icon2,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb):FXLabel(p,text1,icon1,opts,x,y,w,h,pl,pr,pt,pb){
   FXString string=text2.section('\t',0);
-  target=tgt;
-  message=sel;
+  althotkey=parseHotKey(string);
   altlabel=stripHotKey(string);
+  althotoff=findHotKey(string);
   alttip=text2.section('\t',1);
   althelp=text2.section('\t',2);
   alticon=icon2;
-  althotkey=parseHotKey(string);
-  althotoff=findHotKey(string);
   addHotKey(althotkey);
+  target=tgt;
+  message=sel;
   state=false;
   down=false;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXToolBar.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXToolBar.cpp Changed

@@ -3,7 +3,7 @@
 *                        T o o l   B a r   W i d g e t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2004,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2004,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -99,9 +99,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXToolBar::getDefaultWidth(){
-  register FXint total=0,mw=0,w;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint total=0,mw=0,w;
+  FXWindow* child;
+  FXuint hints;
   if(options&PACK_UNIFORM_WIDTH) mw=maxChildWidth();
   for(child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
@@ -125,9 +125,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXToolBar::getDefaultHeight(){
-  register FXint total=0,mh=0,h;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint total=0,mh=0,h;
+  FXWindow* child;
+  FXuint hints;
   if(options&PACK_UNIFORM_HEIGHT) mh=maxChildHeight();
   for(child=getFirst(); child; child=child->getNext()){
     if(child->shown()){
@@ -152,9 +152,9 @@
 /*
 // Return width for given height
 FXint FXToolBar::getWidthForHeight(FXint givenheight){
-  register FXint wtot,wmax,hcum,w,h,space,ngalleys,mw=0,mh=0;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint wtot,wmax,hcum,w,h,space,ngalleys,mw=0,mh=0;
+  FXWindow* child;
+  FXuint hints;
   wtot=wmax=hcum=ngalleys=0;
   space=givenheight-padtop-padbottom-(border<<1);
   if(space<1) space=1;
@@ -184,9 +184,9 @@
 
 // Return height for given width
 FXint FXToolBar::getHeightForWidth(FXint givenwidth){
-  register FXint htot,hmax,wcum,w,h,space,ngalleys,mw=0,mh=0;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint htot,hmax,wcum,w,h,space,ngalleys,mw=0,mh=0;
+  FXWindow* child;
+  FXuint hints;
   htot=hmax=wcum=ngalleys=0;
   space=givenwidth-padleft-padright-(border<<1);
   if(space<1) space=1;
@@ -356,9 +356,9 @@
 
 // Recalculate layout
 void FXToolBar::layout(){
-  register FXint left,right,top,bottom,remain,expand,mw=0,mh=0,x,y,w,h,e,t;
-  register FXWindow *child;
-  register FXuint hints;
+  FXint left,right,top,bottom,remain,expand,mw=0,mh=0,x,y,w,h,e,t;
+  FXWindow *child;
+  FXuint hints;
 
   // Placement rectangle; right/bottom non-inclusive
   left=border+padleft;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXToolBarGrip.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXToolBarGrip.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXToolBarShell.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXToolBarShell.cpp Changed

@@ -3,7 +3,7 @@
 *                    T o o l   B a r   S h e l l   W i d g e t                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2000,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2000,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -255,8 +255,8 @@
 
 // Perform layout; return 0 because no GUI update is needed
 long FXToolBarShell::onLayout(FXObject*,FXSelector,void*){
-  register FXuint hints;
-  register FXint w,h;
+  FXuint hints;
+  FXint w,h;
   if(getFirst() && getFirst()->shown()){
     hints=getFirst()->getLayoutHints();
     if(hints&LAYOUT_FIX_HEIGHT) h=getFirst()->getHeight();
@@ -275,7 +275,7 @@
 
 // Find out where window was grabbed
 FXuchar FXToolBarShell::where(FXint x,FXint y) const {
-  register FXuchar code=DRAG_NONE;
+  FXuchar code=DRAG_NONE;
   if(getFirst() && ((0<=x && x<border+padleft) || (0<=y && y<border+padtop) || (width-padright-border<=x && x<width) || (height-padbottom-border<=y && y<height))){
     FXuint hints=getFirst()->getLayoutHints();
     if(hints&LAYOUT_FIX_WIDTH){
@@ -293,7 +293,7 @@
 
 // Change cursor if we entered the window normally
 long FXToolBarShell::onEnter(FXObject* sender,FXSelector sel,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   FXTopWindow::onEnter(sender,sel,ptr);
   if(event->code!=CROSSINGGRAB){
     setDefaultCursor(getApp()->getDefaultCursor(cursorTypewhere(event->win_x,event->win_y)));
@@ -304,7 +304,7 @@
 
 // Restore cursor if we left the window normally
 long FXToolBarShell::onLeave(FXObject* sender,FXSelector sel,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   FXTopWindow::onLeave(sender,sel,ptr);
   if(event->code!=CROSSINGUNGRAB){
     setDefaultCursor(getApp()->getDefaultCursor(DEF_ARROW_CURSOR));
@@ -315,7 +315,7 @@
 
 // Pressed LEFT button
 long FXToolBarShell::onLeftBtnPress(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
   flags&=~FLAG_TIP;
   handle(this,FXSEL(SEL_FOCUS_SELF,0),ptr);
   if(isEnabled()){
@@ -362,7 +362,7 @@
 
 // Moved the mouse
 long FXToolBarShell::onMotion(FXObject*,FXSelector,void* ptr){
-  register FXEvent *event=(FXEvent*)ptr;
+  FXEvent *event=(FXEvent*)ptr;
 
   // We were dragging
   if(mode!=DRAG_NONE){
@@ -414,9 +414,9 @@
 
 // Get width
 FXint FXToolBarShell::getDefaultWidth(){
-  register FXWindow* child=getFirst();
-  register FXuint hints;
-  register FXint w=0;
+  FXWindow* child=getFirst();
+  FXuint hints;
+  FXint w=0;
   if(child && child->shown()){
     hints=child->getLayoutHints();
     if(hints&LAYOUT_FIX_WIDTH){       // Fixed width
@@ -435,9 +435,9 @@
 
 // Get height
 FXint FXToolBarShell::getDefaultHeight(){
-  register FXWindow* child=getFirst();
-  register FXuint hints;
-  register FXint h=0;
+  FXWindow* child=getFirst();
+  FXuint hints;
+  FXint h=0;
   if(child && child->shown()){
     hints=child->getLayoutHints();
     if(hints&LAYOUT_FIX_HEIGHT){      // Fixed height

gogglesmm-1.2.1.tar.gz/cfox/lib/FXToolBarTab.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXToolBarTab.cpp Changed

@@ -3,7 +3,7 @@
 *                     T o o l   B a r   T a b   O b j e c t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -382,7 +382,7 @@
 
 // Draw horizontal speckles
 void FXToolBarTab::drawHSpeckles(FXDCWindow& dc,FXint x,FXint w){
-  register FXint i;
+  FXint i;
   dc.setForeground(hiliteColor);
   for(i=0; i<w-5; i+=4){dc.drawPoint(x+i,2);dc.drawPoint(x+i+1,5);}
   dc.setForeground(shadowColor);
@@ -392,7 +392,7 @@
 
 // Draw vertical speckles
 void FXToolBarTab::drawVSpeckles(FXDCWindow& dc,FXint y,FXint h){
-  register FXint i;
+  FXint i;
   dc.setForeground(hiliteColor);
   for(i=0; i<h-5; i+=3){dc.drawPoint(2,y+i+1);dc.drawPoint(5,y+i);}
   dc.setForeground(shadowColor);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXToolTip.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXToolTip.cpp Changed

@@ -3,7 +3,7 @@
 *                         T o o l   T i p   W i d g e t                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -256,12 +256,12 @@
 
 // Update tooltip based on widget under cursor
 long FXToolTip::onUpdate(FXObject* sender,FXSelector sel,void* ptr){
-  FXWindow *helpsource=getApp()->getCursorWindow();
 
   // Regular GUI update
   FXWindow::onUpdate(sender,sel,ptr);
 
   // Ask the help source for a new status text first
+  FXWindow *helpsource=getApp()->getCursorWindow();
   if(helpsource && helpsource->handle(this,FXSEL(SEL_QUERY_TIP,0),NULL)){
     if(!popped){
       popped=true;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTopWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTopWindow.cpp Changed

@@ -3,7 +3,7 @@
 *                         T o p   W i n d o w   O b j e c t                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -673,7 +673,7 @@
 #ifdef WIN32
 #ifdef UNICODE
     FXnchar unititle1024;
-    utf2ncs(unititle,title.text(),1024);
+    utf2ncs(unititle,title.text(),ARRAYNUMBER(unititle));
     SetWindowTextW((HWND)xid,unititle);
 #else
     SetWindowTextA((HWND)xid,title.text());
@@ -1050,7 +1050,7 @@
 
 // Attempt to close the window, return true if actually closed
 FXbool FXTopWindow::close(FXbool notify){
-  register FXWindow *window;
+  FXWindow *window;
 
   // Ask target if desired
   if(!notify || !target || !target->tryHandle(this,FXSEL(SEL_CLOSE,message),NULL)){
@@ -1311,9 +1311,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXTopWindow::getDefaultWidth(){
-  register FXint w,wcum,wmax,mw;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint w,wcum,wmax,mw;
+  FXWindow* child;
+  FXuint hints;
   wmax=wcum=mw=0;
   if(options&PACK_UNIFORM_WIDTH) mw=maxChildWidth();
   for(child=getLast(); child; child=child->getPrev()){
@@ -1342,9 +1342,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXTopWindow::getDefaultHeight(){
-  register FXint h,hcum,hmax,mh;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint h,hcum,hmax,mh;
+  FXWindow* child;
+  FXuint hints;
   hmax=hcum=mh=0;
   if(options&PACK_UNIFORM_HEIGHT) mh=maxChildHeight();
   for(child=getLast(); child; child=child->getPrev()){
@@ -1373,10 +1373,10 @@
 
 // Recalculate layout
 void FXTopWindow::layout(){
-  register FXint left,right,top,bottom,x,y,w,h;
-  register FXint mw=0,mh=0;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint left,right,top,bottom,x,y,w,h;
+  FXint mw=0,mh=0;
+  FXWindow* child;
+  FXuint hints;
 
   // Placement rectangle; right/bottom non-inclusive
   left=padleft;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTranslator.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTranslator.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTreeList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTreeList.cpp Changed

@@ -3,7 +3,7 @@
 *                          T r e e L i s t   O b j e c t                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -89,9 +89,9 @@
 
 // Draw item
 void FXTreeItem::draw(const FXTreeList* list,FXDC& dc,FXint xx,FXint yy,FXint,FXint hh) const {
-  register FXIcon *icon=(state&OPENED)?openIcon:closedIcon;
-  register FXFont *font=list->getFont();
-  register FXint th=0,tw=0,ih=0,iw=0;
+  FXIcon *icon=(state&OPENED)?openIcon:closedIcon;
+  FXFont *font=list->getFont();
+  FXint th=0,tw=0,ih=0,iw=0;
   xx+=SIDE_SPACING/2;
   if(icon){
     iw=icon->getWidth();
@@ -126,8 +126,8 @@
 
 // See if item got hit, and where:- 1 is icon, 2 is text
 FXint FXTreeItem::hitItem(const FXTreeList* list,FXint xx,FXint yy) const {
-  register FXint oiw=0,ciw=0,oih=0,cih=0,tw=0,th=0,iw,ih,ix,iy,tx,ty,h;
-  register FXFont *font=list->getFont();
+  FXint oiw=0,ciw=0,oih=0,cih=0,tw=0,th=0,iw,ih,ix,iy,tx,ty,h;
+  FXFont *font=list->getFont();
   if(openIcon){
     oiw=openIcon->getWidth();
     oih=openIcon->getHeight();
@@ -252,8 +252,8 @@
 
 // Get number of child items
 FXint FXTreeItem::getNumChildren() const {
-  register FXTreeItem *item=first;
-  register FXint n=0;
+  FXTreeItem *item=first;
+  FXint n=0;
   while(item){item=item->next;n++;}
   return n;
   }
@@ -262,7 +262,7 @@
 
 // Get item (logically) below this one
 FXTreeItem* FXTreeItem::getBelow() const {
-  register FXTreeItem* item=(FXTreeItem*)this;
+  FXTreeItem* item=(FXTreeItem*)this;
   if(first) return first;
   while(!item->next && item->parent) item=item->parent;
   return item->next;
@@ -271,7 +271,7 @@
 
 // Get item (logically) above this one
 FXTreeItem* FXTreeItem::getAbove() const {
-  register FXTreeItem* item=prev;
+  FXTreeItem* item=prev;
   if(!item) return parent;
   while(item->last) item=item->last;
   return item;
@@ -280,7 +280,7 @@
 
 // Return true if child of parent item
 FXbool FXTreeItem::isChildOf(const FXTreeItem* item) const {
-  register const FXTreeItem* child=this;
+  const FXTreeItem* child=this;
   while(child){ child=child->parent; if(child==item) return true; }
   return false;
   }
@@ -288,7 +288,7 @@
 
 // Return true if parent of child item
 FXbool FXTreeItem::isParentOf(const FXTreeItem* item) const {
-  register const FXTreeItem* child=item;
+  const FXTreeItem* child=item;
   while(child){ child=child->parent; if(child==this) return true; }
   return false;
   }
@@ -302,8 +302,8 @@
 
 // Get item width
 FXint FXTreeItem::getWidth(const FXTreeList* list) const {
-  register FXFont *font=list->getFont();
-  register FXint w=0,oiw=0,ciw=0;
+  FXFont *font=list->getFont();
+  FXint w=0,oiw=0,ciw=0;
   if(openIcon) oiw=openIcon->getWidth();
   if(closedIcon) ciw=closedIcon->getWidth();
   w=FXMAX(oiw,ciw);
@@ -317,8 +317,8 @@
 
 // Get item height
 FXint FXTreeItem::getHeight(const FXTreeList* list) const {
-  register FXFont *font=list->getFont();
-  register FXint th=0,oih=0,cih=0;
+  FXFont *font=list->getFont();
+  FXint th=0,oih=0,cih=0;
   if(openIcon) oih=openIcon->getHeight();
   if(closedIcon) cih=closedIcon->getHeight();
   if(!label.empty()) th=4+font->getFontHeight();
@@ -460,7 +460,7 @@
 
 // Create window
 void FXTreeList::create(){
-  register FXTreeItem *item=firstitem;
+  FXTreeItem *item=firstitem;
   FXScrollArea::create();
   while(item){
     item->create();
@@ -474,7 +474,7 @@
 
 // Detach window
 void FXTreeList::detach(){
-  register FXTreeItem *item=firstitem;
+  FXTreeItem *item=firstitem;
   FXScrollArea::detach();
   while(item){
     item->detach();
@@ -525,8 +525,8 @@
 
 // Recompute interior
 void FXTreeList::recompute(){
-  register FXTreeItem* item;
-  register FXint x,y,w,h;
+  FXTreeItem* item;
+  FXint x,y,w,h;
   x=y=0;
   treeWidth=0;
   treeHeight=0;
@@ -596,8 +596,8 @@
 
 // Get number of toplevel items
 FXint FXTreeList::getNumItems() const {
-  register FXTreeItem *item=firstitem;
-  register FXint n=0;
+  FXTreeItem *item=firstitem;
+  FXint n=0;
   while(item){
     item=item->next;
     n++;
@@ -718,7 +718,7 @@
 
 // Make item fully visible
 void FXTreeList::makeItemVisible(FXTreeItem* item){
-  register FXint px,py,x,y,w,h,vw,vh;
+  FXint px,py,x,y,w,h,vw,vh;
   if(item){
 
     // Remember for later
@@ -771,8 +771,8 @@
 
 // Get item at position x,y
 FXTreeItem* FXTreeList::getItemAt(FXint,FXint y) const {
-  register FXTreeItem* item=firstitem;
-  register FXint ix,iy,ih;
+  FXTreeItem* item=firstitem;
+  FXint ix,iy,ih;
   ix=pos_x;
   iy=pos_y;
   if(options&TREELIST_ROOT_BOXES) ix+=(4+indent);
@@ -797,7 +797,7 @@
 
 // Did we hit the item, and which part of it did we hit (0=outside, 1=icon, 2=text, 3=box)
 FXint FXTreeList::hitItem(const FXTreeItem* item,FXint x,FXint y) const {
-  register FXint ix,iy,ih,xh,yh,hit=0;
+  FXint ix,iy,ih,xh,yh,hit=0;
   if(item){
     x-=pos_x;
     y-=pos_y;
@@ -932,8 +932,8 @@
 
 // Extend selection
 FXbool FXTreeList::extendSelection(FXTreeItem* item,FXbool notify){
-  register FXTreeItem *it,*i1,*i2,*i3;
-  register FXbool changes=false;
+  FXTreeItem *it,*i1,*i2,*i3;
+  FXbool changes=false;
   if(item && anchoritem && extentitem){
     it=firstitem;
     i1=i2=i3=NULL;
@@ -1011,8 +1011,8 @@
 
 // Select all items
 FXbool FXTreeList::selectAll(FXbool notify){
-  register FXTreeItem *item=firstitem;
-  register FXbool changes=false;
+  FXTreeItem *item=firstitem;
+  FXbool changes=false;
   while(item){
     if(!item->isSelected()){
       item->setSelected(true);
@@ -1028,8 +1028,8 @@
 
 // Kill selection
 FXbool FXTreeList::killSelection(FXbool notify){
-  register FXTreeItem *item=firstitem;
-  register FXbool changes=false;
+  FXTreeItem *item=firstitem;
+  FXbool changes=false;
   while(item){
     if(item->isSelected()){
       item->setSelected(false);
@@ -1976,7 +1976,7 @@
 
 // Sort all items recursively
 void FXTreeList::sortItems(){
-  register FXTreeItem *item;
+  FXTreeItem *item;
   if(sortfunc){
     sortRootItems();
     item=firstitem;
@@ -2053,12 +2053,12 @@
 FXTreeItem* FXTreeList::setItem(FXTreeItem* orig,FXTreeItem* item,FXbool notify){
   if(!orig || !item){ fxerror("%s::setItem: NULL argument.\n",getClassName()); }
   if(orig!=item){
-    register FXTreeItem *par=orig->parent;
-    register FXTreeItem *fst=orig->first;
-    register FXTreeItem *lst=orig->last;
-    register FXTreeItem *nxt=orig->next;
-    register FXTreeItem *prv=orig->prev;
-    register FXTreeItem *ch;
+    FXTreeItem *par=orig->parent;
+    FXTreeItem *fst=orig->first;
+    FXTreeItem *lst=orig->last;
+    FXTreeItem *nxt=orig->next;
+    FXTreeItem *prv=orig->prev;
+    FXTreeItem *ch;
 
     // Notify old item will be deleted
     if(notify && target){
@@ -2113,7 +2113,7 @@
 
 // Insert item under father before other item
 FXTreeItem* FXTreeList::insertItem(FXTreeItem* other,FXTreeItem* father,FXTreeItem* item,FXbool notify){
-  register FXTreeItem* olditem=currentitem;
+  FXTreeItem* olditem=currentitem;
 
   // Verify correctness of arguments
   if(!item){ fxerror("%s::insertItem: NULL item argument.\n",getClassName()); }
@@ -2210,7 +2210,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXTreeList::fillItems(FXTreeItem* father,const FXchar *const *strings,FXIcon* oi,FXIcon* ci,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(stringsn){
       appendItem(father,stringsn++,oi,ci,ptr,notify);
@@ -2222,7 +2222,7 @@
 
 // Fill list by appending items from array of strings
 FXint FXTreeList::fillItems(FXTreeItem* father,const FXString* strings,FXIcon* oi,FXIcon* ci,FXptr ptr,FXbool notify){
-  register FXint n=0;
+  FXint n=0;
   if(strings){
     while(!stringsn.empty()){
       appendItem(father,stringsn++,oi,ci,ptr,notify);
@@ -2234,7 +2234,7 @@
 
 // Fill list by appending items from newline separated strings
 FXint FXTreeList::fillItems(FXTreeItem* father,const FXString& strings,FXIcon* oi,FXIcon* ci,FXptr ptr,FXbool notify){
-  register FXint beg=0,end=0,n=0;
+  FXint beg=0,end=0,n=0;
   while(end<strings.length()){
     beg=end;
     while(end<strings.length() && stringsend!='\n' && stringsend!='\r') end++;
@@ -2300,11 +2300,11 @@
 
 // Extract node from list
 FXTreeItem* FXTreeList::extractItem(FXTreeItem* item,FXbool notify){
-  register FXTreeItem *olditem=currentitem;
-  register FXTreeItem *result=item;
-  register FXTreeItem *prv;
-  register FXTreeItem *nxt;
-  register FXTreeItem *par;
+  FXTreeItem *olditem=currentitem;
+  FXTreeItem *result=item;
+  FXTreeItem *prv;
+  FXTreeItem *nxt;
+  FXTreeItem *par;
   if(item){
 
     // Remember hookups
@@ -2369,10 +2369,10 @@
 void FXTreeList::removeItems(FXTreeItem* fm,FXTreeItem* to,FXbool notify){
   if(fm && to){
     if(fm->parent!=to->parent){ fxerror("%s::removeItems: arguments have different parent.\n",getClassName()); }
-    register FXTreeItem *old;
-    register FXTreeItem *prv;
-    register FXTreeItem *nxt;
-    register FXTreeItem *par;
+    FXTreeItem *old;
+    FXTreeItem *prv;
+    FXTreeItem *nxt;
+    FXTreeItem *par;
 
     old=currentitem;
 
@@ -2449,9 +2449,9 @@
 
 // Get item by name
 FXTreeItem* FXTreeList::findItem(const FXString& text,FXTreeItem* start,FXuint flgs) const {
-  register FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)comparecase : (FXCompareFunc)compare;
-  register FXTreeItem *item;
-  register FXint len;
+  FXCompareFunc comparefunc=(flgs&SEARCH_IGNORECASE) ? (FXCompareFunc)comparecase : (FXCompareFunc)compare;
+  FXTreeItem *item;
+  FXint len;
   if(firstitem){
     len=(flgs&SEARCH_PREFIX)?text.length():2147483647;
     if(flgs&SEARCH_BACKWARD){
@@ -2487,7 +2487,7 @@
 
 // Get item by data
 FXTreeItem* FXTreeList::findItemByData(FXptr ptr,FXTreeItem* start,FXuint flgs) const {
-  register FXTreeItem *item;
+  FXTreeItem *item;
   if(firstitem){
     if(flgs&SEARCH_BACKWARD){
       item=start;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTreeListBox.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTreeListBox.cpp Changed

@@ -3,7 +3,7 @@
 *                      T r e e  L i s t  B o x   O b j e c t                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -364,8 +364,8 @@
 
 // Fill tree list box by appending items from array of strings
 FXint FXTreeListBox::fillItems(FXTreeItem* father,const FXchar *const *strings,FXIcon* oi,FXIcon* ci,void* ptr,FXbool notify){
-  register FXTreeItem* currentitem=tree->getCurrentItem();
-  register FXint n=tree->fillItems(father,strings,oi,ci,ptr,notify);
+  FXTreeItem* currentitem=tree->getCurrentItem();
+  FXint n=tree->fillItems(father,strings,oi,ci,ptr,notify);
   if(currentitem!=tree->getCurrentItem()){
     field->setIcon(tree->getItemClosedIcon(tree->getCurrentItem()));
     field->setText(tree->getItemText(tree->getCurrentItem()));
@@ -377,8 +377,8 @@
 
 // Fill tree list box by appending items from array of strings
 FXint FXTreeListBox::fillItems(FXTreeItem* father,const FXString* strings,FXIcon* oi,FXIcon* ci,void* ptr,FXbool notify){
-  register FXTreeItem* currentitem=tree->getCurrentItem();
-  register FXint n=tree->fillItems(father,strings,oi,ci,ptr,notify);
+  FXTreeItem* currentitem=tree->getCurrentItem();
+  FXint n=tree->fillItems(father,strings,oi,ci,ptr,notify);
   if(currentitem!=tree->getCurrentItem()){
     field->setIcon(tree->getItemClosedIcon(tree->getCurrentItem()));
     field->setText(tree->getItemText(tree->getCurrentItem()));
@@ -390,8 +390,8 @@
 
 // Fill tree list box by appending items from newline separated strings
 FXint FXTreeListBox::fillItems(FXTreeItem* father,const FXString& strings,FXIcon* oi,FXIcon* ci,void* ptr,FXbool notify){
-  register FXTreeItem* currentitem=tree->getCurrentItem();
-  register FXint n=tree->fillItems(father,strings,oi,ci,ptr,notify);
+  FXTreeItem* currentitem=tree->getCurrentItem();
+  FXint n=tree->fillItems(father,strings,oi,ci,ptr,notify);
   if(currentitem!=tree->getCurrentItem()){
     field->setIcon(tree->getItemClosedIcon(tree->getCurrentItem()));
     field->setText(tree->getItemText(tree->getCurrentItem()));
@@ -403,7 +403,7 @@
 
 // Replace the original item orig with new possibly subclassed item
 FXTreeItem* FXTreeListBox::setItem(FXTreeItem* orig,FXTreeItem* item,FXbool notify){
-  register FXTreeItem *newitem=tree->setItem(orig,item,notify);
+  FXTreeItem *newitem=tree->setItem(orig,item,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -415,7 +415,7 @@
 
 // Insert item under father before other item
 FXTreeItem* FXTreeListBox::insertItem(FXTreeItem* other,FXTreeItem* father,FXTreeItem* item,FXbool notify){
-  register FXTreeItem *newitem=tree->insertItem(other,father,item,notify);
+  FXTreeItem *newitem=tree->insertItem(other,father,item,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -427,7 +427,7 @@
 
 // Insert item with given text and optional icons, and user-data pointer under father before other item
 FXTreeItem* FXTreeListBox::insertItem(FXTreeItem* other,FXTreeItem* father,const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr,FXbool notify){
-  register FXTreeItem *newitem=tree->insertItem(other,father,text,oi,ci,ptr,notify);
+  FXTreeItem *newitem=tree->insertItem(other,father,text,oi,ci,ptr,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -439,7 +439,7 @@
 
 // Append item as last child of father
 FXTreeItem* FXTreeListBox::appendItem(FXTreeItem* father,FXTreeItem* item,FXbool notify){
-  register FXTreeItem *newitem=tree->appendItem(father,item,notify);
+  FXTreeItem *newitem=tree->appendItem(father,item,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -451,7 +451,7 @@
 
 // Append item with given text and optional icons, and user-data pointer as last child of father
 FXTreeItem* FXTreeListBox::appendItem(FXTreeItem* father,const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr,FXbool notify){
-  register FXTreeItem *newitem=tree->appendItem(father,text,oi,ci,ptr,notify);
+  FXTreeItem *newitem=tree->appendItem(father,text,oi,ci,ptr,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -463,7 +463,7 @@
 
 // Prepend item as first child of father
 FXTreeItem* FXTreeListBox::prependItem(FXTreeItem* father,FXTreeItem* item,FXbool notify){
-  register FXTreeItem *newitem=tree->prependItem(father,item,notify);
+  FXTreeItem *newitem=tree->prependItem(father,item,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -475,7 +475,7 @@
 
 // Prepend item with given text and optional icons, and user-data pointer as first child of father
 FXTreeItem* FXTreeListBox::prependItem(FXTreeItem* father,const FXString& text,FXIcon* oi,FXIcon* ci,void* ptr,FXbool notify){
-  register FXTreeItem *newitem=tree->prependItem(father,text,oi,ci,ptr,notify);
+  FXTreeItem *newitem=tree->prependItem(father,text,oi,ci,ptr,notify);
   if(tree->getCurrentItem()==newitem){
     field->setIcon(tree->getItemClosedIcon(newitem));
     field->setText(tree->getItemText(newitem));
@@ -487,7 +487,7 @@
 
 // Move item under father before other item
 FXTreeItem *FXTreeListBox::moveItem(FXTreeItem* other,FXTreeItem* father,FXTreeItem* item){
-  register FXTreeItem *newitem=tree->moveItem(other,father,item);
+  FXTreeItem *newitem=tree->moveItem(other,father,item);
   recalc();
   return newitem;
   }
@@ -495,8 +495,8 @@
 
 // Extract item
 FXTreeItem* FXTreeListBox::extractItem(FXTreeItem* item,FXbool notify){
-  register FXTreeItem *currentitem=tree->getCurrentItem();
-  register FXTreeItem *result=tree->extractItem(item,notify);
+  FXTreeItem *currentitem=tree->getCurrentItem();
+  FXTreeItem *result=tree->extractItem(item,notify);
   if(item==currentitem){
     currentitem=tree->getCurrentItem();
     if(currentitem){
@@ -515,7 +515,7 @@
 
 // Remove given item
 void FXTreeListBox::removeItem(FXTreeItem* item,FXbool notify){
-  register FXTreeItem *currentitem=tree->getCurrentItem();
+  FXTreeItem *currentitem=tree->getCurrentItem();
   tree->removeItem(item,notify);
   if(item==currentitem){
     currentitem=tree->getCurrentItem();

gogglesmm-1.2.1.tar.gz/cfox/lib/FXTriStateButton.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXTriStateButton.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXURL.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXURL.cpp Changed

@@ -3,7 +3,7 @@
 *                       U R L   M a n i p u l a t i o n                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2000,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2000,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -215,8 +215,8 @@
 
 // Parse string to url parts
 URL::URL(const FXString& string){
-  register FXint s=0;
-  register FXuchar c;
+  FXint s=0;
+  FXuchar c;
 
   prot0=prot1=0;
 
@@ -315,7 +315,7 @@
 FXString FXURL::encode(const FXString& url,const FXchar* set){
   FXString result;
   if(!url.empty()){
-    register FXint p,q,c;
+    FXint p,q,c;
     for(p=q=0; p<url.length(); ++p){
       c=(FXuchar)urlp;
       if(c<0x20 || 128<=c || c=='%' || (set && strchr(set,c))){
@@ -344,7 +344,7 @@
 FXString FXURL::decode(const FXString& url){
   FXString result;
   if(!url.empty()){
-    register FXint p,q,c;
+    FXint p,q,c;
     for(p=q=0; p<url.length(); ++p){
       c=(FXuchar)urlp;
       if(c=='%' && Ascii::isHexDigit(urlp+1) && Ascii::isHexDigit(urlp+2)){
@@ -367,16 +367,69 @@
 
 /*******************************************************************************/
 
+// Convert path from using 'sepfm' to use 'septo' path-separators
+static FXString convertPathSep(const FXString& file,FXchar septo,FXchar sepfm){
+  if(!file.empty()){
+    FXString result(file);
+    FXint p=0;
+    FXint q=0;
+#if defined(WIN32)
+    if(resultq==sepfm || resultq==septo){                   // UNC
+      resultp++=septo; q++;
+      if(resultq==sepfm || resultq==septo){
+        resultp++=septo; q++;
+        while(resultq==sepfm || resultq==septo) q++;
+        }
+      }
+    else if(Ascii::isLetter(resultq) && resultq+1==':'){    // C:
+      resultp++=resultq++;
+      resultp++=':'; q++;
+      if(resultq==sepfm || resultq==septo){
+        resultp++=septo; q++;
+        while(resultq==sepfm || resultq==septo) q++;
+        }
+      }
+    while(resultq){
+      if(resultq==sepfm || resultq==septo){                 // FIXME don't convert escaped path separators!!
+        resultp++=septo; q++;
+        while(resultq==sepfm || resultq==septo) q++;
+        continue;
+        }
+      resultp++=resultq++;
+      }
+    return result.trunc(p);
+#else
+    if(resultq==sepfm || resultq==septo){
+      resultp++=septo; q++;
+      while(resultq==sepfm || resultq==septo) q++;
+      }
+    while(resultq){
+      if(resultq==sepfm || resultq==septo){                 // FIXME don't convert escaped path separators!!
+        resultp++=septo; q++;
+        while(resultq==sepfm || resultq==septo) q++;
+        continue;
+        }
+      resultp++=resultq++;
+      }
+    return result.trunc(p);
+#endif
+    }
+  return FXString::null;
+  }
+
+
+/*******************************************************************************/
+
 // Return URL of filename
 FXString FXURL::fileToURL(const FXString& file){
 #ifdef WIN32
   if(ISPATHSEP(file0) && ISPATHSEP(file1)){
-    return "file:"+encode(FXPath::convert(file,'/','\\'),ENCODE_THESE);         // file://share/path-with-slashes
+    return "file:"+encode(convertPathSep(file,'/','\\'),ENCODE_THESE);         // file://share/path-with-slashes
     }
   if(Ascii::isLetter(file0) && file1==':'){
-    return "file:///"+encode(FXPath::convert(file,'/','\\'),ENCODE_THESE);      // file:///c:/path-with-slashes
+    return "file:///"+encode(convertPathSep(file,'/','\\'),ENCODE_THESE);      // file:///c:/path-with-slashes
     }
-  return "file://"+encode(FXPath::convert(file,'/','\\'),ENCODE_THESE);         // file://path-with-slashes
+  return "file://"+encode(convertPathSep(file,'/','\\'),ENCODE_THESE);         // file://path-with-slashes
 #else
   return "file://"+encode(file,ENCODE_THESE);                                   // file://path
 #endif
@@ -389,9 +442,9 @@
 #ifdef WIN32
     URL url(string);
     if(url.host0<url.host1){
-      return "\\\\"+string.mid(url.host0,url.host1-url.host0)+decode(FXPath::convert(string.mid(url.path0,url.path1-url.path0),'\\','/'));
+      return "\\\\"+string.mid(url.host0,url.host1-url.host0)+decode(convertPathSep(string.mid(url.path0,url.path1-url.path0),'\\','/'));
       }
-    return decode(FXPath::convert(string.mid(url.path0,url.path1-url.path0),'\\','/'));
+    return decode(convertPathSep(string.mid(url.path0,url.path1-url.path0),'\\','/'));
 #else
     URL url(string);
     return decode(string.mid(url.path0,url.path1-url.path0));
@@ -462,7 +515,7 @@
 
 // Parse port number from string containing url
 FXint FXURL::port(const FXString& string,FXint def){
-  register FXint result=def;
+  FXint result=def;
   URL url(string);
   if(url.port0<url.port1){
     result=Ascii::digitValue(stringurl.port0++);
@@ -494,5 +547,4 @@
   return string.mid(url.frag0,url.frag1-url.frag0);
   }
 
-
 }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXUTF16Codec.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXUTF16Codec.cpp Changed

@@ -3,7 +3,7 @@
 *                      U T F - 1 6  T e x t   C o d e c                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by L.Johnson & J.van der Zijp.  All Rights Reserved.  *
+* Copyright (C) 2002,2020 by L.Johnson & J.van der Zijp.  All Rights Reserved.  *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -56,7 +56,7 @@
 // Convert from utf16be
 FXint FXUTF16BECodec::mb2wc(FXwchar& wc,const FXchar* src,FXint nsrc) const {
   const FXint SURROGATE_OFFSET=0x10000-(0xD800<<10)-0xDC00;
-  register FXwchar w;
+  FXwchar w;
   if(nsrc<2) return 0;
   wc=(((FXuchar)src0)<<8)|((FXuchar)src1);
   if(__unlikely(FXISLEADUTF16(wc))){
@@ -74,7 +74,7 @@
 FXint FXUTF16BECodec::wc2mb(FXchar* dst,FXint ndst,FXwchar wc) const {
   const FXint LEAD_OFFSET=0xD800-(0x10000>>10);
   const FXint TAIL_OFFSET=0xDC00;
-  register FXwchar w;
+  FXwchar w;
   if(ndst<2) return 0;
   if(0xD800<=wc && wc<0xE000) return 0;
   dst0=(FXchar)(wc>>8);
@@ -126,7 +126,7 @@
 // Convert from utf16le
 FXint FXUTF16LECodec::mb2wc(FXwchar& wc,const FXchar* src,FXint nsrc) const {
   const FXint SURROGATE_OFFSET=0x10000-(0xD800<<10)-0xDC00;
-  register FXwchar w;
+  FXwchar w;
   if(nsrc<2) return 0;
   wc=(((FXuchar)src1)<<8)|((FXuchar)src0);
   if(__unlikely(FXISLEADUTF16(wc))){
@@ -144,7 +144,7 @@
 FXint FXUTF16LECodec::wc2mb(FXchar* dst,FXint ndst,FXwchar wc) const {
   const FXint LEAD_OFFSET=0xD800-(0x10000>>10);
   const FXint TAIL_OFFSET=0xDC00;
-  register FXwchar w;
+  FXwchar w;
   if(ndst<2) return 0;
   if(0xD800<=wc && wc<0xE000) return 0;
   dst0=(FXchar)(wc);
@@ -195,8 +195,8 @@
 // Convert utf16 but strip BOM
 FXint FXUTF16Codec::mb2wc(FXwchar& wc,const FXchar* src,FXint nsrc) const {
   const FXint SURROGATE_OFFSET=0x10000-(0xD800<<10)-0xDC00;
-  register const FXuchar *s=(const FXuchar*)src;
-  register FXwchar w;
+  const FXuchar *s=(const FXuchar*)src;
+  FXwchar w;
   if(nsrc<2) return 0;
   wc=(s0<<8)|s1;
   if(wc==BOM_BE){
@@ -237,7 +237,7 @@
 // Count number of utf8 characters needed to convert multi-byte characters from src
 FXint FXUTF16Codec::mb2utflen(const FXchar* src,FXint nsrc) const {
   const FXint SURROGATE_OFFSET=0x10000-(0xD800<<10)-0xDC00;
-  register FXint len=0;
+  FXint len=0;
   FXwchar w,v;
   if(src && 0<nsrc){
     if(nsrc<2) return -2;
@@ -290,7 +290,7 @@
 // Convert multi-byte characters from src to utf8 characters at dst
 FXint FXUTF16Codec::mb2utf(FXchar* dst,FXint ndst,const FXchar* src,FXint nsrc) const {
   const FXint SURROGATE_OFFSET=0x10000-(0xD800<<10)-0xDC00;
-  register FXint nw,len=0;
+  FXint nw,len=0;
   FXwchar w,v;
   if(dst && src && 0<nsrc){
     if(nsrc<2) return -2;
@@ -352,7 +352,7 @@
 FXint FXUTF16Codec::wc2mb(FXchar* dst,FXint ndst,FXwchar wc) const {
   const FXint LEAD_OFFSET=0xD800-(0x10000>>10);
   const FXint TAIL_OFFSET=0xDC00;
-  register FXwchar w;
+  FXwchar w;
   if(0xD800<=wc && wc<0xE000) return 0;
   if(ndst<2) return -2;
   dst0=(FXchar)(wc>>8);
@@ -373,7 +373,7 @@
 
 // Count multi-byte characters characters needed to convert utf8 from src
 FXint FXUTF16Codec::utf2mblen(const FXchar* src,FXint nsrc) const {
-  register FXint nr,len=0;
+  FXint nr,len=0;
   FXchar buffer64;
   FXwchar w;
   if(0<nsrc){
@@ -393,7 +393,7 @@
 
 // Convert utf8 characters at src to multi-byte characters at dst
 FXint FXUTF16Codec::utf2mb(FXchar* dst,FXint ndst,const FXchar* src,FXint nsrc) const {
-  register FXint nr,nw,len=0;
+  FXint nr,nw,len=0;
   FXwchar w;
   if(dst && src && 0<nsrc){
     dst0='\xFE';

gogglesmm-1.2.1.tar.gz/cfox/lib/FXUTF32Codec.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXUTF32Codec.cpp Changed

@@ -3,7 +3,7 @@
 *                      U T F - 3 2  T e x t   C o d e c                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by L.Johnson & J.van der Zijp.  All Rights Reserved.  *
+* Copyright (C) 2002,2020 by L.Johnson & J.van der Zijp.  All Rights Reserved.  *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -239,7 +239,7 @@
 
 // Count number of utf8 characters needed to convert multi-byte characters from src
 FXint FXUTF32Codec::mb2utflen(const FXchar* src,FXint nsrc) const {
-  register FXint len=0;
+  FXint len=0;
   FXwchar w;
   if(src && 0<nsrc){
     if(nsrc<4) return -4;
@@ -305,7 +305,7 @@
 
 // Convert multi-byte characters from src to utf8 characters at dst
 FXint FXUTF32Codec::mb2utf(FXchar* dst,FXint ndst,const FXchar* src,FXint nsrc) const {
-  register FXint nw,len=0;
+  FXint nw,len=0;
   FXwchar w;
   if(dst && src && 0<nsrc){
     if(nsrc<4) return -4;
@@ -397,7 +397,7 @@
 
 // Count multi-byte characters characters needed to convert utf8 from src
 FXint FXUTF32Codec::utf2mblen(const FXchar* src,FXint nsrc) const {
-  register FXint nr,len=0;
+  FXint nr,len=0;
   if(src && 0<nsrc){
     len+=4;
     while(0<nsrc){
@@ -414,7 +414,7 @@
 
 // Convert utf8 characters at src to multi-byte characters at dst
 FXint FXUTF32Codec::utf2mb(FXchar* dst,FXint ndst,const FXchar* src,FXint nsrc) const {
-  register FXint nr,len=0;
+  FXint nr,len=0;
   FXwchar w;
   if(dst && src && 0<nsrc){
     if(ndst<4) return 0;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXUTF8Codec.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXUTF8Codec.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXUndoList.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXUndoList.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVariant.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVariant.cpp Changed

@@ -3,7 +3,7 @@
 *                          V a r i a n t   T y p e                              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2013,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2013,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -34,19 +34,44 @@
 
 /*
   Notes:
-  - General purpose variant type to hold run-time determined values.
-  - Probably should simplify storage of all integer types to either FXlong
-    or FXulong; this will lead to fewer cases and cost no extra storage
-    at all since the union is the size of the biggest type, anyway.
-  - Object member operator or array indexing operator have two flavors;
-    the non-const version will change the type of the variant automatically,
-    and possibly return newly created variant objects.
-    The const operators will return default Null variant if referencing non-
-    existing members.
-  - New mebers or array entries will be automatically created in this case.
-  - Converting any non-empty string to type bool yields true; this was changed
-    from older implementation.  New implementation makes more sense.
-  - Likewise, converting non-empty map or array to boolean also yields true.
+  - Variant is a "discriminated union" type that may hold a integer, floating
+    point number, string, or respectively an array or key/value collection of
+    variants.  Thus, a single Variant can hold an arbitrarily complex collection
+    of information.
+  - As such, this makes for a convenient data structure to serialize and deserialize
+    JSON files; JSON syntax in fact maps almost 1:1 to Variant capabilities.
+  - Access to Variant's information is most typically performed using overloaded
+    conversion operators reading information from variants, and overloaded
+    assignment operators writing data to variants.
+  - A few important caveats are worth mentioning for effiencent use of this flexible
+    data structure:
+
+      1 When writing to variant as an array, its best to reference the last element
+        first, or if the number of elements is known in advance, to set the size
+        explicitly prior to assigning elements.  Even though Variant automatically
+        adapts the size of the array based on the index being accessed, such usage
+        may lead to much unneccessary reallocations and copying; if things get big
+        that may be performance bottleneck.
+
+      2 Be aware that variant map may get resized as more key/value pairs are added;
+        this means don't hang on to references to Variants that may be affected by
+        the resize.
+
+      3 Simple numbers (booleans, integers, floats, etc.) are VERY efficient to store;
+        consequently, its fine to store a fairly large array into Variant, as long as
+        one keeps point (1) above in mind.
+
+      4 No artificial limits to sizes.  Variant should handle arbitrarily large data-
+        structures, but efficient use needs to observe (1) above.
+
+  - Object member operator or array indexing operator have two flavors; the non-const
+    version will change the type of the variant automatically, and possibly return
+    reference to newly created variant object.
+    The const operators will return default Null variant if referencing non-existing
+    members.
+  - Probably should simplify storage of all integer types to either FXlong or FXulong;
+    this will lead to fewer cases and cost no extra storage at all since the union is
+    the size of the biggest type, anyway.
 */
 
 using namespace FX;
@@ -293,12 +318,6 @@
   }
 
 
-// Convert to char pointer
-const FXchar* FXVariant::toChars() const {
-  return (type==VString) ? value.s : FXString::null;
-  }
-
-
 // Convert to int
 FXint FXVariant::toInt(FXbool* ok) const {
   return (FXint)toLong(ok);
@@ -423,6 +442,12 @@
   }
 
 
+// Convert to char pointer
+const FXchar* FXVariant::toChars() const {
+  return (type==VString) ? value.s : FXString::null;
+  }
+
+
 // Convert to string
 FXString FXVariant::toString(FXbool* ok) const {
   const FXchar truth26={"false","true"};

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVariantArray.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVariantArray.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVariantMap.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVariantMap.cpp Changed

@@ -3,7 +3,7 @@
 *                              V a r i a n t - M a p                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -111,11 +111,10 @@
   FXASSERT((n-used())>0);       // At least one free slot
   if(elbat.no(n)){
     if(1<elbat.no() && 1<no()){
-      FXuval p,b,h,x;
-      FXival i;
+      FXuval p,b,h,x; FXival i;
       for(i=0; i<no(); ++i){                  // Hash existing entries into new table
-        p=b=h=tablei.hash;
         if(!tablei.key.empty()){
+          p=b=h=tablei.hash;
           while(elbat.tablex=p&(n-1).hash){ // Locate slot
             p=(p<<2)+p+b+1;
             b>>=BSHIFT;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVec2d.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVec2d.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVec2f.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVec2f.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVec3d.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVec3d.cpp Changed

@@ -3,7 +3,7 @@
 *       D o u b l e - P r e c i s i o n   3 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -75,12 +75,6 @@
   }
 
 
-// Linearly interpolate
-FXVec3d lerp(const FXVec3d& u,const FXVec3d& v,FXdouble f){
-  return FXVec3d(u.x+(v.x-u.x)*f,u.y+(v.y-u.y)*f,u.z+(v.z-u.z)*f);
-  }
-
-
 // Rotate vector vec by unit-length axis about angle specified as (ca,sa)
 FXVec3d rotate(const FXVec3d& vec,const FXVec3d& axis,FXdouble ca,FXdouble sa){
   FXVec3d v1((vec*axis)*axis);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVec3f.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVec3f.cpp Changed

@@ -3,7 +3,7 @@
 *       S i n g l e - P r e c i s i o n   3 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -57,12 +57,12 @@
 // Compute fast cross product with vector code
 FXVec3f cross(const FXVec3f& u,const FXVec3f& v){
 #if defined(FOX_HAS_AVX)
-  register __m128 uu=_mm_maskload_ps(&u0,MMM);
-  register __m128 vv=_mm_maskload_ps(&v0,MMM);
-  register __m128 a0=_mm_shuffle_ps(uu,uu,_MM_SHUFFLE(3,0,2,1));
-  register __m128 b0=_mm_shuffle_ps(vv,vv,_MM_SHUFFLE(3,1,0,2));
-  register __m128 a1=_mm_shuffle_ps(uu,uu,_MM_SHUFFLE(3,1,0,2));
-  register __m128 b1=_mm_shuffle_ps(vv,vv,_MM_SHUFFLE(3,0,2,1));
+  __m128 uu=_mm_maskload_ps(&u0,MMM);
+  __m128 vv=_mm_maskload_ps(&v0,MMM);
+  __m128 a0=_mm_shuffle_ps(uu,uu,_MM_SHUFFLE(3,0,2,1));
+  __m128 b0=_mm_shuffle_ps(vv,vv,_MM_SHUFFLE(3,1,0,2));
+  __m128 a1=_mm_shuffle_ps(uu,uu,_MM_SHUFFLE(3,1,0,2));
+  __m128 b1=_mm_shuffle_ps(vv,vv,_MM_SHUFFLE(3,0,2,1));
   FXVec3f r;
   _mm_maskstore_ps(&r0,MMM,_mm_sub_ps(_mm_mul_ps(a0,b0),_mm_mul_ps(a1,b1)));
   return r;
@@ -79,8 +79,8 @@
 // Compute fast dot product with vector code
 FXfloat dot(const FXVec3f& u,const FXVec3f& v){
 #if defined(FOX_HAS_AVX)
-  register __m128 uu=_mm_maskload_ps(&u0,MMM);
-  register __m128 vv=_mm_maskload_ps(&v0,MMM);
+  __m128 uu=_mm_maskload_ps(&u0,MMM);
+  __m128 vv=_mm_maskload_ps(&v0,MMM);
   return _mm_cvtss_f32(_mm_dp_ps(uu,vv,0x71));
 #else
   return u*v;
@@ -109,12 +109,6 @@
   }
 
 
-// Linearly interpolate
-FXVec3f lerp(const FXVec3f& u,const FXVec3f& v,FXfloat f){
-  return FXVec3f(u.x+(v.x-u.x)*f,u.y+(v.y-u.y)*f,u.z+(v.z-u.z)*f);
-  }
-
-
 // Rotate vector vec by unit-length axis about angle specified as (ca,sa)
 FXVec3f rotate(const FXVec3f& vec,const FXVec3f& axis,FXfloat ca,FXfloat sa){
   FXVec3f v1((vec*axis)*axis);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVec4d.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVec4d.cpp Changed

@@ -3,7 +3,7 @@
 *       D o u b l e - P r e c i s i o n   4 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -60,10 +60,10 @@
   }
 
 
-// Compute plane equation from 3 points a,b,c
-FXVec4d plane(const FXVec3d& a,const FXVec3d& b,const FXVec3d& c){
-  FXVec3d nm(normal(a,b,c));
-  return FXVec4d(nm,-(nm.x*a.x+nm.y*a.y+nm.z*a.z));
+// Compute normalized plane equation ax+by+cz+d=0
+FXVec4d plane(const FXVec4d& vec){
+  FXdouble t=Math::sqrt(vec.x*vec.x+vec.y*vec.y+vec.z*vec.z);
+  return FXVec4d(vec.x/t,vec.y/t,vec.z/t,vec.w/t);
   }
 
 
@@ -81,10 +81,10 @@
   }
 
 
-// Compute plane equation from 4 vector
-FXVec4d plane(const FXVec4d& vec){
-  register FXdouble t=Math::sqrt(vec.x*vec.x+vec.y*vec.y+vec.z*vec.z);
-  return FXVec4d(vec.x/t,vec.y/t,vec.z/t,vec.w/t);
+// Compute plane equation from 3 points a,b,c
+FXVec4d plane(const FXVec3d& a,const FXVec3d& b,const FXVec3d& c){
+  FXVec3d nm(normal(a,b,c));
+  return FXVec4d(nm,-(nm.x*a.x+nm.y*a.y+nm.z*a.z));
   }
 
 
@@ -100,38 +100,6 @@
   }
 
 
-// Linearly interpolate
-FXVec4d lerp(const FXVec4d& u,const FXVec4d& v,FXdouble f){
-#if defined(FOX_HAS_AVX2) && defined(FOX_HAS_FMA)
-  register __m256d u0=_mm256_loadu_pd(&u0);
-  register __m256d v0=_mm256_loadu_pd(&v0);
-  register __m256d ff=_mm256_set1_pd(f);
-  FXVec4d r;
-  _mm256_storeu_pd(&r0,_mm256_fmadd_pd(ff,v0,_mm256_fnmadd_pd(ff,u0,u0)));       // Lerp in two instructions!
-  return r;
-#elif defined(FOX_HAS_AVX)
-  register __m256d u0=_mm256_loadu_pd(&u0);
-  register __m256d v0=_mm256_loadu_pd(&v0);
-  register __m256d ff=_mm256_set1_pd(f);
-  FXVec4d r;
-  _mm256_storeu_pd(&r0,_mm256_add_pd(u0,_mm256_mul_pd(_mm256_sub_pd(v0,u0),ff)));
-  return r;
-#elif defined(FOX_HAS_SSE2)
-  register __m128d u0=_mm_loadu_pd(&u0);
-  register __m128d u1=_mm_loadu_pd(&u2);
-  register __m128d v0=_mm_loadu_pd(&v0);
-  register __m128d v1=_mm_loadu_pd(&v2);
-  register __m128d ff=_mm_set1_pd(f);
-  FXVec4d r;
-  _mm_storeu_pd(&r0,_mm_add_pd(u0,_mm_mul_pd(_mm_sub_pd(v0,u0),ff)));
-  _mm_storeu_pd(&r2,_mm_add_pd(u1,_mm_mul_pd(_mm_sub_pd(v1,u1),ff)));
-  return r;
-#else
-  return FXVec4d(u.x+(v.x-u.x)*f,u.y+(v.y-u.y)*f,u.z+(v.z-u.z)*f,u.w+(v.w-u.w)*f);
-#endif
-  }
-
-
 // Save vector to stream
 FXStream& operator<<(FXStream& store,const FXVec4d& v){
   store << v.x << v.y << v.z << v.w;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVec4f.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVec4f.cpp Changed

@@ -3,7 +3,7 @@
 *       S i n g l e - P r e c i s i o n   4 - E l e m e n t   V e c t o r       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1994,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1994,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -54,8 +54,8 @@
 // Compute fast dot product with vector code
 FXfloat dot(const FXVec4f& u,const FXVec4f& v){
 #if defined(FOX_HAS_AVX)
-  register __m128 uu=_mm_load_ps(&u0);
-  register __m128 vv=_mm_load_ps(&v0);
+  __m128 uu=_mm_load_ps(&u0);
+  __m128 vv=_mm_load_ps(&v0);
   return _mm_cvtss_f32(_mm_dp_ps(uu,vv,0xF1));
 #else
   return u*v;
@@ -72,10 +72,10 @@
   }
 
 
-// Compute plane equation from 3 points a,b,c
-FXVec4f plane(const FXVec3f& a,const FXVec3f& b,const FXVec3f& c){
-  FXVec3f nm(normal(a,b,c));
-  return FXVec4f(nm,-(nm.x*a.x+nm.y*a.y+nm.z*a.z));
+// Compute normalized plane equation ax+by+cz+d=0
+FXVec4f plane(const FXVec4f& vec){
+  FXfloat t=Math::sqrt(vec.x*vec.x+vec.y*vec.y+vec.z*vec.z);
+  return FXVec4f(vec.x/t,vec.y/t,vec.z/t,vec.w/t);
   }
 
 
@@ -93,10 +93,10 @@
   }
 
 
-// Compute plane equation from 4 vector
-FXVec4f plane(const FXVec4f& vec){
-  register FXfloat t=Math::sqrt(vec.x*vec.x+vec.y*vec.y+vec.z*vec.z);
-  return FXVec4f(vec.x/t,vec.y/t,vec.z/t,vec.w/t);
+// Compute plane equation from 3 points a,b,c
+FXVec4f plane(const FXVec3f& a,const FXVec3f& b,const FXVec3f& c){
+  FXVec3f nm(normal(a,b,c));
+  return FXVec4f(nm,-(nm.x*a.x+nm.y*a.y+nm.z*a.z));
   }
 
 
@@ -112,28 +112,6 @@
   }
 
 
-// Linearly interpolate
-FXVec4f lerp(const FXVec4f& u,const FXVec4f& v,FXfloat f){
-#if defined(FOX_HAS_AVX2) && defined(FOX_HAS_FMA)
-  register __m128 u0=_mm_loadu_ps(&u0);
-  register __m128 v0=_mm_loadu_ps(&v0);
-  register __m128 ff=_mm_set1_ps(f);
-  FXVec4f r;
-  _mm_storeu_ps(&r0,_mm_fmadd_ps(ff,v0,_mm_fnmadd_ps(ff,u0,u0)));       // Lerp in two instructions!
-  return r;
-#elif defined(FOX_HAS_SSE2)
-  register __m128 u0=_mm_loadu_ps(&u0);
-  register __m128 v0=_mm_loadu_ps(&v0);
-  register __m128 ff=_mm_set1_ps(f);
-  FXVec4f r;
-  _mm_storeu_ps(&r0,_mm_add_ps(u0,_mm_mul_ps(_mm_sub_ps(v0,u0),ff)));
-  return r;
-#else
-  return FXVec4f(u.x+(v.x-u.x)*f,u.y+(v.y-u.y)*f,u.z+(v.z-u.z)*f,u.w+(v.w-u.w)*f);
-#endif
-  }
-
-
 // Save vector to stream
 FXStream& operator<<(FXStream& store,const FXVec4f& v){
   store << v.x << v.y << v.z << v.w;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVerticalFrame.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVerticalFrame.cpp Changed

@@ -3,7 +3,7 @@
 *                 V e r t i c a l   C o n t a i n e r   O b j e c t             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -72,9 +72,9 @@
 
 // Compute minimum width based on child layout hints
 FXint FXVerticalFrame::getDefaultWidth(){
-  register FXint w,wmax,wcum,mw;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint w,wmax,wcum,mw;
+  FXWindow* child;
+  FXuint hints;
   wmax=wcum=mw=0;
   if(options&PACK_UNIFORM_WIDTH) mw=maxChildWidth();
   for(child=getFirst(); child; child=child->getNext()){
@@ -99,9 +99,9 @@
 
 // Compute minimum height based on child layout hints
 FXint FXVerticalFrame::getDefaultHeight(){
-  register FXint h,hcum,hmax,mh;
-  register FXWindow* child;
-  register FXuint hints;
+  FXint h,hcum,hmax,mh;
+  FXWindow* child;
+  FXuint hints;
   hcum=hmax=mh=0;
   if(options&PACK_UNIFORM_HEIGHT) mh=maxChildHeight();
   for(child=getFirst(); child; child=child->getNext()){
@@ -127,14 +127,14 @@
 
 // Recalculate layout
 void FXVerticalFrame::layout(){
-  register FXint left,right,top,bottom,remain,extra_space,total_space,t,x,y,w,h;
-  register FXWindow* child;
-  register FXint sumexpand=0;
-  register FXint numexpand=0;
-  register FXint mw=0;
-  register FXint mh=0;
-  register FXint e=0;
-  register FXuint hints;
+  FXint left,right,top,bottom,remain,extra_space,total_space,t,x,y,w,h;
+  FXWindow* child;
+  FXint sumexpand=0;
+  FXint numexpand=0;
+  FXint mw=0;
+  FXint mh=0;
+  FXint e=0;
+  FXuint hints;
 
   // Placement rectangle; right/bottom non-inclusive
   left=border+padleft;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXVisual.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXVisual.cpp Changed

@@ -3,7 +3,7 @@
 *                            V i s u a l   C l a s s                            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -150,7 +150,7 @@
 
 // Get number of bits in n
 static inline FXuint findnbits(DWORD n){
-  register FXuint nb=0;
+  FXuint nb=0;
   while(n){nb+=(n&1);n>>=1;}
   return nb;
   }
@@ -282,7 +282,7 @@
 
 // Find shift amount
 static inline FXuint findshift(FXPixel mask){
-  register FXuint sh=0;
+  FXuint sh=0;
   while(!(mask&(1<<sh))) sh++;
   return sh;
   }
@@ -290,22 +290,18 @@
 
 // Apply gamma correction to an intensity value in 0..max.
 static FXuint gamma_adjust(FXdouble gamma,FXuint value,FXuint max){
-  register FXdouble x=(FXdouble)value / (FXdouble)max;
+  FXdouble x=(FXdouble)value / (FXdouble)max;
   return (FXuint) (((FXdouble)max * Math::pow(x,1.0/gamma))+0.5);
   }
 
 
-// Apparently, fabs() gives trouble on HP-UX aCC compiler
-static inline double fxabs(double a){ return a<0 ? -a : a; }
-
-
 // Setup for true color
 void FXVisual::setuptruecolor(){
-  register FXuint  redshift,greenshift,blueshift;
-  register FXPixel redmask,greenmask,bluemask,alphamask;
-  register FXPixel redmax,greenmax,bluemax;
-  register FXuint i,c,d,r,g,b;
-  register FXdouble gamma;
+  FXuint   redshift,greenshift,blueshift;
+  FXPixel  redmask,greenmask,bluemask,alphamask;
+  FXPixel  redmax,greenmax,bluemax;
+  FXuint   i,c,d,r,g,b;
+  FXdouble gamma;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);
@@ -360,14 +356,15 @@
 
 // Setup direct color
 void FXVisual::setupdirectcolor(){
-  register FXuint  redshift,greenshift,blueshift;
-  register FXPixel redmask,greenmask,bluemask;
-  register FXPixel redmax,greenmax,bluemax;
-  register FXuint  mapsize,maxcols,i,j,r,g,b,emax,rr,gg,bb,d;
-  register FXuint  bestmatchr,bestmatchg,bestmatchb,gottable,allocedcolor;
-  register FXdouble mindist,dist,gamma;
-  XColor  tableMAX_MAPSIZE,color;
-  FXPixel allocedMAX_MAPSIZE;
+  FXuint   redshift,greenshift,blueshift;
+  FXPixel  redmask,greenmask,bluemask;
+  FXPixel  redmax,greenmax,bluemax;
+  FXuint   mapsize,maxcols,i,j,r,g,b,emax,rr,gg,bb,d;
+  FXuint   bestmatchr,bestmatchg,bestmatchb,gottable,allocedcolor;
+  FXint    mindist,dist;
+  FXdouble gamma;
+  XColor   tableMAX_MAPSIZE,color;
+  FXPixel  allocedMAX_MAPSIZE;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);
@@ -435,21 +432,21 @@
         }
 
       // Find best match for red
-      for(mindist=1.0E10,bestmatchr=0,j=0; j<mapsize; j++){
-        dist=fxabs(color.red-tablej.red);
-        if(dist<mindist){ bestmatchr=j; mindist=dist; if(mindist==0.0) break; }
+      for(mindist=2147483647,bestmatchr=0,j=0; j<mapsize; j++){
+        dist=Math::iabs(color.red-tablej.red);
+        if(dist<mindist){ bestmatchr=j; mindist=dist; if(mindist==0) break; }
         }
 
       // Find best match for green
-      for(mindist=1.0E10,bestmatchg=0,j=0; j<mapsize; j++){
-        dist=fxabs(color.green-tablej.green);
-        if(dist<mindist){ bestmatchg=j; mindist=dist; if(mindist==0.0) break; }
+      for(mindist=2147483647,bestmatchg=0,j=0; j<mapsize; j++){
+        dist=Math::iabs(color.green-tablej.green);
+        if(dist<mindist){ bestmatchg=j; mindist=dist; if(mindist==0) break; }
         }
 
       // Find best match for blue
-      for(mindist=1.0E10,bestmatchb=0,j=0; j<mapsize; j++){
-        dist=fxabs(color.blue-tablej.blue);
-        if(dist<mindist){ bestmatchb=j; mindist=dist; if(mindist==0.0) break; }
+      for(mindist=2147483647,bestmatchb=0,j=0; j<mapsize; j++){
+        dist=Math::iabs(color.blue-tablej.blue);
+        if(dist<mindist){ bestmatchb=j; mindist=dist; if(mindist==0) break; }
         }
 
       // Now try to allocate this color
@@ -505,10 +502,10 @@
 
 // Setup for pseudo color
 void FXVisual::setuppseudocolor(){
-  register FXuint r,g,b,mapsize,bestmatch,maxcols,gottable,allocedcolor,i,d;
-  register FXdouble mindist,dist,gamma,dr,dg,db;
-  register FXPixel redmax,greenmax,bluemax;
-  XColor table256,color;
+  FXuint   r,g,b,mapsize,bestmatch,maxcols,gottable,allocedcolor,i,d;
+  FXdouble mindist,dist,gamma,dr,dg,db;
+  FXPixel  redmax,greenmax,bluemax;
+  XColor   table256,color;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);
@@ -636,11 +633,11 @@
 
 // Setup for static color
 void FXVisual::setupstaticcolor(){
-  register FXuint mapsize,bestmatch,i,nr,ng,nb,r,g,b,j,d;
-  register FXdouble mindist,dist,gamma,dr,dg,db;
-  register FXPixel redmax,greenmax,bluemax;
-  FXuchar rcnt256,gcnt256,bcnt256;
-  XColor table256,color;
+  FXuint   mapsize,bestmatch,i,nr,ng,nb,r,g,b,j,d;
+  FXdouble mindist,dist,gamma,dr,dg,db;
+  FXPixel  redmax,greenmax,bluemax;
+  FXuchar  rcnt256,gcnt256,bcnt256;
+  XColor   table256,color;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);
@@ -746,10 +743,10 @@
 
 // Setup for gray scale
 void FXVisual::setupgrayscale(){
-  register FXuint g,bestmatch,mapsize,maxcols,graymax,gottable,allocedcolor,i,d;
-  register FXdouble mindist,dist,gamma,dr,dg,db;
-  XColor table256,color;
-  FXPixel alloced256;
+  FXuint   g,bestmatch,mapsize,maxcols,graymax,gottable,allocedcolor,i,d;
+  FXdouble mindist,dist,gamma,dr,dg,db;
+  XColor   table256,color;
+  FXPixel  alloced256;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);
@@ -851,8 +848,8 @@
 
 // Setup for static gray
 void FXVisual::setupstaticgray(){
-  register FXuint i,d,c,graymax;
-  register FXdouble gamma;
+  FXuint   i,d,c,graymax;
+  FXdouble gamma;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);
@@ -884,8 +881,8 @@
 
 // Setup for pixmap monochrome; this one has no colormap!
 void FXVisual::setuppixmapmono(){
-  register FXuint d,i,c;
-  register FXdouble gamma;
+  FXuint   d,i,c;
+  FXdouble gamma;
 
   // Get gamma
   gamma=getApp()->reg().readRealEntry("SETTINGS","displaygamma",1.0);

gogglesmm-1.2.1.tar.gz/cfox/lib/FXWEBPIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXWEBPIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXWEBPImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXWEBPImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXWSQueue.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXWSQueue.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXWindow.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXWindow.cpp Changed

@@ -3,7 +3,7 @@
 *                            W i n d o w   O b j e c t                          *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -450,8 +450,8 @@
 
 // Return a pointer to the shell window
 FXWindow* FXWindow::getShell() const {
-  register FXWindow *win=(FXWindow*)this;
-  register FXWindow *p;
+  FXWindow *win=(FXWindow*)this;
+  FXWindow *p;
   while((p=win->parent)!=NULL && p->parent) win=p;
   return win;
   }
@@ -459,7 +459,7 @@
 
 // Return a pointer to the root window
 FXWindow* FXWindow::getRoot() const {
-  register FXWindow *win=(FXWindow*)this;
+  FXWindow *win=(FXWindow*)this;
   while(win->parent) win=win->parent;
   return win;
   }
@@ -488,9 +488,9 @@
 
 // Get window from Dewey decimal key
 FXWindow *FXWindow::getChildFromKey(const FXString& key) const {
-  register FXWindow *window=(FXWindow*)this;
-  register const FXchar *s=key.text();
-  register FXuint num;
+  FXWindow *window=(FXWindow*)this;
+  const FXchar *s=key.text();
+  FXuint num;
   do{
     if(!('0'<=*s && *s<='9')) return NULL;
     for(num=0; '0'<=*s && *s<='9'; s++){ num=10*num+*s-'0'; }
@@ -504,8 +504,8 @@
 // Get Dewey decimal key from window
 FXString FXWindow::getKeyFromChild(FXWindow* window) const {
   FXchar buf1024;
-  register FXchar *p=buf+1023;
-  register FXuint num;
+  FXchar *p=buf+1023;
+  FXuint num;
   *p='\0';
   while(window && window!=this && buf+10<=p){
     num=window->getKey();
@@ -541,7 +541,7 @@
 
 // Return true if specified window is ancestor of this window
 FXbool FXWindow::isChildOf(const FXWindow* window) const {
-  register const FXWindow* child=this;
+  const FXWindow* child=this;
   while(child){
     child=child->parent;
     if(child==window) return true;
@@ -552,7 +552,7 @@
 
 // Get child at x,y
 FXWindow* FXWindow::getChildAt(FXint x,FXint y) const {
-  register FXWindow *child;
+  FXWindow *child;
   if(0<=x && 0<=y && x<width && y<height){
     for(child=last; child; child=child->prev){
       if(child->shown() && child->xpos<=x && child->ypos<=y && x<child->xpos+child->width && y<child->ypos+child->height) return child;
@@ -564,8 +564,8 @@
 
 // Count number of children
 FXint FXWindow::numChildren() const {
-  register const FXWindow *child=first;
-  register FXint num=0;
+  const FXWindow *child=first;
+  FXint num=0;
   while(child){
     child=child->next;
     num++;
@@ -576,7 +576,7 @@
 
 // Get index of child window
 FXint FXWindow::indexOfChild(const FXWindow *window) const {
-  register FXint index=0;
+  FXint index=0;
   if(!window || window->parent!=this) return -1;
   while(window->prev){
     window=window->prev;
@@ -588,7 +588,7 @@
 
 // Get child window at index
 FXWindow* FXWindow::childAtIndex(FXint index) const {
-  register FXWindow* child=first;
+  FXWindow* child=first;
   if(index<0) return NULL;
   while(index && child){
     child=child->next;
@@ -600,7 +600,7 @@
 
 // Find common ancestor between window a and b
 FXWindow* FXWindow::commonAncestor(FXWindow* a,FXWindow* b){
-  register FXWindow *p1,*p2;
+  FXWindow *p1,*p2;
   if(a || b){
     if(!a) return b->getRoot();
     if(!b) return a->getRoot();
@@ -1098,7 +1098,7 @@
 
 // Make widget drawn as default
 void FXWindow::setDefault(FXuchar flag){
-  register FXWindow *win;
+  FXWindow *win;
   switch(flag){
     case false:
       flags&=~FLAG_DEFAULT;
@@ -1122,7 +1122,7 @@
 
 // Find default window
 FXWindow* FXWindow::findDefault() const {
-  register FXWindow *win=(FXWindow*)this;
+  FXWindow *win=(FXWindow*)this;
   while(1){
     if(win->isDefault()) return win;
     if(win->getFirst()){ win=win->getFirst(); continue; }
@@ -1144,7 +1144,7 @@
 
 // Make this window the initial default window
 void FXWindow::setInitial(FXbool flag){
-  register FXWindow *win;
+  FXWindow *win;
   if((flags&FLAG_INITIAL) && !flag){
     flags&=~FLAG_INITIAL;
     }
@@ -1158,7 +1158,7 @@
 
 // Find initial window
 FXWindow* FXWindow::findInitial() const {
-  register FXWindow *win=(FXWindow*)this;
+  FXWindow *win=(FXWindow*)this;
   while(1){
     if(win->isInitial()) return win;
     if(win->getFirst()){ win=win->getFirst(); continue; }
@@ -1586,8 +1586,8 @@
 #ifdef WIN32
 static HRGN makeregion(HDC hdc,FXint w,FXint h){
   const COLORREF clear=RGB(255,255,255);
-  register HRGN shape,run;
-  register FXint x,y,z;
+  HRGN shape,run;
+  FXint x,y,z;
   shape=CreateRectRgn(0,0,0,0);
   for(y=0; y<h; y++){
     for(x=0; x<w; ){
@@ -1760,8 +1760,8 @@
 
 // Add hot key to closest ancestor's accelerator table
 void FXWindow::addHotKey(FXHotKey code){
-  register FXAccelTable *accel=NULL;
-  register FXWindow *win=this;
+  FXAccelTable *accel=NULL;
+  FXWindow *win=this;
   while(win && (accel=win->getAccelTable())==NULL) win=win->parent;
   if(accel) accel->addAccel(code,this,FXSEL(SEL_KEYPRESS,ID_HOTKEY),FXSEL(SEL_KEYRELEASE,ID_HOTKEY));
   }
@@ -1769,8 +1769,8 @@
 
 // Remove hot key from closest ancestor's accelerator table
 void FXWindow::remHotKey(FXHotKey code){
-  register FXAccelTable *accel=NULL;
-  register FXWindow *win=this;
+  FXAccelTable *accel=NULL;
+  FXWindow *win=this;
   while(win && (accel=win->getAccelTable())==NULL) win=win->parent;
   if(accel) accel->removeAccel(code);
   }
@@ -2103,7 +2103,7 @@
 
 // Force GUI refresh of this window and all of its children
 void FXWindow::forceRefresh(){
-  register FXWindow *win=this;
+  FXWindow *win=this;
   while(1){
     win->handle(win,FXSEL(SEL_UPDATE,0),NULL);
     if(win->getFirst()){ win=win->getFirst(); continue; }
@@ -2138,7 +2138,7 @@
       r.bottom=y+h;
       InvalidateRect((HWND)xid,&r,true);
 #else
-      getApp()->addRepaint(xid,x,y,w,h,1);
+      getApp()->addRepaint(xid,x,y,w,h,true);
 #endif
       }
     }
@@ -2209,8 +2209,8 @@
 
 // Move and resize
 void FXWindow::position(FXint x,FXint y,FXint w,FXint h){
-  register FXint ow=width;
-  register FXint oh=height;
+  FXint ow=width;
+  FXint oh=height;
   FXTRACE((200,"%s::position: x=%d y=%d w=%d h=%d\n",getClassName(),x,y,w,h));
   if(w<0) w=0;
   if(h<0) h=0;
@@ -2249,8 +2249,8 @@
 
 // Resize
 void FXWindow::resize(FXint w,FXint h){
-  register FXint ow=width;
-  register FXint oh=height;
+  FXint ow=width;
+  FXint oh=height;
   FXTRACE((200,"%s::resize: w=%d h=%d\n",getClassName(),w,h));
   if(w<0) w=0;
   if(h<0) h=0;
@@ -2295,7 +2295,7 @@
 
     // No overlap:- repaint the whole thing
     if((w<=FXABS(dx)) || (h<=FXABS(dy))){
-      getApp()->addRepaint(xid,x,y,w,h,1);
+      getApp()->addRepaint(xid,x,y,w,h,true);
       }
 
     // Has overlap, so blit contents and repaint the exposed parts
@@ -2309,7 +2309,7 @@
       // Pull any outstanding repaint events into our own repaint rectangle list
       while(XCheckWindowEvent((Display*)getApp()->getDisplay(),xid,ExposureMask,&event)){
         if(event.xany.type==NoExpose) continue;
-        getApp()->addRepaint(xid,event.xexpose.x,event.xexpose.y,event.xexpose.width,event.xexpose.height,0);
+        getApp()->addRepaint(xid,event.xexpose.x,event.xexpose.y,event.xexpose.width,event.xexpose.height,false);
         if(event.xgraphicsexpose.count==0) break;
         }
 
@@ -2347,10 +2347,10 @@
 
       // Post additional rectangles for the uncovered areas
       if(dy){
-        getApp()->addRepaint(xid,x,ey,w,eh,1);
+        getApp()->addRepaint(xid,x,ey,w,eh,true);
         }
       if(dx){
-        getApp()->addRepaint(xid,ex,y,ew,h,1);
+        getApp()->addRepaint(xid,ex,y,ew,h,true);
         }
       }
 #endif
@@ -2850,6 +2850,7 @@
     if(callocElms(ptr,size+2)){
       unicode.utf2mb(ptr,size,string.text(),string.length());
       return setDNDData(origin,targettype,reinterpret_cast<FXuchar*>(ptr),size);
+//      return setDNDData(origin,targettype,reinterpret_cast<FXuchar*>(ptr),size+2);
       }
     }
   else if(targettype==textType || targettype==stringType){      // ASCII
@@ -2858,6 +2859,7 @@
     if(callocElms(ptr,size+2)){
       ascii.utf2mb(ptr,size,string.text(),string.length());
       return setDNDData(origin,targettype,reinterpret_cast<FXuchar*>(ptr),size);
+//      return setDNDData(origin,targettype,reinterpret_cast<FXuchar*>(ptr),size+1);
       }
     }
   else{                                                         // AS-IS
@@ -2865,6 +2867,7 @@
     if(callocElms(ptr,size+2)){
       memcpy(ptr,string.text(),string.length());
       return setDNDData(origin,targettype,reinterpret_cast<FXuchar*>(ptr),size);
+//      return setDNDData(origin,targettype,reinterpret_cast<FXuchar*>(ptr),size);
       }
     }
   return false;
@@ -3235,7 +3238,7 @@
   if(xid==0){ fxerror("%s::endDrag: window has not yet been created.\n",getClassName()); }
   if(isDragging()){
 
-#ifdef WIN32            // WINDOWS
+#if defined(WIN32)      // WINDOWS
 
     FXbool nodrop=true;
     FXuint loops;

gogglesmm-1.2.1.tar.gz/cfox/lib/FXWizard.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXWizard.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXWorker.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXWorker.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXXBMIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXXBMIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXXBMImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXXBMImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXXML.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXXML.cpp Changed

@@ -3,7 +3,7 @@
 *                       X M L   R e a d e r  &  W r i t e r                     *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2016,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -202,6 +202,8 @@
 
       o We're not at token or (multibyte) character boundary.
 
+  - The column may be incorrect if input string is not UTF8; column number is incremented
+    for every character-start not for UTF8 follower characters, in other words.
 */
 
 
@@ -323,8 +325,8 @@
 
 // Decode escaped special characters from XML stream
 FXbool FXXML::decode(FXString& dst,const FXString& src,FXuint flags){
-  register FXint p,q;
-  register FXwchar wc;
+  FXint p,q;
+  FXwchar wc;
 
   // Measure the resulting string first
   p=q=0;
@@ -471,8 +473,8 @@
 
 // Encode special characters for inclusion into XML stream
 FXbool FXXML::encode(FXString& dst,const FXString& src,FXuint flags){
-  register FXint p,q;
-  register FXuchar ch;
+  FXint p,q;
+  FXuchar ch;
 
   // Measure the resulting string first
   p=q=0;
@@ -589,53 +591,29 @@
 /*******************************************************************************/
 
 // Construct XML parser instance
-FXXML::FXXML():begptr(NULL),endptr(NULL),sptr(NULL),rptr(NULL),wptr(NULL),current(NULL),column(0),line(1),dir(Stop),enc(UTF8),owns(false){
-  FXTRACE((1,"FXXML::FXXML\n"));
+FXXML::FXXML():begptr(NULL),endptr(NULL),wptr(NULL),rptr(NULL),sptr(NULL),offset(0),current(NULL),column(0),line(1),dir(Stop),enc(UTF8){
+  FXTRACE((100,"FXXML::FXXML\n"));
   }
 
 
 // Construct XML parser instance and pass it external buffer
-FXXML::FXXML(FXchar* data,FXuval sz,Direction d):begptr(NULL),endptr(NULL),sptr(NULL),rptr(NULL),wptr(NULL),current(NULL),column(0),line(1),dir(Stop),enc(UTF8),owns(false){
-  FXTRACE((1,"FXXML::FXXML(%p,%ld,%s)\n",data,sz,d==Load?"Load":d==Save?"Save":"Stop"));
-  open(data,sz,d);
+FXXML::FXXML(FXchar* buffer,FXuval sz,Direction d):begptr(NULL),endptr(NULL),wptr(NULL),rptr(NULL),sptr(NULL),offset(0),current(NULL),column(0),line(1),dir(Stop),enc(UTF8){
+  FXTRACE((100,"FXXML::FXXML(%p,%ld,%s)\n",buffer,sz,d==Load?"Load":d==Save?"Save":"Stop"));
+  open(buffer,sz,d);
   }
 
 
 // Open XML stream for given direction d
-FXbool FXXML::open(FXchar* data,FXuval sz,Direction d){
-  FXTRACE((2,"FXXML::open(%p,%ld,%s)\n",data,sz,d==Load?"Load":d==Save?"Save":"Stop"));
-  if((dir==Stop) && (d!=Stop)){
-    if(data){
-      begptr=data;
-      endptr=begptr+sz;
-      if(d==Save){
-        sptr=begptr;
-        rptr=begptr;
-        wptr=begptr;
-        }
-      else{
-        sptr=begptr;
-        rptr=begptr;
-        wptr=endptr;
-        }
-      owns=false;
-      }
-    else{
-      if(sz<MINBUFFER) sz=MINBUFFER;
-      if(!allocElms(begptr,sz)) return false;
-      endptr=begptr+sz;
-      if(d==Save){
-        sptr=begptr;
-        rptr=begptr;
-        wptr=begptr;
-        }
-      else{
-        sptr=endptr;
-        rptr=endptr;
-        wptr=endptr;
-        }
-      owns=true;
-      }
+FXbool FXXML::open(FXchar* buffer,FXuval sz,Direction d){
+  FXTRACE((101,"FXXML::open(%p,%ld,%s)\n",buffer,sz,d==Load?"Load":d==Save?"Save":"Stop"));
+  FXASSERT(dir==Stop);
+  if((dir==Stop) && (d!=Stop) && (0<sz) && buffer){
+    begptr=buffer;
+    endptr=buffer+sz;
+    wptr=(d==Load)?endptr:begptr;
+    rptr=begptr;
+    sptr=begptr;
+    offset=0;
     current=NULL;
     column=0;
     line=1;
@@ -646,16 +624,19 @@
   return false;
   }
 
+/*******************************************************************************/
 
-// Fill buffer
-FXbool FXXML::fill(){
-  return rptr<wptr;
+// Read at least count bytes into buffer; return bytes available, or -1 for error
+FXival FXXML::fill(FXival){
+  FXASSERT(dir==Load);
+  return wptr-sptr;
   }
 
 
-// Flush buffer
-FXbool FXXML::flush(){
-  return wptr<endptr;
+// Write at least count bytes from buffer; return space available, or -1 for error
+FXival FXXML::flush(FXival){
+  FXASSERT(dir==Save);
+  return endptr-wptr;
   }
 
 
@@ -663,45 +644,52 @@
 // to load additional data into the buffer if needed.
 // Near the end of the file, there may be fewer than n bytes in the buffer
 // even after fill() is called.
-FXbool FXXML::need(FXival n){
-  if(wptr<rptr+n){
+FXbool FXXML::need(FXival count){
+  FXASSERT(dir==Load);
+  if(sptr+count>wptr){
     if(wptr==endptr){
-      fill();
+      if(fill(count)<0) return false;
       }
-    return rptr<wptr;
+    return sptr<wptr;
     }
   return true;
   }
 
 
-// Emit text to buffer
-FXXML::Error FXXML::emit(const FXchar* str,FXint count){
+// Emit characters to buffer
+FXbool FXXML::emit(FXchar ch,FXint count){
   FXival num;
+  FXASSERT(dir==Save);
   while(0<count){
-    if(wptr>=endptr && !flush()){ FXTRACE((2,"%s:%d: flush() failed!\n",__FILE__,__LINE__)); return ErrSave; }
+    if(wptr>=endptr){
+      if(flush(count)<=0) return false;
+      }
     FXASSERT(wptr<endptr);
     num=FXMIN(count,endptr-wptr);
-    memcpy(wptr,str,num);
+    fillElms(wptr,ch,num);
     wptr+=num;
-    str+=num;
     count-=num;
     }
-  return ErrOK;
+  return true;
   }
 
 
-// Emit characters to buffer
-FXXML::Error FXXML::emit(FXchar ch,FXint count){
+// Emit text to buffer
+FXbool FXXML::emit(const FXchar* str,FXint count){
   FXival num;
+  FXASSERT(dir==Save);
   while(0<count){
-    if(wptr>=endptr && !flush()){ FXTRACE((2,"%s:%d: flush() failed!\n",__FILE__,__LINE__)); return ErrSave; }
+    if(wptr>=endptr){
+      if(flush(count)<=0) return false;
+      }
     FXASSERT(wptr<endptr);
     num=FXMIN(count,endptr-wptr);
-    memset(wptr,ch,num);
+    copyElms(wptr,str,num);
     wptr+=num;
+    str+=num;
     count-=num;
     }
-  return ErrOK;
+  return true;
   }
 
 /*******************************************************************************/
@@ -712,111 +700,135 @@
 
 // Document start
 FXXML::Error FXXML::startDocument(){
-  Error err=ErrSave;
   if(dir==Save){
-    err=emit(boilerplate,sizeof(boilerplate)-1);
+    if(!emit(boilerplate,sizeof(boilerplate)-1)) return ErrSave;
+    offset+=sizeof(boilerplate)-1;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Element start w/no attributes
 FXXML::Error FXXML::startElement(const FXString& tag){
-  Error err=ErrSave;
   if(dir==Save){
-    if((err=emit("<",1))!=ErrOK) return err;
-    if((err=emit(tag.text(),tag.length()))!=ErrOK) return err;
-    if((err=emit(">",1))!=ErrOK) return err;
+    if(!emit("<",1)) return ErrSave;
+    offset+=1;
+    if(!emit(tag.text(),tag.length())) return ErrSave;
+    offset+=tag.length();
+    if(!emit(">",1)) return ErrSave;
+    offset+=1;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Element start w/attributes
 FXXML::Error FXXML::startElement(const FXString& tag,const FXStringDictionary& atts){
-  Error err=ErrSave;
   FXString encodedatt;
   if(dir==Save){
-    if((err=emit("<",1))!=ErrOK) return err;
-    if((err=emit(tag.text(),tag.length()))!=ErrOK) return err;
+    if(!emit("<",1)) return ErrSave;
+    offset+=1;
+    if(!emit(tag.text(),tag.length())) return ErrSave;
+    offset+=tag.length();
     if(!atts.empty()){
       for(FXint i=0; i<atts.no(); ++i){
         if(!atts.empty(i)){
-          if((err=emit(" ",1))!=ErrOK) return err;
-          if((err=emit(atts.key(i).text(),atts.key(i).length()))!=ErrOK) return err;
-          if((err=emit("=\"",2))!=ErrOK) return err;
+          if(!emit(" ",1)) return ErrSave;
+          offset+=1;
+          if(!emit(atts.key(i).text(),atts.key(i).length())) return ErrSave;
+          offset+=atts.key(i).length();
+          if(!emit("=\"",2)) return ErrSave;
+          offset+=2;
           FXXML::encode(encodedatt,atts.data(i),REFS|CRLF);
-          if((err=emit(encodedatt.text(),encodedatt.length()))!=ErrOK) return err;
-          if((err=emit("\"",1))!=ErrOK) return err;
+          if(!emit(encodedatt.text(),encodedatt.length())) return ErrSave;
+          offset+=encodedatt.length();
+          if(!emit("\"",1)) return ErrSave;
+          offset+=1;
           }
         }
       }
-    if((err=emit(">",1))!=ErrOK) return err;
+    if(!emit(">",1)) return ErrSave;
+    offset+=1;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Characters
 FXXML::Error FXXML::characters(const FXString& text){
-  Error err=ErrSave;
   if(dir==Save){
     FXString encodedtext;
     FXXML::encode(encodedtext,text,CRLF|REFS);
-    if((err=emit(encodedtext.text(),encodedtext.length()))!=ErrOK) return err;
+    if(!emit(encodedtext.text(),encodedtext.length())) return ErrSave;
+    offset+=encodedtext.length();
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Comment
 FXXML::Error FXXML::comment(const FXString& text){
-  Error err=ErrSave;
   if(dir==Save){
-    if((err=emit("",3))!=ErrOK) return err;
-    err=ErrOK;
+    if(!emit("",3)) return ErrSave;
+    offset+=3;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Processing instruction
 FXXML::Error FXXML::processing(const FXString& target,const FXString& data){
-  Error err=ErrSave;
   if(dir==Save){
-    if((err=emit("<?",2))!=ErrOK) return err;
-    if((err=emit(target.text(),target.length()))!=ErrOK) return err;
+    if(!emit("<?",2)) return ErrSave;
+    offset+=2;
+    if(!emit(target.text(),target.length())) return ErrSave;
+    offset+=target.length();
     if(!data.empty()){
-      if((err=emit(" ",1))!=ErrOK) return err;
-      if((err=emit(data.text(),data.length()))!=ErrOK) return err;
+      if(!emit(" ",1)) return ErrSave;
+      offset+=1;
+      if(!emit(data.text(),data.length())) return ErrSave;
+      offset+=data.length();
       }
-    if((err=emit("?>",2))!=ErrOK) return err;
+    if(!emit("?>",2)) return ErrSave;
+    offset+=2;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Element end
 FXXML::Error FXXML::endElement(const FXString& tag){
-  Error err=ErrSave;
   if(dir==Save){
-    err=emit("</",2);
-    err=emit(tag.text(),tag.length());
-    err=emit(">",1);
+    if(!emit("</",2)) return ErrSave;
+    offset+=2;
+    if(!emit(tag.text(),tag.length())) return ErrSave;
+    offset+=tag.length();
+    if(!emit(">",1)) return ErrSave;
+    offset+=1;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 
 // Document end
 FXXML::Error FXXML::endDocument(){
-  Error err=ErrSave;
   if(dir==Save){
-    err=emit("\n",1);
+    if(!emit("\n",1)) return ErrSave;
+    offset+=1;
+    return ErrOK;
     }
-  return err;
+  return ErrSave;
   }
 
 /*******************************************************************************/
@@ -827,23 +839,23 @@
 FXuint FXXML::guess(){
 
   // Quick check for UTF8 coded byte order mark (most likely case)
-  if(rptr+2<wptr && rptr0=='\xef' && rptr1=='\xbb' && rptr2=='\xbf'){ rptr+=3; return UTF8; }
+  if(sptr+3<=wptr && sptr0=='\xef' && sptr1=='\xbb' && sptr2=='\xbf'){ offset+=3; sptr+=3; return UTF8; }
 
   // Look for 32-bit byte order mark
-  if(rptr+3<wptr && rptr0=='\xff' && rptr1=='\xfe' && rptr2==0 && rptr3==0){ rptr+=4; return UTF32LE; }
-  if(rptr+3<wptr && rptr0==0 && rptr1==0 && rptr2=='\xfe' && rptr3=='\xff'){ rptr+=4; return UTF32BE; }
+  if(sptr+4<=wptr && sptr0=='\xff' && sptr1=='\xfe' && sptr2==0 && sptr3==0){ offset+=4; sptr+=4; return UTF32LE; }
+  if(sptr+4<=wptr && sptr0==0 && sptr1==0 && sptr2=='\xfe' && sptr3=='\xff'){ offset+=4; sptr+=4; return UTF32BE; }
 
   // Look for 16-bit byte order mark
-  if(rptr+1<wptr && rptr0=='\xff' && rptr1=='\xfe'){ rptr+=2; return UTF16LE; }
-  if(rptr+1<wptr && rptr0=='\xfe' && rptr1=='\xff'){ rptr+=2; return UTF16BE; }
+  if(sptr+2<=wptr && sptr0=='\xff' && sptr1=='\xfe'){ offset+=2; sptr+=2; return UTF16LE; }
+  if(sptr+2<=wptr && sptr0=='\xfe' && sptr1=='\xff'){ offset+=2; sptr+=2; return UTF16BE; }
 
   // Otherwise, look for 32-bit wide characters
-  if(rptr+3<wptr && rptr0==0 && rptr1==0 && rptr2==0 && rptr3!=0){ return UTF32BE; }
-  if(rptr+3<wptr && rptr0!=0 && rptr1==0 && rptr2==0 && rptr3==0){ return UTF32LE; }
+  if(sptr+4<=wptr && (sptr0!=0 || sptr1!=0) && (sptr2==0 && sptr3==0)){ return UTF32LE; }
+  if(sptr+4<=wptr && (sptr0==0 && sptr1==0) && (sptr2!=0 || sptr3!=0)){ return UTF32BE; }
 
   // Finally, look for 16-bit wide characters
-  if(rptr+1<wptr && rptr0==0 && rptr1!=0){ return UTF16BE; }
-  if(rptr+1<wptr && rptr0!=0 && rptr1==0){ return UTF16LE; }
+  if(sptr+2<=wptr && sptr0==0 && sptr1!=0){ return UTF16BE; }
+  if(sptr+2<=wptr && sptr0!=0 && sptr1==0){ return UTF16LE; }
 
   // Unknown encoding
   return 0;
@@ -853,23 +865,29 @@
 // Parse just spaces
 void FXXML::spaces(){
   while(need(MAXTOKEN)){
-    sptr=rptr;
-    switch(rptr0){
+    rptr=sptr;
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
+      sptr++;
       line++;
-      rptr++;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       continue;
-    default:                    // We have a non-whitespace character
+    default:                            // We have a non-whitespace character
       return;
       }
     }
@@ -878,14 +896,15 @@
 
 // Parse name
 FXbool FXXML::name(){
-  if(nameStartChar(rptr0)){
-    sptr=rptr;
+  if(nameStartChar(sptr0)){
+    rptr=sptr;
     do{
-      rptr=wcinc(rptr);
-      column++;
-      if(rptr>=wptr) return false;
+      column+=FXISUTF8(*sptr);          // Increment if UTF8 leader only
+      offset++;
+      sptr++;
+      if(sptr>=wptr) return false;
       }
-    while(nameChar(rptr0));
+    while(nameChar(sptr0));
     return true;
     }
   return false;
@@ -894,10 +913,11 @@
 
 // Match name with given name str of length len
 FXbool FXXML::match(FXchar ch){
-  if(rptr0==ch){
-    sptr=rptr;
+  if(sptr0==ch){
+    rptr=sptr;
     column++;
-    rptr++;
+    offset++;
+    sptr++;
     return true;
     }
   return false;
@@ -906,8 +926,8 @@
 
 // Match name with given name str of length len
 FXbool FXXML::match(const FXchar* str,FXint len){
-  if(name() && sptr+len==rptr){
-    return compare(sptr,str,len)==0;
+  if(name() && rptr+len==sptr){
+    return compare(rptr,str,len)==0;
     }
   return false;
   }
@@ -915,43 +935,52 @@
 
 // Parse string
 FXXML::Error FXXML::parsestring(FXString& str){
-  FXchar q=rptr0;
+  FXchar q=sptr0;
   str.clear();
   if(q=='"' || q=='\''){
-    rptr++;
     column++;
-    sptr=rptr;
+    offset++;
+    sptr++;
+    rptr=sptr;
     while(need(MAXTOKEN)){
-      switch(rptr0){
+      switch(sptr0){
       case '\t':
         column+=(8-column%8);
-        rptr++;
+        offset++;
+        sptr++;
         continue;
+      case '\r':
+        if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
       case '\n':
         column=0;
+        offset++;
+        sptr++;
         line++;
-        rptr++;
         continue;
       case ' ':
         column++;
-      case '\r':
-        rptr++;
+      case '\v':
+      case '\f':
+        offset++;
+        sptr++;
         continue;
       case '\'':
       case '"':
-        if(rptr0!=q) goto nxt;
-        str.append(sptr,rptr-sptr);
-        rptr++;
+        if(sptr0!=q) goto nxt;
+        str.append(rptr,sptr-rptr);
+        offset++;
         column++;
-        sptr=rptr;
+        sptr++;
+        rptr=sptr;
         return ErrOK;
       default:
-nxt:    if((rptr-sptr)>=(endptr-begptr-MAXTOKEN)){
-          str.append(sptr,rptr-sptr);
-          sptr=rptr;
+nxt:    if((sptr-rptr)>=(endptr-begptr-MAXTOKEN)){
+          str.append(rptr,sptr-rptr);
+          rptr=sptr;
           }
-        rptr=wcinc(rptr);
-        column++;
+        column+=FXISUTF8(*sptr);        // Increment if UTF8 leader only
+        offset++;
+        sptr++;
         continue;
         }
       }
@@ -999,67 +1028,77 @@
 // XML header
 FXXML::Error FXXML::parsexml(){
   FXXML::Error err;
-  sptr=rptr;
+  rptr=sptr;
   while(need(MAXTOKEN)){
-    switch(rptr0){
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
       line++;
-      rptr++;
+      sptr++;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       continue;
     case '?':                   // End of xml declaration
-      if(rptr1!='>') return ErrToken;
+      if(sptr1!='>') return ErrToken;
       column+=2;
-      rptr+=2;
+      offset+=2;
+      sptr+=2;
       return ErrOK;
     case 'v':
-      if(rptr1!='e') return ErrToken;
-      if(rptr2!='r') return ErrToken;
-      if(rptr3!='s') return ErrToken;
-      if(rptr4!='i') return ErrToken;
-      if(rptr5!='o') return ErrToken;
-      if(rptr6!='n') return ErrToken;
+      if(sptr1!='e') return ErrToken;
+      if(sptr2!='r') return ErrToken;
+      if(sptr3!='s') return ErrToken;
+      if(sptr4!='i') return ErrToken;
+      if(sptr5!='o') return ErrToken;
+      if(sptr6!='n') return ErrToken;
       column+=7;
-      rptr+=7;
+      offset+=7;
+      sptr+=7;
       if((err=parseversion())!=ErrOK) return err;
-      sptr=rptr;
+      rptr=sptr;
       continue;
     case 'e':
-      if(rptr1!='n') return ErrToken;
-      if(rptr2!='c') return ErrToken;
-      if(rptr3!='o') return ErrToken;
-      if(rptr4!='d') return ErrToken;
-      if(rptr5!='i') return ErrToken;
-      if(rptr6!='n') return ErrToken;
-      if(rptr7!='g') return ErrToken;
+      if(sptr1!='n') return ErrToken;
+      if(sptr2!='c') return ErrToken;
+      if(sptr3!='o') return ErrToken;
+      if(sptr4!='d') return ErrToken;
+      if(sptr5!='i') return ErrToken;
+      if(sptr6!='n') return ErrToken;
+      if(sptr7!='g') return ErrToken;
       column+=8;
-      rptr+=8;
+      offset+=8;
+      sptr+=8;
       if((err=parseencoding())!=ErrOK) return err;
-      sptr=rptr;
+      rptr=sptr;
       continue;
     case 's':
-      if(rptr1!='t') return ErrToken;
-      if(rptr2!='a') return ErrToken;
-      if(rptr3!='n') return ErrToken;
-      if(rptr4!='d') return ErrToken;
-      if(rptr5!='a') return ErrToken;
-      if(rptr6!='l') return ErrToken;
-      if(rptr7!='o') return ErrToken;
-      if(rptr8!='n') return ErrToken;
-      if(rptr9!='e') return ErrToken;
+      if(sptr1!='t') return ErrToken;
+      if(sptr2!='a') return ErrToken;
+      if(sptr3!='n') return ErrToken;
+      if(sptr4!='d') return ErrToken;
+      if(sptr5!='a') return ErrToken;
+      if(sptr6!='l') return ErrToken;
+      if(sptr7!='o') return ErrToken;
+      if(sptr8!='n') return ErrToken;
+      if(sptr9!='e') return ErrToken;
       column+=10;
-      rptr+=10;
+      offset+=10;
+      sptr+=10;
       if((err=parsestandalone())!=ErrOK) return err;
-      sptr=rptr;
+      rptr=sptr;
       continue;
     default:
       return ErrToken;
@@ -1074,7 +1113,7 @@
   FXString elmname;
   spaces();
   if(name()){
-    elmname.assign(sptr,rptr-sptr);
+    elmname.assign(rptr,sptr-rptr);
     spaces();
     //?//
     return ErrOK;
@@ -1093,7 +1132,7 @@
     spaces();
     if((err=parsestring(syslit))!=ErrOK) return err;
     ///
-    FXTRACE((10,"SYSTEM \"%s\"\n",syslit.text()));
+    FXTRACE((101,"SYSTEM \"%s\"\n",syslit.text()));
     return ErrOK;
     }
   if(match("PUBLIC",6)){
@@ -1101,7 +1140,7 @@
     if((err=parsestring(publit))!=ErrOK) return err;
     spaces();
     if((err=parsestring(syslit))!=ErrOK) return err;
-    FXTRACE((10,"PUBLIC \"%s\" \"%s\"\n",publit.text(),syslit.text()));
+    FXTRACE((101,"PUBLIC \"%s\" \"%s\"\n",publit.text(),syslit.text()));
     ///
     return ErrOK;
     }
@@ -1114,74 +1153,84 @@
   FXXML::Error err;
   spaces();
   if(match('')){
-    FXTRACE((2,"internalsubset\n"));
+    FXTRACE((101,"internalsubset\n"));
     while(need(MAXTOKEN)){
-      switch(rptr0){
+      switch(sptr0){
       case '\t':
         column+=(8-column%8);
-        rptr++;
+        offset++;
+        sptr++;
         continue;
+      case '\r':
+        if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
       case '\n':
         column=0;
+        offset++;
         line++;
-        rptr++;
+        sptr++;
         continue;
       case ' ':
         column++;
-      case '\r':
-        rptr++;
+      case '\v':
+      case '\f':
+        offset++;
+        sptr++;
         continue;
       case '':
         column++;
-        rptr++;
+        offset++;
+        sptr++;
         return ErrOK;
       case '<':
-        if(rptr1=='?'){
+        if(sptr1=='?'){
           column+=2;
-          rptr+=2;
+          offset+=2;
+          sptr+=2;
           if((err=parseprocessing())!=ErrOK) return err;
           continue;
           }
-        if(rptr1=='!' && rptr2=='-' && rptr3=='-'){
+        if(sptr1=='!' && sptr2=='-' && sptr3=='-'){
           column+=4;
-          rptr+=4;
+          offset+=4;
+          sptr+=4;
           if((err=parsecomment())!=ErrOK) return err;
           continue;
           }
 #if 0 // SKIP NOT-YET-IMPLEMENTED STUFF
-        if(rptr1=='!' && rptr2=='E' && rptr3=='L' && rptr4=='E' && rptr5=='M' && rptr6=='E' && rptr7=='N' && rptr8=='T'){
+        if(sptr1=='!' && sptr2=='E' && sptr3=='L' && sptr4=='E' && sptr5=='M' && sptr6=='E' && sptr7=='N' && sptr8=='T'){
           column+=9;
-          rptr+=9;
-          FXTRACE((1,"<!ELEMENT\n"));
-          sptr=rptr;
+          sptr+=9;
+          FXTRACE((101,"<!ELEMENT\n"));
+          rptr=sptr;
           continue;
           }
-        if(rptr1=='!' && rptr2=='A' && rptr3=='T' && rptr4=='T' && rptr5=='L' && rptr6=='I' && rptr7=='T'){
+        if(sptr1=='!' && sptr2=='A' && sptr3=='T' && sptr4=='T' && sptr5=='L' && sptr6=='I' && sptr7=='T'){
           column+=8;
-          rptr+=8;
-          FXTRACE((1,"<!ATTLIST\n"));
-          sptr=rptr;
+          sptr+=8;
+          FXTRACE((101,"<!ATTLIST\n"));
+          rptr=sptr;
           continue;
           }
-        if(rptr1=='!' && rptr2=='E' && rptr3=='N' && rptr4=='T' && rptr5=='I' && rptr6=='T' && rptr7=='Y'){
+        if(sptr1=='!' && sptr2=='E' && sptr3=='N' && sptr4=='T' && sptr5=='I' && sptr6=='T' && sptr7=='Y'){
           column+=8;
-          rptr+=8;
-          FXTRACE((1,"<!ENTITY\n"));
-          sptr=rptr;
+          sptr+=8;
+          FXTRACE((101,"<!ENTITY\n"));
+          rptr=sptr;
           continue;
           }
-        if(rptr1=='!' && rptr2=='N' && rptr3=='O' && rptr4=='T' && rptr5=='A' && rptr6=='T' && rptr7=='I' && rptr8=='O' && rptr9=='N'){
+        if(sptr1=='!' && sptr2=='N' && sptr3=='O' && sptr4=='T' && sptr5=='A' && sptr6=='T' && sptr7=='I' && sptr8=='O' && sptr9=='N'){
           column+=10;
-          rptr+=10;
-          FXTRACE((1,"<!NOTATION\n"));
-          sptr=rptr;
+          sptr+=10;
+          FXTRACE((101,"<!NOTATION\n"));
+          rptr=sptr;
           continue;
           }
 #endif
 //        return ErrToken;
       default:
         column++;
-        rptr++;
+        offset++;
+        sptr++;
 //        return ErrToken;
         }
       }
@@ -1197,8 +1246,8 @@
   FXString docname;
   spaces();
   if(name()){
-    docname.assign(sptr,rptr-sptr);
-    FXTRACE((10,"docname=%s\n",docname.text()));
+    docname.assign(rptr,sptr-rptr);
+    FXTRACE((101,"docname=%s\n",docname.text()));
     if((err=parseexternalid())!=ErrOK) return err;
     if((err=parseinternalsubset())!=ErrOK) return err;
     spaces();
@@ -1214,38 +1263,46 @@
   FXString target;
   FXString data;
   if(name()){
-    target.assign(sptr,rptr-sptr);
-    sptr=rptr;                          // Start of processing instruction data
+    target.assign(rptr,sptr-rptr);
+    rptr=sptr;                          // Start of processing instruction data
     while(need(MAXTOKEN)){
-      switch(rptr0){
+      switch(sptr0){
       case '\t':
         column+=(8-column%8);
-        rptr++;
+        offset++;
+        sptr++;
         continue;
+      case '\r':
+        if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
       case '\n':
         column=0;
+        offset++;
         line++;
-        rptr++;
+        sptr++;
         continue;
       case ' ':
         column++;
-      case '\r':
-        rptr++;
+      case '\v':
+      case '\f':
+        offset++;
+        sptr++;
         continue;
       case '?':
-        if(rptr1!='>') goto nxt;      // Just a lone '?'
-        data.append(sptr,rptr-sptr);    // Add last chunk of processing instruction
+        if(sptr1!='>') goto nxt;      // Just a lone '?'
+        data.append(rptr,sptr-rptr);    // Add last chunk of processing instruction
         column+=2;
-        rptr+=2;
-        sptr=rptr;
+        offset+=2;
+        sptr+=2;
+        rptr=sptr;
         return processingCB(target,data);
       default:
-nxt:    if((rptr-sptr)>=(endptr-begptr-MAXTOKEN)){
-          data.append(sptr,rptr-sptr);  // Add another chunk
-          sptr=rptr;
+nxt:    if((sptr-rptr)>=(endptr-begptr-MAXTOKEN)){
+          data.append(rptr,sptr-rptr);  // Add another chunk
+          rptr=sptr;
           }
-        rptr=wcinc(rptr);               // Next wide character
-        column++;
+        column+=FXISUTF8(*sptr);        // Increment if UTF8 leader only
+        offset++;
+        sptr++;
         continue;
         }
       }
@@ -1258,38 +1315,46 @@
 // Scan comment
 FXXML::Error FXXML::parsecomment(){
   FXString text;
-  sptr=rptr;
+  rptr=sptr;
   while(need(MAXTOKEN)){
-    switch(rptr0){
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
       line++;
-      rptr++;
+      sptr++;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       continue;
     case '-':
-      if(rptr1!='-') goto nxt;        // Just a lone '-'
-      if(rptr2!='>') goto nxt;        // Allow a '--' inside a comment; technically, not spec
-      text.append(sptr,rptr-sptr);      // Pass comment undecoded
+      if(sptr1!='-') goto nxt;        // Just a lone '-'
+      if(sptr2!='>') goto nxt;        // Allow a '--' inside a comment; technically, not spec
+      text.append(rptr,sptr-rptr);      // Pass comment undecoded
       column+=3;
-      rptr+=3;
-      sptr=rptr;
+      offset+=3;
+      sptr+=3;
+      rptr=sptr;
       return commentCB(text);
     default:
-nxt:  if((rptr-sptr)>=(endptr-begptr-MAXTOKEN)){
-        text.append(sptr,rptr-sptr);    // Pass comment undecoded
-        sptr=rptr;
+nxt:  if((sptr-rptr)>=(endptr-begptr-MAXTOKEN)){
+        text.append(rptr,sptr-rptr);    // Pass comment undecoded
+        rptr=sptr;
         }
-      rptr=wcinc(rptr);                 // Next wide character
-      column++;
+      column+=FXISUTF8(*sptr);          // Increment if UTF8 leader only
+      offset++;
+      sptr++;
       continue;
       }
     }
@@ -1303,7 +1368,7 @@
   FXString value;
   FXString key;
   if(name()){
-    key.assign(sptr,rptr-sptr);
+    key.assign(rptr,sptr-rptr);
     spaces();
     if(!match('=')) return ErrEquals;
     spaces();
@@ -1320,34 +1385,42 @@
 FXXML::Error FXXML::parsestarttag(Element& elm){
   FXXML::Error err;
   if(!name()) return ErrName;
-  elm.name.assign(sptr,rptr-sptr);
+  elm.name.assign(rptr,sptr-rptr);
   while(need(MAXTOKEN)){
-    sptr=rptr;
-    switch(rptr0){
+    rptr=sptr;
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
       line++;
-      rptr++;
+      sptr++;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       continue;
     case '/':
-      if(rptr1!='>') return ErrToken; // Improper empty tag syntax
+      if(sptr1!='>') return ErrToken; // Improper empty tag syntax
       elm.empty=true;
       column+=2;
-      rptr+=2;
+      offset+=2;
+      sptr+=2;
       return ErrOK;                     // End of empty stag element
     case '>':
       elm.empty=false;
       column++;
-      rptr++;
+      offset++;
+      sptr++;
       return ErrOK;                     // End of stag
     default:
       if((err=parseattribute(elm))!=ErrOK) return err;
@@ -1362,25 +1435,32 @@
 FXXML::Error FXXML::parseendtag(Element& elm){
   if(!match(elm.name.text(),elm.name.length())) return ErrNoMatch;
   while(need(MAXTOKEN)){
-    sptr=rptr;
-    switch(rptr0){
+    rptr=sptr;
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
       line++;
-      rptr++;
+      sptr++;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       continue;
     case '>':
       column++;
-      rptr++;
+      offset++;
+      sptr++;
       return ErrOK;                     // End of etag
     default:
       return ErrToken;
@@ -1394,40 +1474,48 @@
 FXXML::Error FXXML::parsecdata(Element& elm){
   FXXML::Error err;
   FXString text;
-  sptr=rptr;
+  rptr=sptr;
   while(need(MAXTOKEN)){
-    switch(rptr0){
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
       line++;
-      rptr++;
+      sptr++;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       continue;
     case '':
-      if(rptr1!='') goto nxt;
-      if(rptr2!='>') goto nxt;
-      if(!FXXML::decode(text,FXString(sptr,rptr-sptr),CRLF)) return ErrToken;
+      if(sptr1!='') goto nxt;
+      if(sptr2!='>') goto nxt;
+      if(!FXXML::decode(text,FXString(rptr,sptr-rptr),CRLF)) return ErrToken;
       if((err=charactersCB(text))!=ErrOK) return err;
       column+=3;
-      rptr+=3;
-      sptr=rptr;
+      offset+=3;
+      sptr+=3;
+      rptr=sptr;
       return ErrOK;
     default:
-nxt:  if((rptr-sptr)>=(endptr-begptr-MAXTOKEN)){
-        if(!FXXML::decode(text,FXString(sptr,rptr-sptr),CRLF)) return ErrToken;
+nxt:  if((sptr-rptr)>=(endptr-begptr-MAXTOKEN)){
+        if(!FXXML::decode(text,FXString(rptr,sptr-rptr),CRLF)) return ErrToken;
         if((err=charactersCB(text))!=ErrOK) return err;
-        sptr=rptr;
+        rptr=sptr;
         }
-      rptr=wcinc(rptr);                 // Next wide character
-      column++;
+      column+=FXISUTF8(*sptr);          // Increment if UTF8 leader only
+      offset++;
+      sptr++;
       continue;
       }
     }
@@ -1440,102 +1528,116 @@
   FXXML::Error err;
   FXString text;
   FXint brk=1;                          // Allow break
-  sptr=rptr;
+  rptr=sptr;
   while(need(MAXTOKEN)){
-    switch(rptr0){
+    switch(sptr0){
     case '\t':
       column+=(8-column%8);
-      rptr++;
+      offset++;
+      sptr++;
       brk=1;
       continue;
+    case '\r':
+      if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
     case '\n':
       column=0;
+      offset++;
       line++;
-      rptr++;
+      sptr++;
       brk=1;
       continue;
     case ' ':
       column++;
-    case '\r':
-      rptr++;
+    case '\v':
+    case '\f':
+      offset++;
+      sptr++;
       brk=1;
       continue;
     case '&':                           // Disallow break in character reference
       column++;
-      rptr++;
+      offset++;
+      sptr++;
       brk=0;
       continue;
     case ';':                           // Allow break now
       column++;
-      rptr++;
+      offset++;
+      sptr++;
       brk=1;
       continue;
     case '<':
       brk=1;
 
       // Try decode, translate both CRLF and references
-      if(!FXXML::decode(text,FXString(sptr,rptr-sptr),CRLF|REFS)) return ErrToken;
+      if(!FXXML::decode(text,FXString(rptr,sptr-rptr),CRLF|REFS)) return ErrToken;
 
       // Report final batch of characters
       if((err=charactersCB(text))!=ErrOK) return err;
 
       // Eat text
-      sptr=rptr;
+      rptr=sptr;
 
       // End tag
-      if(rptr1=='/'){
+      if(sptr1=='/'){
         column+=2;
-        rptr+=2;
+        offset+=2;
+        sptr+=2;
         return ErrOK;
         }
 
       // Processing instruction
-      if(rptr1=='?'){
+      if(sptr1=='?'){
         column+=2;
-        rptr+=2;
+        offset+=2;
+        sptr+=2;
         if((err=parseprocessing())!=ErrOK) return err;
         continue;
         }
 
       // Comment
-      if(rptr1=='!' && rptr2=='-' && rptr3=='-'){
+      if(sptr1=='!' && sptr2=='-' && sptr3=='-'){
         column+=4;
-        rptr+=4;
+        offset+=4;
+        sptr+=4;
         if((err=parsecomment())!=ErrOK) return err;
         continue;
         }
 
       // CDATA segment
-      if(rptr1=='!' && rptr2=='' && rptr3=='C' && rptr4=='D' && rptr5=='A' && rptr6=='T' && rptr7=='A' && rptr8==''){
+      if(sptr1=='!' && sptr2=='' && sptr3=='C' && sptr4=='D' && sptr5=='A' && sptr6=='T' && sptr7=='A' && sptr8==''){
         column+=9;
-        rptr+=9;
+        offset+=9;
+        sptr+=9;
         if((err=parsecdata(elm))!=ErrOK) return err;
         continue;
         }
 
       // Just eat the '<'
       column++;
-      rptr++;
+      offset++;
+      sptr++;
 
       // Parse child element
       if((err=parseelement())!=ErrOK) return err;
 
-      sptr=rptr;
+      rptr=sptr;
       continue;
     default:
-      if(brk && (rptr-sptr)>=(endptr-begptr-MAXTOKEN)){
+      if(brk && (sptr-rptr)>=(endptr-begptr-MAXTOKEN)){
 
         // Try decode, translate both CRLF and references
-        if(!FXXML::decode(text,FXString(sptr,rptr-sptr),CRLF|REFS)) return ErrToken;
+        if(!FXXML::decode(text,FXString(rptr,sptr-rptr),CRLF|REFS)) return ErrToken;
 
         // Report batch of characters
         if((err=charactersCB(text))!=ErrOK) return err;
 
         // Eat text
-        sptr=rptr;
+        rptr=sptr;
         }
-      rptr=wcinc(rptr);                 // Next wide character
-      column++;
+      column+=FXISUTF8(*sptr);          // Increment if UTF8 leader only
+      offset++;
+      sptr++;
       continue;
       }
     }
@@ -1578,61 +1680,72 @@
   current=NULL;
   if(need(MAXTOKEN)){
     enc=guess();
-    FXTRACE((10,"encoding=%s\n",encodingNameenc));
+    FXTRACE((101,"encoding=%s\n",encodingNameenc));
     while(need(MAXTOKEN)){
-      sptr=rptr;
-      switch(rptr0){
+      rptr=sptr;
+      switch(sptr0){
       case '\t':
         column+=(8-column%8);
-        rptr++;
+        offset++;
+        sptr++;
         continue;
+      case '\r':
+        if(sptr+1<wptr && sptr1=='\n'){ offset++; sptr++; }
       case '\n':
         column=0;
+        offset++;
         line++;
-        rptr++;
+        sptr++;
         continue;
       case ' ':
         column++;
-      case '\r':
-        rptr++;
+      case '\v':
+      case '\f':
+        offset++;
+        sptr++;
         continue;
       case '<':
 
         // Parse comment
-        if(rptr1=='!' && rptr2=='-' && rptr3=='-'){
+        if(sptr1=='!' && sptr2=='-' && sptr3=='-'){
           column+=4;
-          rptr+=4;
+          offset+=4;
+          sptr+=4;
           if((err=parsecomment())!=ErrOK) return err;
           continue;
           }
 
         // Parse document type declarations
-        if(rptr1=='!' && rptr2=='D' && rptr3=='O' && rptr4=='C' && rptr5=='T' && rptr6=='Y' && rptr7=='P' && rptr8=='E' && spaceChar(rptr9)){
+        if(sptr1=='!' && sptr2=='D' && sptr3=='O' && sptr4=='C' && sptr5=='T' && sptr6=='Y' && sptr7=='P' && sptr8=='E' && spaceChar(sptr9)){
           column+=9;
-          rptr+=9;
+          offset+=9;
+          sptr+=9;
           if((err=parsedeclarations())!=ErrOK) return err;
           continue;
           }
 
         // Parse XML declaration
-        if(rptr1=='?' && rptr2=='x' && rptr3=='m' && rptr4=='l' && spaceChar(rptr5)){
+        if(sptr1=='?' && sptr2=='x' && sptr3=='m' && sptr4=='l' && spaceChar(sptr5)){
           column+=5;
-          rptr+=5;
+          offset+=5;
+          sptr+=5;
           if((err=parsexml())!=ErrOK) return err;
           continue;
           }
 
         // Parse processing instruction
-        if(rptr1=='?'){
+        if(sptr1=='?'){
           column+=2;
-          rptr+=2;
+          offset+=2;
+          sptr+=2;
           if((err=parseprocessing())!=ErrOK) return err;
           continue;
           }
 
         // Just eat the '<'
         column++;
-        rptr++;
+        offset++;
+        sptr++;
 
         // Report document start
         if((err=startDocumentCB())!=ErrOK) return err;
@@ -1657,20 +1770,24 @@
 
 // Close it
 FXbool FXXML::close(){
-  FXTRACE((2,"XML::close()\n"));
+  FXTRACE((101,"XML::close()\n"));
   if(dir!=Stop){
-    if((dir==Load) || flush()){
-      if(owns){ freeElms(begptr); }
+    if((dir==Load) || 0<=flush(0)){             // Error during final flush is possible
       begptr=NULL;
       endptr=NULL;
-      sptr=NULL;
       rptr=NULL;
+      sptr=NULL;
       wptr=NULL;
       current=NULL;
       dir=Stop;
-      enc=UTF8;
       return true;
       }
+    begptr=NULL;
+    endptr=NULL;
+    wptr=NULL;
+    rptr=NULL;
+    sptr=NULL;
+    dir=Stop;
     }
   return false;
   }
@@ -1678,7 +1795,7 @@
 
 // Clean up
 FXXML::~FXXML(){
-  FXTRACE((1,"FXXML::~FXXML\n"));
+  FXTRACE((100,"FXXML::~FXXML\n"));
   close();
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/FXXMLFile.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXXMLFile.cpp Changed

@@ -3,7 +3,7 @@
 *                             X M L - F i l e   I / O                           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2016,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -57,25 +57,32 @@
 
 // Create XML file i/o object
 FXXMLFile::FXXMLFile(){
-  FXTRACE((1,"FXXMLFile::FXXMLFile\n"));
+  FXTRACE((100,"FXXMLFile::FXXMLFile\n"));
   }
 
 
 // Create XML file i/o object and open it
 FXXMLFile::FXXMLFile(const FXString& filename,Direction d,FXuval sz){
-  FXTRACE((1,"FXXMLFile::FXXMLFile(\"%s\",%s,%lu)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
+  FXTRACE((100,"FXXMLFile::FXXMLFile(\"%s\",%s,%lu)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
   open(filename,d,sz);
   }
 
 
 // Open archive for operation
 FXbool FXXMLFile::open(FXInputHandle h,Direction d,FXuval sz){
-  FXTRACE((2,"FXXMLFile::open(%lx,%s,%lu)\n",h,(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
-  if(FXXML::open(NULL,sz,d)){
+  FXTRACE((101,"FXXMLFile::open(%lx,%s,%lu)\n",h,(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
+  FXchar *buffer;
+  if(allocElms(buffer,sz)){
     if(file.open(h,(d==Save)?FXIO::Writing:FXIO::Reading)){
-      return true;
+      if(FXXML::open(buffer,sz,d)){
+        rptr=endptr;
+        sptr=endptr;
+        wptr=endptr;
+        return true;
+        }
+      file.close();
       }
-    close();
+    freeElms(buffer);
     }
   return false;
   }
@@ -83,59 +90,69 @@
 
 // Open archive for operation
 FXbool FXXMLFile::open(const FXString& filename,Direction d,FXuval sz){
-  FXTRACE((2,"FXXMLFile::open(\"%s\",%s,%lu)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
-  if(FXXML::open(NULL,sz,d)){
+  FXTRACE((101,"FXXMLFile::open(\"%s\",%s,%lu)\n",filename.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop",sz));
+  FXchar *buffer;
+  FXASSERT(dir==Stop);
+  if(allocElms(buffer,sz)){
     if(file.open(filename,(d==Save)?FXIO::Writing:FXIO::Reading,FXIO::AllReadWrite)){
-      return true;
+      if(FXXML::open(buffer,sz,d)){
+        rptr=endptr;
+        sptr=endptr;
+        wptr=endptr;
+        return true;
+        }
+      file.close();
       }
-    close();
+    freeElms(buffer);
     }
   return false;
   }
 
 
-// Fill buffer from file
-FXbool FXXMLFile::fill(){
-  register FXival n;
+// Read at least count bytes into buffer; return bytes available, or -1 for error
+FXival FXXMLFile::fill(FXival){
+  FXival nbytes;
+  FXASSERT(dir==Load);
   if(file.isReadable()){
-    if(sptr<wptr){ moveElms(begptr,sptr,wptr-sptr); }
-    wptr=begptr+(wptr-sptr);
-    rptr=begptr+(rptr-sptr);
-    sptr=begptr;
-    n=file.readBlock(wptr,endptr-wptr);
-    FXTRACE((2,"FXXMLFile::fill() = %ld\n",n));
-    if(0<=n){
-      wptr+=n;
+    moveElms(begptr,rptr,wptr-rptr);
+    wptr=begptr+(wptr-rptr);
+    sptr=begptr+(sptr-rptr);
+    rptr=begptr;
+    nbytes=file.readBlock(wptr,endptr-wptr);
+    if(0<=nbytes){
+      wptr+=nbytes;
       if(wptr<endptr){ wptr0='\0'; }
-      return rptr<wptr;         // Input left to read
+      return wptr-sptr;                         // Input left to read
       }
     }
-  return false;
+  return -1;
   }
 
 
-// Flush buffer to file
-FXbool FXXMLFile::flush(){
-  register FXival n;
+// Write at least count bytes from buffer; return space available, or -1 for error
+FXival FXXMLFile::flush(FXival){
+  FXival nbytes;
+  FXASSERT(dir==Save);
   if(file.isWritable()){
-    n=file.writeBlock(rptr,wptr-rptr);
-    FXTRACE((2,"FXXMLFile::flush() = %ld\n",n));
-    if(0<=n){
-      rptr+=n;
-      if(rptr<wptr){ moveElms(begptr,rptr,wptr-rptr); }
+    nbytes=file.writeBlock(rptr,wptr-rptr);
+    if(0<=nbytes){
+      rptr+=nbytes;
+      moveElms(begptr,rptr,wptr-rptr);
       wptr=begptr+(wptr-rptr);
       rptr=begptr;
-      return wptr<endptr;       // Space left to write
+      return endptr-wptr;                       // Space left to write
       }
     }
-  return false;
+  return -1;
   }
 
 
 // Close stream and delete buffers
 FXbool FXXMLFile::close(){
-  FXTRACE((2,"FXXMLFile::close()\n"));
+  FXchar *buffer=begptr;
+  FXTRACE((101,"FXXMLFile::close()\n"));
   if(FXXML::close()){
+    freeElms(buffer);
     return file.close();
     }
   return false;
@@ -144,7 +161,7 @@
 
 // Close XML file
 FXXMLFile::~FXXMLFile(){
-  FXTRACE((1,"FXXMLFile::~FXXMLFile\n"));
+  FXTRACE((100,"FXXMLFile::~FXXMLFile\n"));
   close();
   }

gogglesmm-1.2.2.tar.gz/cfox/lib/FXXMLString.cpp Added

@@ -0,0 +1,125 @@
+/********************************************************************************
+*                                                                               *
+*                             X M L   S t r i n g   I / O                       *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2016,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "fxunicode.h"
+#include "FXElement.h"
+#include "FXArray.h"
+#include "FXString.h"
+#include "FXStat.h"
+#include "FXFile.h"
+#include "FXException.h"
+#include "FXStringDictionary.h"
+#include "FXCallback.h"
+#include "FXXML.h"
+#include "FXXMLString.h"
+
+/*
+  Notes:
+
+  - XML Serialization to a string.
+  - Should default behaviour be to append to the given string instead of overwriting
+    it (if writing)?
+*/
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+// Create XML file i/o object
+FXXMLString::FXXMLString(){
+  FXTRACE((100,"FXXMLString::FXXMLString\n"));
+  }
+
+
+// Create XML file i/o object and open it
+FXXMLString::FXXMLString(const FXString& string,Direction d){
+  FXTRACE((100,"FXXMLString::FXXMLString(\"%.*s\",%s)\n",FXMIN(string.length(),16),string.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  open(string,d);
+  }
+
+
+// Create XML file i/o object and open it
+FXXMLString::FXXMLString(const FXchar* string,FXuval length,Direction d){
+  FXTRACE((100,"FXXMLString::FXXMLString(\"%.*s\",%lu,%s)\n",FXMIN(length,16),string,length,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  open(string,length,d);
+  }
+
+
+// Open XML for load or save
+FXbool FXXMLString::open(const FXString& string,Direction d){
+  FXTRACE((101,"FXXMLString::open(\"%.*s\",%s)\n",FXMIN(string.length(),16),string.text(),(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  FXASSERT(dir==Stop);
+  buffer=string;
+  if(FXXML::open(buffer.text(),buffer.length(),d)){
+    // wptr=endptr;             // Append to end of buffer
+    return true;
+    }
+  return false;
+  }
+
+
+// Open JSON character string of length for direction d
+FXbool FXXMLString::open(const FXchar* string,FXuval length,Direction d){
+  FXTRACE((101,"FXXMLString::open(\"%.*s\",%lu,%s)\n",FXMIN(length,16),string,length,(d==Save)?"Save":(d==Load)?"Load":"Stop"));
+  FXASSERT(dir==Stop);
+  buffer.assign(string,length);
+  if(FXXML::open(buffer.text(),buffer.length(),d)){
+    // wptr=endptr;             // Append to end of buffer
+    return true;
+    }
+  return false;
+  }
+
+
+// Read at least count bytes into buffer; return bytes available, or -1 for error
+FXival FXXMLString::fill(FXival){
+  FXASSERT(dir==Load);
+  if(dir==Load){
+    return wptr-sptr;
+    }
+  return -1;
+  }
+
+
+// Write at least count bytes from buffer; return space available, or -1 for error
+FXival FXXMLString::flush(FXival count){
+  FXASSERT(dir==Save);
+  if(dir==Save){
+    FXchar *oldptr=begptr;
+    buffer.length(buffer.length()+count);
+    begptr=buffer.text();
+    endptr=buffer.text()+buffer.length();
+    rptr=begptr+(rptr-oldptr);
+    sptr=begptr+(sptr-oldptr);
+    wptr=begptr+(wptr-oldptr);
+    return endptr-wptr;
+    }
+  return -1;
+  }
+
+
+// Close stream and delete buffers
+FXbool FXXMLString::close(){
+  FXTRACE((101,"FXXMLString::close()\n"));
+  return FXXML::close();
+  }
+
+
+// Close XML stream and clean up.
+FXXMLString::~FXXMLString(){
+  FXTRACE((100,"FXXMLString::~FXXMLString\n"));
+  close();
+  }
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/FXXPMIcon.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXXPMIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXXPMImage.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXXPMImage.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/FXhalf.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/FXhalf.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/dialmode.gif -> gogglesmm-1.2.2.tar.gz/cfox/lib/dialmode.gif Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxascii.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxascii.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxbase64.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxbase64.cpp Changed

@@ -3,7 +3,7 @@
 *              B a s e - 6 4    E n c o d i n g  /  D e c o d i n g             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2012,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2012,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -25,7 +25,8 @@
 /*
   Notes:
   - Encode/decode binary data to or from base64 ascii.
-  - Maybe add some code to limit number of columns to N.
+  - New implementation should be both faster and safer.
+  -
 */
 
 using namespace FX;
@@ -39,74 +40,123 @@
 static const FXchar encode="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 
-// Encode src to dst in base64
-FXint fxencode64(FXchar* dst,const FXchar* src,FXint len){
-  register FXchar* ptr=dst;
-  while(3<=len){
-    *ptr++=encode(src0>>2)&0x3f;
-    *ptr++=encode((src0&0x03)<<4)|((src1>>4)&0x0f);
-    *ptr++=encode((src1&0x0f)<<2)|((src2>>6)&0x03);
-    *ptr++=encodesrc2&0x3f;
+// Decode table
+static const FXuchar decode256={
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,  62, 128, 128, 128,  63,
+   52,  53,  54,  55,  56,  57,  58,  59,  60,  61, 128, 128, 128, 128, 128, 128,
+  128,   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+   15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25, 128, 128, 128, 128, 128,
+  128,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,
+   41,  42,  43,  44,  45,  46,  47,  48,  49,  50,  51, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128
+  };
+
+
+
+// Encode bytes from source src to destination dst using base64.
+// The encoding stops when all source bytes have been encoded or destination buffer
+// is full.  A pointer ptr past the last written byte is returned.
+// Each 3 bytes from source is encoded as 4 bytes to destination.  If source is not
+// a multiple of 3 bytes, last few bytes are encoded with '='.
+FXchar* fxencode64(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend){
+  FXchar* ptr=dst;
+  FXuchar c0,c1,c2;
+  while(ptr+3<dstend && src+2<srcend){  // Encode whole groups
+    c0=src0;
+    c1=src1;
+    c2=src2;
+    ptr0=encode(c0>>2)&0x3f;
+    ptr1=encode((c0<<4)|(c1>>4))&0x3f;
+    ptr2=encode((c1<<2)|(c2>>6))&0x3f;
+    ptr3=encodec2&0x3f;
     src+=3;
-    len-=3;
+    ptr+=4;
     }
-  if(0<len){
-    *ptr++=encode(src0>>2)&0x3f;
-    if(1<len){
-      *ptr++=encode((src0&0x03)<<4)|((src1>>4)&0x0f);
-      *ptr++=encode((src1&0x0f)<<2);
+  if(ptr+3<dstend && src<srcend){       // Encode partial group
+    c0=src0;
+    ptr0=encode(c0>>2)&0x3f;
+    if(src+1<srcend){
+      c1=src1;
+      ptr1=encode((c0<<4)|(c1>>4))&0x3f;
+      ptr2=encode(c1<<2)&0x3f;
       }
     else{
-      *ptr++=encode(src0&0x03)<<4;
-      *ptr++='=';
+      ptr1=encode(c0<<4)&0x3f;
+      ptr2='=';
       }
-    *ptr++='=';
+    ptr3='=';
+    ptr+=4;
+    }
+  if(ptr<dstend){                       // Terminate string
+    ptr0='\0';
     }
-  return ptr-dst;
+  return ptr;
   }
 
 
-// Decode table
-static const FXschar decode256={
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
-  52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
-  -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
-  -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-  41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
-  };
-
-
-// Decode src to dst from base64
-FXint fxdecode64(FXchar* dst,const FXchar* src,FXint len){
-  register FXuchar c0,c1,c2,c3;
-  register FXchar* ptr=dst;
-  while(4<=len){
-    if(decodec0=(FXuchar)src0<0) break;
-    if(decodec1=(FXuchar)src1<0) break;
-    if(decodec2=(FXuchar)src2<0) break;
-    if(decodec3=(FXuchar)src3<0) break;
-    *ptr++=((decodec0<<2)&0xfc)|((decodec1>>4)&0x03);
-    if(c2!='='){
-      *ptr++=((decodec1&0x0f)<<4)|((decodec2>>2)&0x0f);
-      if(c3!='='){
-        *ptr++=((decodec2&0x03)<<6)|(decodec3&0x3f);
-        }
-      }
+// Decode bytes from source src to destination dst using base64.
+// The decoding stops when all source bytes have been decoded, a illegal byte is
+// encountered, the end of the source is deteced, or when the destination buffer is
+// full.  A pointer ptr past the last written byte is returned.
+// Each 4 bytes from source is decoded to 3 bytes to destination, except at the end
+// where fewer bytes may be generated.
+FXchar* fxdecode64(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend){
+  const FXchar* end=src;
+  FXchar* ptr=dst;
+  FXuchar c0,c1,c2,c3;
+  while(end<srcend && decode(FXuchar)end0!=128){
+    ++end;
+    }
+  while(ptr+2<dstend && src+3<end){     // Decode whole group of 4
+    c0=src0;
+    c1=src1;
+    c2=src2;
+    c3=src3;
+    c0=decodec0;
+    c1=decodec1;
+    c2=decodec2;
+    c3=decodec3;
+    FXASSERT(c0<64 && c1<64 && c2<64 && c3<64);
+    ptr0=(c0<<2)|(c1>>4);
+    ptr1=(c1<<4)|(c2>>2);
+    ptr2=(c2<<6)|c3;
     src+=4;
-    len-=4;
+    ptr+=3;
+    }
+  if(ptr+1<dstend && src+2<end){        // Decode partial group of 3
+    c0=src0;
+    c1=src1;
+    c2=src2;
+    c0=decodec0;
+    c1=decodec1;
+    c2=decodec2;
+    FXASSERT(c0<64 && c1<64 && c2<64);
+    ptr0=(c0<<2)|(c1>>4);
+    ptr1=(c1<<4)|(c2>>2);
+    ptr+=2;
+    }
+  else if(ptr<dstend && src+1<end){     // Decode partial group of 2
+    c0=src0;
+    c1=src1;
+    c0=decodec0;
+    c1=decodec1;
+    FXASSERT(c0<64 && c1<64);
+    ptr0=(c0<<2)|(c1>>4);
+    ptr+=1;
+    }
+  if(ptr<dstend){                       // Terminate string
+    ptr0='\0';
     }
-  return ptr-dst;
+  return ptr;
   }
 
 }

gogglesmm-1.2.2.tar.gz/cfox/lib/fxbase85.cpp Added

@@ -0,0 +1,165 @@
+/********************************************************************************
+*                                                                               *
+*              B a s e - 8 5    E n c o d i n g  /  D e c o d i n g             *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+
+/*
+  Notes:
+  - Encode/decode binary data to or from ascii85.
+  - Could do with some error checking; encode can't fail, but decode can,
+    if input character is not in expected set, what do we do? suggest we
+    skip it, maybe.
+  - Which base85 is most useful? Adobe, rfc1924, Z85,
+  - 85^5 = 4384852500, which is just larger than 256^4=4294967295; thus, 5
+    bytes needed to encode each 4 bytes.
+
+*/
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+
+// Ascii85 encoding table
+static const FXchar encode86="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~";
+
+
+// Ascii85 decoding table
+static const FXuchar decode256={
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128,  62, 128,  63,  64,  65,  66, 128,  67,  68,  69,  70, 128,  71, 128, 128,
+    0,   1,   2,   3,   4,   5,   6,   7,   8,   9, 128,  72,  73,  74,  75,  76,
+   77,  10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,
+   25,  26,  27,  28,  29,  30,  31,  32,  33,  34,  35, 128, 128, 128,  78,  79,
+   80,  36,  37,  38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  50,
+   51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,  81,  82,  83,  84, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+  };
+
+
+// Encode src to dst in base85, each 4 bytes is encoded as 5 ascii bytes
+FXchar* fxencode85(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend){
+  FXchar* ptr=dst;
+  FXuchar c0,c1,c2,c3,c4;
+  FXuint value;
+  while(ptr+4<dstend && src+3<srcend){  // Encode whole groups
+    c0=src0;
+    c1=src1;
+    c2=src2;
+    c3=src3;
+    value=(c0<<24)|(c1<<16)|(c2<<8)|c3;
+    c0=value/52200625;                  // No modulo needed
+    c1=(value/614125)%85;
+    c2=(value/7225)%85;
+    c3=(value/85)%85;
+    c4=value%85;
+    ptr0=encodec0;
+    ptr1=encodec1;
+    ptr2=encodec2;
+    ptr3=encodec3;
+    ptr4=encodec4;
+    src+=4;
+    ptr+=5;
+    }
+  if(ptr+4<dstend && src<srcend){       // Encode partial group
+    c0=src0;
+    c1=0;
+    c2=0;
+    if(src+1<srcend){
+      c1=src1;
+      if(src+2<srcend){
+        c2=src2;
+        }
+      }
+    value=(c0<<24)|(c1<<16)|(c2<<8);
+    c0=value/52200625;                  // No modulo needed
+    c1=(value/614125)%85;
+    c2=(value/7225)%85;
+    c3=(value/85)%85;
+    c4=value%85;
+    ptr0=encodec0;
+    ptr1=encodec1;
+    ptr2=encodec2;
+    ptr3=encodec3;
+    ptr4=encodec4;
+    ptr+=5;
+    }
+  if(ptr<dstend){                       // Terminate string
+    ptr0='\0';
+    }
+  return ptr;
+  }
+
+
+// Decode src to dst from base85; assume input is a multiple of 5,
+// and output a whole multiple of 4.
+FXchar* fxdecode85(FXchar* dst,FXchar* dstend,const FXchar* src,const FXchar* srcend){
+  const FXchar* end=src;
+  FXchar* ptr=dst;
+  FXuchar c0,c1,c2,c3,c4;
+  FXuint value;
+  while(end<srcend && decode(FXuchar)end0!=128){
+    ++end;
+    }
+  while(ptr+3<dstend && src+4<end){     // Decode whole group of 4
+    c0=src0;
+    c1=src1;
+    c2=src2;
+    c3=src3;
+    c4=src4;
+    c0=decodec0;
+    c1=decodec1;
+    c2=decodec2;
+    c3=decodec3;
+    c4=decodec4;
+    value=((c0*85+c1)*85+c2)*85+c3;
+    if(value>=50529027 && (value+c4)>50529027) break;   // Overflow check
+    value=value*85+c4;
+    c0=value>>24;
+    c1=value>>16;
+    c2=value>>8;
+    c3=value;
+    ptr0=c0;
+    ptr1=c1;
+    ptr2=c2;
+    ptr3=c3;
+    src+=5;
+    ptr+=4;
+    }
+  if(ptr<dstend){                       // Terminate string
+    ptr0='\0';
+    }
+  return ptr;
+  }
+
+}
+

gogglesmm-1.2.1.tar.gz/cfox/lib/fxbmpio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxbmpio.cpp Changed

@@ -3,7 +3,7 @@
 *                          B M P   I n p u t / O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -355,7 +355,7 @@
 static FXbool fxsaveBMPBits(FXStream& store,const FXColor* data,FXint width,FXint height,FXint bpp){
   const FXuchar padding3={0,0,0};
   FXuchar pad,r,g,b,a;
-  register FXint x,y;
+  FXint x,y;
 
   // Handle various depths
   switch(bpp){
@@ -395,7 +395,7 @@
 
 // Load icon bits
 static FXbool fxloadICOBits(FXStream& store,FXColor*& data,FXint width,FXint height,FXint bpp,FXint enc,FXint clrs,FXint fmt){
-  register FXint x,y,pad; FXuchar c;
+  FXint x,y,pad; FXuchar c;
 
   // Load pixels (XOR bytes)
   if(fxloadBMPBits(store,data,width,height,bpp,enc,clrs,fmt)){

gogglesmm-1.2.1.tar.gz/cfox/lib/fxcompose.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxcompose.cpp Changed

@@ -3,7 +3,7 @@
 *       C o m p o s e  /  D e c o m p o s e   U n i c o d e   S t r i n g       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2018 by Jeroen van der Zijp.   All Rights Reserved.             *
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -32,7 +32,7 @@
 
 /*
   Notes:
-  - Compose or decompose UTF8 unicode strings.
+  - Compose or decompose diacritics in UTF8 unicode strings.
 */
 
 
@@ -58,8 +58,8 @@
 
 // Decompose hangul method, if it is hangul (from TR# 15)
 static FXint decomposehangul(FXwchar *result,FXwchar w){
-  register FXwchar SIndex=w-SBase;
-  register FXwchar L,V,T;
+  FXwchar SIndex=w-SBase;
+  FXwchar L,V,T;
   if(0<=SIndex && SIndex<SCount){
     L=LBase+SIndex/NCount;
     V=VBase+(SIndex%NCount)/TCount;
@@ -79,8 +79,8 @@
 
 // Compose hangul in situ; return new length (from TR# 15)
 static FXint composehangul(FXwchar *result,FXint len){
-  register FXwchar w,last,LIndex,VIndex,SIndex,TIndex;
-  register FXint p,q;
+  FXwchar w,last,LIndex,VIndex,SIndex,TIndex;
+  FXint p,q;
   if(0<len){
     last=result0;
     for(p=q=1; q<len; q++){
@@ -124,10 +124,10 @@
 
 // Recursive decomposition of type kind
 static FXint decomposerecursive(FXwchar *result,FXwchar w,FXbool canonical){
-  register const FXwchar* decomposition=Unicode::charDecompose(w);
+  const FXwchar* decomposition=Unicode::charDecompose(w);
   if(decomposition-2 && ((decomposition-2==DecomposeCanonical) || !canonical)){
-    register FXint p=0;
-    register FXint n=0;
+    FXint p=0;
+    FXint n=0;
     while(p<decomposition-1){
       n+=decomposerecursive(result+n,decompositionp++,canonical);
       }
@@ -138,9 +138,9 @@
 
 
 // Canonicalize wide character string s, by rearranging combining marks
-static FXwchar *normalize(FXwchar* result,FXint len){
-  register FXwchar uf,us,cf,cs;
-  register FXint p=0;
+static FXwchar *strnormalize(FXwchar* result,FXint len){
+  FXwchar uf,us,cf,cs;
+  FXint p=0;
   while(p+1<len){
 
     // Second character is a starter; advance by 2
@@ -171,9 +171,9 @@
 
 
 // Compose characters from canonical/compatible decomposition
-static FXint compose(FXwchar* result,FXint len){
-  register FXint p,q,cc,starterpos,startercc;
-  register FXwchar w;
+static FXint strcompose(FXwchar* result,FXint len){
+  FXint p,q,cc,starterpos,startercc;
+  FXwchar w;
   if(0<len){
     starterpos=0;
     startercc=0;
@@ -184,11 +184,12 @@
         for(p=q+1; p<len; p++) resultp-1=resultp;
         len--;
         q--;
-        if(q==starterpos)
+        if(q==starterpos){
           startercc=0;
-        else
+          }
+        else{
           startercc=Unicode::charCombining(resultq-1);
-
+          }
         continue;
         }
       if(cc==0) starterpos=q;
@@ -200,12 +201,12 @@
 
 
 // Return normalized string
-FXString normalize(const FXString& s){
+FXString FXString::normalize(const FXString& s){
   FXwchar* wcs=(FXwchar*)::malloc(s.length()*sizeof(FXwchar));
   FXString result;
   if(wcs){
-    FXint n=utf2wcs(wcs,s.text(),s.length(),s.length());
-    normalize(wcs,n);
+    FXint n=utf2wcs(wcs,s.text(),s.length());
+    strnormalize(wcs,n);
     result.assign(wcs,n);
     ::free(wcs);
     }
@@ -217,19 +218,19 @@
 // the length of the worst recursive decomposition (18).  If unicode
 // tables change, make sure this code is updated.   We have an assert
 // just in case.
-FXString decompose(const FXString& s,FXbool canonical){
+FXString FXString::decompose(const FXString& s,FXbool canonical){
   FXwchar* wcs=(FXwchar*)::malloc(s.length()*sizeof(FXwchar)*18);
   FXString result;
   if(wcs){
     FXwchar* ptr=wcs+s.length()*17;
-    FXint m=utf2wcs(ptr,s.text(),s.length(),s.length());
+    FXint m=utf2wcs(ptr,s.text(),s.length());
     FXint p=0;
     FXint n=0;
     while(p<m){
       n+=decomposerecursive(&wcsn,ptrp++,canonical);
       }
     FXASSERT(n<=s.length()*18);
-    normalize(wcs,n);
+    strnormalize(wcs,n);
     result.assign(wcs,n);
     ::free(wcs);
     }
@@ -238,20 +239,20 @@
 
 
 // Return normalized composition of string, as utf8
-FXString compose(const FXString& s,FXbool canonical){
+FXString FXString::compose(const FXString& s,FXbool canonical){
   FXwchar* wcs=(FXwchar*)::malloc(s.length()*sizeof(FXwchar)*18);
   FXString result;
   if(wcs){
     FXwchar* ptr=wcs+s.length()*17;
-    FXint m=utf2wcs(ptr,s.text(),s.length(),s.length());
+    FXint m=utf2wcs(ptr,s.text(),s.length());
     FXint p=0;
     FXint n=0;
     while(p<m){
       n+=decomposerecursive(&wcsn,ptrp++,canonical);
       }
     FXASSERT(n<=s.length()*18);
-    normalize(wcs,n);
-    n=compose(wcs,n);
+    strnormalize(wcs,n);
+    n=strcompose(wcs,n);
     result.assign(wcs,n);
     ::free(wcs);
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxcpuid.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxcpuid.cpp Changed

@@ -3,7 +3,7 @@
 *                              C P U I D   S u p p o r t                        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -21,6 +21,7 @@
 #include "xincs.h"
 #include "fxver.h"
 #include "fxdefs.h"
+#include "fxmath.h"
 #include "fxcpuid.h"
 
 
@@ -42,20 +43,20 @@
 
 // Return number of levels of CPUID feature-requests supported
 FXuint fxCPUCaps(FXuint level){
-#if defined(WIN32) && (_MSC_VER >= 1400)
+#if defined(WIN32) && (defined(_M_IX86) || defined(_M_X64)) && (_MSC_VER >= 1500)
   FXint features4;
   level&=0x80000000;
   __cpuid(features,level);
   return features0+1;
 #elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__i686__))
-  register FXuint eax,ebx,ecx,edx;
+  FXuint eax,ebx,ecx,edx;
   level&=0x80000000;
   __asm__ __volatile__("xchgl %%ebx, %1 \n\t"  \
                        "cpuid           \n\t"  \
                        "xchgl %%ebx, %1 \n\t"  : "=a"(eax), "=r"(ebx), "=c"(ecx), "=d"(edx) : "0" (level) : "cc");
   return eax+1;
 #elif ((defined(__GNUC__) || defined(__INTEL_COMPILER)) && defined(__x86_64__))
-  register FXuint eax,ebx,ecx,edx;
+  FXuint eax,ebx,ecx,edx;
   level&=0x80000000;
   __asm__ __volatile__("cpuid \n\t" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) : "0" (level) : "cc");
   return eax+1;
@@ -66,7 +67,7 @@
 
 // Get CPU info
 FXbool fxCPUGetCaps(FXuint level,FXuint features){
-#if defined(WIN32) && (_MSC_VER >= 1400)
+#if defined(WIN32) && (defined(_M_IX86) || defined(_M_X64)) && (_MSC_VER >= 1500)
   if(level<fxCPUCaps(level)){
     __cpuid((int*)features,level);
     return true;
@@ -90,7 +91,7 @@
 
 // Get CPU info
 FXbool fxCPUGetXCaps(FXuint level,FXuint count,FXuint features){
-#if defined(WIN32) && (_MSC_VER >= 1400)
+#if defined(WIN32) && (defined(_M_IX86) || defined(_M_X64)) && (_MSC_VER >= 1500)
   if(level<fxCPUCaps(level)){
    __cpuidex((int*)features,level,count);
     return true;
@@ -138,7 +139,7 @@
       __asm__ __volatile__(".byte 0x0f,0x01,0xd0" : "=a" (lo), "=d" (hi) : "c" (0));    // XGETBV ecx=0
       if((lo&6)==6) blank=0;                            // Don't blank out AVX, AVX2, FMA, FMA4, XOP later
 #endif
-// __xgetbv(0); // For _MSC_VER
+// _xgetbv(0); // For _MSC_VER
       }
     if(fxCPUGetXCaps(7,0,features)){
       if(FXBIT(features1,3)) caps|=CPU_HAS_BMI1;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxddsio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxddsio.cpp Changed

@@ -3,7 +3,7 @@
 *                          D D S   I n p u t / O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -422,7 +422,7 @@
 // Undo premultiplied alpha
 // The math: 255*X = (255*R * 255*A)/255, so 255*R = 255*X*255 / 255*A
 static void dds_correct_color(FXuchar *image,FXuint size){
-  register FXuint i,a;
+  FXuint i,a;
   for(i=0; i<size; i+=4){
     if((a=imagei+3)>0){
       imagei+0=(imagei+0*255)/a;
@@ -435,7 +435,7 @@
 
 // Swizzle red and alpha for RXGB
 static void dds_correct_swizzle(FXuchar *image,FXuint size){
-  register FXuint i;
+  FXuint i;
   for(i=0; i<size; i+=4){
     imagei+2^=imagei+3;
     imagei+3^=imagei+2;
@@ -446,10 +446,10 @@
 
 // Decompress DXT1/BC1 image
 static FXbool dds_decompress_DXT1(const DDSImage& dds,FXuchar *image){
-  register const FXuchar *temp=dds.data;
-  register FXuint x,y,z,i,j,select,bitmask,offset;
-  register FXuchar r0,g0,b0,r1,g1,b1;
-  register FXushort c0,c1;
+  const FXuchar *temp=dds.data;
+  FXuint x,y,z,i,j,select,bitmask,offset;
+  FXuchar r0,g0,b0,r1,g1,b1;
+  FXushort c0,c1;
   FXuchar colors44;
 
   FXTRACE((100,"dds_decompress_DXT1\n"));
@@ -532,10 +532,10 @@
 
 // Decompress DXT3/BC2 image
 static FXbool dds_decompress_DXT3(const DDSImage& dds,FXuchar *image){
-  register FXuchar *temp=dds.data;
-  register FXuint x,y,z,i,j,select,bitmask,offset;
-  register FXuchar r0,g0,b0,r1,g1,b1;
-  register FXushort c0,c1;
+  FXuchar *temp=dds.data;
+  FXuint x,y,z,i,j,select,bitmask,offset;
+  FXuchar r0,g0,b0,r1,g1,b1;
+  FXushort c0,c1;
   FXuchar colors44;
   FXuchar alpha44;
 
@@ -637,15 +637,15 @@
 
 // Decompress DXT5/BC3 image
 static FXbool dds_decompress_DXT5(const DDSImage& dds,FXuchar *image){
-  register FXuchar *temp=dds.data;
-  register FXuint x,y,z,i,j,select,bitmask,bits,offset;
-  register FXuchar r0,g0,b0,r1,g1,b1;
-  register FXushort c0,c1;
+  FXuchar *temp=dds.data;
+  FXuint x,y,z,i,j,select,bitmask,bits,offset;
+  FXuchar r0,g0,b0,r1,g1,b1;
+  FXushort c0,c1;
   FXuchar colors44;
   FXuchar levels8;
   FXuchar alpha44;
 
-  FXTRACE((100,"dds_decompress_DXT5\n"));
+  FXTRACE((150,"dds_decompress_DXT5\n"));
 
   // Loop over 4x4 blocks
   for(z=0; z<dds.header.dwDepth; z+=1){
@@ -774,11 +774,11 @@
 
 // Decompress BC4 (ATI1) image
 static FXbool dds_decompress_BC4(const DDSImage& dds,FXuchar *image){
-  register FXuchar *temp=dds.data;
-  register FXuint x,y,z,i,j,bits,offset;
+  FXuchar *temp=dds.data;
+  FXuint x,y,z,i,j,bits,offset;
   FXuchar levels8;
 
-  FXTRACE((100,"dds_decompress_BC4\n"));
+  FXTRACE((150,"dds_decompress_BC4\n"));
 
   // Loop over 4x4 blocks
   for(z=0; z<dds.header.dwDepth; z+=1){
@@ -842,13 +842,13 @@
 
 // Decompress 3DC (ATI2) image
 static FXbool dds_decompress_3DC(const DDSImage& dds,FXuchar *image){
-  register FXuchar *temp=dds.data;
-  register FXuint x,y,z,i,j,redbits,grnbits,offset;
-  register FXint tx,ty,t;
+  FXuchar *temp=dds.data;
+  FXuint x,y,z,i,j,redbits,grnbits,offset;
+  FXint tx,ty,t;
   FXuchar red8;
   FXuchar grn8;
 
-  FXTRACE((100,"dds_decompress_3DC\n"));
+  FXTRACE((150,"dds_decompress_3DC\n"));
 
   // Loop over 4x4 blocks
   for(z=0; z<dds.header.dwDepth; z+=1){
@@ -958,7 +958,7 @@
 
 // Compute shifts
 static void getShifts(FXuint mask,FXuint& shift,FXuint& mul,FXuint& sc){
-  register FXuint bits=0;
+  FXuint bits=0;
   shift=0;
   mul=1;
   sc=0;
@@ -983,13 +983,13 @@
   FXuint rshift=0,gshift=0,bshift=0,rmul=0,gmul=0,bmul=0,rs=0,gs=0,bs=0;
   FXuint x,y,z,offset,pix,t;
   FXuchar *temp=dds.data;
-  FXTRACE((100,"dds_decompress_RGBA\n"));
+  FXTRACE((150,"dds_decompress_RGBA\n"));
   if(rmask){ getShifts(rmask,rshift,rmul,rs); }
   if(gmask){ getShifts(gmask,gshift,gmul,gs); }
   if(bmask){ getShifts(bmask,bshift,bmul,bs); }
-  FXTRACE((100,"rmask=0x%08x rshift=%2d rmul=%3d rs=%3d\n",rmask,rshift,rmul,rs));
-  FXTRACE((100,"gmask=0x%08x gshift=%2d gmul=%3d gs=%3d\n",gmask,gshift,gmul,gs));
-  FXTRACE((100,"bmask=0x%08x bshift=%2d bmul=%3d bs=%3d\n",bmask,bshift,bmul,bs));
+  FXTRACE((150,"rmask=0x%08x rshift=%2d rmul=%3d rs=%3d\n",rmask,rshift,rmul,rs));
+  FXTRACE((150,"gmask=0x%08x gshift=%2d gmul=%3d gs=%3d\n",gmask,gshift,gmul,gs));
+  FXTRACE((150,"bmask=0x%08x bshift=%2d bmul=%3d bs=%3d\n",bmask,bshift,bmul,bs));
   for(z=offset=0; z<dds.header.dwDepth; ++z){
     for(y=0; y<dds.header.dwHeight; ++y){
       for(x=0; x<dds.header.dwWidth; ++x){
@@ -1012,15 +1012,15 @@
   FXuint rshift=0,gshift=0,bshift=0,ashift=0,rmul=0,gmul=0,bmul=0,amul=0,rs=0,gs=0,bs=0,as=0;
   FXuint x,y,z,offset,pix,t;
   FXuchar *temp=dds.data;
-  FXTRACE((100,"dds_decompress_RGBA\n"));
+  FXTRACE((150,"dds_decompress_RGBA\n"));
   if(rmask){ getShifts(rmask,rshift,rmul,rs); }
   if(gmask){ getShifts(gmask,gshift,gmul,gs); }
   if(bmask){ getShifts(bmask,bshift,bmul,bs); }
   if(amask){ getShifts(amask,ashift,amul,as); }
-  FXTRACE((100,"rmask=0x%08x rshift=%2d rmul=%3d rs=%3d\n",rmask,rshift,rmul,rs));
-  FXTRACE((100,"gmask=0x%08x gshift=%2d gmul=%3d gs=%3d\n",gmask,gshift,gmul,gs));
-  FXTRACE((100,"bmask=0x%08x bshift=%2d bmul=%3d bs=%3d\n",bmask,bshift,bmul,bs));
-  FXTRACE((100,"amask=0x%08x ashift=%2d amul=%3d as=%3d\n",amask,ashift,amul,as));
+  FXTRACE((150,"rmask=0x%08x rshift=%2d rmul=%3d rs=%3d\n",rmask,rshift,rmul,rs));
+  FXTRACE((150,"gmask=0x%08x gshift=%2d gmul=%3d gs=%3d\n",gmask,gshift,gmul,gs));
+  FXTRACE((150,"bmask=0x%08x bshift=%2d bmul=%3d bs=%3d\n",bmask,bshift,bmul,bs));
+  FXTRACE((150,"amask=0x%08x ashift=%2d amul=%3d as=%3d\n",amask,ashift,amul,as));
   for(z=offset=0; z<dds.header.dwDepth; ++z){
     for(y=0; y<dds.header.dwHeight; ++y){
       for(x=0; x<dds.header.dwWidth; ++x){
@@ -1043,9 +1043,9 @@
   FXuint cshift=0,cmul=0,cs=0;
   FXuint x,y,z,offset,pix,t;
   FXuchar *temp=dds.data;
-  FXTRACE((100,"dds_decompress_LUM\n"));
+  FXTRACE((150,"dds_decompress_LUM\n"));
   if(cmask){ getShifts(cmask,cshift,cmul,cs); }
-  FXTRACE((100,"cmask=0x%08x cshift=%2d cmul=%3d cs=%3d\n",cmask,cshift,cmul,cs));
+  FXTRACE((150,"cmask=0x%08x cshift=%2d cmul=%3d cs=%3d\n",cmask,cshift,cmul,cs));
   for(z=offset=0; z<dds.header.dwDepth; ++z){
     for(y=0; y<dds.header.dwHeight; ++y){
       for(x=0; x<dds.header.dwWidth; ++x){
@@ -1065,11 +1065,11 @@
   FXuint cshift=0,ashift=0,cmul=0,amul=0,cs=0,as=0;
   FXuint x,y,z,offset,pix,t;
   FXuchar *temp=dds.data;
-  FXTRACE((100,"dds_decompress_LUMA\n"));
+  FXTRACE((150,"dds_decompress_LUMA\n"));
   if(cmask){ getShifts(cmask,cshift,cmul,cs); }
   if(amask){ getShifts(amask,ashift,amul,as); }
-  FXTRACE((100,"cmask=0x%08x cshift=%2d cmul=%3d cs=%3d\n",cmask,cshift,cmul,cs));
-  FXTRACE((100,"amask=0x%08x ashift=%2d amul=%3d as=%3d\n",amask,ashift,amul,as));
+  FXTRACE((150,"cmask=0x%08x cshift=%2d cmul=%3d cs=%3d\n",cmask,cshift,cmul,cs));
+  FXTRACE((150,"amask=0x%08x ashift=%2d amul=%3d as=%3d\n",amask,ashift,amul,as));
   for(z=offset=0; z<dds.header.dwDepth; ++z){
     for(y=0; y<dds.header.dwHeight; ++y){
       for(x=0; x<dds.header.dwWidth; ++x){
@@ -1087,10 +1087,10 @@
 
 // Decompress R16F
 static FXbool dds_decompress_R16F(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXhalf *temp=(FXhalf*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_R16F\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXhalf *temp=(FXhalf*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_R16F\n"));
   while(p<count){
     imagep+0=0;
     imagep+1=0;
@@ -1104,10 +1104,10 @@
 
 // Decompress G16R16F
 static FXbool dds_decompress_G16R16F(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXhalf *temp=(FXhalf*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_G16R16F\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXhalf *temp=(FXhalf*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_G16R16F\n"));
   while(p<count){
     imagep+0=0;
     imagep+2=(FXuchar)(*temp++ * 255.0f + 0.5f);
@@ -1121,10 +1121,10 @@
 
 // Decompress A16B16G16R16F
 static FXbool dds_decompress_A16B16G16R16F(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXhalf *temp=(FXhalf*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_A16B16G16R16F\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXhalf *temp=(FXhalf*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_A16B16G16R16F\n"));
   while(p<count){
     imagep+2=(FXuchar)(*temp++ * 255.0f + 0.5f);
     imagep+1=(FXuchar)(*temp++ * 255.0f + 0.5f);
@@ -1138,10 +1138,10 @@
 
 // Decompress A16B16G16R16
 static FXbool dds_decompress_A16B16G16R16(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXushort *temp=(FXushort*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_A16B16G16R16\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXushort *temp=(FXushort*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_A16B16G16R16\n"));
   while(p<count){
     imagep+2=(FXuchar)(*temp++ / 257);
     imagep+1=(FXuchar)(*temp++ / 257);
@@ -1155,10 +1155,10 @@
 
 // Decompress R32F
 static FXbool dds_decompress_R32F(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXfloat *temp=(FXfloat*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_R32F\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXfloat *temp=(FXfloat*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_R32F\n"));
   while(p<count){
     imagep+0=0;
     imagep+1=0;
@@ -1172,10 +1172,10 @@
 
 // Decompress G32R32F
 static FXbool dds_decompress_G32R32F(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXfloat *temp=(FXfloat*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_G32R32F\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXfloat *temp=(FXfloat*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_G32R32F\n"));
   while(p<count){
     imagep+2=(FXuchar)(*temp++ * 255.0f + 0.5f);
     imagep+1=(FXuchar)(*temp++ * 255.0f + 0.5f);
@@ -1189,10 +1189,10 @@
 
 // Decompress A32B32G32R32F
 static FXbool dds_decompress_A32B32G32R32F(const DDSImage& dds,FXuchar *image){
-  register FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
-  register FXfloat *temp=(FXfloat*)dds.data;
-  register FXuint p=0;
-  FXTRACE((100,"dds_decompress_A32B32G32R32F\n"));
+  FXuint count=dds.header.dwDepth*dds.header.dwHeight*dds.header.dwWidth*4;
+  FXfloat *temp=(FXfloat*)dds.data;
+  FXuint p=0;
+  FXTRACE((150,"dds_decompress_A32B32G32R32F\n"));
   while(p<count){
     imagep+2=(FXuchar)(*temp++ * 255.0f + 0.5f);
     imagep+1=(FXuchar)(*temp++ * 255.0f + 0.5f);
@@ -1208,7 +1208,7 @@
 static FXbool dds_decompress_RGBG(const DDSImage& dds,FXuchar *image){
   FXuint x,y,z,offset;
   FXuchar *temp=dds.data;
-  FXTRACE((100,"dds_decompress_RGBG\n"));
+  FXTRACE((150,"dds_decompress_RGBG\n"));
   for(z=offset=0; z<dds.header.dwDepth; z+=1){
     for(y=0; y<dds.header.dwHeight; y+=1){
       for(x=0; x<dds.header.dwWidth; x+=2){
@@ -1233,7 +1233,7 @@
 static FXbool dds_decompress_GRGB(const DDSImage& dds,FXuchar *image){
   FXuint x,y,z,offset;
   FXuchar *temp=dds.data;
-  FXTRACE((100,"dds_decompress_GRGB\n"));
+  FXTRACE((150,"dds_decompress_GRGB\n"));
   for(z=offset=0; z<dds.header.dwDepth; z+=1){
     for(y=0; y<dds.header.dwHeight; y+=1){
       for(x=0; x<dds.header.dwWidth; x+=2){
@@ -1320,32 +1320,32 @@
       dds.xheader.reserved=0;
       }
 
-    FXTRACE((100,"dds.magic=0x%08x\n",dds.magic));
-    FXTRACE((100,"dds.header.dwSize=%d\n",dds.header.dwSize));
-    FXTRACE((100,"dds.header.dwFlags=0x%08x: %s%s%s%s%s%s%s%s\n",dds.header.dwFlags,(dds.header.dwFlags&DDSD_CAPS)?"DDSD_CAPS ":"",(dds.header.dwFlags&DDSD_HEIGHT)?"DDSD_HEIGHT ":"",(dds.header.dwFlags&DDSD_WIDTH)?"DDSD_WIDTH ":"",(dds.header.dwFlags&DDSD_PITCH)?"DDSD_PITCH ":"",(dds.header.dwFlags&DDSD_PIXELFORMAT)?"DDSD_PIXELFORMAT ":"",(dds.header.dwFlags&DDSD_MIPMAPCOUNT)?"DDSD_MIPMAPCOUNT ":"",(dds.header.dwFlags&DDSD_LINEARSIZE)?"DDSD_LINEARSIZE ":"",(dds.header.dwFlags&DDSD_DEPTH)?"DDSD_DEPTH":""));
-    FXTRACE((100,"dds.header.dwHeight=%d\n",dds.header.dwHeight));
-    FXTRACE((100,"dds.header.dwWidth=%d\n",dds.header.dwWidth));
-    FXTRACE((100,"dds.header.dwDepth=%d\n",dds.header.dwDepth));
-    FXTRACE((100,"dds.header.dwLinearSize=%d\n",dds.header.dwLinearSize));
-    FXTRACE((100,"dds.header.dwMipMapCount=%d\n",dds.header.dwMipMapCount));
-    FXTRACE((100,"dds.header.ddpf.dwSize=%d\n",dds.header.ddpf.dwSize));
-    FXTRACE((100,"dds.header.ddpf.dwFlags=0x%08x: %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",dds.header.ddpf.dwFlags,(dds.header.ddpf.dwFlags&DDPF_ALPHAPIXELS)?"DDPF_ALPHAPIXELS ":"",(dds.header.ddpf.dwFlags&DDPF_ALPHA)?"DDPF_ALPHA ":"",(dds.header.ddpf.dwFlags&DDPF_FOURCC)?"DDPF_FOURCC ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED4)?"DDPF_PALETTEINDEXED4 ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED8)?"DDPF_PALETTEINDEXED8 ":"",(dds.header.ddpf.dwFlags&DDPF_RGB)?"DDPF_RGB ":"",(dds.header.ddpf.dwFlags&DDPF_COMPRESSED)?"DDPF_COMPRESSED ":"",(dds.header.ddpf.dwFlags&DDPF_RGBTOYUV)?"DDPF_RGBTOYUV ":"",(dds.header.ddpf.dwFlags&DDPF_YUV)?"DDPF_YUV ":"",(dds.header.ddpf.dwFlags&DDPF_ZBUFFER)?"DDPF_ZBUFFER ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED1)?"DDPF_PALETTEINDEXED1 ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED2)?"DDPF_PALETTEINDEXED2 ":"",(dds.header.ddpf.dwFlags&DDPF_ZPIXELS)?"DDPF_ZPIXELS ":"",(dds.header.ddpf.dwFlags&DDPF_STENCILBUFFER)?"DDPF_STENCILBUFFER ":"",(dds.header.ddpf.dwFlags&DDPF_ALPHAPREMULT)?"DDPF_ALPHAPREMULT ":"",(dds.header.ddpf.dwFlags&DDPF_LUMINANCE)?"DDPF_LUMINANCE ":"",(dds.header.ddpf.dwFlags&DDPF_BUMPLUMINANCE)?"DDPF_BUMPLUMINANCE ":"",(dds.header.ddpf.dwFlags&DDPF_NORMAL)?"DDPF_NORMAL":""));
-    FXTRACE((100,"dds.header.ddpf.dwFourCC=0x%08x (%d) (%c%c%c%c)\n",dds.header.ddpf.dwFourCC,dds.header.ddpf.dwFourCC,dds.header.ddpf.dwFourCC&255,(dds.header.ddpf.dwFourCC>>8)&255,(dds.header.ddpf.dwFourCC>>16)&255,(dds.header.ddpf.dwFourCC>>24)&255));
-    FXTRACE((100,"dds.header.ddpf.dwRGBBitCount=%d\n",dds.header.ddpf.dwRGBBitCount));
-    FXTRACE((100,"dds.header.ddpf.dwRBitMask=0x%08x\n",dds.header.ddpf.dwRBitMask));
-    FXTRACE((100,"dds.header.ddpf.dwGBitMask=0x%08x\n",dds.header.ddpf.dwGBitMask));
-    FXTRACE((100,"dds.header.ddpf.dwBBitMask=0x%08x\n",dds.header.ddpf.dwBBitMask));
-    FXTRACE((100,"dds.header.ddpf.dwABitMask=0x%08x\n",dds.header.ddpf.dwABitMask));
-
-    FXTRACE((100,"dds.header.dwCaps =0x%08x: %s%s%s\n",dds.header.dwCaps,(dds.header.dwCaps&DDSCAPS_COMPLEX)?"DDSCAPS_COMPLEX ":"",(dds.header.dwCaps&DDSCAPS_TEXTURE)?"DDSCAPS_TEXTURE ":"",(dds.header.dwCaps&DDSCAPS_MIPMAP)?"DDSCAPS_MIPMAP":""));
-    FXTRACE((100,"dds.header.dwCaps2=0x%08x: %s%s%s%s%s%s%s%s\n",dds.header.dwCaps2,(dds.header.dwCaps2&DDSCAPS2_CUBEMAP)?"DDSCAPS2_CUBEMAP ":"",(dds.header.dwCaps2&DDSCAPS2_VOLUME)?"DDSCAPS2_VOLUME ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_POSITIVEX)?"DDSCAPS2_CUBEMAP_POSITIVEX ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_NEGATIVEX)?"DDSCAPS2_CUBEMAP_NEGATIVEX ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_POSITIVEY)?"DDSCAPS2_CUBEMAP_POSITIVEY ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_NEGATIVEY)?"DDSCAPS2_CUBEMAP_NEGATIVEY ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_POSITIVEZ)?"DDSCAPS2_CUBEMAP_POSITIVEZ ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_NEGATIVEZ)?"DDSCAPS2_CUBEMAP_NEGATIVEZ ":""));
-    FXTRACE((100,"dds.header.dwCaps3=0x%08x\n",dds.header.dwCaps3));
-    FXTRACE((100,"dds.header.dwCaps4=0x%08x\n",dds.header.dwCaps4));
-
-    FXTRACE((100,"dds.xheader.dxgiFormat=%d\n",dds.xheader.dxgiFormat));
-    FXTRACE((100,"dds.xheader.resourceDimension=%d\n",dds.xheader.resourceDimension));
-    FXTRACE((100,"dds.xheader.miscFlag=%d\n",dds.xheader.miscFlag));
-    FXTRACE((100,"dds.xheader.arraySize=%d\n",dds.xheader.arraySize));
+    FXTRACE((150,"dds.magic=0x%08x\n",dds.magic));
+    FXTRACE((150,"dds.header.dwSize=%d\n",dds.header.dwSize));
+    FXTRACE((150,"dds.header.dwFlags=0x%08x: %s%s%s%s%s%s%s%s\n",dds.header.dwFlags,(dds.header.dwFlags&DDSD_CAPS)?"DDSD_CAPS ":"",(dds.header.dwFlags&DDSD_HEIGHT)?"DDSD_HEIGHT ":"",(dds.header.dwFlags&DDSD_WIDTH)?"DDSD_WIDTH ":"",(dds.header.dwFlags&DDSD_PITCH)?"DDSD_PITCH ":"",(dds.header.dwFlags&DDSD_PIXELFORMAT)?"DDSD_PIXELFORMAT ":"",(dds.header.dwFlags&DDSD_MIPMAPCOUNT)?"DDSD_MIPMAPCOUNT ":"",(dds.header.dwFlags&DDSD_LINEARSIZE)?"DDSD_LINEARSIZE ":"",(dds.header.dwFlags&DDSD_DEPTH)?"DDSD_DEPTH":""));
+    FXTRACE((150,"dds.header.dwHeight=%d\n",dds.header.dwHeight));
+    FXTRACE((150,"dds.header.dwWidth=%d\n",dds.header.dwWidth));
+    FXTRACE((150,"dds.header.dwDepth=%d\n",dds.header.dwDepth));
+    FXTRACE((150,"dds.header.dwLinearSize=%d\n",dds.header.dwLinearSize));
+    FXTRACE((150,"dds.header.dwMipMapCount=%d\n",dds.header.dwMipMapCount));
+    FXTRACE((150,"dds.header.ddpf.dwSize=%d\n",dds.header.ddpf.dwSize));
+    FXTRACE((150,"dds.header.ddpf.dwFlags=0x%08x: %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",dds.header.ddpf.dwFlags,(dds.header.ddpf.dwFlags&DDPF_ALPHAPIXELS)?"DDPF_ALPHAPIXELS ":"",(dds.header.ddpf.dwFlags&DDPF_ALPHA)?"DDPF_ALPHA ":"",(dds.header.ddpf.dwFlags&DDPF_FOURCC)?"DDPF_FOURCC ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED4)?"DDPF_PALETTEINDEXED4 ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED8)?"DDPF_PALETTEINDEXED8 ":"",(dds.header.ddpf.dwFlags&DDPF_RGB)?"DDPF_RGB ":"",(dds.header.ddpf.dwFlags&DDPF_COMPRESSED)?"DDPF_COMPRESSED ":"",(dds.header.ddpf.dwFlags&DDPF_RGBTOYUV)?"DDPF_RGBTOYUV ":"",(dds.header.ddpf.dwFlags&DDPF_YUV)?"DDPF_YUV ":"",(dds.header.ddpf.dwFlags&DDPF_ZBUFFER)?"DDPF_ZBUFFER ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED1)?"DDPF_PALETTEINDEXED1 ":"",(dds.header.ddpf.dwFlags&DDPF_PALETTEINDEXED2)?"DDPF_PALETTEINDEXED2 ":"",(dds.header.ddpf.dwFlags&DDPF_ZPIXELS)?"DDPF_ZPIXELS ":"",(dds.header.ddpf.dwFlags&DDPF_STENCILBUFFER)?"DDPF_STENCILBUFFER ":"",(dds.header.ddpf.dwFlags&DDPF_ALPHAPREMULT)?"DDPF_ALPHAPREMULT ":"",(dds.header.ddpf.dwFlags&DDPF_LUMINANCE)?"DDPF_LUMINANCE ":"",(dds.header.ddpf.dwFlags&DDPF_BUMPLUMINANCE)?"DDPF_BUMPLUMINANCE ":"",(dds.header.ddpf.dwFlags&DDPF_NORMAL)?"DDPF_NORMAL":""));
+    FXTRACE((150,"dds.header.ddpf.dwFourCC=0x%08x (%d) (%c%c%c%c)\n",dds.header.ddpf.dwFourCC,dds.header.ddpf.dwFourCC,dds.header.ddpf.dwFourCC&255,(dds.header.ddpf.dwFourCC>>8)&255,(dds.header.ddpf.dwFourCC>>16)&255,(dds.header.ddpf.dwFourCC>>24)&255));
+    FXTRACE((150,"dds.header.ddpf.dwRGBBitCount=%d\n",dds.header.ddpf.dwRGBBitCount));
+    FXTRACE((150,"dds.header.ddpf.dwRBitMask=0x%08x\n",dds.header.ddpf.dwRBitMask));
+    FXTRACE((150,"dds.header.ddpf.dwGBitMask=0x%08x\n",dds.header.ddpf.dwGBitMask));
+    FXTRACE((150,"dds.header.ddpf.dwBBitMask=0x%08x\n",dds.header.ddpf.dwBBitMask));
+    FXTRACE((150,"dds.header.ddpf.dwABitMask=0x%08x\n",dds.header.ddpf.dwABitMask));
+
+    FXTRACE((150,"dds.header.dwCaps =0x%08x: %s%s%s\n",dds.header.dwCaps,(dds.header.dwCaps&DDSCAPS_COMPLEX)?"DDSCAPS_COMPLEX ":"",(dds.header.dwCaps&DDSCAPS_TEXTURE)?"DDSCAPS_TEXTURE ":"",(dds.header.dwCaps&DDSCAPS_MIPMAP)?"DDSCAPS_MIPMAP":""));
+    FXTRACE((150,"dds.header.dwCaps2=0x%08x: %s%s%s%s%s%s%s%s\n",dds.header.dwCaps2,(dds.header.dwCaps2&DDSCAPS2_CUBEMAP)?"DDSCAPS2_CUBEMAP ":"",(dds.header.dwCaps2&DDSCAPS2_VOLUME)?"DDSCAPS2_VOLUME ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_POSITIVEX)?"DDSCAPS2_CUBEMAP_POSITIVEX ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_NEGATIVEX)?"DDSCAPS2_CUBEMAP_NEGATIVEX ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_POSITIVEY)?"DDSCAPS2_CUBEMAP_POSITIVEY ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_NEGATIVEY)?"DDSCAPS2_CUBEMAP_NEGATIVEY ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_POSITIVEZ)?"DDSCAPS2_CUBEMAP_POSITIVEZ ":"",(dds.header.dwCaps2&DDSCAPS2_CUBEMAP_NEGATIVEZ)?"DDSCAPS2_CUBEMAP_NEGATIVEZ ":""));
+    FXTRACE((150,"dds.header.dwCaps3=0x%08x\n",dds.header.dwCaps3));
+    FXTRACE((150,"dds.header.dwCaps4=0x%08x\n",dds.header.dwCaps4));
+
+    FXTRACE((150,"dds.xheader.dxgiFormat=%d\n",dds.xheader.dxgiFormat));
+    FXTRACE((150,"dds.xheader.resourceDimension=%d\n",dds.xheader.resourceDimension));
+    FXTRACE((150,"dds.xheader.miscFlag=%d\n",dds.xheader.miscFlag));
+    FXTRACE((150,"dds.xheader.arraySize=%d\n",dds.xheader.arraySize));
 
     // Fix depth
     if(!(dds.header.dwFlags&DDSD_DEPTH) || (dds.header.dwDepth==0)) dds.header.dwDepth=1;
@@ -1449,7 +1449,7 @@
       goto x;           // Not supported
       }
 
-    FXTRACE((100,"dds.size=%d\n",dds.size));
+    FXTRACE((150,"dds.size=%d\n",dds.size));
 
     // Allocate array for compressed data
     if(allocElms(dds.data,dds.size)){

gogglesmm-1.2.1.tar.gz/cfox/lib/fxescape.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxescape.cpp Changed

@@ -3,7 +3,7 @@
 *                   E s c a p e  /  U n e s c a p e   S t r i n g               *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2018 by Jeroen van der Zijp.   All Rights Reserved.             *
+* Copyright (C) 2018,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -34,7 +34,29 @@
   Notes:
 
   - Escape or unescape string, optionally adding or removing quotes.
+
   - This makes the string safe when it contains non-printing characters.
+
+  - UTF8 characters may be encoded as hex (in the form of: \xHH), or as unicode
+    escape sequences (of the form \uHHHH).  Code points exceeding 16-bits will be
+    encoded as hex-encoded surrogate-pairs (\uHHHH\uHHHH) in unicode escape mode.
+
+  - Control characters, and non-ASCII characters other than UTF8 leaders or followers
+    will always be escaped.
+
+  - UTF8 leaders or followers will be hex escaped if hex-escape mode in effect.
+
+  - If unicode escape in effect, UTF8 followers will be escaped as \xHH when not
+    preceeded by  UTF8 leaders.
+
+  - Bad UTF8 sequences will be escaped as hex \xHH if unicode escaping in effect.
+
+  - End-of-line continuation: '\<LF>', '\<CR>', '\<CR><LF>' will be replaced by nothing
+    when unescaped.  Allows long strings from being broken up into separate lines.
+
+  - Bottom line: an escaped string shall not contain any control characters, UTF8
+    followers not preceeded by a UTF8 leader, line terminators, or leading or
+    trailing spaces surrounding printable characters.
 */
 
 
@@ -55,224 +77,491 @@
 
 
 // Check if the string contains special characters or leading or trailing whitespace, or contains utf8 if flag!=0
-FXbool shouldEscape(const FXString& str,FXchar lquote,FXchar rquote,FXint flag){
+FXbool FXString::shouldEscape(const FXString& str,FXchar lquote,FXchar rquote,FXint flag){
   if(0<str.length()){
-    FXuchar c;
-    if(Ascii::isSpace(str.head())) return true;
-    if(Ascii::isSpace(str.tail())) return true;
-    for(FXint p=0; p<str.length(); p++){
-      if((c=strp)<0x20 || c==0x7F || c=='\\' || c==lquote || c==rquote || (0x80<=c && flag)) return true;
+    FXint p=0; FXuchar c;
+    c=str.head();
+    if(c<=0x20) return true;
+    c=str.tail();
+    if(c<=0x20) return true;
+    while(p<str.length()){
+      c=strp++;
+      if(c<=0x1F || 0xF8<=c || c==0x7F) return true;
+      if(c=='\\' || c==lquote || c==rquote) return true;
+      if(0x80<=c && flag) return true;
       }
     }
   return false;
   }
 
 
-// Escape special characters, and optionally enclose with left and right quotes; escape utf8 as \xHH if flag=1, or as \uHHHH if flag=2
-FXString escape(const FXString& str,FXchar lquote,FXchar rquote,FXint flag){
-  register FXint p,q,w;
-  register FXwchar c;
+// Escape special characters, and optionally enclose with left and right quotes
+// and escape utf8 as \xHH if flag=1, or as \uHHHH if flag=2.
+// UTF8 characters may be encoded as hex (in the form of: \xHH), or as Unicode
+// escape sequences (of the form \uHHHH).  Code points exceeding 16-bits will be
+// encoded as hex-encoded surrogate-pairs (\uHHHH\uHHHH) in Unicode escape mode.
+// UTF8 followers will be always escaped if not preceeded by UTF8 leaders, if
+// escaping is enabled.
+FXString FXString::escape(const FXString& str,FXchar lquote,FXchar rquote,FXint flag){
   FXString result;
+  FXint p,q,w,v;
+  FXuchar c,cc;
   p=q=0;
-  if(lquote) q++;                       // Opening quote
-  while(p<str.length()){                // Measure length of converted string
+  if(lquote) q++;                               // Opening quote
+  while(p<str.length()){                        // Measure length of converted string
     c=strp++;
     switch(c){
-    case '\x00':                        // Control characters
-    case '\x01':
-    case '\x02':
-    case '\x03':
-    case '\x04':
-    case '\x05':
-    case '\x06':
-    case '\x0E':
-    case '\x0F':
-    case '\x10':
-    case '\x11':
-    case '\x12':
-    case '\x13':
-    case '\x14':
-    case '\x15':
-    case '\x16':
-    case '\x17':
-    case '\x18':
-    case '\x19':
-    case '\x1A':
-    case '\x1B':                        // Or represent as \e ?
-    case '\x1C':
-    case '\x1D':
-    case '\x1E':
-    case '\x1F':
-    case '\x7F':
-hex1: q+=4;                             // Escape as \xHH
-      continue;
-    case '\a':                          // Special characters
-    case '\b':
-    case '\t':
-    case '\n':
-    case '\v':
-    case '\f':
-    case '\r':
-    case '\\':
-      q+=2;
-      continue;
-    default:
-      if(__unlikely(c==lquote && lquote)){      // Escape opening quote if found in string
+      case '\a':                                // Special control characters
+      case '\b':
+      case '\t':
+      case '\n':
+      case '\v':
+      case '\f':
+      case '\r':
+      case '\\':
         q+=2;
         continue;
-        }
-      if(__unlikely(c==rquote && rquote)){      // Escape closing quote if found in string
-        q+=2;
+      case 0x00:                                // Non-special control characters
+      case 0x01:
+      case 0x02:
+      case 0x03:
+      case 0x04:
+      case 0x05:
+      case 0x06:
+      case 0x0E:
+      case 0x0F:
+      case 0x10:
+      case 0x11:
+      case 0x12:
+      case 0x13:
+      case 0x14:
+      case 0x15:
+      case 0x16:
+      case 0x17:
+      case 0x18:
+      case 0x19:
+      case 0x1A:
+      case 0x1B:
+      case 0x1C:
+      case 0x1D:
+      case 0x1E:
+      case 0x1F:
+      case 0x7F:                                // DEL
+      case 0xF8:                                // Bad UTF8 leaders
+      case 0xF9:
+      case 0xFA:
+      case 0xFB:
+      case 0xFC:
+      case 0xFD:
+      case 0xFF:
+hex1:   q+=4;                                   // Escape as \xHH
         continue;
-        }
-      if(__unlikely(0x80<=c)){          // Escape specials
-        if(flag&1) goto hex1;           // Output \xHH for everything
-        if(flag&2){
-          if(!FXISLEADUTF8(c)) goto hex1;               // UTF8 starter?
-          if(!FXISFOLLOWUTF8(strp)) goto hex1;        // UTF8 follower?
-          c=(c<<6)^(FXuchar)strp^0x3080;
-          if(0x800<=c){
-            if(!FXISFOLLOWUTF8(strp+1)) goto hex1;    // UTF8 follower?
-            c=(c<<6)^(FXuchar)strp+1^0x20080;
-            if(0x10000<=c){                             // Surrogate pair needed
-              if(!FXISFOLLOWUTF8(strp+2)) goto hex1;  // UTF8 follower?
-              c=(c<<6)^(FXuchar)strp+2^0x400080;
-              if(0x110000<=c) goto hex1;                // Beyond assigned code space?
-              p++;
-              q+=6;
-              }
+      case 0x80:                                // UTF8 followers
+      case 0x81:
+      case 0x82:
+      case 0x83:
+      case 0x84:
+      case 0x85:
+      case 0x86:
+      case 0x87:
+      case 0x88:
+      case 0x89:
+      case 0x8A:
+      case 0x8B:
+      case 0x8C:
+      case 0x8D:
+      case 0x8E:
+      case 0x8F:
+      case 0x90:
+      case 0x91:
+      case 0x92:
+      case 0x93:
+      case 0x94:
+      case 0x95:
+      case 0x96:
+      case 0x97:
+      case 0x98:
+      case 0x99:
+      case 0x9A:
+      case 0x9B:
+      case 0x9C:
+      case 0x9D:
+      case 0x9E:
+      case 0x9F:
+      case 0xA0:
+      case 0xA1:
+      case 0xA2:
+      case 0xA3:
+      case 0xA4:
+      case 0xA5:
+      case 0xA6:
+      case 0xA7:
+      case 0xA8:
+      case 0xA9:
+      case 0xAA:
+      case 0xAB:
+      case 0xAC:
+      case 0xAD:
+      case 0xAE:
+      case 0xAF:
+      case 0xB0:
+      case 0xB1:
+      case 0xB2:
+      case 0xB3:
+      case 0xB4:
+      case 0xB5:
+      case 0xB6:
+      case 0xB7:
+      case 0xB8:
+      case 0xB9:
+      case 0xBA:
+      case 0xBB:
+      case 0xBC:
+      case 0xBD:
+      case 0xBE:
+      case 0xBF:
+        if(flag==0) goto nml1;                  // Pass UTF8 through
+        goto hex1;                              // Escape UTF8 follower not preceeded by UTF8 leader
+      case 0xC0:                                // 2-byte UTF8 sequences
+      case 0xC1:
+      case 0xC2:
+      case 0xC3:
+      case 0xC4:
+      case 0xC5:
+      case 0xC6:
+      case 0xC7:
+      case 0xC8:
+      case 0xC9:
+      case 0xCA:
+      case 0xCB:
+      case 0xCC:
+      case 0xCD:
+      case 0xCE:
+      case 0xCF:
+      case 0xD0:
+      case 0xD1:
+      case 0xD2:
+      case 0xD3:
+      case 0xD4:
+      case 0xD5:
+      case 0xD6:
+      case 0xD7:
+      case 0xD8:
+      case 0xD9:
+      case 0xDA:
+      case 0xDB:
+      case 0xDC:
+      case 0xDD:
+      case 0xDE:
+      case 0xDF:
+      case 0xE0:                                // 3-byte UTF8 sequences
+      case 0xE1:
+      case 0xE2:
+      case 0xE3:
+      case 0xE4:
+      case 0xE5:
+      case 0xE6:
+      case 0xE7:
+      case 0xE8:
+      case 0xE9:
+      case 0xEA:
+      case 0xEB:
+      case 0xEC:
+      case 0xED:
+      case 0xEE:
+      case 0xEF:
+      case 0xF0:                                // 4-byte UTF8 sequences
+      case 0xF1:
+      case 0xF2:
+      case 0xF3:
+      case 0xF4:
+      case 0xF5:
+      case 0xF6:
+      case 0xF7:
+        if(flag==0) goto nml1;                  // Pass UTF8 through
+        if(flag==1) goto hex1;                  // Simple hex escaping
+        cc=strp;
+        if(!FXISFOLLOWUTF8(cc)) goto hex1;      // UTF8 follower?
+        w=(c<<6)^cc^0x3080;
+        if(0x800<=w){
+          cc=strp+1;
+          if(!FXISFOLLOWUTF8(cc)) goto hex1;    // UTF8 follower?
+          w=(w<<6)^cc^0x20080;
+          if(0x10000<=w){                       // Surrogate pair needed
+            cc=strp+2;
+            if(!FXISFOLLOWUTF8(cc)) goto hex1;  // UTF8 follower?
+            w=(w<<6)^cc^0x400080;
+            if(0x110000<=w) goto hex1;          // Beyond assigned code space?
+            q+=6;
             p++;
             }
           p++;
-          q+=6;                                         // Escape as \uHHHH
+          }
+        q+=6;
+        p++;
+        continue;
+      default:
+        if(c==lquote && lquote){                // Escape opening quote if found in string
+          q+=2;
           continue;
           }
-        }
-      q+=1;                             // Normal characters
-      continue;
+        if(c==rquote && rquote){                // Escape closing quote if found in string
+          q+=2;
+          continue;
+          }
+nml1:   q+=1;                                   // Normal characters
+        continue;
       }
     }
-  if(rquote) q++;                       // Closing quote
+  if(rquote) q++;                               // Closing quote
   result.length(q);
   p=q=0;
-  if(lquote) resultq++=lquote;        // Opening quote
-  while(p<str.length()){                // Then convert the string
+  if(lquote) resultq++=lquote;                // Opening quote
+  while(p<str.length()){                        // Then convert the string
     c=strp++;
     switch(c){
-    case '\x00':                        // Control characters
-    case '\x01':
-    case '\x02':
-    case '\x03':
-    case '\x04':
-    case '\x05':
-    case '\x06':
-    case '\x0E':
-    case '\x0F':
-    case '\x10':
-    case '\x11':
-    case '\x12':
-    case '\x13':
-    case '\x14':
-    case '\x15':
-    case '\x16':
-    case '\x17':
-    case '\x18':
-    case '\x19':
-    case '\x1A':
-    case '\x1B':                        // Or represent as \e ?
-    case '\x1C':
-    case '\x1D':
-    case '\x1E':
-    case '\x1F':
-    case '\x7F':
-hex2: resultq++='\\';                 // Escape as \xHH
-      resultq++='x';
-      resultq++=FXString::value2Digit(c>>4)&15;
-      resultq++=FXString::value2Digitc&15;
-      continue;
-    case '\a':                          // Special characters
-      resultq++='\\';
-      resultq++='a';
-      continue;
-    case '\b':
-      resultq++='\\';
-      resultq++='b';
-      continue;
-    case '\t':
-      resultq++='\\';
-      resultq++='t';
-      continue;
-    case '\n':
-      resultq++='\\';
-      resultq++='n';
-      continue;
-    case '\v':
-      resultq++='\\';
-      resultq++='v';
-      continue;
-    case '\f':
-      resultq++='\\';
-      resultq++='f';
-      continue;
-    case '\r':
-      resultq++='\\';
-      resultq++='r';
-      continue;
-    case '\\':
-      resultq++='\\';
-      resultq++='\\';
-      continue;
-    default:
-      if(__unlikely(c==lquote && lquote)){      // Escape opening quote if found in string
+      case '\a':                                // Special control characters
         resultq++='\\';
-        resultq++=lquote;
+        resultq++='a';
         continue;
-        }
-      if(__unlikely(c==rquote && rquote)){      // Escape closing quote if found in string
+      case '\b':
         resultq++='\\';
-        resultq++=rquote;
+        resultq++='b';
         continue;
-        }
-      if(__unlikely(0x80<=c)){          // Escape specials
-        if(flag&1) goto hex2;           // Output \xHH for everything
-        if(flag&2){
-          if(!FXISLEADUTF8(c)) goto hex2;               // UTF8 starter?
-          if(!FXISFOLLOWUTF8(strp)) goto hex2;        // UTF8 follower?
-          c=(c<<6)^(FXuchar)strp^0x3080;
-          if(0x800<=c){
-            if(!FXISFOLLOWUTF8(strp+1)) goto hex2;    // UTF8 follower?
-            c=(c<<6)^(FXuchar)strp+1^0x20080;
-            if(0x10000<=c){                             // Surrogate pair needed
-              if(!FXISFOLLOWUTF8(strp+2)) goto hex2;  // UTF8 follower?
-              c=(c<<6)^(FXuchar)strp+2^0x400080;
-              if(0x110000<=c) goto hex1;                // Beyond assigned code space?
-              w=LEAD_OFFSET+(c>>10);
-              c=TAIL_OFFSET+(c&0x3FF);
-              resultq++='\\';
-              resultq++='u';
-              resultq++=FXString::value2Digit(w>>12)&15;
-              resultq++=FXString::value2Digit(w>>8)&15;
-              resultq++=FXString::value2Digit(w>>4)&15;
-              resultq++=FXString::value2Digitw&15;
-              p++;
-              }
+      case '\t':
+        resultq++='\\';
+        resultq++='t';
+        continue;
+      case '\n':
+        resultq++='\\';
+        resultq++='n';
+        continue;
+      case '\v':
+        resultq++='\\';
+        resultq++='v';
+        continue;
+      case '\f':
+        resultq++='\\';
+        resultq++='f';
+        continue;
+      case '\r':
+        resultq++='\\';
+        resultq++='r';
+        continue;
+      case '\\':
+        resultq++='\\';
+        resultq++='\\';
+        continue;
+      case 0x00:                                // Non-special control characters
+      case 0x01:
+      case 0x02:
+      case 0x03:
+      case 0x04:
+      case 0x05:
+      case 0x06:
+      case 0x0E:
+      case 0x0F:
+      case 0x10:
+      case 0x11:
+      case 0x12:
+      case 0x13:
+      case 0x14:
+      case 0x15:
+      case 0x16:
+      case 0x17:
+      case 0x18:
+      case 0x19:
+      case 0x1A:
+      case 0x1B:
+      case 0x1C:
+      case 0x1D:
+      case 0x1E:
+      case 0x1F:
+      case 0x7F:                                // DEL
+      case 0xF8:                                // Bad UTF8 leaders
+      case 0xF9:
+      case 0xFA:
+      case 0xFB:
+      case 0xFC:
+      case 0xFD:
+      case 0xFF:
+hex2:   resultq++='\\';                       // Escape as \xHH
+        resultq++='x';
+        resultq++=FXString::value2Digit(c>>4)&15;
+        resultq++=FXString::value2Digitc&15;
+        continue;
+      case 0x80:                                // UTF8 followers
+      case 0x81:
+      case 0x82:
+      case 0x83:
+      case 0x84:
+      case 0x85:
+      case 0x86:
+      case 0x87:
+      case 0x88:
+      case 0x89:
+      case 0x8A:
+      case 0x8B:
+      case 0x8C:
+      case 0x8D:
+      case 0x8E:
+      case 0x8F:
+      case 0x90:
+      case 0x91:
+      case 0x92:
+      case 0x93:
+      case 0x94:
+      case 0x95:
+      case 0x96:
+      case 0x97:
+      case 0x98:
+      case 0x99:
+      case 0x9A:
+      case 0x9B:
+      case 0x9C:
+      case 0x9D:
+      case 0x9E:
+      case 0x9F:
+      case 0xA0:
+      case 0xA1:
+      case 0xA2:
+      case 0xA3:
+      case 0xA4:
+      case 0xA5:
+      case 0xA6:
+      case 0xA7:
+      case 0xA8:
+      case 0xA9:
+      case 0xAA:
+      case 0xAB:
+      case 0xAC:
+      case 0xAD:
+      case 0xAE:
+      case 0xAF:
+      case 0xB0:
+      case 0xB1:
+      case 0xB2:
+      case 0xB3:
+      case 0xB4:
+      case 0xB5:
+      case 0xB6:
+      case 0xB7:
+      case 0xB8:
+      case 0xB9:
+      case 0xBA:
+      case 0xBB:
+      case 0xBC:
+      case 0xBD:
+      case 0xBE:
+      case 0xBF:
+        if(flag==0) goto nml2;                  // Pass UTF8 through
+        goto hex2;                              // Escape UTF8 follower not preceeded by UTF8 leader
+      case 0xC0:                                // 2-byte UTF8 sequences
+      case 0xC1:
+      case 0xC2:
+      case 0xC3:
+      case 0xC4:
+      case 0xC5:
+      case 0xC6:
+      case 0xC7:
+      case 0xC8:
+      case 0xC9:
+      case 0xCA:
+      case 0xCB:
+      case 0xCC:
+      case 0xCD:
+      case 0xCE:
+      case 0xCF:
+      case 0xD0:
+      case 0xD1:
+      case 0xD2:
+      case 0xD3:
+      case 0xD4:
+      case 0xD5:
+      case 0xD6:
+      case 0xD7:
+      case 0xD8:
+      case 0xD9:
+      case 0xDA:
+      case 0xDB:
+      case 0xDC:
+      case 0xDD:
+      case 0xDE:
+      case 0xDF:
+      case 0xE0:                                // 3-byte UTF8 sequences
+      case 0xE1:
+      case 0xE2:
+      case 0xE3:
+      case 0xE4:
+      case 0xE5:
+      case 0xE6:
+      case 0xE7:
+      case 0xE8:
+      case 0xE9:
+      case 0xEA:
+      case 0xEB:
+      case 0xEC:
+      case 0xED:
+      case 0xEE:
+      case 0xEF:
+      case 0xF0:                                 // 4-byte UTF8 sequences
+      case 0xF1:
+      case 0xF2:
+      case 0xF3:
+      case 0xF4:
+      case 0xF5:
+      case 0xF6:
+      case 0xF7:
+        if(flag==0) goto nml2;                  // Pass UTF8 through
+        if(flag==1) goto hex2;                  // Simple hex escaping
+        cc=strp;
+        if(!FXISFOLLOWUTF8(cc)) goto hex2;      // UTF8 follower?
+        w=(c<<6)^cc^0x3080;
+        if(0x800<=w){
+          cc=strp+1;
+          if(!FXISFOLLOWUTF8(cc)) goto hex2;    // UTF8 follower?
+          w=(w<<6)^cc^0x20080;
+          if(0x10000<=w){                       // Surrogate pair needed
+            cc=strp+2;
+            if(!FXISFOLLOWUTF8(cc)) goto hex2;  // UTF8 follower?
+            w=(w<<6)^cc^0x400080;
+            if(0x110000<=w) goto hex2;          // Beyond assigned code space?
+            v=LEAD_OFFSET+(w>>10);
+            w=TAIL_OFFSET+(w&0x3FF);
+            resultq++='\\';                   // Escape as \uHHHH
+            resultq++='u';
+            resultq++=FXString::value2Digit(v>>12)&15;
+            resultq++=FXString::value2Digit(v>>8)&15;
+            resultq++=FXString::value2Digit(v>>4)&15;
+            resultq++=FXString::value2Digitv&15;
             p++;
             }
           p++;
-          resultq++='\\';                             // Escape as \uHHHH
-          resultq++='u';
-          resultq++=FXString::value2Digit(c>>12)&15;
-          resultq++=FXString::value2Digit(c>>8)&15;
-          resultq++=FXString::value2Digit(c>>4)&15;
-          resultq++=FXString::value2Digitc&15;
+          }
+        resultq++='\\';                       // Escape as \uHHHH
+        resultq++='u';
+        resultq++=FXString::value2Digit(w>>12)&15;
+        resultq++=FXString::value2Digit(w>>8)&15;
+        resultq++=FXString::value2Digit(w>>4)&15;
+        resultq++=FXString::value2Digitw&15;
+        p++;
+        continue;
+      default:
+        if(__unlikely(c==lquote && lquote)){    // Escape opening quote if found in string
+          resultq++='\\';
+          resultq++=lquote;
           continue;
           }
-        }
-      resultq++=c;                    // Normal characters
-      continue;
+        if(__unlikely(c==rquote && rquote)){    // Escape closing quote if found in string
+          resultq++='\\';
+          resultq++=rquote;
+          continue;
+          }
+nml2:   resultq++=c;                          // Normal characters
+        continue;
       }
     }
-  if(rquote) resultq++=rquote;        // Closing quote
+  if(rquote) resultq++=rquote;                // Closing quote
   FXASSERT(q==result.length());
   return result;
   }
@@ -280,10 +569,10 @@
 /*******************************************************************************/
 
 // Unescape special characters in a string; optionally strip quote characters
-FXString unescape(const FXString& str,FXchar lquote,FXchar rquote){
-  register FXint p,q,c,w;
+FXString FXString::unescape(const FXString& str,FXchar lquote,FXchar rquote){
   FXString result;
-  p=q=c=0;
+  FXint p,q,w,c;
+  p=q=c=w=0;
   if(strp==lquote && lquote) p++;     // Opening quote
   while(p<str.length()){                // Measure length of converted string
     w=c;                                // Keep previous decoded character
@@ -291,60 +580,65 @@
     if(c==rquote && rquote) break;      // Closing quote
     if(c=='\\' && p<str.length()){      // Escape sequence
       switch((c=strp++)){
-      case 'u':                         // Unicode escape
-        c=0;
-        if(Ascii::isHexDigit(strp)){
-          c=(c<<4)+Ascii::digitValue(strp++);
+        case 'u':                       // Unicode escape
+          c=0;
           if(Ascii::isHexDigit(strp)){
             c=(c<<4)+Ascii::digitValue(strp++);
             if(Ascii::isHexDigit(strp)){
               c=(c<<4)+Ascii::digitValue(strp++);
               if(Ascii::isHexDigit(strp)){
                 c=(c<<4)+Ascii::digitValue(strp++);
+                if(Ascii::isHexDigit(strp)){
+                  c=(c<<4)+Ascii::digitValue(strp++);
+                  }
                 }
               }
             }
-          }
-        if(FXISLEADUTF16(c)) continue;
-        if(FXISFOLLOWUTF16(c)){
-          if(!FXISLEADUTF16(w)) continue;
-          c=SURROGATE_OFFSET+(w<<10)+c;
-          }
-        q+=wc2utf(c);
-        continue;
-      case 'x':                         // Hex escape
-        if(Ascii::isHexDigit(strp)){
-          p++;
-          if(Ascii::isHexDigit(strp)) p++;
-          }
-        q++;
-        continue;
-      case '0':                         // Octal escape
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-        if(Ascii::isOctDigit(strp)){
-          p++;
-          if(Ascii::isOctDigit(strp)) p++;
-          }
-        q++;
-        continue;
-      case 'n':                         // Special characters
-      case 'r':
-      case 'b':
-      case 'v':
-      case 'a':
-      case 'e':                         // Escape
-      case 'f':
-      case 't':
-      case '\\':
-      default:                          // Unneccessarily escaped character
-        q++;
-        continue;
+          if(FXISLEADUTF16(c)) continue;
+          if(FXISFOLLOWUTF16(c)){
+            if(!FXISLEADUTF16(w)) continue;
+            c=SURROGATE_OFFSET+(w<<10)+c;
+            }
+          q+=wc2utf(c);
+          continue;
+        case 'x':                       // Hex escape
+          if(Ascii::isHexDigit(strp)){
+            p++;
+            if(Ascii::isHexDigit(strp)) p++;
+            }
+          q++;
+          continue;
+        case '\r':                      // End-of-line continuation
+          if(strp=='\n') p++;         // Eat both <CR> and <LF> of <CR><LF>
+          continue;
+        case '\n':                      // End-of-line continuation
+          continue;
+        case '0':                       // Octal escape
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+          if(Ascii::isOctDigit(strp)){
+            p++;
+            if(Ascii::isOctDigit(strp)) p++;
+            }
+          q++;
+          continue;
+        case 'n':                       // Special characters
+        case 'r':
+        case 'b':
+        case 'v':
+        case 'a':
+        case 'e':                       // Escape
+        case 'f':
+        case 't':
+        case '\\':
+        default:                        // Unneccessarily escaped character
+          q++;
+          continue;
         }
       }
     q++;                                // Normal characters
@@ -358,82 +652,87 @@
     if(c==rquote && rquote) break;      // Closing quote
     if(c=='\\' && p<str.length()){      // Escape sequence
       switch((c=strp++)){
-      case 'u':                         // Unicode escape
-        if(Ascii::isHexDigit(strp)){
-          c=Ascii::digitValue(strp++);
+        case 'u':                       // Unicode escape
           if(Ascii::isHexDigit(strp)){
-            c=(c<<4)+Ascii::digitValue(strp++);
+            c=Ascii::digitValue(strp++);
             if(Ascii::isHexDigit(strp)){
               c=(c<<4)+Ascii::digitValue(strp++);
               if(Ascii::isHexDigit(strp)){
                 c=(c<<4)+Ascii::digitValue(strp++);
+                if(Ascii::isHexDigit(strp)){
+                  c=(c<<4)+Ascii::digitValue(strp++);
+                  }
                 }
               }
             }
-          }
-        if(FXISLEADUTF16(c)) continue;
-        if(FXISFOLLOWUTF16(c)){
-          if(!FXISLEADUTF16(w)) continue;
-          c=SURROGATE_OFFSET+(w<<10)+c;
-          }
-        q+=wc2utf(&resultq,c);
-        continue;
-      case 'x':                         // Hex escape
-        if(Ascii::isHexDigit(strp)){
-          c=Ascii::digitValue(strp++);
+          if(FXISLEADUTF16(c)) continue;
+          if(FXISFOLLOWUTF16(c)){
+            if(!FXISLEADUTF16(w)) continue;
+            c=SURROGATE_OFFSET+(w<<10)+c;
+            }
+          q+=wc2utf(&resultq,c);
+          continue;
+        case 'x':                       // Hex escape
           if(Ascii::isHexDigit(strp)){
-            c=(c<<4)+Ascii::digitValue(strp++);
+            c=Ascii::digitValue(strp++);
+            if(Ascii::isHexDigit(strp)){
+              c=(c<<4)+Ascii::digitValue(strp++);
+              }
             }
-          }
-        resultq++=c;
-        continue;
-      case '0':                         // Octal escape
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-        c=c-'0';
-        if(Ascii::isOctDigit(strp)){
-          c=(c<<3)+strp++-'0';
+          resultq++=c;
+          continue;
+        case '\r':                      // End-of-line continuation
+          if(strp=='\n') p++;         // Eat both <CR> and <LF> of <CR><LF>
+          continue;
+        case '\n':                      // End-of-line continuation
+          continue;
+        case '0':                       // Octal escape
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+          c=c-'0';
           if(Ascii::isOctDigit(strp)){
             c=(c<<3)+strp++-'0';
+            if(Ascii::isOctDigit(strp)){
+              c=(c<<3)+strp++-'0';
+              }
             }
-          }
-        resultq++=c;
-        continue;
-      case 'n':                         // Special characters
-        resultq++='\n';
-        continue;
-      case 'r':
-        resultq++='\r';
-        continue;
-      case 'b':
-        resultq++='\b';
-        continue;
-      case 'v':
-        resultq++='\v';
-        continue;
-      case 'a':
-        resultq++='\a';
-        continue;
-      case 'e':                         // Escape
-        resultq++='\033';
-        continue;
-      case 'f':
-        resultq++='\f';
-        continue;
-      case 't':
-        resultq++='\t';
-        continue;
-      case '\\':
-        resultq++='\\';
-        continue;
-      default:                          // Unneccessarily escaped character
-        resultq++=c;
-        continue;
+          resultq++=c;
+          continue;
+        case 'n':                       // Special characters
+          resultq++='\n';
+          continue;
+        case 'r':
+          resultq++='\r';
+          continue;
+        case 'b':
+          resultq++='\b';
+          continue;
+        case 'v':
+          resultq++='\v';
+          continue;
+        case 'a':
+          resultq++='\a';
+          continue;
+        case 'e':                       // Escape
+          resultq++='\033';
+          continue;
+        case 'f':
+          resultq++='\f';
+          continue;
+        case 't':
+          resultq++='\t';
+          continue;
+        case '\\':
+          resultq++='\\';
+          continue;
+        default:                        // Unneccessarily escaped character
+          resultq++=c;
+          continue;
         }
       }
     resultq++=c;                      // Normal characters
@@ -442,4 +741,5 @@
   return result;
   }
 
+
 }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxexeio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxexeio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxezquantize.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxezquantize.cpp Changed

@@ -3,7 +3,7 @@
 *                   E Z   C o l o r   Q u a n t i z a t i o n                   *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -49,10 +49,10 @@
 // used is less than maxcolors; using fxezquantize assures that no
 // loss of data occurs repeatedly loading and saving the same file!
 FXbool fxezquantize(FXuchar* dst,const FXColor* src,FXColor* colormap,FXint& actualcolors,FXint w,FXint h,FXint maxcolors){
-  register FXint   npixels=w*h;
-  register FXint   ncolors=0;
-  register FXColor color;
-  register FXint   i,p,x;
+  FXint   npixels=w*h;
+  FXint   ncolors=0;
+  FXColor color;
+  FXint   i,p,x;
   FXColor  colortable337;             // Colors encountered in image
   FXushort mapindex337;               // Map index assigned to color

gogglesmm-1.2.1.tar.gz/cfox/lib/fxfsquantize.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxfsquantize.cpp Changed

@@ -3,7 +3,7 @@
 *                     F S   C o l o r   Q u a n t i z a t i o n                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1999,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1999,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -54,7 +54,7 @@
 
 // Floyd-Steinberg quantization full 32 bpp to less than or equal to maxcolors
 FXbool fxfsquantize(FXuchar* dst,const FXColor* src,FXColor* colormap,FXint& actualcolors,FXint w,FXint h,FXint){
-  register FXint i,j,val,r1,g1,b1,*cr,*cg,*cb,*nr,*ng,*nb,*p;
+  FXint i,j,val,r1,g1,b1,*cr,*cg,*cb,*nr,*ng,*nb,*p;
   FXint *begin;
 
   // Fill colormap

gogglesmm-1.2.1.tar.gz/cfox/lib/fxgetticks.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxgetticks.cpp Changed

@@ -3,7 +3,7 @@
 *                          U t i l i t y   F u n c t i o n s                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -108,7 +108,7 @@
 // Return clock ticks from performance counter GCC PA-RISC version.
 FXTime fxgetticks(){
   FXTime value;
-  asm ("mfctl 16, %0": "=r" (value));           // FIXME not tested!
+  asm ("mfctl 16, %0": "=r" (value));                   // FIXME not tested!
   return value;
   }
 
@@ -117,7 +117,7 @@
 
 // Return clock ticks from performance counter HP-C++ PA-RISC version.
 FXTime fxgetticks(){
-  register FXTime ret;
+  FXTime ret;
   _MFCTL(16, ret);
   return ret;
   }
@@ -166,7 +166,7 @@
 FXTime fxgetticks(){
   const FXTime seconds=1000000000;
   struct timespec ts;
-  clock_gettime(CLOCK_REALTIME,&ts);
+  clock_gettime(CLOCK_MONOTONIC,&ts);
   return ts.tv_sec*seconds+ts.tv_nsec;                  // NOT accurate!
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxgifio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxgifio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxiffio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxiffio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxjp2io.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxjp2io.cpp Changed

@@ -3,7 +3,7 @@
 *                    J P E G - 2 0 0 0   I n p u t / O u t p u t                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2009,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2009,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -99,19 +99,19 @@
 
 // Report error
 void j2k_error_callback(const char *msg, void *client_data){
-  FXTRACE((90,"fxjp2io: error: %s.\n",msg));
+  FXTRACE((100,"fxjp2io: error: %s.\n",msg));
   }
 
 
 // Report warning
 void j2k_warning_callback(const char *msg, void *client_data){
-  FXTRACE((90,"fxjp2io: warning: %s.\n",msg));
+  FXTRACE((100,"fxjp2io: warning: %s.\n",msg));
   }
 
 
 // Report info
 void j2k_info_callback(const char *msg, void *client_data){
-  FXTRACE((90,"fxjp2io: info: %s.\n",msg));
+  FXTRACE((100,"fxjp2io: info: %s.\n",msg));
   }
 
 
@@ -126,8 +126,8 @@
 
 // Load a JPEG image
 FXbool fxloadJP2(FXStream& store,FXColor*& data,FXint& width,FXint& height,FXint&){
-  register FXint x,y,cw,rsh,gsh,bsh,ash,rof,gof,bof,aof;
-  register FXuchar r,g,b,a;
+  FXint x,y,cw,rsh,gsh,bsh,ash,rof,gof,bof,aof;
+  FXuchar r,g,b,a;
   FXbool swap=store.swapBytes();
   FXlong pos=store.position();
   FXbool result=false;
@@ -155,7 +155,7 @@
     size=store.position()-pos;
     store.position(pos);
 
-    FXTRACE((90,"fxloadJP2: file size=%d\n",size));
+    FXTRACE((100,"fxloadJP2: file size=%d\n",size));
 
     // Allocate chunk for file data
     if(allocElms(ptr,size)){
@@ -197,7 +197,7 @@
             width=image->x1-image->x0;
             height=image->y1-image->y0;
 
-            FXTRACE((90,"fxloadJP2: width=%d height=%d numcomps=%d color_space=%d\n",width,height,image->numcomps,image->color_space));
+            FXTRACE((100,"fxloadJP2: width=%d height=%d numcomps=%d color_space=%d\n",width,height,image->numcomps,image->color_space));
 
             // Only support GREY, RGB, and RGBA
             if(((image->numcomps==1) && (image->color_space==CLRSPC_GRAY)) || ((image->numcomps==3 || image->numcomps==4) && (image->color_space==CLRSPC_SRGB))){
@@ -277,7 +277,7 @@
 
 // Save a JPEG image
 FXbool fxsaveJP2(FXStream& store,const FXColor* data,FXint width,FXint height,FXint quality){
-  register FXint x,y,c,p;
+  FXint x,y,c,p;
   FXbool result=false;
 
   // Must make sense
@@ -399,9 +399,8 @@
    0x45, 0x44, 0x20, 0xa2, 0x85, 0xe3, 0xe0, 0xa3, 0x05, 0x00, 0x00, 0xa0,
    0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0xa0, 0xfd, 0xff, 0xff, 0xbf,
    0x01, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff};
-  register FXint p;
   allocElms(data,32*32);
-  for(p=0; p<32*32; p++){
+  for(FXint p=0; p<32*32; p++){
     datap=color(image_bitsp>>3>>(p&7))&1;
     }
   width=32;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxjpegio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxjpegio.cpp Changed

@@ -3,7 +3,7 @@
 *                      J P E G    I n p u t / O u t p u t                       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2000,2018 by David Tyree.   All Rights Reserved.                *
+* Copyright (C) 2000,2020 by David Tyree.   All Rights Reserved.                *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -177,8 +177,8 @@
   FOX_jpeg_error_mgr jerr;
   FOX_jpeg_source_mgr src;
   JSAMPLE *buffer1;
-  register FXColor *pp;
-  register JSAMPLE *qq;
+  FXColor *pp;
+  JSAMPLE *qq;
   int row_stride,color,i;
 
   // Null out
@@ -328,8 +328,8 @@
   FOX_jpeg_error_mgr jerr;
   FOX_jpeg_dest_mgr dst;
   JSAMPLE *buffer1;
-  register const FXColor *pp;
-  register JSAMPLE *qq;
+  const FXColor *pp;
+  JSAMPLE *qq;
 
   // Must make sense
   if(!data || width<=0 || height<=0 || quality<=0 || 100<quality) return false;
@@ -418,9 +418,8 @@
    0xe5, 0x04, 0x9f, 0xa3, 0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0xa0,
    0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0xa0, 0xfd, 0xff, 0xff, 0xbf,
    0x01, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff};
-  register FXint p;
   allocElms(data,32*32);
-  for(p=0; p<32*32; p++){
+  for(FXint p=0; p<32*32; p++){
     datap=color(jpeg_bitsp>>3>>(p&7))&1;
     }
   width=32;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxkeyboard.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxkeyboard.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxkeysym.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxkeysym.cpp Changed

@@ -3,7 +3,7 @@
 *                 K e y S y m   t o   U n i c o d e   M a p p i n g             *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -820,7 +820,7 @@
 
 // Translate X11 keysym to unicode
 FXwchar fxkeysym2ucs(FXwchar sym){
-  register FXint h=ARRAYNUMBER(sym2ucs)-1,l=0,m;
+  FXint h=ARRAYNUMBER(sym2ucs)-1,l=0,m;
 
   // First check for Latin-1 characters (1:1 mapping)
   if((0x0020<=sym && sym<=0x007e) || (0x00a0<=sym && sym<=0x00ff)) return sym;
@@ -1600,7 +1600,7 @@
 
 // Translate X11 keysym to unicode
 FXwchar fxucs2keysym(FXwchar ucs){
-  register FXint h=ARRAYNUMBER(ucs2sym)-1,l=0,m;
+  FXint h=ARRAYNUMBER(ucs2sym)-1,l=0,m;
 
   // First check for Latin-1 characters
   if((ucs>=0x0020 && ucs<=0x007e) || (ucs>=0x00a0 && ucs<=0x00ff)) return ucs;

gogglesmm-1.2.2.tar.gz/cfox/lib/fxleaps.cpp Added

@@ -0,0 +1,77 @@
+/********************************************************************************
+*                                                                               *
+*                                T i m e   S t u f f                            *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "FXString.h"
+#include "FXSystem.h"
+
+
+/*
+  Notes:
+  - Return number of leap seconds from utc or tai (nanoseconds) since Unix Epoch.
+  - Leap seconds date may be obtained from International Earth Rotation
+    System (www.iers.org), Bulletin C.  At the time of this writing,
+    https://datacenter.iers.org/data/16/bulletinc-059.txt.
+  - List of leap seconds is obtained from IETF,
+    https://www.ietf.org/timezones/data/leap-seconds.list.
+  - When new leap seconds are announced by IERS, leapsecond table must be
+    appended with a new entry; please notify jeroen@fox-toolkit.com if new
+    data is available but not yet incorporated into "leapseconds.h".
+  - We only remember *when* the leap seconds happen; the index in the array
+    tells us how many leap seconds there were up to that time (just add 10,
+    since when leap seconds were first applied, there were 10 of them).
+*/
+
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+#include "leapseconds.h"
+
+// Return leap seconds from utc in nanocseconds since Unix Epoch
+FXival FXSystem::leapSeconds(FXTime utc){
+  FXival l=0,h=ARRAYNUMBER(leapseconds_utc)-1,m;
+  if(leapseconds_utch<=utc) return h+10;
+  if(utc<leapseconds_utcl) return 0;
+  while(l<(m=(h+l)>>1)){
+    if(leapseconds_utcm<=utc) l=m; else h=m;
+    }
+  return l+10;
+  }
+
+
+// Return leap seconds from tai in nanocseconds since Unix Epoch
+FXival FXSystem::leapSecondsTAI(FXTime tai){
+  FXival l=0,h=ARRAYNUMBER(leapseconds_tai)-1,m;
+  if(leapseconds_taih<=tai) return h+10;
+  if(tai<leapseconds_tail) return 0;
+  while(l<(m=(h+l)>>1)){
+    if(leapseconds_taim<=tai) l=m; else h=m;
+    }
+  return l+10;
+  }
+
+}
+

gogglesmm-1.2.1.tar.gz/cfox/lib/fxmath.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxmath.cpp Changed

@@ -3,7 +3,7 @@
 *                           M a t h   F u n c t i o n s                         *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2015,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2015,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -46,6 +46,114 @@
 namespace FX {
 
 
+// All bits of single precision floating point number
+FXuint Math::fpBits(FXfloat x){
+  union{ FXfloat f; FXuint u; } z={x};
+  return z.u;
+  }
+
+
+// All bits of double precision floating point number
+FXulong Math::fpBits(FXdouble x){
+  union{ FXdouble f; FXulong u; } z={x};
+  return z.u;
+  }
+
+
+// Sign of single precision float point number (0..1)
+FXint Math::fpSign(FXfloat x){
+  FXint sign=Math::fpBits(x)>>31;
+  return sign;
+  }
+
+
+// Sign of double precision float point number (0..1)
+FXlong Math::fpSign(FXdouble x){
+  FXlong sign=Math::fpBits(x)>>63;
+  return sign;
+  }
+
+
+// Signed exponent of single precision float point number (-127..128)
+FXint Math::fpExponent(FXfloat x){
+  FXint result=(Math::fpBits(x)>>23)&0xff;
+  return result-127;
+  }
+
+
+// Signed exponent of double precision float point number (-1023..1023)
+FXlong Math::fpExponent(FXdouble x){
+  FXlong result=(Math::fpBits(x)>>52)&0x7ff;
+  return result-1023;
+  }
+
+
+// Mantissa of single precision float point number
+FXint Math::fpMantissa(FXfloat x){
+  FXint mantissa=Math::fpBits(x)&0x007fffff;
+  FXint exponent=Math::fpBits(x)&0x7f800000;
+  return mantissa|((FXint)(0<exponent))<<23;
+  }
+
+
+// Mantissa of double precision float point number
+FXlong Math::fpMantissa(FXdouble x){
+  FXlong mantissa=Math::fpBits(x)&FXLONG(0x000fffffffffffff);
+  FXlong exponent=Math::fpBits(x)&FXLONG(0x7ff0000000000000);
+  return mantissa|((FXlong)(0<exponent))<<52;
+  }
+
+
+// Single precision floating point number is finite
+FXbool Math::fpFinite(FXfloat x){
+  return ((Math::fpBits(x)&0x7fffffff)<0x7f800000);
+  }
+
+
+// Double precision floating point number is finite
+FXbool Math::fpFinite(FXdouble x){
+  return ((Math::fpBits(x)&FXULONG(0x7fffffffffffffff))<FXULONG(0x7ff0000000000000));
+  }
+
+
+// Single precision floating point number is infinite
+FXbool Math::fpInfinite(FXfloat x){
+  return ((Math::fpBits(x)&0x7fffffff)==0x7f800000);
+  }
+
+
+// Double precision floating point number is infinite
+FXbool Math::fpInfinite(FXdouble x){
+  return ((Math::fpBits(x)&FXULONG(0x7fffffffffffffff))==FXULONG(0x7ff0000000000000));
+  }
+
+
+// Single precision floating point number is NaN
+FXbool Math::fpNan(FXfloat x){
+  return (0x7f800000<(Math::fpBits(x)&0x7fffffff));
+  }
+
+
+// Double precision floating point number is NaN
+FXbool Math::fpNan(FXdouble x){
+  return (FXULONG(0x7ff0000000000000)<(Math::fpBits(x)&FXULONG(0x7fffffffffffffff)));
+  }
+
+
+// Single precision floating point number is normalized
+FXbool Math::fpNormal(FXfloat x){
+  FXuint bits=Math::fpBits(x)&0x7fffffff;
+  return bits==0 || (0x00800000<=bits && bits<0x7f800000);
+  }
+
+
+// Double precision floating point number is normalized
+FXbool Math::fpNormal(FXdouble x){
+  FXulong bits=Math::fpBits(x)&FXULONG(0x7fffffffffffffff);
+  return (bits==0) || ((FXULONG(0x0010000000000000)<=bits) && (bits<FXULONG(0x7ff0000000000000)));
+  }
+
+
 // Single precision ceiling (round upward to nearest integer)
 #if defined(NO_CEILF)
 FXfloat Math::ceil(FXfloat x){
@@ -200,7 +308,7 @@
   FXulong ax=z.u&FXULONG(0x7fffffffffffffff);
   if(ax<FXULONG(0x4330000000000000)){   // |x| has fraction
     volatile FXdouble tmp;              // Volatile lest add/subtract is optimized away
-    register FXulong sx=z.u>>63;
+    FXulong sx=z.u>>63;
     tmp=x+TWO52sx;                    // Blow fraction bits, works for values up to 4503599627370496
     x=tmp-TWO52sx;                    // Values greater than 4503599627370496 are integral anyway
     }
@@ -632,8 +740,91 @@
 
 /*******************************************************************************/
 
+static FXdouble posPowOfTen309={
+  1E+000,1E+001,1E+002,1E+003,1E+004,1E+005,1E+006,1E+007,1E+008,1E+009,
+  1E+010,1E+011,1E+012,1E+013,1E+014,1E+015,1E+016,1E+017,1E+018,1E+019,
+  1E+020,1E+021,1E+022,1E+023,1E+024,1E+025,1E+026,1E+027,1E+028,1E+029,
+  1E+030,1E+031,1E+032,1E+033,1E+034,1E+035,1E+036,1E+037,1E+038,1E+039,
+  1E+040,1E+041,1E+042,1E+043,1E+044,1E+045,1E+046,1E+047,1E+048,1E+049,
+  1E+050,1E+051,1E+052,1E+053,1E+054,1E+055,1E+056,1E+057,1E+058,1E+059,
+  1E+060,1E+061,1E+062,1E+063,1E+064,1E+065,1E+066,1E+067,1E+068,1E+069,
+  1E+070,1E+071,1E+072,1E+073,1E+074,1E+075,1E+076,1E+077,1E+078,1E+079,
+  1E+080,1E+081,1E+082,1E+083,1E+084,1E+085,1E+086,1E+087,1E+088,1E+089,
+  1E+090,1E+091,1E+092,1E+093,1E+094,1E+095,1E+096,1E+097,1E+098,1E+099,
+  1E+100,1E+101,1E+102,1E+103,1E+104,1E+105,1E+106,1E+107,1E+108,1E+109,
+  1E+110,1E+111,1E+112,1E+113,1E+114,1E+115,1E+116,1E+117,1E+118,1E+119,
+  1E+120,1E+121,1E+122,1E+123,1E+124,1E+125,1E+126,1E+127,1E+128,1E+129,
+  1E+130,1E+131,1E+132,1E+133,1E+134,1E+135,1E+136,1E+137,1E+138,1E+139,
+  1E+140,1E+141,1E+142,1E+143,1E+144,1E+145,1E+146,1E+147,1E+148,1E+149,
+  1E+150,1E+151,1E+152,1E+153,1E+154,1E+155,1E+156,1E+157,1E+158,1E+159,
+  1E+160,1E+161,1E+162,1E+163,1E+164,1E+165,1E+166,1E+167,1E+168,1E+169,
+  1E+170,1E+171,1E+172,1E+173,1E+174,1E+175,1E+176,1E+177,1E+178,1E+179,
+  1E+180,1E+181,1E+182,1E+183,1E+184,1E+185,1E+186,1E+187,1E+188,1E+189,
+  1E+190,1E+191,1E+192,1E+193,1E+194,1E+195,1E+196,1E+197,1E+198,1E+199,
+  1E+200,1E+201,1E+202,1E+203,1E+204,1E+205,1E+206,1E+207,1E+208,1E+209,
+  1E+210,1E+211,1E+212,1E+213,1E+214,1E+215,1E+216,1E+217,1E+218,1E+219,
+  1E+220,1E+221,1E+222,1E+223,1E+224,1E+225,1E+226,1E+227,1E+228,1E+229,
+  1E+230,1E+231,1E+232,1E+233,1E+234,1E+235,1E+236,1E+237,1E+238,1E+239,
+  1E+240,1E+241,1E+242,1E+243,1E+244,1E+245,1E+246,1E+247,1E+248,1E+249,
+  1E+250,1E+251,1E+252,1E+253,1E+254,1E+255,1E+256,1E+257,1E+258,1E+259,
+  1E+260,1E+261,1E+262,1E+263,1E+264,1E+265,1E+266,1E+267,1E+268,1E+269,
+  1E+270,1E+271,1E+272,1E+273,1E+274,1E+275,1E+276,1E+277,1E+278,1E+279,
+  1E+280,1E+281,1E+282,1E+283,1E+284,1E+285,1E+286,1E+287,1E+288,1E+289,
+  1E+290,1E+291,1E+292,1E+293,1E+294,1E+295,1E+296,1E+297,1E+298,1E+299,
+  1E+300,1E+301,1E+302,1E+303,1E+304,1E+305,1E+306,1E+307,1E+308
+  };
+
+static FXdouble negPowOfTen324={
+  1E-000,1E-001,1E-002,1E-003,1E-004,1E-005,1E-006,1E-007,1E-008,1E-009,
+  1E-010,1E-011,1E-012,1E-013,1E-014,1E-015,1E-016,1E-017,1E-018,1E-019,
+  1E-020,1E-021,1E-022,1E-023,1E-024,1E-025,1E-026,1E-027,1E-028,1E-029,
+  1E-030,1E-031,1E-032,1E-033,1E-034,1E-035,1E-036,1E-037,1E-038,1E-039,
+  1E-040,1E-041,1E-042,1E-043,1E-044,1E-045,1E-046,1E-047,1E-048,1E-049,
+  1E-050,1E-051,1E-052,1E-053,1E-054,1E-055,1E-056,1E-057,1E-058,1E-059,
+  1E-060,1E-061,1E-062,1E-063,1E-064,1E-065,1E-066,1E-067,1E-068,1E-069,
+  1E-070,1E-071,1E-072,1E-073,1E-074,1E-075,1E-076,1E-077,1E-078,1E-079,
+  1E-080,1E-081,1E-082,1E-083,1E-084,1E-085,1E-086,1E-087,1E-088,1E-089,
+  1E-090,1E-091,1E-092,1E-093,1E-094,1E-095,1E-096,1E-097,1E-098,1E-099,
+  1E-100,1E-101,1E-102,1E-103,1E-104,1E-105,1E-106,1E-107,1E-108,1E-109,
+  1E-110,1E-111,1E-112,1E-113,1E-114,1E-115,1E-116,1E-117,1E-118,1E-119,
+  1E-120,1E-121,1E-122,1E-123,1E-124,1E-125,1E-126,1E-127,1E-128,1E-129,
+  1E-130,1E-131,1E-132,1E-133,1E-134,1E-135,1E-136,1E-137,1E-138,1E-139,
+  1E-140,1E-141,1E-142,1E-143,1E-144,1E-145,1E-146,1E-147,1E-148,1E-149,
+  1E-150,1E-151,1E-152,1E-153,1E-154,1E-155,1E-156,1E-157,1E-158,1E-159,
+  1E-160,1E-161,1E-162,1E-163,1E-164,1E-165,1E-166,1E-167,1E-168,1E-169,
+  1E-170,1E-171,1E-172,1E-173,1E-174,1E-175,1E-176,1E-177,1E-178,1E-179,
+  1E-180,1E-181,1E-182,1E-183,1E-184,1E-185,1E-186,1E-187,1E-188,1E-189,
+  1E-190,1E-191,1E-192,1E-193,1E-194,1E-195,1E-196,1E-197,1E-198,1E-199,
+  1E-200,1E-201,1E-202,1E-203,1E-204,1E-205,1E-206,1E-207,1E-208,1E-209,
+  1E-210,1E-211,1E-212,1E-213,1E-214,1E-215,1E-216,1E-217,1E-218,1E-219,
+  1E-220,1E-221,1E-222,1E-223,1E-224,1E-225,1E-226,1E-227,1E-228,1E-229,
+  1E-230,1E-231,1E-232,1E-233,1E-234,1E-235,1E-236,1E-237,1E-238,1E-239,
+  1E-240,1E-241,1E-242,1E-243,1E-244,1E-245,1E-246,1E-247,1E-248,1E-249,
+  1E-250,1E-251,1E-252,1E-253,1E-254,1E-255,1E-256,1E-257,1E-258,1E-259,
+  1E-260,1E-261,1E-262,1E-263,1E-264,1E-265,1E-266,1E-267,1E-268,1E-269,
+  1E-270,1E-271,1E-272,1E-273,1E-274,1E-275,1E-276,1E-277,1E-278,1E-279,
+  1E-280,1E-281,1E-282,1E-283,1E-284,1E-285,1E-286,1E-287,1E-288,1E-289,
+  1E-290,1E-291,1E-292,1E-293,1E-294,1E-295,1E-296,1E-297,1E-298,1E-299,
+  1E-300,1E-301,1E-302,1E-303,1E-304,1E-305,1E-306,1E-307,1E-308,1E-309,
+  1E-310,1E-311,1E-312,1E-313,1E-314,1E-315,1E-316,1E-317,1E-318,1E-319,
+  1E-320,1E-321,1E-322,1E-323
+  };
+
+
+// Fast integer power of 10; this is based on the mathematical
+// identity 10^(a+b) = 10^a * 10^b.  We could also use a really large
+// table of 308+ entries, but that would take a lot of space...
+// The exponent should be in the range -323 to +308, these being the limits
+// of double precision IEEE754 standard floating point.
+FXdouble Math::pow10i(FXint ex){
+  FXASSERT(-323<=ex && ex<=308);
+  return 0<=ex ? posPowOfTenex : negPowOfTen-ex;
+  }
+
+/*******************************************************************************/
+
 // Single precision integer power
-FXfloat Math::ipow(FXfloat base,FXint ex){
+FXfloat Math::powi(FXfloat base,FXint ex){
   FXfloat result=1.0f;
   if(ex){
     if(ex<0){
@@ -652,7 +843,7 @@
 
 
 // Double precision integer power
-FXdouble Math::ipow(FXdouble base,FXint ex){
+FXdouble Math::powi(FXdouble base,FXint ex){
   FXdouble result=1.0;
   if(ex){
     if(ex<0){

gogglesmm-1.2.2.tar.gz/cfox/lib/fxntp.cpp Added

@@ -0,0 +1,69 @@
+/********************************************************************************
+*                                                                               *
+*                                 N T P - T i m e                               *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 2019,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "FXString.h"
+#include "FXSystem.h"
+
+
+/*
+  Notes:
+
+  - Conversions between Network Time Protocol (NTP) time and Unix Epoch Time.
+*/
+
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+// Offset from Epoch to 1-Jan-1900 @ 00:00:00 UTC
+const FXTime JANUARY1900=-FXLONG(2208988800000000000);
+
+// Offset from Epoch to 7-Feb-2036 @ 06:28:16 UTC
+const FXTime FEBRUARY2036=+FXLONG(2085978496000000000);
+
+
+// Convert NTP format (ssss:ffff) to nanoseconds since Unix Epoch
+FXTime FXSystem::timeFromNTPTime(FXulong ntptime){
+  FXTime secs=(ntptime>>32)&0xFFFFFFFF;
+  FXTime frac=ntptime-(secs<<32);
+  FXTime nano=(frac*1000000000+2147483647)>>32;
+  return (secs&0x80000000) ? (secs*1000000000+nano+JANUARY1900) : (secs*1000000000+nano+FEBRUARY2036);
+  }
+
+
+// Convert utc in nanoseconds since Unix Epoch to NTP (ssss:ffff)
+FXulong FXSystem::ntpTimeFromTime(FXTime utc){
+  FXlong base=utc-FEBRUARY2036;
+  FXlong secs=(0<=base ? base : base-999999999)/1000000000;
+  FXlong nano=base-secs*1000000000;
+  FXlong frac=((nano<<32)+500000000)/1000000000;
+  return (secs<<32)+frac;
+  }
+
+}
+

gogglesmm-1.2.1.tar.gz/cfox/lib/fxparsegeometry.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxparsegeometry.cpp Changed

@@ -3,7 +3,7 @@
 *         P a r s e   G e o m e t r y   F r o m   C o m m a n d   L i n e       *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -48,12 +48,12 @@
 //      4       width was assigned
 //      8       height was assigned
 FXint fxparsegeometry(const FXchar *string,FXint& x,FXint& y,FXint& w,FXint& h){
-  register FXint result=0;
-  register FXint tw=0;
-  register FXint th=0;
-  register FXint tx=0;
-  register FXint ty=0;
-  register FXint mul;
+  FXint result=0;
+  FXint tw=0;
+  FXint th=0;
+  FXint tx=0;
+  FXint ty=0;
+  FXint mul;
 
   // Got string?
   if(string && *string!='\0'){

gogglesmm-1.2.1.tar.gz/cfox/lib/fxpcxio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxpcxio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxpngio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxpngio.cpp Changed

@@ -3,7 +3,7 @@
 *                         P N G    I n p u t / O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -18,9 +18,6 @@
 * You should have received a copy of the GNU Lesser General Public License      *
 * along with this program.  If not, see <http://www.gnu.org/licenses/>          *
 ********************************************************************************/
-#ifdef HAVE_PNG_H
-#include "png.h"
-#endif
 #include "xincs.h"
 #include "fxver.h"
 #include "fxdefs.h"
@@ -29,6 +26,9 @@
 #include "FXHash.h"
 #include "FXElement.h"
 #include "FXStream.h"
+#ifdef HAVE_PNG_H
+#include "png.h"
+#endif
 
 /*
   Notes:
@@ -37,6 +37,7 @@
     http://www.graphicswiz.com/png/
     http://www.inforamp.net/~poynton
     http://www.libpng.org/pub/png/
+    https://libspng.org/download.html (new!)
 */
 
 using namespace FX;
@@ -313,9 +314,8 @@
    0x45, 0x20, 0x24, 0xa2, 0x45, 0x20, 0xc4, 0xa1, 0x05, 0x00, 0x00, 0xa0,
    0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0xa0, 0xfd, 0xff, 0xff, 0xbf,
    0x01, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff};
-  register FXint p;
   allocElms(data,32*32);
-  for(p=0; p<32*32; p++){
+  for(FXint p=0; p<32*32; p++){
     datap=color(png_bitsp>>3>>(p&7))&1;
     }
   width=32;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxppmio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxppmio.cpp Changed

@@ -3,7 +3,7 @@
 *                          P P M   I n p u t / O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -55,7 +55,7 @@
 
 // Read one integer
 static FXint getint(FXStream& store){
-  register FXint num=0;
+  FXint num=0;
   FXuchar c;
   while(!store.eof()){
     store >> c;
@@ -87,8 +87,8 @@
 
 // Load image from stream
 FXbool fxloadPPM(FXStream& store,FXColor*& data,FXint& width,FXint& height){
-  register FXint npixels,i,j,maxvalue=1;
-  register FXuchar *pp;
+  FXint npixels,i,j,maxvalue=1;
+  FXuchar *pp;
   FXuchar magic,format,byte;
 
   // Null out
@@ -210,8 +210,8 @@
 // Save a bmp file to a stream
 FXbool fxsavePPM(FXStream& store,const FXColor *data,FXint width,FXint height){
   if(data && 0<width && 0<height){
-    register const FXuchar *pp=(const FXuchar*)data;
-    register FXint i,j,nsize;
+    const FXuchar *pp=(const FXuchar*)data;
+    FXint i,j,nsize;
     FXchar size32;
 
     // Save header

gogglesmm-1.2.1.tar.gz/cfox/lib/fxprintf.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxprintf.cpp Changed

@@ -3,7 +3,7 @@
 *                  V a r a r g s   P r i n t f   R o u t i n e s                *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -37,7 +37,8 @@
                 followed by '$'.  The first parameter starts at 1.
 
   - Interpretation of the flags:
-     '#'        Alternate form (prefix '0' for octal, '0x' for hex, decimal point if float.
+     '#'        Alternate form (prefix '0' for octal, '0x' for hex, '0b' for binary, and
+                always emit decimal point for floats.
      '0'        Zero-padding.
      '-'        Left-adjust.
      '+'        Show sign always.
@@ -89,20 +90,47 @@
      'e', 'E',  Exponential notation floating point conversion.
      'f', 'F'   Simple point conversion.
      'g', 'G'   Shortest representation point conversion.
+     'a', 'A'   Hexadecimal floating point output. If no precision specified,
+                print the shortest number of digits (at most 13 after the hexadecimal
+                point), otherwise, round the last printed digit.  Use upper- or lower-case,
+                depending on whether A or a was used.
+
+  - Printing special floating point values:
+
+     nan,       If floating point conversion specifier is lower case ('f', 'g',
+     inf        or 'e'), if needed, preceded by a sign.
+
+     NAN,       If floating point conversion specifier is lower case ('F', 'G',
+     INF        or 'E'), if needed, preceded by a sign.
+
+    We may have to change inf -> Infinity or INFINITY instead have to find spec
+    for this change.
 
   - If the range of positional parameters in a format string is not contiguous,
     i.e. if a positional parameter is skipped (e.g. "%3$d%1$d"), then the missing
     one is assumed to be of type "int".
     Its therefore best if no parameters are skipped; referencing a single parameter
     multiple times however, is no problem!!
-  - FIXME Subtle difference between glibc: does NOT output '\0' at the end, unless
-    buffer is large enough.  This implementation is better for our purposes, however.
-*/
 
-#define CONVERTSIZE     512     // Conversion buffer
-#define NDIG            512     // Maximum space used for numbers
+  - A sticky situation developed with compilers optimizing statements like:
+
+        number*=xxx;
+        number*=yyy;
+
+    to:
+
+        number*=(xxx*yyy);
 
-#ifdef WIN32
+    This causes overflow of the (xxx*yyy) expression, and thus incorrect outputs.
+    The problem is prevented by declaring 'number' as 'volatile' which causes the
+    value to be written to memory after assignment, and thus execute these two
+    statements as written.
+
+  - Subtle difference between glibc: does NOT output '\0' at the end, unless
+    buffer is large enough.
+*/
+
+#if defined(_WIN32)
 #ifndef va_copy
 #define va_copy(arg,list) ((arg)=(list))
 #endif
@@ -143,115 +171,271 @@
   FLG_THOUSAND = 128,   // Print comma's for thousands
   FLG_EXPONENT = 256,   // Exponential notation
   FLG_FRACTION = 512,   // Fractional notation
-  FLG_DOTSEEN  = 1024   // Dot was seen
+  FLG_HEXADEC  = 1024,  // Hexadecimal notation
+  FLG_DOTSEEN  = 2048   // Dot was seen
   };
 
 
-static const FXchar lower_digits="0123456789abcdef";
-static const FXchar upper_digits="0123456789ABCDEF";
+// Conversion buffer
+const FXint CONVERTSIZE=512;
+
+// Hexadecimal digits
+const FXchar lower_digits="0123456789abcdef";
+const FXchar upper_digits="0123456789ABCDEF";
 
 /*******************************************************************************/
 
-// The buffer must have at least NDIG bytes
-static FXchar* _cvt(FXchar* buffer,FXdouble arg,FXint& decimal,FXint prec,FXuint flags){
-  register FXchar *ptr=buffer;
-  register FXchar *p;
-  register FXint d=0;
-  FXdouble fi;
-  FXdouble fj;
-
-  // Clamp to maximum digits
-  if(prec>=NDIG-1) prec=NDIG-2;
-
-  // Split into whole and fraction
-  arg=modf(arg,&fi);
-
-  // Generate integer part
-  p=buffer+NDIG;
-  if(fi!=0.0){
-    while(buffer<p && fi!=0.0){
-      fj=modf(fi/10.0,&fi);
-      *--p=(FXint)((fj+0.03)*10.0)+'0';
-      d++;
+static FXdouble scalepos132 = {
+  1.0E+18, 1.0E+19, 1.0E+20, 1.0E+21, 1.0E+22, 1.0E+23, 1.0E+24, 1.0E+25,
+  1.0E+26, 1.0E+27, 1.0E+28, 1.0E+29, 1.0E+30, 1.0E+31, 1.0E+32, 1.0E+33,
+  1.0E+34, 1.0E+35, 1.0E+36, 1.0E+37, 1.0E+38, 1.0E+39, 1.0E+40, 1.0E+41,
+  1.0E+42, 1.0E+43, 1.0E+44, 1.0E+45, 1.0E+46, 1.0E+47, 1.0E+48, 1.0E+49
+  };
+
+static FXdouble scaleneg132 = {
+  1.0E+18, 1.0E+17, 1.0E+16, 1.0E+15, 1.0E+14, 1.0E+13, 1.0E+12, 1.0E+11,
+  1.0E+10, 1.0E+09, 1.0E+08, 1.0E+07, 1.0E+06, 1.0E+05, 1.0E+04, 1.0E+03,
+  1.0E+02, 1.0E+01, 1.0E+00, 1.0E-01, 1.0E-02, 1.0E-03, 1.0E-04, 1.0E-05,
+  1.0E-06, 1.0E-07, 1.0E-08, 1.0E-09, 1.0E-10, 1.0E-11, 1.0E-12, 1.0E-13
+  };
+
+static FXdouble scalepos210 = {
+  1.0E+00,  1.0E+32,  1.0E+64,  1.0E+96,  1.0E+128,
+  1.0E+160, 1.0E+192, 1.0E+224, 1.0E+256, 1.0E+288
+  };
+
+static FXdouble scaleneg210 = {
+  1.0E-00,  1.0E-32,  1.0E-64,  1.0E-96,  1.0E-128,
+  1.0E-160, 1.0E-192, 1.0E-224, 1.0E-256, 1.0E-288
+  };
+
+
+// Convert number to string in buffer
+static FXchar* cvt(FXchar* buffer,FXuval size,FXdouble value,FXint& decimal,FXint precision,FXuint flags){
+  volatile FXdouble number=value;
+  FXchar *end=buffer+size;
+  FXchar *dst=buffer;
+  FXchar *src=end;
+  FXchar *p;
+  FXint digits,binex,decex,negex,dex,x;
+  FXulong num,n;
+
+  // Compute decimal point
+  if(__likely(number)){
+
+    // Get binary exponent
+    binex=Math::fpExponent(number);
+
+    // Compute base 10 exponent from base 2 exponent as follows:
+    //
+    //   decex = log10(2^binex) = binex*log10(2) = binex*0.301029995663981
+    //
+    // This may be approximated as:
+    //
+    //   decex = binex*0.30078125 = (binex*77)>>8
+    //
+    decex=(binex*77)>>8;
+
+    // Ought to be in this range
+    FXASSERT(-308<=decex && decex<=308);
+
+    // Bring mantissa in range for conversion to a 64-bit long.
+    // For normalized floating point numbers the mantissa is always
+    // 0.5...1), thus we scale by:
+    //
+    //   1.0E18 * 10^-decex       decex>=0
+    //
+    // or:
+    //
+    //   1.0E18 * 10^+decex       decex<0
+    //
+    // This leaves a number 0.5E18...1.0E18, which fits in 64-bit long.
+    // If the floating point number was denormalized, apply an additional
+    // scale after the one above.  We scale the number an arbitrary number
+    // of times by 10, until its in the expected range 0.5E18...1.0E18, and
+    // adjust the exponent along the way.
+    //
+    // The variable 'number' is declared as 'volatile', to force compiler
+    // to write back to memory in between the two statements:
+    //
+    //    number*=xxx;
+    //    number*=yyy;
+    //
+    // Without this volatile declaration, these two statements may be
+    // compiled as in optimized mode:
+    //
+    //    number*=(xxx*yyy);
+    //
+    // Mathematically this would be the same, but computer arithmetic
+    // is NOT generally associative.  The optimized (xxx*yyy) may overflow,
+    // and if this happens then the result of the conversion will NOT be
+    // accurate.
+    if(decex>=0){
+      if(decex<32){
+        number*=scaleneg1decex;
+        }
+      else{
+        number*=scaleneg1decex&31;
+        number*=scaleneg2decex>>5;
+        }
       }
-    while(p<buffer+NDIG){
-      *ptr++=*p++;
+    else{
+      negex=-decex;
+      if(negex<32){
+        number*=scalepos1negex;
+        }
+      else{
+        number*=scalepos1negex&31;
+        number*=scalepos2negex>>5;
+        }
       }
-    }
 
-  // Else shift fraction until >=1
-  else if(0.0<arg){
-    while((fj=arg*10.0)<1.0){
-      arg=fj;
-      d--;
+    // Denormalized number hack
+    if(binex==-1023){
+      dex=(Math::fpExponent(number)*77)>>8;
+      number*=Math::pow10i(18-dex);
+      decex+=dex-18;
       }
-    }
 
-  // End of digits to generate
-  p=buffer+prec;
+    // Adjust decimal point, keep 18 digits only
+    if(1.0E19<=number){
+      number*=0.1;
+      decex++;
+      }
+
+    // Convert to string at end of buffer
+    num=(FXulong)number;
+
+    FXASSERT(num<FXULONG(10000000000000000000));
+
+    // Generate digits at end of buffer, starting with last
+    do{
+      n=num/10;
+      *--src='0'+(num-n*10);
+      num=n;
+      }
+    while(num);
+
+    // Decimal point location after 1st digit
+    decimal=decex+1;
+    }
+  else{
 
-  // In normal mode, add the ones before the decimal point
-  if(flags&FLG_FRACTION) p+=d;
+    // Just one lone '0'
+    *--src='0';
 
-  // Not enough room for expected digits
-  if(p<buffer){
-    decimal=-prec;           // With prec=5 0.000001 becomes 0.00000
-    buffer0='\0';
-    return buffer;
+    // Assume decimal point location 0.
+    decimal=1;
     }
 
-  // Decimal point location from start; may be negative
-  decimal=d;
+  // Digits to be returned
+  digits=precision;
 
-  // Generate fraction of up to prec digits, plus one
-  while(ptr<=p && ptr<buffer+NDIG){
-    arg*=10.0;
-    arg=modf(arg,&fj);
-    *ptr++=(FXint)fj+'0';
+  // In exponent mode, add one before decimal point; add up to
+  // two more digits if engineering mode also in effect.
+  if(flags&FLG_EXPONENT){
+    if(flags&FLG_THOUSAND){
+      x=(decimal+600-1)%3;
+      digits+=x;
+      }
+    digits++;
+    }
+
+  // In fraction mode, add digits before the decimal point. If the
+  // decimal point is negative, there will be fewer digits generated,
+  // and the decimal point will be adjusted accordingly.
+  if(flags&FLG_FRACTION){
+    if(digits<-decimal) decimal=-digits;
+    digits+=decimal;
     }
 
-  // No more space
-  if(p>=buffer+NDIG){
-    bufferNDIG-1='\0';
-    return buffer;
+  // Don't exceed buffer space
+  digits=Math::imin(digits,size-1);
+
+  // Move string to begin of buffer
+  while(0<digits && src<end){
+    *dst++=*src++;
+    digits--;
     }
 
-  // Round the result
-  ptr=p;
-  *p+=5;
-  while('9' < *p){
-    *p='0';
-    if(buffer<p){
-      ++*--p;
+  // Rounding result if using fewer digits than generated
+  if(src<end && '5'<=*src){
+    p=dst;
+    while(buffer<p){
+      if(++*--p<='9') goto n;
+      *p='0';
       }
-    else{
-      *p='1';
-      decimal++;
-      if(flags&FLG_FRACTION){           // Extra zero at the end for normal mode
-        if(buffer<ptr) *ptr='0';
-        ptr++;
+    if(buffer==p){
+      *buffer='1';
+      if(flags&FLG_FRACTION){
+        if(buffer<dst) *dst='0';        // Extra zero at the end for normal mode
+        dst++;                          // Added a digit
         }
+      decimal++;
+      digits--;
       }
     }
 
+  // Need more digits
+n:while(digits>0){
+    *dst++='0';
+    digits--;
+    }
+
+  FXASSERT(dst<end);
+
   // Terminate
-  *ptr='\0';
+  *dst='\0';
 
-  // Done
   return buffer;
   }
 
+/*******************************************************************************/
+
+// Convert number to hex string in buffer
+static FXchar* cvthex(FXchar* buffer,FXuval size,FXdouble value,FXint& decimal,FXint precision,FXuint flags){
+  const FXchar* hexdigits=(flags&FLG_UPPER)?upper_digits:lower_digits;
+  const FXlong HEXRND=FXLONG(0x0080000000000000);
+  const FXlong HEXMSK=FXLONG(0xFF00000000000000);
+  FXulong mantissa=Math::fpMantissa(value);
+  FXint exponent=Math::fpExponent(value);
+  FXint digits=Math::imin(precision,size-2);
+  FXchar *dst=buffer;
+
+  // Zero mantissa means exponent should be zero also
+  if(mantissa==0) exponent=0;
+
+  // Decimal point location after 1st digit
+  decimal=exponent+1;
+
+  // Round to precision nibbles, and zero the rest
+  if(precision<14){
+    mantissa+=HEXRND>>(precision<<2);
+    mantissa&=HEXMSK>>(precision<<2);
+    }
+
+  // Whip out digits
+  while(digits>0){
+    *dst++=hexdigits(mantissa>>52)&15;
+    mantissa<<=4;
+    digits--;
+    }
+
+  // Terminate
+  *dst='\0';
+
+  return buffer;
+  }
 
 /*******************************************************************************/
 
-// Convert minimal length mode; precision is significant digits
-static FXchar *convertGeneral(FXchar *buffer,FXint& len,FXdouble number,FXint prec,FXuint flags){
-  register FXchar *ptr=buffer;
-  register FXchar *p;
-  register FXint i;
-  FXchar digitsNDIG;
-  FXint  decimal;
-  FXbool mode;
+// Convert double number; precision is digits after decimal point
+static FXchar* convertDouble(FXchar* buffer,FXint& len,FXdouble number,FXint precision,FXint flags){
+  FXchar *ptr=buffer;
+  FXchar *p;
+  FXchar digits512;
+  FXint  decimal,pr;
+  FXbool expo;
 
   // Handle sign
   if(Math::fpSign(number)){
@@ -267,180 +451,275 @@
 
   // Infinity
   if(Math::fpInfinite(number)){
-    *ptr++='i';
-    *ptr++='n';
-    *ptr++='f';
+    if(flags&FLG_UPPER){
+      *ptr++='I';
+      *ptr++='N';
+      *ptr++='F';
+      }
+    else{
+      *ptr++='i';
+      *ptr++='n';
+      *ptr++='f';
+      }
     }
 
   // NaN
   else if(Math::fpNan(number)){
-    *ptr++='n';
-    *ptr++='a';
-    *ptr++='n';
+    if(flags&FLG_UPPER){
+      *ptr++='N';
+      *ptr++='A';
+      *ptr++='N';
+      }
+    else{
+      *ptr++='n';
+      *ptr++='a';
+      *ptr++='n';
+      }
     }
 
-  // Finite
-  else{
+  // Hexadecimal float mode
+  else if(flags&FLG_HEXADEC){
 
-    // Convert the number as if by exponential mode
-    p=_cvt(digits,number,decimal,prec,flags);
+    pr=precision;
+    if(precision<0) precision=13;
+    precision++;
 
-    // Check if we need to use exponential mode
-    mode=(prec<decimal) || (decimal<-3);
+    // Convert with 1 extra hexdigit before decimal point
+    p=cvthex(digits,ARRAYNUMBER(digits),number,decimal,precision,flags);
 
     // Eliminate trailing zeroes; not done for alternate mode
-    if(!(flags&FLG_ALTER)){
-      while(0<prec && pprec-1=='0') prec--;
+    if(pr<0 && !(flags&FLG_ALTER)){
+      while(0<precision && pprecision-1=='0') precision--;
       }
 
-    // Exponential notation
-    if(mode){
-      *ptr++=*p++;                                // One before the decimal point
-      if((1<prec) || (flags&FLG_ALTER)){          // Decimal point needed
-        *ptr++='.';
+    // Prefix with 0x
+    *ptr++='0';
+    if(flags&FLG_UPPER){
+      *ptr++='X';
+      }
+    else{
+      *ptr++='x';
+      }
+
+    // One digit before decimal point
+    *ptr++=*p++;
+    decimal--;
+    precision--;
+
+    // Decimal point needed
+    if((0<precision) || (flags&FLG_ALTER)){
+      *ptr++='.';
+      }
+
+    // Copy fraction
+    while(0<precision){
+      *ptr++=*p++;
+      precision--;
+      }
+
+    // Exponent
+    *ptr++=(flags&FLG_UPPER)?'P':'p';
+    if(Math::fpBits(number)){
+
+      // Negative exponent
+      if(decimal<0){
+        decimal=-decimal;
+        *ptr++='-';
         }
-      for(i=1; i<prec; i++){                      // Remaining fraction, if any
+      else{
+        *ptr++='+';
+        }
+
+      // Exponent is 1..4 digits
+      if(10<=decimal){
+        if(100<=decimal){
+          if(1000<=decimal){
+            *ptr++='0'+(decimal/1000);
+            decimal%=1000;
+            }
+          *ptr++='0'+(decimal/100);
+          decimal%=100;
+          }
+        *ptr++='0'+(decimal/10);
+        decimal%=10;
+        }
+      *ptr++='0'+decimal;
+      }
+    else{
+      *ptr++='+';
+      *ptr++='0';
+      }
+    }
+
+  // Force exponential mode
+  else if(flags&FLG_EXPONENT){
+
+    if(precision<0) precision=6;
+
+    // Convert with 1 extra digit before decimal point
+    p=cvt(digits,ARRAYNUMBER(digits),number,decimal,precision,flags);
+
+    // One digit before decimal point
+    *ptr++=*p++;
+    decimal--;
+
+    // One or two more before decimal point
+    if(flags&FLG_THOUSAND){
+      while((decimal+600)%3){
         *ptr++=*p++;
+        decimal--;
         }
-      *ptr++=(flags&FLG_UPPER)?'E':'e';           // Exponent
-      decimal--;
-      if(decimal<0){                              // Sign of exponent
+      }
+
+    // Decimal point needed
+    if((0<precision) || (flags&FLG_ALTER)){
+      *ptr++='.';
+      }
+
+    // Copy fraction
+    while(*p){
+      *ptr++=*p++;
+      precision--;
+      }
+
+    // Exponent
+    *ptr++=(flags&FLG_UPPER)?'E':'e';
+    if(Math::fpBits(number)){
+
+      // Negative exponent
+      if(decimal<0){
         decimal=-decimal;
         *ptr++='-';
         }
       else{
         *ptr++='+';
         }
-      if(99<decimal){                             // Decimal should be -308...308
+
+      // Large exponent is 3 digits
+      if(99<decimal){
         *ptr++=(decimal/100)+'0';
         *ptr++=((decimal/10))%10+'0';
         *ptr++=(decimal%10)+'0';
         }
-      else{                                       // Typical case
+
+      // Normal exponent is 2 digit
+      else{
         *ptr++=(decimal/10)+'0';
         *ptr++=(decimal%10)+'0';
         }
       }
-
-    // Fractional notation
     else{
+      *ptr++='+';
+      *ptr++='0';
+      *ptr++='0';
+      }
+    }
 
-      // Fraction-only notation +0.0000dddddd
-      if(decimal<=0){
-        *ptr++='0';
-        if(decimal<0 || 0<prec) *ptr++='.';         // Decimal point only if followed by at least one digit
-        while(decimal++<0){                         // Generate leading zeroes after decimal point
-          *ptr++='0';
-          }
-        while(prec-->0){                            // Generate prec digits
-          *ptr++=*p++;
-          }
+  // Forced fractional mode
+  else if(flags&FLG_FRACTION){
+
+    if(precision<0) precision=6;
+
+    // Convert with precision decimals after decimal point
+    p=cvt(digits,ARRAYNUMBER(digits),number,decimal,precision,flags);
+
+    // Fractional notation +0.000ddd
+    if(decimal<=0){
+
+      // Always digit before decimal point
+      *ptr++='0';
+
+      // Decimal point is negative or zero
+      if((0<precision) || (flags&FLG_ALTER)){
+        *ptr++='.';
         }
 
-      // Integral notation
-      else if(prec<=decimal){
-        while(prec-->0){                          // Generate prec digits
-          *ptr++=*p++;
-          decimal--;
-          if(flags&FLG_THOUSAND){
-            if(decimal%3==0 && decimal!=0) *ptr++=',';
-            }
-          }
-        while(decimal-->0){
-          *ptr++='0';
-          if(flags&FLG_THOUSAND){
-            if(decimal%3==0 && decimal!=0) *ptr++=',';
-            }
-          }
-        if(flags&FLG_ALTER) *ptr++='.';             // End with decimal point if alternate mode
+      // Output a bunch of zeroes preceeded by '0.'
+      while(decimal<0){
+        *ptr++='0';
+        decimal++;
         }
 
-      // Normal notation +dddd.dd
-      else{
-        while(decimal-->0){
-          *ptr++=*p++;
-          prec--;
-          if(flags&FLG_THOUSAND){
-            if(decimal%3==0 && decimal!=0) *ptr++=',';
-            }
-          }
-        *ptr++='.';                                 // Output decimal point
-        while(prec-->0){                            // Append more digits until we get prec
-          *ptr++=*p++;
-          }
+      // Copy fraction
+      while(*p){
+        *ptr++=*p++;
         }
       }
-    }
 
-  // Set length
-  len=ptr-buffer;
+    // Normal notation +ddd.ddd
+    else{
 
-  // Done
-  return buffer;
-  }
+      // Decimal point is positive
+      while(0<decimal){
+        *ptr++=*p++;
+        decimal--;
+        if(flags&FLG_THOUSAND){
+          if(decimal%3==0 && decimal!=0) *ptr++=',';
+          }
+        }
 
+      // Decimal point needed
+      if((0<precision) || (flags&FLG_ALTER)){
+        *ptr++='.';
+        }
 
-/*******************************************************************************/
+      // Copy fraction
+      while(*p){
+        *ptr++=*p++;
+        }
+      }
+    }
 
+  // General mode
+  else{
 
-// Convert double number; precision is digits after decimal point
-static FXchar* convertDouble(FXchar* buffer,FXint& len,FXdouble number,FXint prec,FXint flags){
-  register FXchar *ptr=buffer;
-  register FXchar *p;
-  FXchar digitsNDIG;
-  FXint  decimal;
+    if(precision<0) precision=6;
+    if(precision<1) precision=1;
 
-  // Handle sign
-  if(Math::fpSign(number)){
-    number=Math::fabs(number);
-    *ptr++='-';
-    }
-  else if(flags&FLG_SIGN){
-    *ptr++='+';
-    }
-  else if(flags&FLG_BLANK){
-    *ptr++=' ';
-    }
+    // Convert with precision decimals
+    p=cvt(digits,ARRAYNUMBER(digits),number,decimal,precision,flags);
 
-  // Infinity
-  if(Math::fpInfinite(number)){
-    *ptr++='i';
-    *ptr++='n';
-    *ptr++='f';
-    }
+    // Switch exponential mode
+    expo=(precision<decimal) || (decimal<-3);
 
-  // NaN
-  else if(Math::fpNan(number)){
-    *ptr++='n';
-    *ptr++='a';
-    *ptr++='n';
-    }
+    // Eliminate trailing zeroes; not done for alternate mode
+    if(!(flags&FLG_ALTER)){
+      while(0<precision && pprecision-1=='0') precision--;
+      }
 
-  // Finite
-  else{
+    // Exponential mode
+    if(expo){
 
-    // Exponential notation
-    if(flags&FLG_EXPONENT){
-      p=_cvt(digits,number,decimal,prec+1,flags);
-      }
+      // One digit before decimal point
+      *ptr++=*p++;
+      decimal--;
+      precision--;
 
-    // Normal notation
-    else{
-      p=_cvt(digits,number,decimal,prec,flags);
-      }
+      // One or two more before decimal point
+      if(flags&FLG_THOUSAND){
+        while((decimal+600)%3){
+          *ptr++=*p++;
+          decimal--;
+          precision--;
+          }
+        }
 
-    // Exponential notation
-    if(flags&FLG_EXPONENT){
-      *ptr++=*p++;                                // One digit before decimal point
-      if((0<prec) || (flags&FLG_ALTER)){          // Decimal point needed
+      // Decimal point needed
+      if((0<precision) || (flags&FLG_ALTER)){
         *ptr++='.';
         }
-      while(*p){                                  // Copy fraction
+
+      // Remaining fraction, if any
+      while(0<precision){
         *ptr++=*p++;
+        precision--;
         }
-      *ptr++=(flags&FLG_UPPER)?'E':'e';           // Exponent
-      if(number!=0.0){
-        decimal--;
+
+      // Exponent
+      *ptr++=(flags&FLG_UPPER)?'E':'e';
+      if(Math::fpBits(number)){
+
+        // Negative exponent
         if(decimal<0){
           decimal=-decimal;
           *ptr++='-';
@@ -448,12 +727,16 @@
         else{
           *ptr++='+';
           }
-        if(99<decimal){                           // Decimal should be -308...308
+
+        // Large exponent is 3 digits
+        if(99<decimal){
           *ptr++=(decimal/100)+'0';
           *ptr++=((decimal/10))%10+'0';
           *ptr++=(decimal%10)+'0';
           }
-        else{                                     // Typical case
+
+        // Normal exponent is 2 digit
+        else{
           *ptr++=(decimal/10)+'0';
           *ptr++=(decimal%10)+'0';
           }
@@ -465,36 +748,77 @@
         }
       }
 
-    // Fractional notation
+    // Fraction mode
     else{
 
-      // Fractional notation +0.0000ddddd
-      if(decimal<=0){                             // Decimal point is negative or zero
+      // Fractional notation +0.000ddd
+      if(decimal<=0){
+
+        // Always digit before decimal point
         *ptr++='0';
-        if((0<prec) || (flags&FLG_ALTER)){
+
+        // Decimal point only if followed by at least one digit
+        if(decimal<0 || 0<precision){
           *ptr++='.';
           }
-        while(decimal++<0){                       // Output a bunch of zeroes preceeded by '0.'
+
+        // Output a bunch of zeroes preceeded by '0.'
+        while(decimal<0){
           *ptr++='0';
+          decimal++;
           }
-        while(*p){                                // Copy fraction
+
+        // Generate precision digits
+        while(0<precision){
           *ptr++=*p++;
+          precision--;
           }
         }
 
-      // Normal notation +ddd.dd
-      else{                                       // Decimal point is positive
-        while(decimal-->0){
+      // Integral notation +ddd000.
+      else if(precision<=decimal){
+
+        // Generate precision digits
+        while(0<precision){
           *ptr++=*p++;
+          decimal--;
+          precision--;
           if(flags&FLG_THOUSAND){
             if(decimal%3==0 && decimal!=0) *ptr++=',';
             }
           }
-        if((0<prec) || (flags&FLG_ALTER)){        // Decimal point needed
-          *ptr++='.';
+        while(0<decimal){
+          *ptr++='0';
+          decimal--;
+          if(flags&FLG_THOUSAND){
+            if(decimal%3==0 && decimal!=0) *ptr++=',';
+            }
+          }
+
+        // End with decimal point if alternate mode
+        if(flags&FLG_ALTER) *ptr++='.';
+        }
+
+      // Normal notation +ddd.ddd
+      else{
+
+        // Decimal point is positive
+        while(0<decimal){
+          *ptr++=*p++;
+          decimal--;
+          precision--;
+          if(flags&FLG_THOUSAND){
+            if(decimal%3==0 && decimal!=0) *ptr++=',';
+            }
           }
-        while(*p){                                // Copy fraction
+
+        // Output decimal point
+        *ptr++='.';
+
+        // Append more digits until we get precision
+        while(0<precision){
           *ptr++=*p++;
+          precision--;
           }
         }
       }
@@ -509,9 +833,8 @@
 
 /*******************************************************************************/
 
-
 // Convert long value
-static FXchar* convertLong(FXchar* buffer,FXint& len,FXlong value,FXuint base,FXint prec,FXuint flags){
+static FXchar* convertLong(FXchar* buffer,FXint& len,FXlong value,FXuint base,FXint precision,FXuint flags){
   const FXchar *digits=(flags&FLG_UPPER)?upper_digits:lower_digits;
   FXchar *end=buffer+CONVERTSIZE-1;
   FXchar *ptr=end;
@@ -543,14 +866,14 @@
     if(flags&FLG_THOUSAND){
       if(++digs%3==0 && number) *--ptr=',';
       }
-    prec--;
+    precision--;
     }
   while(number);
 
   // Pad to precision
-  while(0<prec){
+  while(0<precision){
     *--ptr='0';
-    --prec;
+    --precision;
     }
 
   // Alternate form
@@ -574,19 +897,17 @@
     }
 
   // Return length
-  len=end-ptr;
+  len=(FXint)(end-ptr);
   return ptr;
   }
 
-
 /*******************************************************************************/
 
-
 // Advance ag from args to position before pos
 void vadvance(va_list& ag,va_list args,const FXchar* format,FXint pos){
-  register FXint ch,modifier,val,v;
-  register const FXchar* fmt;
-  register FXint cur=1;
+  FXint ch,modifier,val,v;
+  const FXchar* fmt;
+  FXint cur=1;
   va_copy(ag,args);
   while(cur<pos){
     fmt=format;
@@ -705,6 +1026,8 @@
           case 'e':
           case 'G':
           case 'g':
+          case 'A':
+          case 'a':
             if(val==cur){
               (void)va_arg(ag,FXdouble);
               goto nxt;
@@ -748,17 +1071,16 @@
     }
   }
 
-
 /*******************************************************************************/
 
 // Print using format
 FXint __vsnprintf(FXchar* string,FXint length,const FXchar* format,va_list args){
   FXint ch,modifier,count,flags,width,precision,pos,val,len,i;
+  FXchar bufferCONVERTSIZE+2;
   const FXchar *fmt=format;
   const FXchar *str;
   FXdouble number;
   FXlong value;
-  FXchar bufferCONVERTSIZE+2;
   va_list ag;
 
   count=0;
@@ -1020,7 +1342,6 @@
           flags|=FLG_FRACTION;                          // Fractional notation
           if(0<pos) vadvance(ag,args,format,pos);       // Advance ag to position
           number=va_arg(ag,FXdouble);
-          if(precision<0) precision=6;
           str=convertDouble(buffer,len,number,precision,flags);
           break;
         case 'E':
@@ -1029,7 +1350,6 @@
           flags|=FLG_EXPONENT;                          // Exponential notation
           if(0<pos) vadvance(ag,args,format,pos);       // Advance ag to position
           number=va_arg(ag,FXdouble);
-          if(precision<0) precision=6;
           str=convertDouble(buffer,len,number,precision,flags);
           break;
         case 'G':
@@ -1037,9 +1357,15 @@
         case 'g':
           if(0<pos) vadvance(ag,args,format,pos);       // Advance ag to position
           number=va_arg(ag,FXdouble);
-          if(precision<0) precision=6;
-          if(precision<1) precision=1;
-          str=convertGeneral(buffer,len,number,precision,flags);
+          str=convertDouble(buffer,len,number,precision,flags);
+          break;
+        case 'A':
+          flags|=FLG_UPPER;
+        case 'a':
+          flags|=FLG_HEXADEC;                           // Hexadecimal notation
+          if(0<pos) vadvance(ag,args,format,pos);       // Advance ag to position
+          number=va_arg(ag,FXdouble);
+          str=convertDouble(buffer,len,number,precision,flags);
           break;
         case 'c':                                       // Single character
           flags&=~FLG_ZERO;
@@ -1140,7 +1466,7 @@
           }
         }
 
-      // Get format character
+      // Next character
       continue;
       }
 
@@ -1150,10 +1476,10 @@
     }
 
   // Last character
-  if(count<length){ *string++='\0'; }
+x:if(count<length){ *string++='\0'; }
 
   // Done
-x:va_end(ag);
+  va_end(ag);
   return count;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxpriv.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxpriv.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxpriv.h -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxpriv.h Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxpsio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxpsio.cpp Changed

@@ -3,7 +3,7 @@
 *                        P o s t S c r i p t   O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2003,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2003,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -63,8 +63,8 @@
 
 // Save image to PostScript file
 FXbool fxsavePS(FXStream& store,const FXColor* data,FXint width,FXint height,FXint paperw,FXint paperh,FXint margin,FXbool color){
-  register FXint bx,by,bxx,byy,x,y;
-  register FXuchar *p;
+  FXint bx,by,bxx,byy,x,y;
+  FXuchar *p;
 
   // Must make sense
   if(!data || width<=0 || height<=0 || paperh<=0 || paperw<=0 || margin<=0) return false;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxrasio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxrasio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxrgbio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxrgbio.cpp Changed

@@ -3,7 +3,7 @@
 *                    I R I S   R G B   I n p u t / O u t p u t                  *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -54,8 +54,8 @@
 
 // RLE decompress with some checks against overruns
 static void expand(FXuchar dst,FXint dlen,const FXuchar src,FXint slen){
-  register FXuchar pixel,count;
-  register FXint d=0,s=0;
+  FXuchar pixel,count;
+  FXint d=0,s=0;
   while(s<slen){
     pixel=srcs++;
     count=pixel&0x7F;
@@ -248,7 +248,7 @@
 
       // Allocate image data
       if(allocElms(data,size)){
-        register FXint i,j,k;
+        FXint i,j,k;
 
         // Set width and height
         width=w;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxscanf.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxscanf.cpp Changed

@@ -3,7 +3,7 @@
 *                   V a r a r g s   S c a n f   R o u t i n e s                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2002,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2002,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -31,7 +31,7 @@
   - It may be not perfect, but at least its the same on all platforms.
   - Handles conversions of the form:
 
-        % * digits$ width l|ll|h|hh|L|q|t|z n|p|d|u|i|x|X|o|D|c|s|SET|e|E|f|G|g|b
+        % *' digits$ width l|ll|h|hh|L|q|t|z n|p|d|u|i|x|X|o|D|c|s|SET|e|E|f|G|g|b
 
   - Assignment suppression and number-grouping:
      '*'        When '*' is passed assignment of the matching quantity is suppressed.
@@ -55,7 +55,7 @@
      'L'        ditto
      'q'        ditto
      't'        convert to FXival (size depends on pointer size)
-     'z'        ditto
+     'z'        convert to FXuval (size depends on pointer size)
 
   - Conversion specifiers:
 
@@ -73,23 +73,39 @@
      'e', 'E',  Floating point conversion.
      'f', 'F'   Floating point conversion.
      'g', 'G'   Floating point conversion.
+     'a', 'A'   Floating point conversion.
 
   - In the case of string (%s or %...), do not report a conversion unless at
     least one character is returned.
+
+  - Algorithm accumulate up to 16 digits from the string, starting from most
+    significant digit; then convert to real and adjust exponent as necessary.
+
+  - Background: integer numbers larger than 2**53 (52 bits plus one hidden bit)
+    can not be represented exactly as double-precision real number, so any
+    additional digits past 10**16 are only useful for rounding purposes.
+
+  - Some special numeric values:
+
+    2**53   =     9007199254740992  =  Largest representable mantissa, plus 1.
+    10**16  =    10000000000000000  =  Power of 10 slightly larger than 2**53.
+    10**18  =  1000000000000000000  =  Power of 10 less than 2**63.
+    2**63   =  9223372036854775808  =  Largest 64-bit signed integer, plus 1
+    10**19  = 10000000000000000000  =  Power of 10 slightly less than 2**64.
+    2**64   = 18446744073709551616  =  Largest 64-bit unsigned integer, plus 1.
 */
 
-#ifdef WIN32
+#if defined(WIN32)
 #ifndef va_copy
 #define va_copy(arg,list) ((arg)=(list))
 #endif
 #endif
 
-#define MAXDIGS  20     // Maximum number of significant digits
-
-/*******************************************************************************/
 
 using namespace FX;
 
+/*******************************************************************************/
+
 namespace FX {
 
 
@@ -108,77 +124,47 @@
   ARG_VARIABLE          // Depending on size of pointer
   };
 
-/*******************************************************************************/
-
-static const FXchar* grouping(const FXchar* begin,const FXchar* end){
-  while(end>begin){
-    const FXchar* cp=end-1;
-    const FXchar* new_end;
-    const FXchar* group_end;
-
-    // Scan backwards for thousands separator
-    while(cp>=begin){
-      if(*cp==',') break;
-      --cp;
-      }
-
-    // No numbers grouping
-    if(cp<begin) return end;
-
-    // Three digits following a ','
-    if(end-cp==3+1){
 
-      // No more in front
-      if(cp<begin) return end;
+// Some floating point magick
+const union{ FXulong u; FXdouble f; } inf={FXULONG(0x7ff0000000000000)};
+const union{ FXulong u; FXdouble f; } nan={FXULONG(0x7fffffffffffffff)};
 
-      // Loop while the grouping is correct
-      new_end=cp-1;
-      while(1){
+// Normal mode (non-ascii character)
+const FXint NORMAL=0x100;
 
-        // Scan backwards for next thousands separator
-        group_end=--cp;
-        while(cp>=begin){
-          if(*cp==',') break;
-          --cp;
-          }
+// Thousands separator
+const FXint COMMA=',';
 
-        // Found correct start
-        if(cp<begin && group_end-cp<=3) return end;
-
-        // Incorrect group; bail
-        if(cp<begin || group_end-cp!=3) break;
-        }
+/*******************************************************************************/
 
-      // Drop incorrect tail
-      end=new_end;
-      }
-    else{
-      if(end-cp>3+1) end=cp+3+1;        // Even the first group was wrong; determine maximum shift
-      else if(cp<begin) return end;     // This number does not fill the first group, but is correct
-      else end=cp;                      // CP points to a thousands separator character
-      }
-    }
-  return FXMAX(begin,end);
+// Make double from sign, exponent, and mantissa
+static inline FXdouble fpMake(FXlong m,FXlong exp){
+  union{ FXulong u; FXdouble f; } z={(m&FXULONG(0x000fffffffffffff)) | (((exp+1023)&0x7ff)<<52)};
+  return z.f;
   }
-
+ 
+#if 0
+// Fast hex digit '0'..'9', 'A'..'F', 'a'..'f' to int
+// Otherwise bad values
+static inline FXint htoi(FXint x){
+  return (x>>6)*9+(x&15);
+  }
+#endif
 
 // Scan with va_list arguments
 FXint __vsscanf(const FXchar* string,const FXchar* format,va_list args){
-  FXint modifier,width,convert,comma,base,digits,sdigits,count,exponent,expo,done,neg,nex,pos,v;
+  FXint modifier,width,convert,comma,base,digits,count,exponent,expo,done,neg,nex,pos,ww,v;
   const FXchar *start=string;
   const FXchar *ss;
-  FXchar *ptr;
-  FXuchar ch,nn;
-  FXdouble number;
-  FXdouble mult;
-  FXulong  value;
+  FXdouble dvalue;
+  FXulong  ivalue,imult;
   FXchar   set256;
-  va_list ag;
+  FXchar  *ptr;
+  FXuchar  ch,nn;
+  va_list  ag;
 
   count=0;
 
-  //FXTRACE((1,"string=%s segment=%.*s\n",string,(int)(grouping(string,string+strlen(string))-string),string));
-
   // Process format string
   va_copy(ag,args);
   while((ch=*format++)!='\0'){
@@ -197,21 +183,21 @@
       width=0;
       convert=1;
       done=0;
-      comma=0;
+      comma=NORMAL;
       base=0;
       pos=-1;
 
       // Parse format specifier
 flg:  switch(ch){
-        case '*':                                       // Suppress conversion
+        case '*':                                               // Suppress conversion
           convert=0;
           ch=*format++;
           goto flg;
-        case '\'':                                      // Print thousandths
-          comma=',';                                    // Thousands grouping character
+        case '\'':                                              // Print thousandths
+          comma=COMMA;                                          // Thousands grouping character
           ch=*format++;
           goto flg;
-        case '0':                                       // Width or positional parameter
+        case '0':                                               // Width or positional parameter
         case '1':
         case '2':
         case '3':
@@ -227,273 +213,405 @@
             width=width*10+ch-'0';
             ch=*format++;
             }
-          if(ch=='$'){                                  // Positional parameter
+          if(ch=='$'){                                          // Positional parameter
             ch=*format++;
-            if(width<=0) goto x;                        // Not a legal parameter position
+            if(width<=0) goto x;                                // Not a legal parameter position
             va_copy(ag,args);
-            for(pos=1; pos<width; ++pos){               // Advance to position prior to arg
+            for(pos=1; pos<width; ++pos){                       // Advance to position prior to arg
               (void)va_arg(ag,void*);
               }
-            width=0;                                    // Reset width
+            width=0;                                            // Reset width
             }
           goto flg;
-        case 'l':                                       // Long
+        case 'l':                                               // Long
           modifier=ARG_LONG;
           ch=*format++;
-          if(ch=='l'){                                  // Long Long
+          if(ch=='l'){                                          // Long Long
             modifier=ARG_LONGLONG;
             ch=*format++;
             }
           goto flg;
-        case 'h':                                       // Short
+        case 'h':                                               // Short
           modifier=ARG_HALF;
           ch=*format++;
-          if(ch=='h'){                                  // Char
+          if(ch=='h'){                                          // Char
             modifier=ARG_HALFHALF;
             ch=*format++;
             }
           goto flg;
-        case 'L':                                       // Long Long
+        case 'L':                                               // Long Long
         case 'q':
           modifier=ARG_LONGLONG;
           ch=*format++;
           goto flg;
-        case 't':                                       // Size depends on pointer
+        case 't':                                               // Size depends on pointer
         case 'z':
           modifier=ARG_VARIABLE;
           ch=*format++;
           goto flg;
-        case 'n':                                       // Consumed characters till here
-          value=string-start;
+        case 'n':                                               // Consumed characters till here
+          ivalue=string-start;
           if(convert){
-            if(modifier==ARG_DEFAULT){                  // 32-bit always
-              *va_arg(ag,FXint*)=(FXint)value;
+            if(modifier==ARG_DEFAULT){                          // 32-bit always
+              *va_arg(ag,FXint*)=(FXint)ivalue;
               }
-            else if(modifier==ARG_LONG){                // Whatever size a long is
-              *va_arg(ag,long*)=(long)value;
+            else if(modifier==ARG_LONG){                        // Whatever size a long is
+              *va_arg(ag,long*)=(long)ivalue;
               }
-            else if(modifier==ARG_LONGLONG){            // 64-bit always
-              *va_arg(ag,FXlong*)=value;
+            else if(modifier==ARG_LONGLONG){                    // 64-bit always
+              *va_arg(ag,FXlong*)=ivalue;
               }
-            else if(modifier==ARG_HALF){                // 16-bit always
-              *va_arg(ag,FXshort*)=(FXshort)value;
+            else if(modifier==ARG_HALF){                        // 16-bit always
+              *va_arg(ag,FXshort*)=(FXshort)ivalue;
               }
-            else if(modifier==ARG_HALFHALF){            // 8-bit always
-              *va_arg(ag,FXchar*)=(FXchar)value;
+            else if(modifier==ARG_HALFHALF){                    // 8-bit always
+              *va_arg(ag,FXchar*)=(FXchar)ivalue;
               }
-            else{                                       // Whatever size a pointer is
-              *va_arg(ag,FXival*)=(FXival)value;
+            else{                                               // Whatever size a pointer is
+              *va_arg(ag,FXival*)=(FXival)ivalue;
               }
             }
           break;
-        case 'D':
-          modifier=ARG_LONG;
-          base=10;
-          goto integer;
-        case 'p':                                       // Hex pointer
+        case 'p':                                               // Hex pointer
           modifier=ARG_VARIABLE;
           base=16;
-          comma=0;
+          comma=NORMAL;
           goto integer;
-        case 'x':                                       // Hex
+        case 'x':                                               // Hex
         case 'X':
           base=16;
-          comma=0;
+          comma=NORMAL;
           goto integer;
-        case 'o':                                       // Octal
+        case 'o':                                               // Octal
           base=8;
-          comma=0;
+          comma=NORMAL;
           goto integer;
-        case 'b':                                       // Binary
+        case 'b':                                               // Binary
           base=2;
-          comma=0;
+          comma=NORMAL;
           goto integer;
-        case 'd':                                       // Decimal
+        case 'd':                                               // Decimal
         case 'u':
           base=10;
-        case 'i':                                       // Either
-integer:  value=0;
+        case 'i':                                               // Integer
+integer:  ivalue=0;
           digits=0;
-          if(width<1) width=2147483647;                 // Width at least 1
-          while(Ascii::isSpace(*string)) string++;      // Skip white space; not included in field width
-          if((neg=(*string=='-')) || (*string=='+')){   // Handle sign
+          if(width<1) width=2147483647;                         // Width at least 1
+          while(Ascii::isSpace(string0)) string++;            // Skip white space; not included in field width
+          if((neg=(string0=='-')) || (string0=='+')){
             string++;
             width--;
             }
-          if(0<width && *string=='0'){                          // Got a '0'
-            digits++;
-            string++;
-            width--;
-            if(0<width && (*string=='x' || *string=='X')){      // Got a '0x'
-              if(base==0){ comma=0; base=16; }                  // If not set yet, '0x' means set base to 16
-              if(base==16){                                     // But don't eat the 'x' if base wasn't 16!
-                string++;
-                width--;
+          if(0<width && string0=='0'){                        // Got "0"
+            if(1<width && (string1|0x20)=='x'){               // Got a "0x"
+              if(base==0 || base==16){                          // Its hex
+                comma=NORMAL;
+                base=16;
+                string+=2;
+                width-=2;
                 }
               }
-            else if(0<width && (*string=='b' || *string=='B')){ // Got a '0b'
-              if(base==0){ comma=0; base=2; }                   // If not set yet, '0b' means set base to 2
-              if(base==2){                                      // But don't eat the 'b' if base wasn't 2!
-                string++;
-                width--;
+            else if(1<width && (string1|0x20)=='b'){          // Got a "0b"
+              if(base==0 || base==2){                           // Its binary
+                comma=NORMAL;
+                base=2;
+                string+=2;
+                width-=2;
                 }
               }
-            else{
-              if(base==0){ comma=0; base=8; }                   // If not set yet, '0' means set base to 8
+            else{                                               // Got a "0"
+              if(base==0 || base==8){                           // Its octal
+                comma=NORMAL;
+                base=8;
+                }
               }
             }
-          else{
-            if(base==0){ base=10; }                             // Not starting with '0' or '0x', so its decimal
-            }
-          while(0<width && (ch=*string)!='\0'){
-            if(ch!=comma){                                      // FIXME only should consume LEGAL number groupings!
-              v=FXString::digit2Valuech;
-              if(v<0 || base<=v) break;
-              value=value*base+v;                               // Convert to integer
-              digits++;
+          else{                                                 // Got something else
+            if(base==0){                                        // If not set, its decimal now
+              base=10;
               }
+            }
+          while(0<width && 0<=(v=Ascii::digitValue(string0)) && v<base){
+            ivalue=ivalue*base+v;
             string++;
             width--;
+            digits++;
+            }
+          if(3<width && string0==comma && 0<digits && digits<4){
+            while(3<width && string0==comma){                 // Thousands group is ',ddd' or nothing
+              if((ch=string1)<'0' || ch>'9') break;
+              if((ch=string2)<'0' || ch>'9') break;
+              if((ch=string3)<'0' || ch>'9') break;
+              ivalue=((ivalue*10+string1)*10+string2)*10+string3-5328;
+              string+=4;
+              width-=4;
+              digits+=3;
+              }
             }
           if(!digits) goto x;                                   // No digits seen!
           if(neg){                                              // Apply sign
-            value=0-value;
+            ivalue=0-ivalue;
             }
           if(convert){
             if(modifier==ARG_DEFAULT){                          // 32-bit always
-              *va_arg(ag,FXint*)=(FXint)value;
+              *va_arg(ag,FXint*)=(FXint)ivalue;
               }
             else if(modifier==ARG_LONG){                        // Whatever size a long is
-              *va_arg(ag,long*)=(long)value;
+              *va_arg(ag,long*)=(long)ivalue;
               }
             else if(modifier==ARG_LONGLONG){                    // 64-bit always
-              *va_arg(ag,FXlong*)=value;
+              *va_arg(ag,FXlong*)=ivalue;
               }
             else if(modifier==ARG_HALF){                        // 16-bit always
-              *va_arg(ag,FXshort*)=(FXshort)value;
+              *va_arg(ag,FXshort*)=(FXshort)ivalue;
               }
             else if(modifier==ARG_HALFHALF){                    // 8-bit always
-              *va_arg(ag,FXchar*)=(FXchar)value;
+              *va_arg(ag,FXchar*)=(FXchar)ivalue;
               }
             else{                                               // Whatever size a pointer is
-              *va_arg(ag,FXival*)=(FXival)value;
+              *va_arg(ag,FXival*)=(FXival)ivalue;
               }
             count++;
             }
           break;
-        case 'e':                                       // Floating point
+        case 'a':                                               // Floating point
+        case 'A':
+        case 'e':
         case 'E':
         case 'f':
         case 'F':
         case 'g':
         case 'G':
-          number=0.0;
-          mult=1.0;
-          exponent=-1;
+          dvalue=0.0;
+          ivalue=0;
           digits=0;
-          sdigits=0;
           if(width<1) width=2147483647;                         // Width at least 1
-          while(Ascii::isSpace(*string)) string++;              // Skip white space; not included in field width
-          if((neg=(*string=='-')) || (*string=='+')){           // Handle sign
+          while(Ascii::isSpace(string0)) string++;            // Skip white space; not included in field width
+          if((neg=(string0=='-')) || (string0=='+')){
             string++;
             width--;
             }
-          while(0<width && *string){                            // Leading zeros, with possible groupings
-            if(*string!=comma){
-              if(*string!='0') break;
-              digits++;
-              }
-            string++;
-            width--;
+          if(2<width && (string0|0x20)=='n'){                 // NaN
+            if((string1|0x20)!='a') goto x;
+            if((string2|0x20)!='n') goto x;
+            string+=3;
+            width-=3;
+            dvalue=nan.f;
             }
-          while(0<width && (ch=*string)!='\0'){                 // Mantissa digits
-            if(ch!=comma){                                      // FIXME only should consume LEGAL number groupings!
-              if(ch<'0' || ch>'9') break;
-              if(sdigits<MAXDIGS){
-                number+=(ch-'0')*mult;
-                mult*=0.1;
-                }
-              exponent++;
-              sdigits++;
-              digits++;
-              }
-            string++;
-            width--;
+          else if(2<width && (string0|0x20)=='i'){            // Inf{inity}
+            if((string1|0x20)!='n') goto x;
+            if((string2|0x20)!='f') goto x;
+            if(7<width && (string3|0x20)=='i' && (string4|0x20)=='n' && (string5|0x20)=='i' && (string6|0x20)=='t' && (string7|0x20)=='y'){
+              string+=5;
+              width-=5;
+              }
+            string+=3;
+            width-=3;
+            dvalue=inf.f;
             }
-          if(0<width && *string=='.'){                          // Mantissa decimals following '.'
-            string++;
-            width--;
-            while(0<width && (ch=*string)>='0' && ch<='9'){
-              if(sdigits<MAXDIGS){
-                number+=(ch-'0')*mult;
-                mult*=0.1;
-                }
-              sdigits++;
+          else if(1<width && string0=='0' && (string1|0x20)=='x'){  // Hexadecimal float
+            string+=2;
+            width-=2;
+            exponent=-4;
+            imult=FXLONG(0x0010000000000000);
+            while(0<width && string0=='0'){
+              string++;
+              width--;
               digits++;
+              }
+            while(0<width && 0<=(v=Ascii::digitValue(string0)) && v<16){
+              ivalue+=imult*v;
+              imult>>=4;
+              exponent+=4;
               string++;
               width--;
+              digits++;
               }
-            }
-          if(!digits) goto x;                                   // No digits seen!
-          if(1<width && (*string|0x20)=='e'){                   // Handle exponent, tentatively
-            ss=string;
-            ss++;
-            width--;
-            expo=0;
-            if((nex=(*ss=='-')) || (*ss=='+')){                 // Handle exponent sign
-              ss++;
+            if(0<width && string0=='.'){                      // Hexadecimals following '.'
+              string++;
               width--;
+              if(ivalue==0){
+                while(0<width && string0=='0'){
+                  exponent-=4;
+                  string++;
+                  width--;
+                  digits++;
+                  }
+                }
+              while(0<width && 0<=(v=Ascii::digitValue(string0)) && v<16){
+                ivalue+=imult*v;
+                imult>>=4;
+                string++;
+                width--;
+                digits++;
+                }
               }
-            if(0<width && '0'<=*ss && *ss<='9'){                // Have exponent?
-              while(0<width && (ch=*ss)>='0' && ch<='9'){
-                expo=expo*10+(ch-'0');
+            if(!digits) goto x;                                 // No digits seen!
+            if(1<width && (string0|0x20)=='p'){               // Handle exponent, tentatively
+              ss=string;                                        // Rewind point if no match
+              ww=width;
+              ss++;
+              ww--;
+              expo=0;
+              if((nex=(ss0=='-')) || (ss0=='+')){           // Handle exponent sign
                 ss++;
-                width--;
+                ww--;
+                }
+              if(0<ww && '0'<=ss0 && ss0<='9'){             // Have exponent?
+                while(0<ww && '0'<=(ch=ss0) && ch<='9'){
+                  expo=expo*10+(ch-'0');
+                  ss++;
+                  ww--;
+                  }
+                if(nex){
+                  exponent-=expo;
+                  }
+                else{
+                  exponent+=expo;
+                  }
+                string=ss;                                      // Eat exponent characters
+                width=ww;
+                }
+              }
+            if(ivalue!=0){
+              while(FXLONG(0x001fffffffffffff)<ivalue){         // Adjust to get hidden 1-bit in place
+                ivalue>>=1;                                     // Shift up to 3 times
+                exponent++;
                 }
-              if(nex){
-                exponent-=expo;
+              if(1024<=exponent){                               // Check for overflow
+                if((1024<exponent) || (FXLONG(0x0010000000000000)<=ivalue)){
+                  ivalue=FXLONG(0x0010000000000000);
+                  exponent=1024;
+                  }
                 }
-              else{
-                exponent+=expo;
+              if(exponent<-1022){                               // Check for denormal or underflow
+                if(exponent<-1074){
+                  ivalue=0;
+                  exponent=0;
+                  }
+                v=-exponent-1022;                               // Shift mantissa to fix exponent
+                ivalue>>=v;
+                exponent=-1023;
                 }
-              string=ss;                                        // Eat exponent characters
+              dvalue=fpMake(ivalue,exponent);                   // Assemble double
               }
             }
-          if(number!=0.0){
-            if(308<=exponent){                                  // Check for overflow
-              if((308<exponent) || (1.79769313486231570815<=number)){
-                number=1.79769313486231570815E+308;
-                exponent=0;
+          else{                                                 // Decimal float
+            ivalue=0;
+            imult=FXLONG(10000000000000000);
+            exponent=-1;
+            while(0<width && string0=='0'){
+              string++;
+              width--;
+              digits++;
+              }
+            while(0<width && '0'<=(ch=string0) && ch<='9'){
+              ivalue+=(ch-'0')*imult;
+              imult/=10;
+              exponent++;
+              string++;
+              width--;
+              digits++;
+              }
+            if(3<width && string0==comma && 0<digits && digits<4){
+              while(3<width && string0==comma){               // Thousands group is ',ddd' or nothing
+                if((ch=string1)<'0' || ch>'9') break;
+                if((ch=string2)<'0' || ch>'9') break;
+                if((ch=string3)<'0' || ch>'9') break;
+                ivalue+=(string1-'0')*imult;
+                if(ivalue){imult/=10;exponent++;}
+                ivalue+=(string2-'0')*imult;
+                if(ivalue){imult/=10;exponent++;}
+                ivalue+=(string3-'0')*imult;
+                if(ivalue){imult/=10;exponent++;}
+                string+=4;
+                width-=4;
+                digits+=3;
                 }
               }
-            if(exponent<-308){                                  // Check for denormal or underflow
-              if((exponent<-324) || ((exponent==-324) && (number<=4.94065645841246544177))){
-                number=0.0;
-                exponent=0;
+            if(0<width && string0=='.'){                      // Decimals following '.'
+              string++;
+              width--;
+              if(ivalue==0){
+                while(0<width && string0=='0'){
+                  exponent--;
+                  string++;
+                  width--;
+                  digits++;
+                  }
+                }
+              while(0<width && '0'<=(ch=string0) && ch<='9'){
+                ivalue+=(ch-'0')*imult;
+                imult/=10;
+                string++;
+                width--;
+                digits++;
                 }
-              number*=1.0E-16;
-              exponent+=16;
               }
-            number*=Math::ipow(10.0,exponent);                  // In range
-            if(neg){                                            // Apply sign
-              number=-number;
+            if(!digits) goto x;                                 // No digits seen!
+            if(1<width && (string0|0x20)=='e'){               // Handle exponent, tentatively
+              ss=string;                                        // Rewind point if no match
+              ww=width;
+              ss++;
+              ww--;
+              expo=0;
+              if((nex=(ss0=='-')) || (ss0=='+')){           // Handle exponent sign
+                ss++;
+                ww--;
+                }
+              if(0<ww && '0'<=ss0 && ss0<='9'){             // Have exponent?
+                while(0<ww && '0'<=(ch=ss0) && ch<='9'){
+                  expo=expo*10+(ch-'0');
+                  ss++;
+                  ww--;
+                  }
+                if(nex){
+                  exponent-=expo;
+                  }
+                else{
+                  exponent+=expo;
+                  }
+                string=ss;                                      // Eat exponent characters
+                width=ww;
+                }
+              }
+            dvalue=1.0E-16*(FXlong)ivalue;                      // Convert to 64-bit integer to 64-bit real
+            if(dvalue!=0.0){
+              if(308<=exponent){                                // Check for overflow
+                if((308<exponent) || (1.79769313486231570815<=dvalue)){
+                  dvalue=1.79769313486231570815E+308;
+                  exponent=0;
+                  }
+                }
+              if(exponent<-308){                                // Check for denormal or underflow
+                if((exponent<-324) || ((exponent==-324) && (dvalue<=4.94065645841246544177))){
+                  dvalue=0.0;
+                  exponent=0;
+                  }
+                dvalue*=1.0E-16;
+                exponent+=16;
+                }
+              dvalue*=Math::pow10i(exponent);                   // Exponent in range
               }
             }
+          if(neg){                                              // Apply sign
+            dvalue=-dvalue;
+            }
           if(convert){
             if(modifier==ARG_DEFAULT){
-              *va_arg(ag,FXfloat*)=(FXfloat)number;             // 32-bit float
+              *va_arg(ag,FXfloat*)=(FXfloat)dvalue;             // 32-bit float
               }
             else{
-              *va_arg(ag,FXdouble*)=number;                     // 64-bit double
+              *va_arg(ag,FXdouble*)=dvalue;                     // 64-bit double
               }
             count++;
             }
           break;
-        case 'c':                                       // Character(s)
-          if(width<1) width=1;                          // Width at least 1
+        case 'c':                                               // Character(s)
+          if(width<1) width=1;                                  // Width at least 1
           if(convert){
             ptr=va_arg(ag,FXchar*);
-            while(0<width && (ch=*string)!='\0'){
+            while(0<width && (ch=string0)!='\0'){
               *ptr++=ch;
               string++;
               width--;
@@ -502,18 +620,18 @@
             count+=done;
             }
           else{
-            while(0<width && (ch=*string)!='\0'){
+            while(0<width && string0!='\0'){
               string++;
               width--;
               }
             }
           break;
-        case 's':                                       // String
-          if(width<1) width=2147483647;                 // Width at least 1
-          while(Ascii::isSpace(*string)) string++;      // Skip white space
+        case 's':                                               // String
+          if(width<1) width=2147483647;                         // Width at least 1
+          while(Ascii::isSpace(string0)) string++;            // Skip white space
           if(convert){
             ptr=va_arg(ag,FXchar*);
-            while(0<width && (ch=*string)!='\0' && !Ascii::isSpace(ch)){
+            while(0<width && (ch=string0)!='\0' && !Ascii::isSpace(ch)){
               *ptr++=ch;
               string++;
               width--;
@@ -523,34 +641,34 @@
             count+=done;
             }
           else{
-            while(0<width && (ch=*string)!='\0' && !Ascii::isSpace(ch)){
+            while(0<width && (ch=string0)!='\0' && !Ascii::isSpace(ch)){
               string++;
               width--;
               }
             }
           break;
-        case '':                                       // Character set
-          if(width<1) width=2147483647;                 // Width at least 1
-          ch=*format++;
-          v=1;                                          // Add characters to set
-          if(ch=='^'){                                  // Negated character set
-            ch=*format++;
-            v=0;                                        // Remove characters from set
+        case '':                                               // Character set
+          if(width<1) width=2147483647;                         // Width at least 1
+          ch=(FXuchar)*format++;
+          v=1;                                                  // Add characters to set
+          if(ch=='^'){                                          // Negated character set
+            ch=(FXuchar)*format++;
+            v=0;                                                // Remove characters from set
             }
-          memset(set,1-v,sizeof(set));                  // Initialize set
-          if(ch=='\0') goto x;                          // Format error
-          for(;;){                                      // Parse set
+          memset(set,1-v,sizeof(set));                          // Initialize set
+          if(ch=='\0') goto x;                                  // Format error
+          for(;;){                                              // Parse set
             setch=v;
-            nn=*format++;
-            if(nn=='\0') goto x;                        // Format error
+            nn=(FXuchar)*format++;
+            if(nn=='\0') goto x;                                // Format error
             if(nn=='') break;
             if(nn=='-'){
-              nn=*format;
-              if(nn!='' && ch<=nn){                    // Range if not at end
+              nn=(FXuchar)*format;
+              if(nn!='' && ch<=nn){                            // Range if not at end
                 while(ch<nn){ set++ch=v; }
                 format++;
                 }
-              else{                                     // Otherwise just '-'
+              else{                                             // Otherwise just '-'
                 nn='-';
                 }
               }
@@ -558,7 +676,7 @@
             }
           if(convert){
             ptr=va_arg(ag,FXchar*);
-            while(0<width && (ch=*string)!='\0' && setch){
+            while(0<width && (ch=*string)!='\0' && set(FXuchar)ch){
               *ptr++=ch;
               string++;
               width--;
@@ -568,13 +686,13 @@
             count+=done;
             }
           else{
-            while(0<width && (ch=*string)!='\0' && setch){
+            while(0<width && (ch=*string)!='\0' && set(FXuchar)ch){
               string++;
               width--;
               }
             }
           break;
-        default:                                        // Format error
+        default:                                                // Format error
           goto x;
         }
       continue;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxstrtod.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxstrtod.cpp Changed

@@ -3,7 +3,7 @@
 *               S t r i n g   t o   D o u b l e   C o n v e r s i o n           *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -38,32 +38,36 @@
     will be less accurate!
 */
 
-#define MAXDIGS  20     // Maximum number of significant digits
-
-/*******************************************************************************/
 
 using namespace FX;
 
-namespace FX {
+/*******************************************************************************/
 
+namespace FX {
 
 extern FXAPI FXdouble __strtod(const FXchar *beg,const FXchar** end=NULL,FXbool* ok=NULL);
 extern FXAPI FXfloat __strtof(const FXchar *beg,const FXchar** end=NULL,FXbool* ok=NULL);
 
+
 // Some magick
 const union{ FXulong u; FXdouble f; } inf={FXULONG(0x7ff0000000000000)};
 const union{ FXulong u; FXdouble f; } nan={FXULONG(0x7fffffffffffffff)};
 
+
+// Maximum number of significant digits
+const FXint MAXDIGS=20;
+
+
 // Convert string to double
 FXdouble __strtod(const FXchar *beg,const FXchar** end,FXbool* ok){
-  register const FXchar *s=beg;
-  register FXdouble value=0.0;
-  register FXdouble mult=1.0;
-  register FXint exponent=-1;
-  register FXint digits=0;
-  register FXint expo=0;
-  register FXint neg;
-  register FXint nex;
+  const FXchar *s=beg;
+  FXdouble value=0.0;
+  FXdouble mult=1.0;
+  FXint exponent=-1;
+  FXint digits=0;
+  FXint expo=0;
+  FXint neg;
+  FXint nex;
 
   // Assume the worst
   if(ok) *ok=false;
@@ -77,36 +81,48 @@
     }
 
   // Handle sign
-  if((neg=(*s=='-')) || (*s=='+')){
+  if((neg=(s0=='-')) || (s0=='+')){
     ++s;
     }
 
   // We see start of a number
-  if(*s=='.' || ('0'<=*s && *s<='9')){
+  if(s0=='.' || ('0'<=s0 && s0<='9')){
 
     // Leading zeros
-    while(*s=='0'){
+    while(s0=='0'){
       ++s;
       }
 
-    // Read the mantissa
-    while('0'<=*s && *s<='9'){
+    // Parse significant digits
+    while('0'<=s0 && s0<='9'){
       if(digits<MAXDIGS){
-        value+=(*s-'0')*mult;
+        value+=(s0-'0')*mult;
         mult*=0.1;
         }
       ++exponent;
       ++digits;
       ++s;
       }
-    if(*s=='.'){
+
+    // Decimal point
+    if(s0=='.'){
       ++s;
-      while('0'<=*s && *s<='9'){
+
+      // Leading zeros; adjust exponent
+      if(digits==0){
+        while(s0=='0'){
+          --exponent;
+          ++s;
+          }
+        }
+
+      // Parse significant digits
+      while('0'<=s0 && s0<='9'){
         if(digits<MAXDIGS){
-          value+=(*s-'0')*mult;
+          value+=(s0-'0')*mult;
           mult*=0.1;
           }
-        digits++;
+        ++digits;
         ++s;
         }
       }
@@ -115,20 +131,20 @@
     if(end) *end=s;
 
     // Try exponent
-    if((*s|0x20)=='e'){
+    if((s0|0x20)=='e'){
       ++s;
 
       // Handle optional exponent sign
-      if((nex=(*s=='-')) || (*s=='+')){
+      if((nex=(s0=='-')) || (s0=='+')){
         ++s;
         }
 
       // Got an exponent
-      if('0'<=*s && *s<='9'){
+      if('0'<=s0 && s0<='9'){
 
         // Eat exponent digits
-        while('0'<=*s && *s<='9'){
-          expo=expo*10+(*s-'0');
+        while('0'<=s0 && s0<='9'){
+          expo=expo*10+(s0-'0');
           ++s;
           }
 
@@ -150,56 +166,67 @@
 
       // Check for overflow
       if(308<=exponent){
+
+        // Sensible value, but not OK
         if((308<exponent) || (1.79769313486231570815<=value)){
-          return neg ? -1.79769313486231570815E+308 : 1.79769313486231570815E+308;      // Sensible value, but not OK
+          return neg ? -1.79769313486231570815E+308 : 1.79769313486231570815E+308;
           }
         }
 
       // Check for denormal or underflow
       if(exponent<-308){
+
+        // Flush to zero, and OK
         if((exponent<-324) || ((exponent==-324) && (value<=4.94065645841246544177))){
           if(ok) *ok=true;
-          return 0.0;                                                                   // Flush to zero, and OK
+          return 0.0;
           }
-        value*=1.0E-16;         // Fix number
+
+        // Fix number
+        value*=1.0E-16;
         exponent+=16;
         }
 
-      // In range
-      value*=Math::ipow(10.0,exponent);
+      // Exponent in range
+      value*=Math::pow10i(exponent);
 
       // Adjust sign
       if(neg){
         value=-value;
         }
       }
-    if(ok) *ok=true;            // OK
+    if(ok) *ok=true;
     }
 
   // Infinite
-  else if(*s=='i' || *s=='I'){
+  else if((s0|0x20)=='i'){
     s++;
-    if(*s=='n' || *s=='N'){
+    if((s0|0x20)=='n'){
       s++;
-      if(*s=='f' || *s=='F'){
-        s++;
+      if((s0|0x20)=='f'){
         value=neg?-inf.f:inf.f;
-        if(end) *end=s;
-        if(ok) *ok=true;        // OK
+        if(end){                // Return end of recognized number
+          s++;
+          if((s0|0x20)=='i' && (s1|0x20)=='n' && (s2|0x20)=='i' && (s3|0x20)=='t' && (s4|0x20)=='y') s+=5;
+          *end=s;
+          }
+        if(ok) *ok=true;
         }
       }
     }
 
   // NaN
-  else if(*s=='n' || *s=='N'){
+  else if((s0|0x20)=='n'){
     s++;
-    if(*s=='a' || *s=='A'){
+    if((s0|0x20)=='a'){
       s++;
-      if(*s=='n' || *s=='N'){
-        s++;
+      if((s0|0x20)=='n'){
         value=neg?-nan.f:nan.f;
-        if(end) *end=s;
-        if(ok) *ok=true;        // OK
+        if(end){                // Return end of recognized number
+          s++;
+          *end=s;
+          }
+        if(ok) *ok=true;
         }
       }
     }
@@ -207,14 +234,16 @@
   }
 
 
-// Convert string to unsigned int
+// Convert string to float
 FXfloat __strtof(const FXchar* beg,const FXchar** end,FXbool* ok){
-  register FXdouble value=__strtod(beg,end,ok);
-  if(__unlikely(value<-FLT_MAX)){
+  const FXdouble DBL_MINIMUM=(FXdouble)-FLT_MAX;
+  const FXdouble DBL_MAXIMUM=(FXdouble) FLT_MAX;
+  FXdouble value=__strtod(beg,end,ok);
+  if(__unlikely(value<DBL_MINIMUM)){
     if(ok) *ok=false;
     return -FLT_MAX;
     }
-  if(__unlikely(value>FLT_MAX)){
+  if(__unlikely(value>DBL_MAXIMUM)){
     if(ok) *ok=false;
     return FLT_MAX;
     }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxstrtoll.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxstrtoll.cpp Changed

@@ -3,7 +3,7 @@
 *        S t r i n g   t o   S i g n e d   L o n g   C o n v e r s i o n        *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -23,12 +23,13 @@
 #include "fxdefs.h"
 #include "fxmath.h"
 #include "fxascii.h"
+#include "FXString.h"
 
 
 /*
   Notes:
   - Thread-safe conversion of strings to signed long and int, with extra parameter
-    for conversion success.
+    'ok' for conversion success.
 */
 
 
@@ -40,12 +41,12 @@
 #define LLONG_MIN  (-LLONG_MAX-FXLONG(1))
 #endif
 
-/*******************************************************************************/
 
 using namespace FX;
 
-namespace FX {
+/*******************************************************************************/
 
+namespace FX {
 
 extern FXAPI FXlong __strtoll(const FXchar *beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
 extern FXAPI FXint __strtol(const FXchar *beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
@@ -53,14 +54,14 @@
 
 // Convert string to signed long
 FXlong __strtoll(const FXchar *beg,const FXchar** end,FXint base,FXbool* ok){
-  register const FXchar *s=beg;
-  register FXulong cutoff=LLONG_MAX;
-  register FXulong value=0;
-  register FXint cutlim;
-  register FXint digits=0;
-  register FXint neg=0;
-  register FXint ovf=0;
-  register FXint v;
+  const FXchar *s=beg;
+  FXulong cutoff=LLONG_MAX;
+  FXulong value=0;
+  FXint cutlim;
+  FXint digits=0;
+  FXint neg=0;
+  FXint ovf=0;
+  FXint v;
 
   // Assume the worst
   if(ok) *ok=false;
@@ -130,7 +131,7 @@
 
 // Convert string to signed int
 FXint __strtol(const FXchar *beg,const FXchar** end,FXint base,FXbool* ok){
-  register FXlong value=__strtoll(beg,end,base,ok);
+  FXlong value=__strtoll(beg,end,base,ok);
   if(__unlikely(value<INT_MIN)){
     if(ok) *ok=false;
     return INT_MIN;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxstrtoull.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxstrtoull.cpp Changed

@@ -3,7 +3,7 @@
 *      S t r i n g   t o   U n s i g n e d   L o n g   C o n v e r s i o n      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -23,12 +23,13 @@
 #include "fxdefs.h"
 #include "fxmath.h"
 #include "fxascii.h"
+#include "FXString.h"
 
 
 /*
   Notes:
   - Thread-safe conversion of strings to unsigned long and int, with extra parameter
-    for conversion success.
+    'ok' for conversion success.
 */
 
 
@@ -37,12 +38,11 @@
 #define ULLONG_MAX FXULONG(18446744073709551615)
 #endif
 
-/*******************************************************************************/
-
 using namespace FX;
 
-namespace FX {
+/*******************************************************************************/
 
+namespace FX {
 
 extern FXAPI FXulong __strtoull(const FXchar* beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
 extern FXAPI FXuint __strtoul(const FXchar* beg,const FXchar** end=NULL,FXint base=0,FXbool* ok=NULL);
@@ -50,14 +50,14 @@
 
 // Convert string to unsigned long
 FXulong __strtoull(const FXchar *beg,const FXchar** end,FXint base,FXbool* ok){
-  register const FXchar *s=beg;
-  register FXulong cutoff=ULLONG_MAX;
-  register FXulong value=0;
-  register FXint cutlim;
-  register FXint digits=0;
-  register FXint neg=0;
-  register FXint ovf=0;
-  register FXint v;
+  const FXchar *s=beg;
+  FXulong cutoff=ULLONG_MAX;
+  FXulong value=0;
+  FXint cutlim;
+  FXint digits=0;
+  FXint neg=0;
+  FXint ovf=0;
+  FXint v;
 
   // Assume the worst
   if(ok) *ok=false;
@@ -126,7 +126,7 @@
 
 // Convert string to unsigned int
 FXuint __strtoul(const FXchar* beg,const FXchar** end,FXint base,FXbool* ok){
-  register FXulong value=__strtoull(beg,end,base,ok);
+  FXulong value=__strtoull(beg,end,base,ok);
   if(__unlikely(value>UINT_MAX)){
     if(ok) *ok=false;
     return UINT_MAX;

gogglesmm-1.2.2.tar.gz/cfox/lib/fxtabbify.cpp Added

@@ -0,0 +1,296 @@
+/********************************************************************************
+*                                                                               *
+*                  T a b - S t o p s   M a n i p u l a t i o n s                *
+*                                                                               *
+*********************************************************************************
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
+*********************************************************************************
+* This library is free software; you can redistribute it and/or modify          *
+* it under the terms of the GNU Lesser General Public License as published by   *
+* the Free Software Foundation; either version 3 of the License, or             *
+* (at your option) any later version.                                           *
+*                                                                               *
+* This library is distributed in the hope that it will be useful,               *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of                *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 *
+* GNU Lesser General Public License for more details.                           *
+*                                                                               *
+* You should have received a copy of the GNU Lesser General Public License      *
+* along with this program.  If not, see <http://www.gnu.org/licenses/>          *
+********************************************************************************/
+#include "xincs.h"
+#include "fxver.h"
+#include "fxdefs.h"
+#include "fxmath.h"
+#include "fxascii.h"
+#include "fxunicode.h"
+#include "FXArray.h"
+#include "FXHash.h"
+#include "FXStream.h"
+#include "FXString.h"
+
+
+/*
+  Notes:
+  - Expand tabs to spaces, or compress runs of spaces to tabs, given tab stops
+    and UTF8 encoding.
+  - Assume UTF8 characters account for 1 column.
+  - Complex shifting and tabbification of text.
+*/
+
+using namespace FX;
+
+/*******************************************************************************/
+
+namespace FX {
+
+// Expand tabs with the equivalent amount of spaces.
+// UTF8 encoded characters are counted as one column.
+FXString FXString::detab(const FXString& text,FXint tabcols){
+  FXString result;
+  FXint is,d,s;
+  FXuchar c;
+  is=d=s=0;
+  while(s<text.length()){
+    c=texts++;
+    if(c=='\n'){
+      d++;
+      is=0;
+      continue;
+      }
+    if(c=='\t'){
+      do{ d++; }while(++is%tabcols);
+      continue;
+      }
+    d++;
+    is++;
+    if(c<0xC0) continue;
+    d++; s++;
+    if(c<0xE0) continue;
+    d++; s++;
+    if(c<0xF0) continue;
+    d++; s++;
+    }
+  result.length(d);
+  is=d=s=0;
+  while(s<text.length()){
+    c=texts++;
+    if(c=='\n'){
+      resultd++=c;
+      is=0;
+      continue;
+      }
+    if(c=='\t'){
+      do{ resultd++=' '; }while(++is%tabcols);
+      continue;
+      }
+    resultd++=c;
+    is++;
+    if(c<0xC0) continue;
+    resultd++=texts++;
+    if(c<0xE0) continue;
+    resultd++=texts++;
+    if(c<0xF0) continue;
+    resultd++=texts++;
+    }
+  FXASSERT(d==result.length());
+  return result;
+  }
+
+
+// Compress runs of more than 2 spaces with tabs.
+// UTF8 characters are counted as one column.
+FXString FXString::entab(const FXString& text,FXint tabcols){
+  FXString result;
+  FXint is,ie,d,s,ts;
+  FXuchar c;
+  is=ie=d=s=0;
+  while(s<text.length()){
+    c=texts;
+    s++;
+    d++;
+    ie++;
+    if(c==' '){                                 // Accumulate spaces
+      if((ie-is)<3) continue;                   // Run of less than 3
+      ts=is+tabcols-is%tabcols;
+      if(ie<ts) continue;                       // Not crossing tabstop
+      d+=1+is-ts;                               // Adjust
+      is=ts;                                    // Advance to tabstop
+      continue;
+      }
+    if(c=='\t'){                                // Keep the tab
+      d+=is-ie;                                 // Adjust
+      d++;
+      ie--;
+      ie+=tabcols-ie%tabcols;                   // New tab-column
+      is+=tabcols-is%tabcols;
+      if(is==ie) continue;                      // Reached tabstop
+      is+=tabcols-is%tabcols;
+      d++;
+      continue;
+      }
+    if(c=='\n'){                                // Reset columns
+      is=0;
+      ie=0;
+      continue;
+      }
+    is=ie;                                      // One UTF8 character
+    if(c<0xC0) continue;
+    d++;
+    s++;
+    if(c<0xE0) continue;
+    d++;
+    s++;
+    if(c<0xF0) continue;
+    d++;
+    s++;
+    }
+  result.length(d);
+  is=ie=d=s=0;
+  while(s<text.length()){
+    c=resultd=texts;
+    s++;
+    d++;
+    ie++;
+    if(c==' '){                                 // Accumulate spaces
+      if((ie-is)<3) continue;                   // Run of less than 3
+      ts=is+tabcols-is%tabcols;
+      if(ie<ts) continue;                       // Not crossing tabstop
+      resultd+is-ie='\t';                     // Write a tab at start of run
+      d+=1+is-ts;                               // Adjust
+      is=ts;                                    // Advance to tabstop
+      continue;
+      }
+    if(c=='\t'){                                // Keep the tab
+      d+=is-ie;                                 // Adjust
+      resultd++='\t';
+      ie--;
+      ie+=tabcols-ie%tabcols;
+      is+=tabcols-is%tabcols;
+      if(is==ie) continue;                      // Reached tabstop
+      is+=tabcols-is%tabcols;
+      resultd++='\t';
+      continue;
+      }
+    if(c=='\n'){                                // Reset columns
+      is=0;
+      ie=0;
+      continue;
+      }
+    is=ie;                                      // One UTF8 character
+    if(c<0xC0) continue;
+    resultd=texts;
+    d++;
+    s++;
+    if(c<0xE0) continue;
+    resultd=texts;
+    d++;
+    s++;
+    if(c<0xF0) continue;
+    resultd=texts;
+    d++;
+    s++;
+    }
+  FXASSERT(d<=result.length());
+  return result;
+  }
+
+// Retabbify line
+// Assume original starting column of the string is indent, and the output
+// starting column is outdent; this affects accounting of the tab-stops in the
+// input string, and of the output string relative to the first character.
+// Along the way, extra columns may be inserted or removed as per shift.
+// If shift=0, indent=0, and outdent=0, this routine has the effect of harmonizing
+// the output of white space according to the current tab setting ("clean indent").
+// For now, we assume all unicode characters to be one column.
+FXString FXString::tabbify(const FXString& text,FXint tabcols,FXint indent,FXint outdent,FXint shift,FXbool tabs){
+  FXString result;
+  FXint oec=outdent+shift;
+  FXint osc=outdent;
+  FXint isc=indent;
+  FXint iec=indent;
+  FXint s=0;
+  FXint d=0;
+  FXint ntabs;
+  FXuchar c;
+  while(s<text.length()){
+    c=texts++;
+    if(c==' '){ iec++; continue; }                              // Space is one column
+    if(c=='\t'){ iec+=tabcols-iec%tabcols; continue; }          // Tabs is multiple columns
+    oec+=(iec-isc);
+    if(osc<oec){                                                // Owe some spaces
+      if(tabs && 2<(oec-osc)){
+        ntabs=oec/tabcols-osc/tabcols;                          // How many tabs to emit
+        if(ntabs){ d+=ntabs; osc=(oec/tabcols)*tabcols; }
+        }
+      d+=oec-osc;
+      osc=oec;
+      }
+    if(c=='\n'){                                                // Emit a newline and reset columns
+      d++;
+      isc=indent;
+      iec=indent;
+      osc=outdent;
+      oec=outdent+shift;
+      continue;
+      }
+    isc=++iec;                                                  // Advance input columns
+    osc=++oec;                                                  // Advance output columns
+    d++;                                                        // Copy character
+    if(c<0xC0) continue;
+    d++;
+    s++;
+    if(c<0xE0) continue;
+    d++;
+    s++;
+    if(c<0xF0) continue;
+    d++;
+    s++;
+    }
+  result.length(d);
+  oec=outdent+shift;
+  osc=outdent;
+  isc=indent;
+  iec=indent;
+  s=0;
+  d=0;
+  while(s<text.length()){
+    c=texts++;
+    if(c==' '){ iec++; continue; }                              // Space is one column
+    if(c=='\t'){ iec+=tabcols-iec%tabcols; continue; }          // Tabs is multiple columns
+    oec+=(iec-isc);
+    if(osc<oec){                                                // Owe some spaces
+      if(tabs && 2<(oec-osc)){
+        ntabs=oec/tabcols-osc/tabcols;                          // How many tabs to emit
+        if(ntabs){
+          do{ resultd++='\t'; }while(--ntabs);
+          osc=(oec/tabcols)*tabcols;                            // Advance starting column to the last tabstop
+          }
+        }
+      while(osc<oec){ resultd++=' '; osc++; }                 // Emit spaces to reach current column
+      }
+    if(c=='\n'){                                                // Emit a newline and reset columns
+      resultd++='\n';
+      isc=indent;
+      iec=indent;
+      osc=outdent;
+      oec=outdent+shift;
+      continue;
+      }
+    isc=++iec;                                                  // Advance input columns
+    osc=++oec;                                                  // Advance output columns
+    resultd++=c;                                              // Copy character
+    if(c<0xC0) continue;
+    resultd++=texts++;
+    if(c<0xE0) continue;
+    resultd++=texts++;
+    if(c<0xF0) continue;
+    resultd++=texts++;
+    }
+  FXASSERT(d<=result.length());
+  result.trunc(d);
+  return result;
+  }
+
+
+}

gogglesmm-1.2.1.tar.gz/cfox/lib/fxtargaio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxtargaio.cpp Changed

@@ -3,7 +3,7 @@
 *                      T A R G A   I n p u t / O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2001,2018 by Janusz Ganczarski.   All Rights Reserved.          *
+* Copyright (C) 2001,2020 by Janusz Ganczarski.   All Rights Reserved.          *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -53,7 +53,7 @@
 
 
 static FXbool loadTarga32(FXStream& store,FXColor* data,FXint width,FXint height,FXuchar imgdescriptor,FXuchar ImageType){
-  register FXint i,j,rc;
+  FXint i,j,rc;
   FXuchar *pp,R,G,B,A,c;
 
   // 2 - Uncompressed, RGB images.
@@ -182,7 +182,7 @@
 
 
 static FXbool loadTarga24(FXStream& store,FXColor* data,FXint width,FXint height,FXuchar imgdescriptor,FXuchar ImageType){
-  register int i,j,rc;
+  int i,j,rc;
   FXuchar *pp,R,G,B,c;
 
   // 2 - Uncompressed, RGB images.
@@ -443,8 +443,8 @@
 
 
 static FXbool loadTarga8(FXStream& store,FXColor* data,FXint width,FXint height,FXuchar colormap4,FXuchar imgdescriptor,FXuchar ImageType){
-  register FXint i,j,rc;
-  register FXuchar *pp;
+  FXint i,j,rc;
+  FXuchar *pp;
   FXuchar R,G,B,A,c;
 
   // 1 - Uncompressed, color-mapped images
@@ -583,8 +583,8 @@
 
 
 static FXbool loadTargaGray(FXStream& store,FXColor* data,FXint width,FXint height,FXuchar imgdescriptor,FXuchar ImageType){
-  register FXint i,j,rc;
-  register FXuchar *pp;
+  FXint i,j,rc;
+  FXuchar *pp;
   FXuchar c;
 
   // 3 - Uncompressed, black and white images.

gogglesmm-1.2.1.tar.gz/cfox/lib/fxtifio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxtifio.cpp Changed

@@ -3,7 +3,7 @@
 *                        T I F F   I n p u t / O u t p u t                      *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2001,2018 Eric Gillet.   All Rights Reserved.                   *
+* Copyright (C) 2001,2020 Eric Gillet.   All Rights Reserved.                   *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -338,7 +338,7 @@
 
 // Save a TIFF image
 FXbool fxsaveTIF(FXStream& store,const FXColor* data,FXint width,FXint height,FXushort codec){
-  register FXbool result=false;
+  FXbool result=false;
 
   // Must make sense
   if(data && 0<width && 0<height){
@@ -437,9 +437,8 @@
    0x45, 0x38, 0x81, 0xa0, 0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0xa0,
    0x05, 0x00, 0x00, 0xa0, 0x05, 0x00, 0x00, 0xa0, 0xfd, 0xff, 0xff, 0xbf,
    0x01, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff};
-  register FXint p;
   allocElms(data,32*32);
-  for(p=0; p<32*32; p++){
+  for(FXint p=0; p<32*32; p++){
     datap=color(tiff_bitsp>>3>>(p&7))&1;
     }
   width=32;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxunicode.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxunicode.cpp Changed

@@ -3,7 +3,7 @@
 *                   U N I C O D E   C h a r a c t e r   I n f o                 *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2005,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 2005,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -1513,13 +1513,13 @@
 
 
 FXbool isLetter(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return (CatLetterUpper<=c && c<=CatLetterOther);
   }
 
 
 FXbool isAlphaNumeric(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return (CatLetterUpper<=c && c<=CatNumberOther);
   }
 
@@ -1530,43 +1530,43 @@
 
 
 FXbool isSpace(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return (CatMarkNonSpacing<=c && c<=CatSeparatorParagraph) || (9<=ucs && ucs<=13);
   }
 
 
 FXbool isBlank(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return (CatMarkNonSpacing<=c && c<=CatSeparatorSpace) || (ucs==9);
   }
 
 
 FXbool isMark(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return (CatMarkNonSpacing<=c && c<=CatMarkEnclosing);
   }
 
 
 FXbool isSep(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return (CatSeparatorSpace<=c && c<=CatSeparatorParagraph);
   }
 
 
 FXbool isPunct(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return CatPunctConnector<=c && c<=CatPunctOther;
   }
 
 
 FXbool isGraph(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return CatLetterUpper<=c && c<=CatSymbolOther;
   }
 
 
 FXbool isPrint(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return CatMarkNonSpacing<=c && c<=CatSymbolOther;
   }
 
@@ -1587,7 +1587,7 @@
 
 
 FXbool hasCase(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return CatLetterUpper<=c && c<=CatLetterTitle;
   }
 
@@ -1598,7 +1598,7 @@
 
 
 FXbool isSymbol(FXwchar ucs){
-  register FXuint c=charCategory(ucs);
+  FXuint c=charCategory(ucs);
   return CatSymbolMath<=c && c<=CatSymbolOther;
   }
 
@@ -4659,10 +4659,10 @@
 
 FXwchar charCompose(FXwchar ucsa,FXwchar ucsb){
   if(0x3c<=ucsa && ucsa<=0x110a5 && 0x300<=ucsb && ucsb<=0x110ba){
-    register FXwchar combo=(ucsa<<16)|ucsb;
-    register FXint h=933;
-    register FXint l=0;
-    register FXint m;
+    FXwchar combo=(ucsa<<16)|ucsb;
+    FXint h=933;
+    FXint l=0;
+    FXint m;
     do{
       m=(h+l)>>1;
       if(combo<compose_indexm) h=m-1;
@@ -5207,13 +5207,13 @@
 
 
 FXbool isHexDigit(FXwchar ucs){
-  register FXint c=digitValue(ucs);
+  FXint c=digitValue(ucs);
   return 0<=c && c<16;
   }
 
 
 FXbool isDigit(FXwchar ucs){
-  register FXint c=digitValue(ucs);
+  FXint c=digitValue(ucs);
   return 0<=c && c<10;
   }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxutils.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxutils.cpp Changed

@@ -3,7 +3,7 @@
 *                          U t i l i t y   F u n c t i o n s                    *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1998,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1998,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -340,26 +340,6 @@
   return (s-src)+m;
   }
 
-/*
-FXchar* fxstrcasestr(const FXchar* s,const FXchar* find){
-  FXchar c, sc;
-  size_t len;
-  if((c=*find++)!=0){
-    c=tolower((unsigned char)c);
-    len=strlen(find);
-    do{
-      do{
-        if((sc=*s++)==0) return NULL;
-        }
-      while((FXchar)tolower((FXuchar)sc)!=c);
-      }
-    while(strncasecmp(s,find,len)!=0);
-    s--;
-    }
-  return ((char *)s);
-  }
-*/
-
 /*******************************************************************************/
 
 // Convert string of length len to MSDOS; return new string and new length
@@ -400,10 +380,9 @@
 
 FILE *fxopen(const char *filename,const char *mode){
 #if defined(WIN32) && defined(UNICODE)
-  FXnchar unifileMAXPATHLEN;
-  FXnchar unimode8;
-  utf2ncs(unifile,filename,MAXPATHLEN);
-  utf2ncs(unimode,mode,8);
+  FXnchar unifileMAXPATHLEN,unimode8;
+  utf2ncs(unifile,filename,ARRAYNUMBER(unifile));
+  utf2ncs(unimode,mode,ARRAYNUMBER(unimode));
   return _wfopen(unifile,unimode);
 #else
   return fopen(filename,mode);
@@ -414,10 +393,9 @@
 
 FILE *fxreopen(const char *filename,const char *mode,FILE * stream){
 #if defined(WIN32) && defined(UNICODE)
-  FXnchar unifileMAXPATHLEN;
-  FXnchar unimode8;
-  utf2ncs(unifile,filename,MAXPATHLEN);
-  utf2ncs(unimode,mode,8);
+  FXnchar unifileMAXPATHLEN,unimode8;
+  utf2ncs(unifile,filename,ARRAYNUMBER(unifile));
+  utf2ncs(unimode,mode,ARRAYNUMBER(unimode));
   return _wfreopen(unifile,unimode,stream);
 #else
   return freopen(filename,mode,stream);
@@ -427,7 +405,6 @@
 
 /*******************************************************************************/
 
-
 // Convert RGB to HSV
 void fxrgb_to_hsv(FXfloat& h,FXfloat& s,FXfloat& v,FXfloat r,FXfloat g,FXfloat b){
   FXfloat mx=FXMAX3(r,g,b);
@@ -554,54 +531,5 @@
     }
   }
 
-
-/*******************************************************************************/
-
-#if defined(__GNUC__) && defined(__linux__) && defined(__x86_64__)
-
-// MXCSR controls SSE(2) operation:
-//
-// +----+-------+----+----+----+----+----+----+----+----+----+----+----+----+----+
-// | FZ |   RC  | PM | UM | OM | ZM | DM | IM | DAZ| PE | UE | OE | ZE | DE | IE |
-// +----+-------+----+----+----+----+----+----+----+----+----+----+----+----+----+
-// | 15 | 14 13 | 12 | 11 | 10 |  9 |  8 |  7 |  6 |  5 |  4 |  3 |  2 |  1 |  0 |
-// +----+-------+----+----+----+----+----+----+----+----+----+----+----+----+----+
-//
-// FZ  Flush to zero
-// RC  Round control (00=nearest, 01=down, 10=up, 11=toward zero)
-// PM  Precision exception mask
-// UM  Underflow exception mask
-// OM  Overflow exception mask
-// ZM  Zero divide exception mask
-// DM  Denormalized operand exception mask
-// IM  Invalid operation exception mask
-// DAZ Denormals are zeros
-// PE  Precision exception
-// UE  Underflow exception
-// OE  Overflow exception
-// ZE  Zero-divide exception
-// DE  Denormalized operand exception
-// IE  Invalid operation exception
-
-extern FXAPI FXuint fxgetmxcsr();
-extern FXAPI void fxsetmxcsr(FXuint mxcsr);
-
-
-// Set value to MXCSR control register
-void fxsetmxcsr(unsigned int mxcsr){
-  __asm("ldmxcsr %0" : : "m"(*&mxcsr));
-  }
-
-
-// Get current value of MXCSR control register
-unsigned int fxgetmxcsr(){
-  unsigned int mxcsr;
-  __asm("stmxcsr %0" : "=m"(*&mxcsr));
-  return mxcsr;
-  }
-
-#endif
-
-
 }

gogglesmm-1.2.1.tar.gz/cfox/lib/fxwebpio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxwebpio.cpp Changed

@@ -3,7 +3,7 @@
 *                    W e b - P   I m a g e   I n p u t / O u t p u t            *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 2011,2018 by S. Jansen & J. van der Zijp.  All Rights Reserved. *
+* Copyright (C) 2011,2020 by S. Jansen & J. van der Zijp.  All Rights Reserved. *
 *********************************************************************************
 * This library is free software; you can redistribute it and/or modify          *
 * it under the terms of the GNU Lesser General Public License as published by   *
@@ -171,9 +171,8 @@
   0x00,0x04,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 };
-  FXint p;
   allocElms(data,32*32);
-  for(p=0; p<32*32; p++){
+  for(FXint p=0; p<32*32; p++){
     datap=color(webp_bitsp>>3>>(p&7))&1;
     }
   width=32;

gogglesmm-1.2.1.tar.gz/cfox/lib/fxwuquantize.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxwuquantize.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxxbmio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxxbmio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/fxxpmio.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/fxxpmio.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/icons.cpp -> gogglesmm-1.2.2.tar.gz/cfox/lib/icons.cpp Changed

gogglesmm-1.2.1.tar.gz/cfox/lib/jitter.h -> gogglesmm-1.2.2.tar.gz/cfox/lib/jitter.h Changed

gogglesmm-1.2.2.tar.gz/cfox/lib/leapseconds.h Added

@@ -0,0 +1,68 @@
+/******** Generated on 2020/10/14 08:13:55 *********/
+
+// Leapsecond times in utc
+const long long leapseconds_utc={
+    63072000000000000,  // 1972/01/01: 10
+    78796800000000000,  // 1972/07/01: 11
+    94694400000000000,  // 1973/01/01: 12
+   126230400000000000,  // 1974/01/01: 13
+   157766400000000000,  // 1975/01/01: 14
+   189302400000000000,  // 1976/01/01: 15
+   220924800000000000,  // 1977/01/01: 16
+   252460800000000000,  // 1978/01/01: 17
+   283996800000000000,  // 1979/01/01: 18
+   315532800000000000,  // 1980/01/01: 19
+   362793600000000000,  // 1981/07/01: 20
+   394329600000000000,  // 1982/07/01: 21
+   425865600000000000,  // 1983/07/01: 22
+   489024000000000000,  // 1985/07/01: 23
+   567993600000000000,  // 1988/01/01: 24
+   631152000000000000,  // 1990/01/01: 25
+   662688000000000000,  // 1991/01/01: 26
+   709948800000000000,  // 1992/07/01: 27
+   741484800000000000,  // 1993/07/01: 28
+   773020800000000000,  // 1994/07/01: 29
+   820454400000000000,  // 1996/01/01: 30
+   867715200000000000,  // 1997/07/01: 31
+   915148800000000000,  // 1999/01/01: 32
+  1136073600000000000,  // 2006/01/01: 33
+  1230768000000000000,  // 2009/01/01: 34
+  1341100800000000000,  // 2012/07/01: 35
+  1435708800000000000,  // 2015/07/01: 36
+  1483228800000000000,  // 2017/01/01: 37
+  };
+
+
+// Leapseconds times in tai
+const long long leapseconds_tai={
+    63072010000000000,  // 1972/01/01: 10
+    78796811000000000,  // 1972/07/01: 11
+    94694412000000000,  // 1973/01/01: 12
+   126230413000000000,  // 1974/01/01: 13
+   157766414000000000,  // 1975/01/01: 14
+   189302415000000000,  // 1976/01/01: 15
+   220924816000000000,  // 1977/01/01: 16
+   252460817000000000,  // 1978/01/01: 17
+   283996818000000000,  // 1979/01/01: 18
+   315532819000000000,  // 1980/01/01: 19
+   362793620000000000,  // 1981/07/01: 20
+   394329621000000000,  // 1982/07/01: 21
+   425865622000000000,  // 1983/07/01: 22
+   489024023000000000,  // 1985/07/01: 23
+   567993624000000000,  // 1988/01/01: 24
+   631152025000000000,  // 1990/01/01: 25
+   662688026000000000,  // 1991/01/01: 26
+   709948827000000000,  // 1992/07/01: 27
+   741484828000000000,  // 1993/07/01: 28
+   773020829000000000,  // 1994/07/01: 29
+   820454430000000000,  // 1996/01/01: 30
+   867715231000000000,  // 1997/07/01: 31
+   915148832000000000,  // 1999/01/01: 32
+  1136073633000000000,  // 2006/01/01: 33
+  1230768034000000000,  // 2009/01/01: 34
+  1341100835000000000,  // 2012/07/01: 35
+  1435708836000000000,  // 2015/07/01: 36
+  1483228837000000000,  // 2017/01/01: 37
+  };
+
+

gogglesmm-1.2.1.tar.gz/cfox/lib/version.rc -> gogglesmm-1.2.2.tar.gz/cfox/lib/version.rc Changed

gogglesmm-1.2.1.tar.gz/cfox/utils/reswrap.1 -> gogglesmm-1.2.2.tar.gz/cfox/utils/reswrap.1 Changed

@@ -1,4 +1,4 @@
-.TH reswrap 1 "January 2016" "The FOX C++ GUI Toolkit" "FOX Programmers Manual"
+.TH reswrap 1 "July 2020" "The FOX C++ GUI Toolkit" "FOX Programmers Manual"
 
 .SH NAME
 reswrap \- wrap icon and image resources into C or C++ code
@@ -11,21 +11,21 @@
 .SH DESCRIPTION
 .B Reswrap
 is a tool to turn binary files into C or C++ data arrays.
-This allows various resources such as icons, images, or other data to be embedded into source 
+This allows various resources such as icons, images, or other data to be embedded into source
 code and compiled into an application. When used in text mode, normal printing characters
 are passed normally while control characters or non-ascii are automatically escaped.
 
-In development of graphical applications with FOX, it is customary to embed icons, images, 
-online help, or OpenGL fragment shader programs into the executable file, thus removing the 
+In development of graphical applications with FOX, it is customary to embed icons, images,
+online help, or OpenGL fragment shader programs into the executable file, thus removing the
 need to distribute such files separately with the application.
 
 .B Reswrap
-is typically invoked as a part of the application build process to generate additional C++ source 
-files from collections of icons, images, or other binary resources. This can be easily accomplished 
-using a special Makefile Rule or Custom Build Rule, as part of the normal compile process of 
+is typically invoked as a part of the application build process to generate additional C++ source
+files from collections of icons, images, or other binary resources. This can be easily accomplished
+using a special Makefile Rule or Custom Build Rule, as part of the normal compile process of
 an application.
-Reswrap supports a variety of options to facilitate inclusion into an automated build process.  
-Given a list of resource files, reswrap can automatically generate header files containing just 
+Reswrap supports a variety of options to facilitate inclusion into an automated build process.
+Given a list of resource files, reswrap can automatically generate header files containing just
 the declarations, adorn the generated symbols with namespaces, prefixes and/or postfixes,
 file-extensions, and apply extern or static linkage attributes.  Resource filenames containing
 unsafe characters are automatically transformed into legal C or C++ identifiers.
@@ -224,7 +224,7 @@
 for the Debian distribution of the FOX Toolkit, and is currently maintained
 by Jeroen van der Zijp (jeroen@fox-toolkit.com).
 .SH COPYRIGHT
-Copyright \(co 1997,2016 Jeroen van der Zijp.
+Copyright \(co 1997,2020 Jeroen van der Zijp.
 .br
 This is free software; see the source for copying conditions.  There is
 NO warranty; not even for MERCHANTABILITY or FITNESS FOR  A  PARTICULAR

gogglesmm-1.2.1.tar.gz/cfox/utils/reswrap.cpp -> gogglesmm-1.2.2.tar.gz/cfox/utils/reswrap.cpp Changed

@@ -3,7 +3,7 @@
 *                R e s o u r c e   W r a p p i n g   U t i l i t y              *
 *                                                                               *
 *********************************************************************************
-* Copyright (C) 1997,2018 by Jeroen van der Zijp.   All Rights Reserved.        *
+* Copyright (C) 1997,2020 by Jeroen van der Zijp.   All Rights Reserved.        *
 *********************************************************************************
 * This program is free software: you can redistribute it and/or modify          *
 * it under the terms of the GNU General Public License as published by          *
@@ -150,7 +150,7 @@
 /* Print version information */
 static void printversion(){
   printf("reswrap %s\n\n",version);
-  printf("Copyright (C) 1997,2018 Jeroen van der Zijp. All Rights Reserved.\n");
+  printf("Copyright (C) 1997,2020 Jeroen van der Zijp. All Rights Reserved.\n");
   printf("Please visit: http://www.fox-toolkit.org for further information.\n");
   printf("\n");
   printf("This program is free software: you can redistribute it and/or modify\n");

gogglesmm-1.2.1.tar.gz/gap/CMakeLists.txt -> gogglesmm-1.2.2.tar.gz/gap/CMakeLists.txt Changed

@@ -16,7 +16,7 @@
 
 
 # Goggles Audio Player
-project(GAP VERSION 1.2.1)
+project(GAP VERSION 1.2.2)
 
 # Update whenever ABI changes
 set(GAP_SOVERSION_CURRENT 0)    # Increase whenever an interface has been added, removed or changed.
@@ -79,6 +79,11 @@
                             PURPOSE "\tPulseAudio Output"
                             TYPE OPTIONAL)
 
+set_package_properties(sndio PROPERTIES
+                            URL "http://www.sndio.org/"
+                            PURPOSE "\tSndio Output"
+                            TYPE OPTIONAL)
+
 set_package_properties(openssl PROPERTIES
                             URL "https://www.openssl.org"
                             PURPOSE "\tSecure HTTP"
@@ -132,6 +137,7 @@
   option(WITH_PULSE "PulseAudio Output Support" ON)
   option(WITH_JACK "Jack Output Support (currently not working)" OFF)
   option(WITH_WAVOUT "WAV Output Support" ON)
+  option(WITH_SNDIO "Sndio Output Support" ON)
 
   # Containers
   option(WITH_OGG "Ogg File Support" ON)
@@ -201,6 +207,16 @@
     pkg_check_modules(JACK jack)
   endif()
 
+  if(WITH_SNDIO)
+    check_include_files(sndio.h HAVE_SNDIO_H)
+    if(HAVE_SNDIO_H)
+        find_library(SNDIO_LIBRARIES NAMES sndio)
+        if(SNDIO_LIBRARIES)
+            set(SNDIO_FOUND 1)
+        endif()
+    endif()
+  endif()
+
   if(WITH_DCA)
     pkg_check_modules(DCA libdca)
   endif()
@@ -287,6 +303,7 @@
             ap_buffer_io.cpp
             ap_connect.cpp
             ap_convert.cpp
+            ap_crossfader.cpp
             ap_decoder_plugin.cpp
             ap_decoder_thread.cpp
             ap_device.cpp
@@ -314,6 +331,7 @@
             ap_config.h
             ap_connect.h
             ap_convert.h
+            ap_crossfader.h
             ap_decoder_plugin.h
             ap_decoder_thread.h
             ap_defs.h
@@ -536,6 +554,14 @@
     set(HAVE_JACK 1)
   endif()
 
+  # Sndio Output
+  if (WITH_SNDIO AND SNDIO_FOUND)
+    add_library(gap_sndio MODULE plugins/ap_sndio.cpp)
+    target_link_libraries(gap_sndio ${SNDIO_LIBRARIES})
+    target_include_directories(gap_sndio PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${FOX_INCLUDE_DIRS})
+    install(TARGETS gap_sndio LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gogglesmm)
+    set(HAVE_SNDIO 1)
+  endif()
 endif()
 
 
@@ -555,6 +581,7 @@
 add_feature_info(alsa HAVE_ALSA "${ALSA_VERSION}")
 add_feature_info(jack HAVE_JACK "${JACK_VERSION}")
 add_feature_info(oss HAVE_OSS "OSS Output")
+add_feature_info(sndio HAVE_SNDIO "Sndio Output")
 add_feature_info(wav WITH_WAVOUT "WAV File Output")
 
 # Containers

gogglesmm-1.2.1.tar.gz/gap/ap_app_queue.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_app_queue.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_buffer.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_buffer.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -35,6 +35,18 @@
   freeElms(begptr);
   }
 
+void BufferBase::adopt(BufferBase & other) {
+  freeElms(begptr);
+  begptr = other.begptr;
+  endptr = other.endptr;
+  wrptr  = other.wrptr;
+  rdptr  = other.rdptr;
+  other.begptr = nullptr;
+  other.endptr = nullptr;
+  other.wrptr = nullptr;
+  other.rdptr = nullptr;
+  }
+
 void BufferBase::clear() {
   wrptr=rdptr=begptr;
   }

gogglesmm-1.2.1.tar.gz/gap/ap_buffer.h -> gogglesmm-1.2.2.tar.gz/gap/ap_buffer.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_buffer_io.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_buffer_io.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_config.h.in -> gogglesmm-1.2.2.tar.gz/gap/ap_config.h.in Changed

gogglesmm-1.2.1.tar.gz/gap/ap_connect.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_connect.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_connect.h -> gogglesmm-1.2.2.tar.gz/gap/ap_connect.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_convert.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_convert.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -37,6 +37,15 @@
 namespace ap {
 
 
+
+template <typename T, unsigned B>
+inline T signextend(const T x)
+{
+  struct {T x:B;} s;
+  return s.x = x;
+}
+
+
 static FXint s16_to_s32(FXshort x) {
   if (x==INT16_MIN)
     return INT32_MIN;
@@ -44,6 +53,16 @@
     return (x<<16)+(x+x)+((x+16383)>>15);
   }
 
+static FXfloat s16_to_float(FXshort x) {
+  FXfloat c =  (float)x / (float)INT16_MAX;
+  if (c > 1.0)
+    return 1.0;
+  else if (c < -1.0)
+    return -1.0;
+  else
+    return c;
+  }
+
 static FXint s24_to_s32(FXint x) {
   if (x==INT24_MIN)
     return INT32_MIN;
@@ -51,6 +70,20 @@
     return (x<<8)+(x>>16)+(x>>16)+((x+4194303)>>23);
   }
 
+
+static FXfloat s24_to_float(FXint x) {
+  struct {signed int x:24;} s;
+  FXint e = s.x = x;
+  FXfloat c = (float)e / (float)INT24_MAX;
+  if (c > 1.0)
+    return 1.0;
+  else if (c < -1.0)
+    return -1.0;
+  else
+    return c;
+  }
+
+
 static FXshort float_to_s16(FXfloat x) {
   FXfloat c = x*INT16_MAX;
   if (c>=INT16_MAX)
@@ -72,7 +105,6 @@
   }
 
 
-
 void s16_to_s32(const FXuchar *buffer,FXuint nsamples,MemoryBuffer & out) {
   out.clear();
   out.reserve(nsamples*4);
@@ -100,6 +132,28 @@
   }
 
 
+void s16_to_float(FXuchar * buffer, FXuint nsamples, MemoryBuffer & out){
+  out.clear();
+  out.reserve(nsamples*4);
+  FXshort * input = reinterpret_cast<FXshort*>(buffer);
+  FXfloat * output  = out.flt();
+  for (FXuint i=0;i<nsamples;i++) {
+    outputi=s16_to_float(inputi);
+    }
+  out.wroteBytes(nsamples*4);
+  }
+
+void s24le3_to_float(FXuchar * input,FXuint nsamples, MemoryBuffer & out){
+  out.clear();
+  out.reserve(nsamples*4);
+  FXfloat * output = out.flt();
+  for (FXuint i=0;i<nsamples;i++,input+=3) {
+    outputi = s24_to_float(input0|input1<<8|input2<<16);
+    }
+  out.wroteBytes(nsamples*4);
+  }
+
+
 void s24le3_to_s32(const FXuchar * input,FXuint nsamples,MemoryBuffer & out){
   out.clear();
   out.reserve(nsamples*4);

gogglesmm-1.2.1.tar.gz/gap/ap_convert.h -> gogglesmm-1.2.2.tar.gz/gap/ap_convert.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -23,6 +23,10 @@
 
 namespace ap {
 
+extern void s16_to_float(FXuchar * buffer, FXuint nsamples, MemoryBuffer & out);
+extern void s24le3_to_float(FXuchar * buffer,FXuint nsamples, MemoryBuffer & out);
+
+
 extern void s24le3_to_s16(FXuchar * buffer,FXuint nsamples);
 extern void  float_to_s16(FXuchar * buffer,FXuint nsamples);

gogglesmm-1.2.2.tar.gz/gap/ap_crossfader.cpp Added

@@ -0,0 +1,136 @@
+/*******************************************************************************
+*                         Goggles Audio Player Library                         *
+********************************************************************************
+*           Copyright (C) 2020-2021 by Sander Jansen. All Rights Reserved      *
+*                               ---                                            *
+* This program is free software: you can redistribute it and/or modify         *
+* it under the terms of the GNU General Public License as published by         *
+* the Free Software Foundation, either version 3 of the License, or            *
+* (at your option) any later version.                                          *
+*                                                                              *
+* This program is distributed in the hope that it will be useful,              *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                *
+* GNU General Public License for more details.                                 *
+*                                                                              *
+* You should have received a copy of the GNU General Public License            *
+* along with this program.  If not, see http://www.gnu.org/licenses.           *
+********************************************************************************/
+#include "ap_defs.h"
+#include "ap_convert.h"
+#include "ap_crossfader.h"
+
+namespace ap {
+
+// Start recording samples at stream position
+void CrossFader::start_recording(AudioFormat & fmt, FXuint stream, FXlong stream_position, FXlong stream_length) {
+  GM_DEBUG_PRINT("crossfader start recording at %lld for %lld frames (%g secs)\n", stream_position, stream_length - stream_position,  (stream_length - stream_position) / (double)fmt.rate);
+  position = stream_position;
+  length = stream_length;
+  af = fmt;
+  nframes = 0;
+  rframes = 0;
+  }
+
+
+void CrossFader::flush(){
+  GM_DEBUG_PRINT("crossfader flush\n");
+  buffer.clear();
+  length = 0;
+  position = -1;
+  nframes = 0;
+  rframes = 0;
+  recording = true;
+  }
+
+
+FXlong CrossFader::start_offset() const {
+  return nframes;
+  }
+
+FXint CrossFader::readable_frames() const {
+  return rframes;
+  }
+
+FXint CrossFader::total_frames() const {
+  return nframes;
+  }
+
+FXlong CrossFader::min_stream_length() const {
+  return (duration << 2) * af.rate;
+  }
+
+
+void CrossFader::writeFrames(const FXuchar * data, FXint n) {
+  buffer.append(data, n * af.framesize());
+  nframes += n;
+  rframes += n;
+  }
+
+void CrossFader::readFrames(FXint n) {
+  buffer.readBytes(n * af.framesize());
+  rframes -= n;
+  if (rframes == 0)
+    flush();
+  }
+
+FXbool CrossFader::convert(const AudioFormat & target) {
+  GM_DEBUG_PRINT("crossfade converting samples\n");
+#ifdef DEBUG
+  printf("crossfade source ");
+  af.debug();
+  printf("crossfade target ");
+  target.debug();
+#endif
+
+  if (af.channels != target.channels) {
+    GM_DEBUG_PRINT("crossfade channel mismatch\n");
+    return false;
+    }
+
+  if (af.channelmap != target.channelmap) {
+    GM_DEBUG_PRINT("crossfade channelmap mismatch\n");
+    return false;
+    }
+
+  if (af.rate != target.rate) {
+    GM_DEBUG_PRINT("crossfade rate mismatch\n");
+    return false;
+    }
+
+  if (target.format == AP_FORMAT_S16) {
+    switch(af.format) {
+      case AP_FORMAT_FLOAT: float_to_s16(buffer.data(), buffer.size() / af.packing()); break;
+      case AP_FORMAT_S24_3: s24le3_to_s16(buffer.data(), buffer.size() / af.packing()); break;
+      default             :  GM_DEBUG_PRINT("crossfade conversion not implemented\n"); return false; break;
+      }
+    af.format = target.format;
+    return true;
+    }
+  else if (target.format == AP_FORMAT_FLOAT) {
+    switch(af.format) {
+      case AP_FORMAT_S16:
+        {
+          MemoryBuffer out;
+          s16_to_float(buffer.data(), buffer.size() / af.packing(), out);
+          buffer.adopt(out);
+          break;
+        }
+      case AP_FORMAT_S24_3:
+        {
+          MemoryBuffer out;
+          s24le3_to_float(buffer.data(), buffer.size() / af.packing(), out);
+          buffer.adopt(out);
+          break;
+        }
+      default             : return false; break;
+      }
+    af.format = target.format;
+    return true;
+    }
+  else {
+    return false;
+    }
+  }
+
+}

gogglesmm-1.2.2.tar.gz/gap/ap_crossfader.h Added

@@ -0,0 +1,61 @@
+/*******************************************************************************
+*                         Goggles Audio Player Library                         *
+********************************************************************************
+*           Copyright (C) 2020-2021 by Sander Jansen. All Rights Reserved      *
+*                               ---                                            *
+* This program is free software: you can redistribute it and/or modify         *
+* it under the terms of the GNU General Public License as published by         *
+* the Free Software Foundation, either version 3 of the License, or            *
+* (at your option) any later version.                                          *
+*                                                                              *
+* This program is distributed in the hope that it will be useful,              *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                *
+* GNU General Public License for more details.                                 *
+*                                                                              *
+* You should have received a copy of the GNU General Public License            *
+* along with this program.  If not, see http://www.gnu.org/licenses.           *
+********************************************************************************/
+#ifndef AP_CROSSFADER_H
+#define AP_CROSSFADER_H
+
+#include "ap_buffer.h"
+#include "ap_format.h"
+
+namespace ap {
+
+class CrossFader {
+public:
+  AudioFormat  af;
+  MemoryBuffer buffer;
+  FXlong position=-1;
+  FXlong length=0;
+  FXuint stream=0;
+  FXint  nframes=0;   // number of frames stored in buffer
+  FXint  rframes=0;   // number of readable frames
+  FXuint duration;    // duration in milliseconds
+  FXbool recording=true;
+public:
+  CrossFader(FXuint d=5000) : duration(d) {}
+
+  void start_recording(AudioFormat & fmt, FXuint stream, FXlong stream_position, FXlong stream_length);
+
+  void flush();
+
+  FXlong start_offset() const;
+
+  FXint readable_frames() const;
+
+  FXint total_frames() const;
+
+  FXlong min_stream_length() const;
+
+  void writeFrames(const FXuchar * data, FXint n);
+
+  void readFrames(FXint n);
+
+  FXbool convert(const AudioFormat & target);
+};
+
+}
+#endif

gogglesmm-1.2.1.tar.gz/gap/ap_decoder_plugin.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_decoder_plugin.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_decoder_plugin.h -> gogglesmm-1.2.2.tar.gz/gap/ap_decoder_plugin.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_decoder_thread.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_decoder_thread.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_decoder_thread.h -> gogglesmm-1.2.2.tar.gz/gap/ap_decoder_thread.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_defs.h -> gogglesmm-1.2.2.tar.gz/gap/ap_defs.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_device.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_device.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -33,7 +33,8 @@
   "oss",
   "pulse",
   "jack",
-  "wav"
+  "wav",
+  "sndio"
   };
 
 static FXbool ap_has_plugin(FXuchar device) {
@@ -97,6 +98,22 @@
   }
 
 
+SndioConfig::SndioConfig() : device("default") {
+  }
+
+SndioConfig::SndioConfig(const FXString & d): device(d) {
+  }
+
+SndioConfig::~SndioConfig(){
+  }
+
+void SndioConfig::load(FXSettings & settings) {
+  device=settings.readStringEntry("sndio","device",device.text());
+  }
+
+void SndioConfig::save(FXSettings & settings) const {
+  settings.writeStringEntry("sndio","device",device.text());
+  }
 
 
 OutputConfig::OutputConfig() {
@@ -108,6 +125,8 @@
   device=DevicePulse;
 #elif defined(HAVE_JACK)
   device=DeviceJack;
+#elif defined(HAVE_SNDIO)
+  device=DeviceSndio;
 #else
   device=DeviceWav;
 #endif
@@ -135,6 +154,10 @@
   if (ap_has_plugin(DeviceJack))
     AP_ENABLE_PLUGIN(plugins,DeviceJack);
 #endif
+#ifdef HAVE_SNDIO
+  if (ap_has_plugin(DeviceSndio))
+    AP_ENABLE_PLUGIN(plugins,DeviceSndio);
+#endif
   if (ap_has_plugin(DeviceWav))
     AP_ENABLE_PLUGIN(plugins,DeviceWav);
   return plugins;
@@ -157,6 +180,7 @@
     }
   alsa.load(settings);
   oss.load(settings);
+  sndio.load(settings);
   }
 
 void OutputConfig::save(FXSettings & settings) const {
@@ -174,6 +198,7 @@
 
   alsa.save(settings);
   oss.save(settings);
+  sndio.save(settings);
   }

gogglesmm-1.2.1.tar.gz/gap/ap_engine.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_engine.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_engine.h -> gogglesmm-1.2.2.tar.gz/gap/ap_engine.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_event.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_event.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_event_private.h -> gogglesmm-1.2.2.tar.gz/gap/ap_event_private.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -39,6 +39,8 @@
   Ctrl_Get_Output_Config,
   Ctrl_Set_Replay_Gain,
   Ctrl_Get_Replay_Gain,
+  Ctrl_Set_Cross_Fade,
+  Ctrl_Get_Cross_Fade,
   Ctrl_Volume,
 
   Buffer,
@@ -50,8 +52,6 @@
   };
 
 
-
-
 class CtrlSeekEvent : public Event {
 public:
   FXdouble pos;
@@ -90,6 +90,17 @@
   };
 
 
+class SetCrossFade : public Event {
+public:
+  FXuint duration;  // duration in ms. 0 means off
+protected:
+  virtual ~SetCrossFade() {}
+public:
+  SetCrossFade(FXuint ms) : Event(Ctrl_Set_Cross_Fade), duration(ms) {}
+
+  FXbool enabled() const { return duration > 0; }
+  };
+
 class SetReplayGain : public Event {
 public:
   ReplayGainMode mode;
@@ -160,6 +171,18 @@
   };
 
 
+class GetCrossFade : public SyncEvent {
+public:
+  FXuint duration = 0;  // duration in milliseconds. 0 means off.
+public:
+  GetCrossFade() : SyncEvent(Ctrl_Get_Cross_Fade) {}
+
+  FXbool enabled() const { return duration > 0; }
+
+  virtual ~GetCrossFade() {}
+  };
+
+
 /*
 class StreamInfo {
   FXlong  length;       /// Length in samples

gogglesmm-1.2.1.tar.gz/gap/ap_format.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_format.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_format.h -> gogglesmm-1.2.2.tar.gz/gap/ap_format.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_http_client.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_http_client.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_http_response.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_http_response.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_input_plugin.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_input_plugin.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_input_plugin.h -> gogglesmm-1.2.2.tar.gz/gap/ap_input_plugin.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_input_thread.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_input_thread.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_input_thread.h -> gogglesmm-1.2.2.tar.gz/gap/ap_input_thread.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_output_plugin.h -> gogglesmm-1.2.2.tar.gz/gap/ap_output_plugin.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_output_thread.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_output_thread.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -20,12 +20,11 @@
 #include "ap_utils.h"
 #include "ap_convert.h"
 #include "ap_engine.h"
+#include "ap_crossfader.h"
 #include "ap_input_thread.h"
 #include "ap_output_thread.h"
 
 
-
-
 #ifndef _WIN32
 #include <poll.h>
 #include <errno.h>
@@ -129,6 +128,7 @@
     }
   };
 
+
 OutputThread::OutputThread(AudioEngine*e) : EngineThread(e), fifoinput(nullptr),plugin(nullptr),draining(false),pausing(false) {
   stream=-1;
   stream_length=0;
@@ -136,7 +136,6 @@
   stream_written=0;
   stream_position=0;
   timestamp=-1;
-  packet_queue=nullptr;
   }
 
 
@@ -155,6 +154,8 @@
   reactor.removeInput(fifoinput);
   delete fifoinput;
   clear_timers();
+  if (crossfader)
+    delete crossfader;
   }
 
 
@@ -259,44 +260,6 @@
 
   update_timers(delay,nframes);
   notify_position();
-
-
-#if 0
-
-
-      FXint fs_diff=fs_delay - fs_submitted;
-//      fxmessage("fs_diff=%d",fs_diff);
-      if (fs_diff>0) {
-        if (fs_diff>plugin->af.rate)
-          fs_output    += (fs_remaining - fs_diff);
-        fs_remaining  = fs_diff;
-//        fxmessage("diff: %d => %lg\n",fs_diff,floor((double)fs_output / (double)plugin->af.rate));
-//        fxmessage("fs_output=%d\n" ,fs_output);
-        }
-      else {
-        fs_remaining  = 0;
-        fs_submitted  = 0;
-        stream_length = length;
-        engine->post(new NotifyEvent(Notify_Begin_Of_Stream));
-        }
-      }
-    fs_submitted += nframes;
-    }
-  else {
-    fs_output     = position - fs_delay;
-    fs_submitted  = nframes;
-    stream_length = length;
-    }
-
-
-  FXint s = floor((double)fs_output / (double)plugin->af.rate);
-  if (s!=timestamp) {
-    timestamp=s;
-    FXuint len =0;
-    len = floor((double)stream_length / (double)plugin->af.rate);
-    engine->post(new TimeUpdate(timestamp,len));
-    }
-#endif
   }
 
 
@@ -532,6 +495,18 @@
   FXASSERT(plugin);
 
   if (af==fmt || fmt==plugin->af){
+    if (crossfader && crossfader->readable_frames()) {
+      GM_DEBUG_PRINT("crossfader has buffer\n");
+      if (af != fmt && !crossfader->convert(fmt)) {
+        GM_DEBUG_PRINT("crossfader cannot crossfade, play remaining samples\n");
+        drain_crossfader();
+        reset_crossfader();
+        }
+      else {
+        GM_DEBUG_PRINT("crossfader switch to playback\n");
+        crossfader->recording = false;
+        }
+      }
     af=fmt;
     draining=false;
 
@@ -547,6 +522,13 @@
 
   // We need to reconfigure the hardware, but first let's drain the existing samples
   GM_DEBUG_PRINT("output Potential new format... let's drain\n");
+
+  if (crossfader && crossfader->readable_frames()) {
+    GM_DEBUG_PRINT("crossfader cannot crossfade, play remaining samples\n");
+    drain_crossfader();
+    reset_crossfader();
+    }
+
   drain();
 
   af=fmt;
@@ -564,6 +546,8 @@
   fxmessage("output plugin ");
   plugin->af.debug();
 #endif
+  //crossfader->plugin = plugin;
+
   draining=false;
   }
 
@@ -578,91 +562,6 @@
   }
 
 
-
-/*
-static void softvol_float(FXuchar * buffer,FXuint nsamples,FXfloat vol) {
-  FXfloat * input  = reinterpret_cast<FXfloat*>(buffer);
-  for (FXint i=0;i<nsamples;i++) {
-    inputi*=vol;
-    }
-  }
-
-
-static void softvol_s16(FXuchar * buffer,FXuint nsamples,FXfloat vol) {
-  FXshort * input  = reinterpret_cast<FXshort*>(buffer);
-  for (FXint i=0;i<nsamples;i++) {
-    inputi*=vol;
-    }
-  }
-*/
-
-/*
-static void s8_to_float(FXchar * in,FXfloat * out,FXuint nsamples){
-  for (FXint i=0;i<nsamples;i++) {
-    outi=(((FXfloat)ini)/127.0f);
-    }
-  }
-
-static void s16_to_float(FXshort * in,FXfloat * out,FXuint nsamples){
-  for (FXint i=0;i<nsamples;i++) {
-    outi=(((FXfloat)ini)/32767.0f);
-    }
-  }
-
-
-static FXbool convert_to_float(OutputPacket * packet,MemoryBuffer & output) {
-  const FXint nbytes  = packet->nframes*packet->af.channels*4;
-  const FXint nsamples= packet->nframes*packet->af.channels;
-
-  /// Make sure we have enough space
-  output.grow_by(nbytes);
-
-  switch(packet->af.format){
-    case AP_FORMAT_S8 : s8_to_float(reinterpret_cast<FXchar*>(packet->data),
-                                    reinterpret_cast<FXfloat*>(output.ptr()),
-                                    nsamples);
-                        output.data_size+=nbytes;
-                        break;
-
-    case AP_FORMAT_S16: s16_to_float(reinterpret_cast<FXshort*>(packet->data),
-                                     reinterpret_cast<FXfloat*>(output.ptr()),
-                                     nsamples);
-                        output.data_size+=nbytes;
-                        break;
-    default           : return false; break;
-    }
-  return true;
-  }
-
-*/
-
-
-
-/*
-void OutputThread::convert_and_resample(OutputPacket * packet) {
-
-  if (src_state==nullptr) {
-    int error;
-    src_state = src_new(SRC_SINC_BEST_QUALITY,packet->af.channels,&error);
-    }
-
-  if (packet->af.datatype()!=Format::Float) {
-    convert_to_float(packet,src_input);
-    }
-  else {
-    src_input.append(packet->data,packet->nframes*framesize);
-    }
-
-
-
-
-
-
-
-  }
-
-*/
-
 #ifdef HAVE_SAMPLERATE
 void OutputThread::resample(Packet * packet,FXint & nframes) {
   static SRC_STATE * src_state = nullptr;
@@ -720,6 +619,7 @@
     }
   }
 
+
 static void apply_scale_s16(FXuchar * buffer,FXuint nsamples,FXdouble scale) {
   FXshort * out = reinterpret_cast<FXshort*>(buffer);
   for (FXuint i=0;i<nsamples;i++) {
@@ -727,21 +627,98 @@
     }
   }
 
-void OutputThread::process(Packet * packet) {
-  FXASSERT(packet);
-  FXbool use_buffer=false;
-  FXbool result=false;
-  FXint nframes=packet->numFrames();
-/*
-  if (packet->af.format==AP_FORMAT_FLOAT) {
-    softvol_float(packet->data,packet->nframes*packet->af.channels,softvol);
+
+static void apply_crossfade_s16(MemoryBuffer & fade_in, MemoryBuffer & fade_out, FXint nframes, FXuint nchannels, FXlong position, FXdouble step) {
+  auto in = reinterpret_cast<FXshort*>(fade_in.data());
+  auto out = reinterpret_cast<FXshort*>(fade_out.data());
+  double fade = position * step;
+  for (int f = 0, s = 0; f < nframes; f++, fade += step, s += nchannels) {
+    double fi = pow(fade, 3);
+    double fo = 1.0 - fi;
+    for (FXuint c = 0; c < nchannels; c++) {
+      ins + c = lrint(((double)ins + c) * fi) + (((double)outs + c) * fo);
+
+      }
     }
-  else if (packet->af.format==AP_FORMAT_S16){
-    softvol_s16(packet->data,packet->nframes*packet->af.channels,softvol);
+  }
+
+
+static void apply_crossfade_float(MemoryBuffer & fade_in, MemoryBuffer & fade_out, FXint nframes, FXuint nchannels, FXlong position, FXfloat step) {
+  auto in = reinterpret_cast<FXfloat*>(fade_in.data());
+  auto out = reinterpret_cast<FXfloat*>(fade_out.data());
+  float fade = position * step;
+  for (int f = 0, s = 0; f < nframes; f++, fade += step, s += nchannels) {
+    float fi = powf(fade, 3);
+    float fo = 1.0 - fi;
+    for (FXuint c = 0; c < nchannels; c++) {
+      ins + c = (((float)ins + c) * fi) + (((float)outs + c) * fo);
+      }
     }
-*/
+  }
+
+
+
+void OutputThread::reset_crossfader() {
+  FXASSERT(crossfader);
+  crossfader->flush();
+  if (crossfader->duration == 0) {
+    GM_DEBUG_PRINT("crossfader discard\n");
+    delete crossfader;
+    crossfader = nullptr;
+    }
+  }
+
+
+void OutputThread::drain_crossfader() {
+  FXASSERT(crossfader);
+  if (crossfader->recording && crossfader->rframes) {
+    GM_DEBUG_PRINT("crossfader drain %d\n", crossfader->rframes);
+    init_crossfade_samples();
+    process_samples();
+    }
+  }
+
+
+void OutputThread::init_samples(Packet * packet) {
+  samples.buffer = packet;
+  samples.position = packet->stream_position;
+  samples.length = packet->stream_length;
+  samples.nframes = packet->numFrames();
+  samples.stream = packet->stream;
+  samples.crossfade = true;
+  }
+
+
+void OutputThread::init_crossfade_samples() {
+  FXASSERT(crossfader);
+  samples.buffer = &crossfader->buffer;
+  samples.position = crossfader->position;
+  samples.length = crossfader->length;
+  samples.nframes = crossfader->buffer.size() / crossfader->af.framesize();
+  samples.stream = crossfader->stream;
+  samples.crossfade = false;
+  }
 
-  if (replaygain.mode!=ReplayGainOff) {
+
+void OutputThread::process_samples() {
+
+  replay_gain();
+
+  if (crossfader && samples.crossfade) {
+    crossfade_samples();
+    if (samples.nframes == 0)
+      return;
+    }
+
+  if (!convert_samples())
+    return;
+
+  if (!write_samples())
+    return;
+  }
+
+void OutputThread::replay_gain() {
+  if (replaygain.mode != ReplayGainOff) {
     FXdouble gain  = replaygain.gain();
     if(!isnan(gain)) {
       FXdouble peak  = replaygain.peak();
@@ -751,73 +728,139 @@
       if (!isnan(peak) && peak!=0.0 && (scale*peak)>1.0)
         scale = 1.0 / peak;
 
-      switch(packet->af.format) {
-        case AP_FORMAT_FLOAT: apply_scale_float(packet->data(),packet->numFrames()*packet->af.channels,scale); break;
-        case AP_FORMAT_S16  : apply_scale_s16(packet->data(),packet->numFrames()*packet->af.channels,scale);   break;
+      switch(af.format) {
+        case AP_FORMAT_FLOAT: apply_scale_float(samples.data(), samples.nframes * af.channels, scale); break;
+        case AP_FORMAT_S16  : apply_scale_s16(samples.data(), samples.nframes * af.channels, scale); break;
         }
       }
     }
+  }
 
-  if (packet->af!=plugin->af) {
-
-
-    if (plugin->af.format!=packet->af.format) {
 
-      if (plugin->af.format==AP_FORMAT_S16) {
-        switch(packet->af.format) {
-          case AP_FORMAT_FLOAT: float_to_s16(packet->data(),packet->numFrames()*packet->af.channels); break;
-          case AP_FORMAT_S24_3: s24le3_to_s16(packet->data(),packet->numFrames()*packet->af.channels); break;
-          default             : goto mismatch; break;
-          }
-        }
-      else if (plugin->af.format==AP_FORMAT_S32) {
-        switch(packet->af.format) {
-          case AP_FORMAT_FLOAT: float_to_s32(packet->data(),packet->numFrames()*packet->af.channels); break;
-          case AP_FORMAT_S24_3: s24le3_to_s32(packet->data(),packet->numFrames()*packet->af.channels,converted_samples); use_buffer=true; break;
-          default             : goto mismatch; break;
-          }
-        }
+void OutputThread::crossfade_samples() {
+  FXASSERT(crossfader);
+  if (crossfader->recording) {
 
+    // Initialize Crossfader if we haven't done so.
+    if (crossfader->position == -1) {
+      crossfader->position = samples.length - (af.rate * crossfader->duration) / 1000;
       }
 
-    if (packet->af.channels!=plugin->af.channels) {
+    // Store the end of stream samples into the crossfader
+    if (samples.position + samples.nframes >= crossfader->position) {
 
-      /// FIXME
-      if (use_buffer==true)
-        goto mismatch;
+      if (crossfader->nframes == 0) {  // Check if we record anything in the crossfader buffer
+        if (samples.position >= crossfader->position)  // already passed the record position (due to seeking)
+          crossfader->start_recording(af, samples.stream, samples.position, samples.length);
+        else  // still before the record_position
+          crossfader->start_recording(af, samples.stream, crossfader->position, samples.length);
+        }
 
-      if (packet->af.channels==1 && plugin->af.channels==2 ) {
-        mono_to_stereo(packet->data(),packet->numFrames(),packet->af.packing(),converted_samples);
-        use_buffer=true;
+      if (samples.position < crossfader->position) {
+        FXint skip = crossfader->position - samples.position;
+        crossfader->writeFrames(samples.data() + (af.framesize() * skip), samples.nframes - skip);
+        samples.nframes = skip;
         }
       else {
-        goto mismatch;
+        crossfader->writeFrames(samples.data(), samples.nframes);
+        samples.nframes = 0;
         }
       }
-    if (packet->af.rate!=plugin->af.rate) {
-      goto mismatch;
+
+    }
+  else if (crossfader->readable_frames()) {  // Apply crossfader buffer to the start of the stream
+    FXASSERT(samples.position < crossfader->start_offset());
+    FXint nframes = FXMIN(samples.nframes, crossfader->readable_frames());
+    switch(af.format) {
+      case AP_FORMAT_S16:
+        apply_crossfade_s16(*samples.buffer, crossfader->buffer, nframes, af.channels, samples.position, 1.0 / crossfader->total_frames());
+        crossfader->readFrames(nframes);
+        break;
+      case AP_FORMAT_FLOAT:
+        apply_crossfade_float(*samples.buffer, crossfader->buffer, nframes, af.channels, samples.position, 1.0f / crossfader->total_frames());
+        crossfader->readFrames(nframes);
+        break;
+      default:
+        FXASSERT(0);
+        break;
+      }
+    if (crossfader->rframes == 0 && crossfader->duration == 0) {
+      delete crossfader;
+      crossfader = nullptr;
       }
     }
+  }
 
-  update_position(packet->stream,packet->stream_position,packet->numFrames(),packet->stream_length);
-
-  if (use_buffer)
-    result = plugin->write(converted_samples.data(),nframes);
-  else
-    result = plugin->write(packet->data(),nframes);
 
-  if (result==false) {
-    GM_DEBUG_PRINT("output write failed\n");
-    engine->input->post(new ControlEvent(Ctrl_Close));
-    engine->post(new ErrorMessage(FXString::value("Output Error")));
-    close_plugin();
+bool OutputThread::convert_samples() {
+  if (af.format != plugin->af.format) {
+    switch(plugin->af.format) {
+      case AP_FORMAT_S16:
+        {
+          switch(af.format) {
+            case AP_FORMAT_FLOAT:
+              float_to_s16(samples.data(), samples.nframes * af.channels);
+              break;
+            case AP_FORMAT_S24_3:
+              s24le3_to_s16(samples.data(), samples.nframes * af.channels);
+              break;
+            default:
+              goto mismatch;
+              break;
+            }
+        } break;
+      case AP_FORMAT_S32:
+        {
+          switch(af.format) {
+            case AP_FORMAT_FLOAT:
+              float_to_s32(samples.data(), samples.nframes * af.channels);
+              break;
+            case AP_FORMAT_S24_3:
+              s24le3_to_s32(samples.data(), samples.nframes * af.channels, samples.formatted);
+              samples.buffer = &samples.formatted;
+              break;
+            default:
+              goto mismatch;
+              break;
+            }
+        } break;
+      }
+    }
+  if (af.channels != plugin->af.channels) {
+    if (af.channels == 1 && plugin->af.channels == 2) {
+      mono_to_stereo(samples.data(), samples.nframes, af.packing(), samples.remapped);
+      samples.buffer = &samples.remapped;
+      }
+    else {
+      goto mismatch;
+      }
     }
-  return;
+  return true;
 mismatch:
   GM_DEBUG_PRINT("output config mismatch\n");
   draining=false;
   engine->input->post(new ControlEvent(Ctrl_Close));
   close_plugin();
+  return false;
+  }
+
+
+FXbool OutputThread::write_samples() {
+  FXuint nframes;
+  while (samples.nframes) {
+    nframes = FXMIN(FXint(plugin->af.rate >> 1), samples.nframes);
+    update_position(samples.stream, samples.position, nframes, samples.length);
+    if (!plugin->write(samples.data(), nframes)) {
+      GM_DEBUG_PRINT("output write failed\n");
+      engine->input->post(new ControlEvent(Ctrl_Close));
+      engine->post(new ErrorMessage(FXString::value("Output Error")));
+      close_plugin();
+      return false;
+      }
+    samples.buffer->readBytes(plugin->af.framesize() * nframes);
+    samples.nframes -= nframes;
+    }
+  return true;
   }
 
 
@@ -835,7 +878,9 @@
       case Buffer     :
         {
           if (__likely(af.set())) {
-            process(static_cast<Packet*>(event));
+            auto packet = static_cast<Packet*>(event);
+            init_samples(packet);
+            process_samples();
             }
         } break;
 
@@ -849,6 +894,9 @@
             if (flush->close)
               close_plugin();
             }
+          if (crossfader) {
+            reset_crossfader();
+            }
           pausing=false;
           draining=false;
           reset_position();
@@ -929,6 +977,40 @@
           g->mode = replaygain.mode;
         } break;
 
+
+      case Ctrl_Set_Cross_Fade:
+        {
+          auto g = static_cast<SetCrossFade*>(event);
+          GM_DEBUG_PRINT("output set cross fade %d ms\n",g->duration);
+          if (g->enabled()) {
+            if (crossfader == nullptr)
+              crossfader = new CrossFader(g->duration);
+            else
+              crossfader->duration = g->duration;
+            }
+          else {
+            if (crossfader) {
+              crossfader->duration = 0;
+              if (crossfader->recording) {
+                drain_crossfader();
+                reset_crossfader();
+                }
+              }
+            }
+        } break;
+
+      case Ctrl_Get_Cross_Fade:
+        {
+          auto g = static_cast<GetCrossFade*>(event);
+          GM_DEBUG_PRINT("output get cross fade\n");
+          if (crossfader) {
+            g->duration = crossfader->duration;
+            }
+          else {
+            g->duration = 0;
+            }
+        } break;
+
       case Ctrl_Get_Output_Config:
         {
           GetOutputConfig * out = static_cast<GetOutputConfig*>(event);

gogglesmm-1.2.1.tar.gz/gap/ap_output_thread.h -> gogglesmm-1.2.2.tar.gz/gap/ap_output_thread.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -30,6 +30,7 @@
 class AudioEngine;
 class Packet;
 class FrameTimer;
+class CrossFader;
 
 struct ReplayGainConfig {
   ReplayGainMode  mode;
@@ -41,6 +42,20 @@
   FXdouble peak() const { return (mode==ReplayGainAlbum) ? value.album_peak : value.track_peak; }
   };
 
+
+struct Samples {
+  MemoryBuffer * buffer = nullptr;
+  MemoryBuffer   remapped;
+  MemoryBuffer   formatted;
+  FXint          nframes;
+  FXlong         position;
+  FXlong         length;
+  FXuint         stream;
+  FXbool         crossfade;
+  FXuchar * data() const { return buffer->data();}
+};
+
+
 class OutputThread : public EngineThread, public OutputContext {
 protected:
   OutputConfig   output_config;
@@ -63,11 +78,14 @@
   AudioFormat       af;
   OutputPlugin *    plugin;
   FXDLL             dll;
+  Samples           samples;
+#ifdef HAVE_SAMPLERATE
   MemoryBuffer      converted_samples;
   MemoryBuffer      src_input;
   MemoryBuffer      src_output;
+#endif
   ReplayGainConfig  replaygain;
-  Packet * packet_queue;
+  CrossFader * crossfader = nullptr;
 protected:
   FXbool draining;
   FXbool pausing;
@@ -83,22 +101,28 @@
   void update_timers(FXint delay,FXint nframes);
   void clear_timers();
 protected:
+  void init_samples(Packet*);
+  void init_crossfade_samples();
+  void process_samples();
+  void crossfade_samples();
+  FXbool convert_samples();
+  FXbool write_samples();
+  void replay_gain();
+protected:
+  void reset_crossfader();
+  void drain_crossfader();
+protected:
   void configure(const AudioFormat&);
   void load_plugin();
   void unload_plugin();
   void close_plugin();
-  void process(Packet*);
-
-
 #ifdef HAVE_SAMPLERATE
   void resample(Packet*,FXint & nframes);
 #endif
   void drain(FXbool flush=true);
-
   void update_position(FXint stream,FXlong position,FXint nframes,FXlong length);
   void notify_position();
   void reset_position();
-
   void reconfigure();
 public:
   OutputThread(AudioEngine*);

gogglesmm-1.2.1.tar.gz/gap/ap_packet.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_packet.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_packet.h -> gogglesmm-1.2.2.tar.gz/gap/ap_packet.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_player.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_player.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -119,4 +119,20 @@
   engine->output->post(new SetReplayGain(mode),EventQueue::Front);
   }
 
+
+FXuint AudioPlayer::getCrossFade() const {
+  FXASSERT(engine->output->running());
+  GetCrossFade event;
+  engine->output->post(&event,EventQueue::Front);
+  if (event.waitForUnref()) {
+    return event.duration;
+    }
+  return 0;
+  }
+
+void AudioPlayer::setCrossFade(FXuint ms) {
+  FXASSERT(engine->output->running());
+  engine->output->post(new SetCrossFade(ms),EventQueue::Front);
+  }
+
 }

gogglesmm-1.2.1.tar.gz/gap/ap_reactor.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_reactor.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_reactor.h -> gogglesmm-1.2.2.tar.gz/gap/ap_reactor.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_reader_plugin.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_reader_plugin.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_reader_plugin.h -> gogglesmm-1.2.2.tar.gz/gap/ap_reader_plugin.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_signal.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_signal.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_signal.h -> gogglesmm-1.2.2.tar.gz/gap/ap_signal.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_socket.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_socket.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_socket.h -> gogglesmm-1.2.2.tar.gz/gap/ap_socket.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_thread.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_thread.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_thread.h -> gogglesmm-1.2.2.tar.gz/gap/ap_thread.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_thread_queue.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_thread_queue.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_thread_queue.h -> gogglesmm-1.2.2.tar.gz/gap/ap_thread_queue.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_utils.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_utils.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/ap_utils.h -> gogglesmm-1.2.2.tar.gz/gap/ap_utils.h Changed

gogglesmm-1.2.1.tar.gz/gap/ap_xml_parser.cpp -> gogglesmm-1.2.2.tar.gz/gap/ap_xml_parser.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/fox.h -> gogglesmm-1.2.2.tar.gz/gap/fox.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_app_queue.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_app_queue.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_buffer_base.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_buffer_base.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_buffer_io.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_buffer_io.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_common.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_common.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_device.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_device.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -28,6 +28,7 @@
   DevicePulse   = 3,
   DeviceJack    = 4,
   DeviceWav     = 5,
+  DeviceSndio   = 6,
   DeviceLast,
   };
 
@@ -82,11 +83,27 @@
   };
 
 
+class GMAPI SndioConfig : public DeviceConfig {
+public:
+  FXString device;
+public:
+  SndioConfig();
+  SndioConfig(const FXString & d);
+
+  void load(FXSettings &);
+
+  void save(FXSettings &) const;
+
+  virtual ~SndioConfig();
+  };
+
+
 
 class GMAPI OutputConfig {
 public:
   AlsaConfig  alsa;
   OSSConfig   oss;
+  SndioConfig sndio;
   FXuchar     device;
 public:
   OutputConfig();

gogglesmm-1.2.1.tar.gz/gap/include/ap_event.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_event.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_event_queue.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_event_queue.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_http.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_http.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_http_client.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_http_client.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_http_response.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_http_response.h Changed

gogglesmm-1.2.1.tar.gz/gap/include/ap_player.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_player.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Audio Player Library                         *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -71,9 +71,15 @@
   /// Set Replay Gain Mode
   void setReplayGain(ReplayGainMode mode);
 
+  /// Set Cross Fade Mode
+  void setCrossFade(FXuint seconds);
+
   /// Get Replay Gain Mode
   ReplayGainMode getReplayGain() const;
 
+  /// Get Cross Fade Mode
+  FXuint getCrossFade() const;
+
   Event * pop();
 
   ~AudioPlayer();

gogglesmm-1.2.1.tar.gz/gap/include/ap_xml_parser.h -> gogglesmm-1.2.2.tar.gz/gap/include/ap_xml_parser.h Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_aac.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_aac.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_aiff.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_aiff.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_alac.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_alac.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_alsa.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_alsa.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_file.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_file.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_flac.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_flac.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_http.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_http.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_id3v2.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_id3v2.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_id3v2.h -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_id3v2.h Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_jack.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_jack.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_m3u.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_m3u.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_mad.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_mad.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_mp4.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_mp4.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_ogg.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_ogg.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_ogg_decoder.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_ogg_decoder.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_ogg_decoder.h -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_ogg_decoder.h Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_opus.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_opus.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_opus.h -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_opus.h Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_oss_defs.h -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_oss_defs.h Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_oss_plugin.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_oss_plugin.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_pcm.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_pcm.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_pls.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_pls.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_pulse.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_pulse.cpp Changed

gogglesmm-1.2.2.tar.gz/gap/plugins/ap_sndio.cpp Added

@@ -0,0 +1,260 @@
+/*******************************************************************************
+*                         Goggles Audio Player Library                         *
+********************************************************************************
+*           Copyright (C) 2010-2020 by Sander Jansen. All Rights Reserved      *
+*                               ---                                            *
+* This program is free software: you can redistribute it and/or modify         *
+* it under the terms of the GNU General Public License as published by         *
+* the Free Software Foundation, either version 3 of the License, or            *
+* (at your option) any later version.                                          *
+*                                                                              *
+* This program is distributed in the hope that it will be useful,              *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of               *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                *
+* GNU General Public License for more details.                                 *
+*                                                                              *
+* You should have received a copy of the GNU General Public License            *
+* along with this program.  If not, see http://www.gnu.org/licenses.           *
+********************************************************************************/
+#include "ap_defs.h"
+#include "ap_output_plugin.h"
+
+#include <sndio.h>
+
+using namespace ap;
+
+namespace ap {
+
+class SndioOutput : public OutputPlugin {
+protected:
+  SndioConfig config;
+  sio_hdl * handle = nullptr;
+  FXint sio_delay = 0;
+  FXuint sio_volume = 0;
+  FXbool sio_started = false;
+protected:
+  FXbool open();
+  void start();
+  void stop();
+protected:
+  static void on_move(void * ptr, int delta) {
+    auto output = reinterpret_cast<SndioOutput*>(ptr);
+    output->sio_delay -= delta;
+    }
+
+  static void on_volume(void * ptr, unsigned int volume) {
+    auto output = reinterpret_cast<SndioOutput*>(ptr);
+    if (volume != output->sio_volume) {
+        GM_DEBUG_PRINT("sndio volume: %d\n", volume);
+        output->sio_volume = volume;
+        output->context->notify_volume((float)volume / (float)SIO_MAXVOL);
+        }
+    }
+public:
+  SndioOutput(OutputContext* ctx);
+
+  /// Configure
+  FXbool configure(const AudioFormat &);
+
+  /// Write frames to playback buffer
+  FXbool write(const void*, FXuint);
+
+  /// Return delay in no. of frames
+  FXint delay();
+
+  /// Empty Playback Buffer Immediately
+  void drop();
+
+  /// Wait until playback buffer is emtpy.
+  void drain();
+
+  /// Pause
+  void pause(FXbool);
+
+  /// Change Volume
+  void volume(FXfloat);
+
+  /// Close Output
+  void close();
+
+  /// Get Device Type
+  FXchar type() const { return DeviceSndio; }
+
+  /// Set Device Configuration
+  FXbool setOutputConfig(const OutputConfig &);
+
+  /// Destructor
+  virtual ~SndioOutput();
+  };
+
+
+SndioOutput::SndioOutput(OutputContext * ctx) : OutputPlugin(ctx) {
+  }
+
+
+SndioOutput::~SndioOutput() {
+  close();
+  }
+
+
+FXbool SndioOutput::setOutputConfig(const OutputConfig &c){
+  config=c.sndio;
+  return true;
+  }
+
+
+FXbool SndioOutput::open() {
+  if (handle == nullptr) {
+    handle = sio_open(config.device.text(), SIO_PLAY, 0);
+    if (handle == nullptr) {
+      GM_DEBUG_PRINT("sndio Unable to open device %s.\n", config.device.text());
+      return false;
+      }
+    sio_onmove(handle, SndioOutput::on_move, this);
+    sio_onvol(handle, SndioOutput::on_volume, this);
+    sio_delay = 0;
+    }
+  return true;
+  }
+
+
+void SndioOutput::close() {
+  if (handle != nullptr) {
+     drop();
+     sio_close(handle);
+     handle = nullptr;
+     af.reset();
+     }
+  }
+
+
+void SndioOutput::start() {
+  if (handle != nullptr && sio_started == false) {
+    if (sio_start(handle) == 0) {
+      GM_DEBUG_PRINT("sndio unable to start output\n");
+      }
+    else {
+      sio_started = true;
+      GM_DEBUG_PRINT("sndio switch to START\n");
+      }
+    }
+  }
+
+
+void SndioOutput::stop() {
+  if (handle != nullptr && sio_started == true) {
+    if (sio_stop(handle) == 0) {
+      GM_DEBUG_PRINT("sndio unable to stop output\n");
+      }
+    else {
+      sio_started = false;
+      sio_delay = 0;
+      GM_DEBUG_PRINT("sndio switch to STOP\n");
+      }
+    }
+  }
+
+
+void SndioOutput::volume(FXfloat v) {
+  if (handle != nullptr) {
+    sio_volume = (unsigned int)(v * SIO_MAXVOL);
+    GM_DEBUG_PRINT("sndio volume: %d\n", sio_volume);
+    sio_setvol(handle, sio_volume);
+    }
+  }
+
+
+FXint SndioOutput::delay() {
+  return sio_delay;
+  }
+
+
+void SndioOutput::drop() {
+  GM_DEBUG_PRINT("sndio drop\n");
+  stop();
+  }
+
+
+void SndioOutput::drain() {
+  GM_DEBUG_PRINT("sndio drain\n");
+  stop();
+  }
+
+
+void SndioOutput::pause(FXbool pausing) {
+  if (pausing)
+    stop();
+  else
+    start();
+  }
+
+
+FXbool SndioOutput::configure(const AudioFormat & fmt){
+  sio_par parameters;
+  sio_initpar(&parameters);
+
+  if (handle && fmt==af)
+    return true;
+
+  if (handle) {
+    drop();
+    }
+
+  if (!open())
+    return false;
+
+  parameters.bits = fmt.bps();    // bits per sample
+  parameters.bps = fmt.packing(); // bytes per sample
+  parameters.sig = (fmt.datatype() == Format::Signed || fmt.datatype() == Format::Float); // Signed or Unsigned format
+  parameters.le = fmt.byteorder() == Format::Little; // Byteorder
+  parameters.pchan = fmt.channels; // Channel Count
+  parameters.rate = fmt.rate; // Sample Rate
+  parameters.xrun = SIO_IGNORE; // xrun behaviour
+
+  if (sio_setpar(handle, &parameters) == 0)
+    goto failed;
+
+  if (sio_getpar(handle, &parameters) == 0)
+    goto failed;
+
+  af.set(parameters.sig ? Format::Signed : Format::Unsigned,
+         parameters.bits,
+         parameters.bps,
+         parameters.rate,
+         parameters.pchan);
+
+  return true;
+failed:
+  GM_DEBUG_PRINT("sndio Unsupported configuration:\n");
+  af.debug();
+  return false;
+  }
+
+
+FXbool SndioOutput::write(const void * buffer,FXuint nframes){
+  FXival nwritten;
+  FXival nbytes = nframes*af.framesize();
+  const FXchar * buf = (const FXchar*)buffer;
+
+  if (__unlikely(handle == nullptr)) {
+    GM_DEBUG_PRINT("sndio device not opened\n");
+    return false;
+    }
+
+  if (__unlikely(sio_started == false)) {
+    start();
+    }
+
+  while(nbytes>0) {
+    nwritten = sio_write(handle,buf,nbytes);
+    buf+=nwritten;
+    nbytes-=nwritten;
+    }
+  sio_delay += nframes;
+  return true;
+  }
+
+}
+
+
+AP_IMPLEMENT_PLUGIN(SndioOutput);

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_vorbis.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_vorbis.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_vorbis.h -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_vorbis.h Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_wav.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_wav.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_wavout.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_wavout.cpp Changed

gogglesmm-1.2.1.tar.gz/gap/plugins/ap_xspf.cpp -> gogglesmm-1.2.2.tar.gz/gap/plugins/ap_xspf.cpp Changed

gogglesmm-1.2.1.tar.gz/po/de.mo -> gogglesmm-1.2.2.tar.gz/po/de.mo Changed

gogglesmm-1.2.1.tar.gz/po/de.po -> gogglesmm-1.2.2.tar.gz/po/de.po Changed

@@ -5,26 +5,26 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gogglesmm 0.10.0\n"
+"Project-Id-Version: gogglesmm 1.2.1\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
-"PO-Revision-Date: 2009-05-31 23:51+0200\n"
-"Last-Translator: Hendrik Rittich <hendrik.rittich@gmx.de>\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
+"PO-Revision-Date: 2019-10-24 21:21+0200\n"
+"Last-Translator: Martin Wagner <grisu-04@web.de>\n"
 "Language-Team: German\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.2.3\n"
 
 #: src/GMAbout.cpp:115
 msgid "&Homepage"
 msgstr "&Homepage"
 
 #: src/GMAbout.cpp:116
-#, fuzzy
 msgid "&Report Issue"
-msgstr "Einen Fehle&r melden…"
+msgstr "Einen Fehler &melden"
 
 #: src/GMAbout.cpp:117 src/GMPreferencesDialog.cpp:688
 #: src/GMTrackEditor.cpp:401 src/GMTrackEditor.cpp:449
@@ -78,11 +78,11 @@
 msgid "Move Down"
 msgstr "Nach unten verschieben"
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
+#, fuzzy
 msgid "No"
-msgstr "Nein"
+msgstr "Nr."
 
 #: src/GMDatabaseSource.cpp:227 src/GMPlayQueue.cpp:68
 msgid "Queue"
@@ -101,7 +101,7 @@
 #: src/GMDatabaseSource.cpp:230 src/GMFilterEditor.cpp:43
 #: src/GMPlayQueue.cpp:73
 msgid "Album Artist"
-msgstr "Künstlername des Albums"
+msgstr "Album-Künstler"
 
 #: src/GMDatabaseSource.cpp:231 src/GMFilterEditor.cpp:42
 #: src/GMPlayQueue.cpp:71 src/GMPreferencesDialog.cpp:645
@@ -111,7 +111,7 @@
 
 #: src/GMDatabaseSource.cpp:232 src/GMPlayQueue.cpp:74
 msgid "Disc"
-msgstr "Disc"
+msgstr "CD"
 
 #: src/GMDatabaseSource.cpp:234 src/GMFilterEditor.cpp:48
 #: src/GMPlayQueue.cpp:72
@@ -122,63 +122,58 @@
 #: src/GMPlayQueue.cpp:75 src/GMPodcastSource.cpp:1317
 #: cfox/lib/FXFileSelector.cpp:942
 msgid "Time"
-msgstr "Zeit"
+msgstr "Länge"
 
 #: src/GMDatabaseSource.cpp:236 src/GMFilterEditor.cpp:53
 #: src/GMPlayQueue.cpp:76
-#, fuzzy
 msgid "Play Count"
-msgstr "Player-Steuerung"
+msgstr "Abspielvorgänge"
 
 #: src/GMDatabaseSource.cpp:237 src/GMPlayQueue.cpp:77
-#, fuzzy
 msgid "Play Date"
-msgstr "Play"
+msgstr "Zuletzt abgespielt"
 
 #: src/GMDatabaseSource.cpp:238 src/GMFilterEditor.cpp:57
 #: src/GMImportDialog.cpp:499 src/GMLocalSource.cpp:56 src/GMPlayQueue.cpp:78
 #: src/GMTrackEditor.cpp:500
 msgid "Path"
-msgstr ""
+msgstr "Dateipfad"
 
 #: src/GMDatabaseSource.cpp:239 src/GMFilterEditor.cpp:56
 #: src/GMPlayQueue.cpp:79
-#, fuzzy
 msgid "File Type"
-msgstr "Vorlage für Dateinamen"
+msgstr "Dateityp"
 
 #: src/GMDatabaseSource.cpp:240 src/GMPlayQueue.cpp:80
-#, fuzzy
 msgid "Format"
-msgstr "Normal"
+msgstr ""
 
 #: src/GMDatabaseSource.cpp:241 src/GMFilterEditor.cpp:45
 #: src/GMPlayQueue.cpp:81
 msgid "Composer"
-msgstr ""
+msgstr "Komponist"
 
 #: src/GMDatabaseSource.cpp:242 src/GMFilterEditor.cpp:46
 #: src/GMPlayQueue.cpp:82
 msgid "Conductor"
-msgstr ""
+msgstr "Dirigent"
 
 #: src/GMDatabaseSource.cpp:243 src/GMFilterEditor.cpp:50
 #: src/GMPlayQueue.cpp:83
-#, fuzzy
 msgid "Rating"
-msgstr "Sortierung"
+msgstr "Bewertung"
 
 #: src/GMDatabaseSource.cpp:323 src/GMDatabaseSource.cpp:330
 msgid "Copy\tCtrl-C\tCopy associated tracks to the clipboard."
-msgstr "Kopieren\tCtrl-C\tKopiere die zugehörigen Titel in die Zwischenablage"
+msgstr "Kopieren\tCtrl-C\tKopiere die zugehörigen Titel in die Zwischenablage."
 
 #: src/GMDatabaseSource.cpp:325 src/GMDatabaseSource.cpp:333
 msgid "Remove…\tDel\tRemove associated tracks from library."
-msgstr "Löschen…\tDel\tLösche die zugehörigen Titel aus der Bibliothek"
+msgstr "Löschen…\tDel\tLösche die zugehörigen Titel aus der Bibliothek."
 
 #: src/GMDatabaseSource.cpp:331 src/GMDatabaseSource.cpp:346
 msgid "Find Cover…\t\tFind Cover with Google Image Search"
-msgstr ""
+msgstr "Finde Cover…\t\tFinde Cover über Google Bildersuche"
 
 #: src/GMDatabaseSource.cpp:338 src/GMPlayQueue.cpp:142
 msgid "Edit…\tF2\tEdit Track Information."
@@ -186,25 +181,27 @@
 
 #: src/GMDatabaseSource.cpp:339
 msgid "Set Cover…\t\t"
-msgstr ""
+msgstr "Cover setzen…\t\t"
 
 #: src/GMDatabaseSource.cpp:341 src/GMPlayQueue.cpp:143
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr "Kopieren\tCtrl-C\tKopiere die/den Titel in die Zwischenablage."
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr "Ordner öffnen\t\tUrsprungsordner öffnen."
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr "Löschen…\tDel\tLösche die/den Titel aus der Bibliothek."
 
 #: src/GMDatabaseSource.cpp:356 src/GMPlayListSource.cpp:184
-#, fuzzy
 msgid "Export As…"
-msgstr "Exportieren…"
+msgstr "Speichern unter…"
 
 #: src/GMDatabaseSource.cpp:358
-#, fuzzy
 msgid "Remove Folder…\t\tRemove tracks in folder from library"
-msgstr "Löschen…\tDel\tLösche die/den Titel aus der Bibliothek."
+msgstr "Ordner entfernen…\t\tEntferne einen Ordner aus der Bibliothek"
 
 #: src/GMDatabaseSource.cpp:359
 msgid "Remove All Tracks\t\tRemove all tracks from the library"
@@ -223,26 +220,24 @@
 
 #: src/GMDatabaseSource.cpp:368
 msgid "Play File or Stream…\t\tPlay File or Stream"
-msgstr ""
+msgstr "Spiele eine Datei ab...\t\tSpiele eine Datei ab"
 
 #: src/GMDatabaseSource.cpp:370
-#, fuzzy
 msgid "New Filter…\t\tCreate a new filter"
-msgstr "Neue &Wiedergabeliste…\t\tErstelle eine neue Wiedergabeliste"
+msgstr "Neuen &Filter…\t\tErstelle einen neuen Filter"
 
 #: src/GMDatabaseSource.cpp:371
 msgid "New Playlist…\t\tCreate a new playlist"
 msgstr "Neue &Wiedergabeliste…\t\tErstelle eine neue Wiedergabeliste"
 
 #: src/GMDatabaseSource.cpp:372
-#, fuzzy
 msgid "Import Playlist…\t\tImport existing playlist"
-msgstr "Neue &Wiedergabeliste…\t\tErstelle eine neue Wiedergabeliste"
+msgstr "Wiedergabeliste i&mportieren…\t\tImportiere eine Wiedergabeliste"
 
 #: src/GMDatabaseSource.cpp:717
-#, fuzzy, c-format
+#, c-format
 msgid "All %d Albums"
-msgstr "Alben:"
+msgstr "Alle Alben (%d)"
 
 #: src/GMDatabaseSource.cpp:1028
 msgid "Remove Audio Files?"
@@ -267,7 +262,6 @@
 msgstr "Exportiere die Hauptbibliothek"
 
 #: src/GMDatabaseSource.cpp:1061
-#, fuzzy
 msgid "Export Playlist"
 msgstr "Exportiere Wiedergabeliste"
 
@@ -290,19 +284,16 @@
 msgstr ""
 
 #: src/GMDatabaseSource.cpp:1220
-#, fuzzy
 msgid "Size:"
-msgstr "Größe"
+msgstr "Größe:"
 
 #: src/GMDatabaseSource.cpp:1223
-#, fuzzy
 msgid "Cover Type:"
-msgstr "Vorlage für Dateinamen"
+msgstr "Cover Typ:"
 
 #: src/GMDatabaseSource.cpp:1231
-#, fuzzy
 msgid "Description:"
-msgstr "Beschreibung"
+msgstr "Beschreibung:"
 
 #: src/GMDatabaseSource.cpp:1234
 msgid "Tag Mode:"
@@ -314,7 +305,7 @@
 
 #: src/GMDatabaseSource.cpp:1285
 msgid "Remove tracks from artist from library?"
-msgstr "Entferne die Titel dieses Künstlers aus der Bibliothek."
+msgstr "Titel dieses Künstlers aus der Bibliothek entfernen?"
 
 #: src/GMDatabaseSource.cpp:1289 src/GMPlayListSource.cpp:271
 msgid "Remove Album?"
@@ -322,7 +313,7 @@
 
 #: src/GMDatabaseSource.cpp:1290
 msgid "Remove tracks from album from library?"
-msgstr "Entferne die Titel dieses Albums aus der Bibliothek."
+msgstr "Titel dieses Albums aus der Bibliothek entfernen?"
 
 #: src/GMDatabaseSource.cpp:1294 src/GMPlayListSource.cpp:274
 msgid "Remove Track(s)?"
@@ -330,11 +321,11 @@
 
 #: src/GMDatabaseSource.cpp:1295
 msgid "Remove track(s) from library?"
-msgstr "Die/Den Titel aus der Bibliothek entfernen?"
+msgstr "Titel aus der Bibliothek entfernen?"
 
 #: src/GMDatabaseSource.cpp:1310 src/GMPlayListSource.cpp:288
 msgid "Remove tracks from disk"
-msgstr "Entferne die Titel von der Festplatte"
+msgstr "Entferne Titel von der Festplatte"
 
 #: src/GMDatabaseSource.cpp:1322 src/GMDatabaseSource.cpp:1326
 #: src/GMDatabaseSource.cpp:1335 src/GMStreamSource.cpp:255
@@ -343,11 +334,11 @@
 
 #: src/GMDatabaseSource.cpp:1322
 msgid "Unable to remove artist from the library"
-msgstr "Der Künstler konnte nicht aus der Bibliothek gelöscht werden."
+msgstr "Der Künstler konnte nicht aus der Bibliothek gelöscht werden"
 
 #: src/GMDatabaseSource.cpp:1326
 msgid "Unable to remove album from the library"
-msgstr "Das Album konnte nicht aus der Bibliothek gelöscht werden."
+msgstr "Das Album konnte nicht aus der Bibliothek gelöscht werden"
 
 #: src/GMDatabaseSource.cpp:1335
 msgid "Unable to remove track from the library."
@@ -392,25 +383,25 @@
 
 #: src/GMFilterEditor.cpp:47 src/GMImportDialog.cpp:498
 #: src/GMStreamSource.cpp:156 src/GMTrackView.cpp:264
+#, fuzzy
 msgid "Tag"
 msgstr "Tag"
 
 #: src/GMFilterEditor.cpp:51
 msgid "Track Number"
-msgstr ""
+msgstr "Titelnummer"
 
 #: src/GMFilterEditor.cpp:52
 msgid "Disc Number"
-msgstr ""
+msgstr "CD Nummer"
 
 #: src/GMFilterEditor.cpp:54
 msgid "Last Played"
-msgstr ""
+msgstr "Zuletzt abgespielt"
 
 #: src/GMFilterEditor.cpp:55
-#, fuzzy
 msgid "Last Updated"
-msgstr "Tags aktualisieren?"
+msgstr ""
 
 #: src/GMFilterEditor.cpp:58 src/GMTrackEditor.cpp:515
 msgid "Channels"
@@ -419,91 +410,86 @@
 #: src/GMFilterEditor.cpp:59 src/GMStreamSource.cpp:60
 #: src/GMTrackEditor.cpp:775
 msgid "Bit Rate"
-msgstr ""
+msgstr "Bitrate"
 
 #: src/GMFilterEditor.cpp:60 src/GMTrackEditor.cpp:512
-#, fuzzy
 msgid "Sample Rate"
-msgstr "Sampelrate"
+msgstr "Abtastrate"
 
 #: src/GMFilterEditor.cpp:61 src/GMTrackEditor.cpp:771
-#, fuzzy
 msgid "Sample Size"
-msgstr "Sampelrate"
+msgstr ""
 
 #: src/GMFilterEditor.cpp:62
 msgid "Lyrics"
-msgstr ""
+msgstr "Liedtext"
 
 #: src/GMFilterEditor.cpp:193
 #, fuzzy
 msgid "\tRemove Rule\tRemove Rule"
-msgstr "Entfernen\t\tEntfernen"
+msgstr "\tEntfernen\t\tEntfernen"
 
 #: src/GMFilterEditor.cpp:208
-#, fuzzy
 msgid "Minutes"
-msgstr "Minuten."
+msgstr "Minuten"
 
 #: src/GMFilterEditor.cpp:209
-#, fuzzy
 msgid "Hours"
-msgstr "Stunden und"
+msgstr "Stunden"
 
 #: src/GMFilterEditor.cpp:210
 msgid "Days"
-msgstr ""
+msgstr "Tage"
 
 #: src/GMFilterEditor.cpp:211
 msgid "Weeks"
-msgstr ""
+msgstr "Wochen"
 
 #: src/GMFilterEditor.cpp:386
 msgid "contains"
-msgstr ""
+msgstr "enthält"
 
 #: src/GMFilterEditor.cpp:387
 msgid "does not contain"
-msgstr ""
+msgstr "enthält nicht"
 
 #: src/GMFilterEditor.cpp:388 src/GMFilterEditor.cpp:410
 #: src/GMFilterEditor.cpp:420
 msgid "equals"
-msgstr ""
+msgstr "ist gleich"
 
 #: src/GMFilterEditor.cpp:389 src/GMFilterEditor.cpp:411
 #: src/GMFilterEditor.cpp:421
 msgid "not equal to"
-msgstr ""
+msgstr "ist nicht gleich"
 
 #: src/GMFilterEditor.cpp:390
 msgid "starts with"
-msgstr ""
+msgstr "beginnt mit"
 
 #: src/GMFilterEditor.cpp:391
 msgid "ends with"
-msgstr ""
+msgstr "endet mit"
 
 #: src/GMFilterEditor.cpp:392
 msgid "matches"
 msgstr ""
 
 #: src/GMFilterEditor.cpp:397
-#, fuzzy
 msgid "in"
-msgstr "dünn"
+msgstr "in"
 
 #: src/GMFilterEditor.cpp:398
 msgid "not in"
-msgstr ""
+msgstr "nicht in"
 
 #: src/GMFilterEditor.cpp:399
 msgid "before"
-msgstr ""
+msgstr "vor"
 
 #: src/GMFilterEditor.cpp:400
 msgid "after"
-msgstr ""
+msgstr "nach"
 
 #: src/GMFilterEditor.cpp:404
 msgid "in the last"
@@ -515,34 +501,33 @@
 
 #: src/GMFilterEditor.cpp:412
 msgid "at least"
-msgstr ""
+msgstr "mindestens"
 
 #: src/GMFilterEditor.cpp:413
 msgid "at most"
-msgstr ""
+msgstr "höchstens"
 
 #: src/GMFilterEditor.cpp:596
 msgid "Ascending"
-msgstr ""
+msgstr "Aufsteigend"
 
 #: src/GMFilterEditor.cpp:597
 msgid "Descending"
-msgstr ""
+msgstr "Absteigend"
 
 #: src/GMFilterEditor.cpp:600
 #, fuzzy
 msgid "\tRemove Column\tRemove Column"
-msgstr "Entfernen\t\tEntfernen"
+msgstr "\tEntfernen\tEntfernen"
 
 #: src/GMFilterEditor.cpp:641
 #, fuzzy
 msgid "&Update"
-msgstr "Tags aktualisieren?"
+msgstr "Tags aktualisieren"
 
 #: src/GMFilterEditor.cpp:649
-#, fuzzy
 msgid "Name:"
-msgstr "Name"
+msgstr "Name:"
 
 #: src/GMFilterEditor.cpp:653
 #, fuzzy
@@ -551,21 +536,19 @@
 
 #: src/GMFilterEditor.cpp:655
 msgid "All"
-msgstr ""
+msgstr "Alle"
 
 #: src/GMFilterEditor.cpp:656
 msgid "Any"
 msgstr "Beliebig"
 
 #: src/GMFilterEditor.cpp:660
-#, fuzzy
 msgid "Filter:"
-msgstr "Dateif&ilter:"
+msgstr ""
 
 #: src/GMFilterEditor.cpp:669
-#, fuzzy
 msgid "\tAdd Filter\tAdd Filter"
-msgstr "Dateif&ilter:"
+msgstr "\tFilter hinzufügen\tFilter hinzufügen"
 
 #: src/GMFilterEditor.cpp:672
 msgid "Limit:"
@@ -576,31 +559,32 @@
 msgstr ""
 
 #: src/GMFilterEditor.cpp:683
-#, fuzzy
 msgid "\tAdd Column\tAdd Column"
-msgstr "\tLautstärke einstellen\tLautstärke einstellen"
+msgstr "\tSpalte hinzufügen\tSpalte hinzufügen"
 
 #: src/GMFilterSource.cpp:197 src/GMFilterSource.cpp:208
-#, fuzzy
 msgid "Remove Filter"
-msgstr "Audio-Dateien umbenennen?"
+msgstr "Filter entfernen"
 
 #: src/GMFilterSource.cpp:197
-#, fuzzy
 msgid "Are you sure you want to remove the filter?"
-msgstr ""
-"Sind Sie sicher, dass Sie die folgende Datei löschen wollen:\n"
-"\n"
-"%s"
+msgstr "Sind Sie sicher, dass Sie den Filter löschen wollen?"
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-msgid "Yes"
-msgstr "Ja"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
+msgstr "&Ja"
+
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
+msgstr "&Nein"
 
 #: src/GMFilterSource.cpp:207
-#, fuzzy
 msgid "Edit"
-msgstr "B&earbeiten"
+msgstr "Bearbeiten"
 
 #: src/GMFontDialog.cpp:189
 #, fuzzy
@@ -613,8 +597,9 @@
 msgstr "Besonders dünn"
 
 #: src/GMFontDialog.cpp:191
+#, fuzzy
 msgid "Condensed"
-msgstr "dünn"
+msgstr "Dicht"
 
 #: src/GMFontDialog.cpp:192
 #, fuzzy
@@ -627,6 +612,7 @@
 msgstr "Halbbreit"
 
 #: src/GMFontDialog.cpp:195
+#, fuzzy
 msgid "Expanded"
 msgstr "Breit"
 
@@ -647,22 +633,22 @@
 #: src/GMFontDialog.cpp:205 src/GMPreferencesDialog.cpp:1426
 #, fuzzy
 msgid "Extra Light"
-msgstr "besonders dünn"
+msgstr "Sehr dünn"
 
 #: src/GMFontDialog.cpp:206 src/GMPreferencesDialog.cpp:1427
 #, fuzzy
 msgid "Light"
-msgstr "leicht"
+msgstr "dünn"
 
 #: src/GMFontDialog.cpp:208 src/GMPreferencesDialog.cpp:1429
 #, fuzzy
 msgid "Medium"
-msgstr "mittel"
+msgstr "Medium"
 
 #: src/GMFontDialog.cpp:209 src/GMPreferencesDialog.cpp:1430
 #, fuzzy
 msgid "Demibold"
-msgstr "halbfett"
+msgstr "Halbfett"
 
 #: src/GMFontDialog.cpp:210 src/GMPreferencesDialog.cpp:1431
 msgid "Bold"
@@ -699,13 +685,13 @@
 msgstr "schief"
 
 #: src/GMFontDialog.cpp:245
+#, fuzzy
 msgid "Normal"
 msgstr "Normal"
 
 #: src/GMImportDialog.cpp:163
-#, fuzzy
 msgid "&Folder:"
-msgstr "Ordner:"
+msgstr "&Ordner:"
 
 #: src/GMImportDialog.cpp:213 cfox/lib/FXFileSelector.cpp:211
 msgid "&File Name:"
@@ -726,16 +712,14 @@
 #: src/GMImportDialog.cpp:237 cfox/lib/FXFileSelector.cpp:250
 msgid "&Set bookmark\t\tBookmark current directory."
 msgstr ""
-"Le&sezeichen erstellen\t\tLege ein Lesezeichen ins aktuelle Verzeichnis."
+"Le&sezeichen erstellen\t\tErstellt Lesezeichen für aktuelles Verzeichnis."
 
 #: src/GMImportDialog.cpp:238 cfox/lib/FXFileSelector.cpp:251
-#, fuzzy
 msgid "&Unset bookmark\t\tRemove current directory bookmark."
 msgstr ""
-"Le&sezeichen erstellen\t\tLege ein Lesezeichen ins aktuelle Verzeichnis."
+"Le&sezeichen entfernen\t\tLöscht Lesezeichen für aktuelles Verzeichnis."
 
 #: src/GMImportDialog.cpp:239 cfox/lib/FXFileSelector.cpp:252
-#, fuzzy
 msgid "&Clear all bookmarks\t\tClear all bookmarks."
 msgstr "Lesezeichen leeren\t\tEntferne alle Lesezeichen."
 
@@ -785,12 +769,11 @@
 #: src/GMImportDialog.cpp:295 cfox/lib/FXFileSelector.cpp:308
 #: cfox/lib/FXFileSelector.cpp:1113
 msgid "All Files (*)"
-msgstr ""
+msgstr "Alle Dateien (*)"
 
 #: src/GMImportDialog.cpp:369 src/GMImportDialog.cpp:379
-#, fuzzy
 msgid "&Options:"
-msgstr "Optionen:"
+msgstr "&Optionen:"
 
 #: src/GMImportDialog.cpp:399
 #, fuzzy
@@ -802,9 +785,8 @@
 msgstr "Ordner synchronisieren"
 
 #: src/GMImportDialog.cpp:403
-#, fuzzy
 msgid "Import Playlist"
-msgstr "Exportiere Wiedergabeliste"
+msgstr "Importiere Wiedergabeliste"
 
 #: src/GMImportDialog.cpp:405
 msgid "Import Music"
@@ -812,36 +794,36 @@
 
 #: src/GMImportDialog.cpp:439
 msgid "&File(s)"
-msgstr "&Dateien"
+msgstr "&Datei(en)"
 
 #: src/GMImportDialog.cpp:462
-#, fuzzy
 msgid "&Folder"
-msgstr "Ordner:"
+msgstr "Ordner"
 
 #: src/GMImportDialog.cpp:472 src/GMImportDialog.cpp:578
 msgid "&Sync"
-msgstr "&Sync"
+msgstr ""
 
 #: src/GMImportDialog.cpp:474
 msgid "Sync Operation"
-msgstr "Sync Operation"
+msgstr ""
 
 #: src/GMImportDialog.cpp:477
 msgid "Import new tracks\tImports files not yet in the database."
 msgstr ""
-"Neue Titel imporieren\tTitel, die sich noch nicht in der Datenbank befinden, "
-"werden importiert."
+"Neue Titel importieren\tImportiere Titel, die sich noch nicht in der "
+"Datenbank befinden."
 
 #: src/GMImportDialog.cpp:478
 msgid "Remove tracks that have been deleted from disk"
-msgstr "Entferne von der Festplatte gelösche Titel"
+msgstr "Entferne Titel die von der Festplatte gelöscht wurden"
 
 #: src/GMImportDialog.cpp:480
 msgid "Update existing tracks:"
 msgstr "Aktualisiere die bestehenden Titel:"
 
 #: src/GMImportDialog.cpp:481
+#, fuzzy
 msgid ""
 "Modified since last import\tOnly reread the tag when the file has been "
 "modified."
@@ -849,7 +831,7 @@
 
 #: src/GMImportDialog.cpp:483
 msgid "All\tAlways read the tags"
-msgstr "Alle\tLies alle Tags"
+msgstr "Alle\tTags immer lesen"
 
 #: src/GMImportDialog.cpp:488
 msgid "&Track"
@@ -868,45 +850,46 @@
 msgstr "Beides"
 
 #: src/GMImportDialog.cpp:502
-#, fuzzy
 msgid "ID3v1 Encoding:"
-msgstr "Kodierung:"
+msgstr "ID3v1 Kodierung:"
 
 #: src/GMImportDialog.cpp:513
 msgid "Set track number based on scan order."
-msgstr "Wähle die Titelnummer auf Grund der Scannreihenfolge"
+msgstr "Wähle die Titelnummer anhand der Scanreihenfolge."
 
 #: src/GMImportDialog.cpp:516
 msgid ""
 "Group albums by audio format.\tImported tracks that differ in audio format "
 "will be grouped in separate albums."
 msgstr ""
+"Gruppiere Alben nach Audioformat\tImportierte Titel, die sich im Audioformat "
+"unterscheiden, werden in getrennte Alben gruppiert."
 
 #: src/GMImportDialog.cpp:519
 msgid ""
 "Detect compilations by folder.\tGroup tracks from the same folder without "
 "specific compilation/albumartist tags."
 msgstr ""
+"Erkenne Kompilationen am Ordner\tGruppiere Titel aus dem selben Ordner auch "
+"ohne Album-Künstler Tags."
 
 #: src/GMImportDialog.cpp:522
 msgid "Fetch Lyrics.\tFetch Lyrics"
-msgstr ""
+msgstr "Liedtexte herunterladen.\tLiedtexte herunterladen"
 
 #: src/GMImportDialog.cpp:524
-#, fuzzy
 msgid "Path Template"
-msgstr "Vorlage:"
+msgstr "Pfadmuster"
 
 #: src/GMImportDialog.cpp:527
-#, fuzzy
 msgid ""
 "%T - title              %A - album name\n"
 "%P - album artist name  %p - track artist name \n"
 "%N - track number       %d - disc number\n"
 "%y - year"
 msgstr ""
-"%T - Titelname                %A - Albumname\n"
-"%P - Künstlername des Albums  %p - Künstlername des Titels \n"
+"%T - Titelname                 %A - Albumname\n"
+"%P - Album-Künstler           %p - Künstler\n"
 "%N - Titelnummer              %G - Genre"
 
 #: src/GMImportDialog.cpp:538 src/GMTrackEditor.cpp:378
@@ -918,22 +901,20 @@
 msgstr "Ersetze Unterstriche durch Leerzeichen"
 
 #: src/GMImportDialog.cpp:552
-#, fuzzy
 msgid "&Filter"
-msgstr "Dateif&ilter:"
+msgstr "Dateif&ilter"
 
 #: src/GMImportDialog.cpp:555
-#, fuzzy
 msgid "Exclude Files"
-msgstr "Ausnahmen:"
+msgstr "Dateien Ausschließen"
 
 #: src/GMImportDialog.cpp:556
 msgid "Unsupported Playback Formats"
-msgstr ""
+msgstr "Nicht unterstütze Formate"
 
 #: src/GMImportDialog.cpp:558
 msgid "Exclude by Pattern"
-msgstr ""
+msgstr "Nach Muster ausschließen"
 
 #: src/GMImportDialog.cpp:562
 msgid "Folders:"
@@ -955,7 +936,7 @@
 msgstr ""
 
 #: src/GMPlayerManager.cpp:313
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create directory %s\n"
 msgstr "Das Verzeichnis %s kann nicht erstellt werden.\n"
 
@@ -969,8 +950,8 @@
 msgid ""
 "Session Bus not available. All features requiring sessionbus are disabled."
 msgstr ""
-"Der Session-Bus wurde nicht gefunden. Alle funktionen, die DBus benötigen "
-"stehen nicht zur Verfügung."
+"Der Session-Bus wurde nicht gefunden. Alle funktionen, den Session-Bus "
+"benötigen stehen nicht zur Verfügung."
 
 #: src/GMPlayerManager.cpp:671
 #, c-format
@@ -979,6 +960,9 @@
 "Goggles Music Manager requires a threadsafe SQLite.\n"
 "Please upgrade your SQLite installation."
 msgstr ""
+"Eine nicht threadssichere Version von SQLite (%s) wird benutzt.\n"
+"Goggles Music Manager benötigt jedoch eine threadsichere Version.\n"
+"Bitte aktualisieren sie SQLite."
 
 #: src/GMPlayerManager.cpp:680
 msgid ""
@@ -987,38 +971,35 @@
 "support in the FOX library. If you've compiled FOX yourself, most\n"
 "likely the libpng header files were not installed on your system."
 msgstr ""
-"Das FOX-Toolkit wurde ohne PNG-Unterstützung übersetzt.\n"
+"Das FOX-Toolkit wurde ohne PNG-Unterstützung kompiliert.\n"
 "Diese wird allerdings benötigt, damit Goggles Music Manager alle\n"
-"Symbole anzeigen kann. Wenn Sie das FOX-Toolkit selber übersetzt\n"
+"Symbole anzeigen kann. Wenn Sie das FOX-Toolkit selbst kompiliert\n"
 "haben, so waren die libpng Header-Dateien wahrscheinlich nicht auf\n"
 "Ihrem System vorhanden."
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr "Last.FM-Fehler"
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr "Wiedergabe-Fehler"
 
 #: src/GMPlayListSource.cpp:182
-#, fuzzy
 msgid "Rename…"
-msgstr "Um&benennen"
+msgstr "Umbenennen…"
 
 #: src/GMPlayListSource.cpp:183
-#, fuzzy
 msgid "Import Playlist…"
-msgstr "Exportiere Wiedergabeliste"
+msgstr "Importiere Wiedergabeliste…"
 
 #: src/GMPlayListSource.cpp:185
 msgid "Remove Playlist"
 msgstr "Entferne Wiedergabeliste"
 
 #: src/GMPlayListSource.cpp:265
-#, fuzzy
 msgid "Remove Tag?"
-msgstr "Titel entfernen?"
+msgstr "Tag entfernen?"
 
 #: src/GMPlayListSource.cpp:266
 #, fuzzy
@@ -1065,10 +1046,9 @@
 
 #: src/GMPlayQueue.cpp:114
 msgid "Clear"
-msgstr ""
+msgstr "Leeren"
 
 #: src/GMPlayQueue.cpp:145
-#, fuzzy
 msgid "Remove…\tDel\tRemove track(s) from play queue."
 msgstr "Entfernen…\tDel\tEntferne die/den Titel aus der Wiedergabeliste."
 
@@ -1095,9 +1075,8 @@
 msgstr ""
 
 #: src/GMPodcastSource.cpp:1314
-#, fuzzy
 msgid "Date"
-msgstr "Play"
+msgstr ""
 
 #: src/GMPodcastSource.cpp:1315
 msgid "Feed"
@@ -1105,24 +1084,23 @@
 
 #: src/GMPodcastSource.cpp:1351 src/GMPodcastSource.cpp:1357
 msgid "Add Podcast…"
-msgstr ""
+msgstr "Podcast hinzufügen…"
 
 #: src/GMPodcastSource.cpp:1356
 msgid "Refresh\t\t"
-msgstr ""
+msgstr "Aktualisieren\t\t"
 
 #: src/GMPodcastSource.cpp:1363
 msgid "Auto Download"
-msgstr ""
+msgstr "Automatisch herunterladen"
 
 #: src/GMPodcastSource.cpp:1367
-#, fuzzy
 msgid "Remove Podcast"
-msgstr "Entferne Wiedergabeliste"
+msgstr "Entferne Podcast"
 
 #: src/GMPodcastSource.cpp:1372
 msgid "Download"
-msgstr ""
+msgstr "Herunterladen"
 
 #: src/GMPodcastSource.cpp:1373
 msgid "Mark Played"
@@ -1133,14 +1111,13 @@
 msgstr ""
 
 #: src/GMPodcastSource.cpp:1375
-#, fuzzy
 msgid "Remove Local"
-msgstr "Entferne Wiedergabeliste"
+msgstr ""
 
 #: src/GMPodcastSource.cpp:1415
-#, fuzzy, c-format
+#, c-format
 msgid "All %d Feeds"
-msgstr "Alle Genre"
+msgstr ""
 
 #: src/GMPodcastSource.cpp:1643 src/GMPodcastSource.cpp:1644
 msgid "Subscribe to Podcast"
@@ -1148,7 +1125,7 @@
 
 #: src/GMPodcastSource.cpp:1644
 msgid "Specify url for the rss feed"
-msgstr ""
+msgstr "Geben sie die URL des rss Feeds an"
 
 #: src/GMPodcastSource.cpp:1651 src/GMStreamSource.cpp:152
 #: src/GMStreamSource.cpp:190
@@ -1156,13 +1133,12 @@
 msgstr "Ort"
 
 #: src/GMPodcastSource.cpp:1666
-#, fuzzy
 msgid "Remove Feed?"
-msgstr "Genre entfernen?"
+msgstr "Feed löschen?"
 
 #: src/GMPodcastSource.cpp:1666
 msgid "Remove feed and all downloaded episodes?"
-msgstr ""
+msgstr "Feed und alle heruntergeladenen Folgen löschen?"
 
 #: src/GMPreferencesDialog.cpp:285
 msgid "Preferences"
@@ -1181,23 +1157,16 @@
 msgstr "Führende Worte ignorieren"
 
 #: src/GMPreferencesDialog.cpp:325
-#, fuzzy
 msgid "Additional Track Information"
-msgstr "Bearbeite die Titel-Informationen"
+msgstr "Zusätzliche Titel-Informationen"
 
 #: src/GMPreferencesDialog.cpp:328
-#, fuzzy
 msgid "Show Album Cover\tShow album cover of playing track"
-msgstr ""
-"Albumcover des abzuspielenden Titels anzeigen\tAlbumcover des abzuspielenden "
-"Titels anzeigen"
+msgstr "Albumcover  anzeigen\tAlbumcover des laufenden Titels anzeigen"
 
 #: src/GMPreferencesDialog.cpp:329
-#, fuzzy
 msgid "Show Lyrics\tShow lyrics of playing track"
-msgstr ""
-"Albumcover des abzuspielenden Titels anzeigen\tAlbumcover des abzuspielenden "
-"Titels anzeigen"
+msgstr "Liedtext anzeigen\tLiedtext des laufenden Titels anzeigen"
 
 #: src/GMPreferencesDialog.cpp:332
 msgid "System Tray"
@@ -1211,12 +1180,12 @@
 msgid ""
 "Show Track Change Notifications\tInform notification daemon of track changes."
 msgstr ""
-"Bei Titelwechsel benachrichtigen\tInformiere in der Systemleiste über "
+"Bei Titelwechsel benachrichtigen\tSende eine Benachrichtigung beim "
 "Titelwechsel."
 
 #: src/GMPreferencesDialog.cpp:340
 msgid "MPRIS v1 Connectivity\tEnable MPRIS v1 connectivity"
-msgstr ""
+msgstr "MPRIS-v1-Schnittstelle aktivieren\tMPRIS-v1-Schnittstelle aktivieren"
 
 #: src/GMPreferencesDialog.cpp:344
 msgid "Last.fm"
@@ -1234,12 +1203,11 @@
 
 #: src/GMPreferencesDialog.cpp:355
 msgid "Service:"
-msgstr ""
+msgstr "Dienst:"
 
 #: src/GMPreferencesDialog.cpp:372
-#, fuzzy
 msgid "&Sign up…"
-msgstr "Bei last.fm &anmelden…"
+msgstr "&Anmelden…"
 
 #: src/GMPreferencesDialog.cpp:378
 msgid "Username:"
@@ -1262,9 +1230,8 @@
 msgstr "Fenster"
 
 #: src/GMPreferencesDialog.cpp:414
-#, fuzzy
 msgid "Close button minimizes to tray"
-msgstr "Schließen Knopf versteckt das Hauptfenster"
+msgstr "Beim Schließen in die Systemleiste minimieren"
 
 #: src/GMPreferencesDialog.cpp:415
 msgid "Show Status Bar"
@@ -1276,7 +1243,7 @@
 
 #: src/GMPreferencesDialog.cpp:421
 msgid "Toolbar"
-msgstr ""
+msgstr "Werkzeugleiste"
 
 #: src/GMPreferencesDialog.cpp:425
 msgid "Location:"
@@ -1292,10 +1259,9 @@
 
 #: src/GMPreferencesDialog.cpp:431
 msgid "Title Format:"
-msgstr ""
+msgstr "Titelformat:"
 
 #: src/GMPreferencesDialog.cpp:439 src/GMTrackEditor.cpp:361
-#, fuzzy
 msgid ""
 "%T - title                   %A - album name\n"
 "%P - album artist name       %p - track artist name\n"
@@ -1304,15 +1270,16 @@
 "%N - track number (2 digits) %n - track number      \n"
 "%G - genre"
 msgstr ""
-"%T - Titelname               %A - Albumname\n"
-"%P - Künstlername des Albums %p - Künstlername des Titels\n"
-"%y - Jahr                    %d - Disc-Nummer\n"
-"%N - Titelnummer (2 stellig) %n - Titelnummer\n"
+"%T - Titelname               %A - Album\n"
+"%P - Album-Künstler          %p - Künstler\n"
+"%w - Komponist               %c - Dirigent\n"
+"%y - Jahr                    %d - CD-Nummer\n"
+"%N - Titelnummer (2 Stellen) %n - Titelnummer     \n"
 "%G - Genre"
 
 #: src/GMPreferencesDialog.cpp:457
 msgid "A&ppearance"
-msgstr "&Aussehen"
+msgstr "&Erscheinungsbild"
 
 #: src/GMPreferencesDialog.cpp:459
 msgid "Colors"
@@ -1343,13 +1310,12 @@
 msgstr "Ausgewählt\tFarbe von ausgewähltem Text"
 
 #: src/GMPreferencesDialog.cpp:489
-#, fuzzy
 msgid "Menu\tMenu Base Color"
-msgstr "Menü\tFarbe des Menüs"
+msgstr "Menü\tFarbe der Menüs"
 
 #: src/GMPreferencesDialog.cpp:493
 msgid "Menu\tMenu Text Color"
-msgstr "Menü\tFarbe des Menüs"
+msgstr "Menü\tTextfarbe der Menüs"
 
 #: src/GMPreferencesDialog.cpp:497
 msgid "Border\tBorder Color"
@@ -1357,15 +1323,15 @@
 
 #: src/GMPreferencesDialog.cpp:501
 msgid "Tooltip\tTooltip Color"
-msgstr "Kurzinfo\tFarbe von Kurzinfos"
+msgstr "Kurzinfo\tFarbe der Kurzinfos"
 
 #: src/GMPreferencesDialog.cpp:505
 msgid "Hilite\tHilite Color"
-msgstr "Hilite\tFarbe von Markierungen"
+msgstr ""
 
 #: src/GMPreferencesDialog.cpp:512
 msgid "Shadow\tShadow Color"
-msgstr "Schatten\tFarbe von Schatten"
+msgstr "Schatten\tSchattenfarbe"
 
 #: src/GMPreferencesDialog.cpp:515
 msgid "Playing\tPlaying Track Color"
@@ -1382,12 +1348,11 @@
 
 #: src/GMPreferencesDialog.cpp:537
 msgid "Font & Icons"
-msgstr ""
+msgstr "Schrift & Symbole"
 
 #: src/GMPreferencesDialog.cpp:542
-#, fuzzy
 msgid "Default Font"
-msgstr "Standardwert:"
+msgstr "Standardschriftart"
 
 #: src/GMPreferencesDialog.cpp:544
 msgid "Change…"
@@ -1395,7 +1360,7 @@
 
 #: src/GMPreferencesDialog.cpp:546
 msgid "Display DPI"
-msgstr ""
+msgstr "Bildschirmauflösung (DPI)"
 
 #: src/GMPreferencesDialog.cpp:553
 msgid "Icons"
@@ -1407,21 +1372,19 @@
 
 #: src/GMPreferencesDialog.cpp:575
 msgid "Output"
-msgstr ""
+msgstr "Ausgabe"
 
 #: src/GMPreferencesDialog.cpp:579
-#, fuzzy
 msgid "Driver:"
-msgstr "Audio-Treiber:"
+msgstr "Audio-Teiber:"
 
 #: src/GMPreferencesDialog.cpp:613 src/GMPreferencesDialog.cpp:626
 msgid "Device:"
-msgstr ""
+msgstr "Gerät:"
 
 #: src/GMPreferencesDialog.cpp:633
-#, fuzzy
 msgid "Apply Changes"
-msgstr "Keine Änderungen"
+msgstr "Änderungen anwenden"
 
 #: src/GMPreferencesDialog.cpp:635
 msgid "Playback"
@@ -1433,63 +1396,55 @@
 
 #: src/GMPreferencesDialog.cpp:643
 msgid "Off"
-msgstr ""
+msgstr "Aus"
 
 #: src/GMPreferencesDialog.cpp:644
 msgid "Track"
 msgstr "Titel"
 
 #: src/GMPreferencesDialog.cpp:650
-#, fuzzy
 msgid "&Podcasts"
-msgstr "Entferne Wiedergabeliste"
+msgstr "&Podcasts"
 
 #: src/GMPreferencesDialog.cpp:653
-#, fuzzy
 msgid "Updates"
-msgstr "Tags aktualisieren?"
+msgstr "Aktualisierung"
 
 #: src/GMPreferencesDialog.cpp:657
-#, fuzzy
 msgid "Update Interval"
-msgstr "Dateiname aktualisieren"
+msgstr "Aktualisierungsintervall"
 
 #: src/GMPreferencesDialog.cpp:659
 msgid "Disabled"
 msgstr "Deaktiviert"
 
 #: src/GMPreferencesDialog.cpp:660
-#, fuzzy
 msgid "10 minutes"
-msgstr "Minuten."
+msgstr "10 Minuten"
 
 #: src/GMPreferencesDialog.cpp:661
-#, fuzzy
 msgid "20 minutes"
-msgstr "Minuten."
+msgstr "20 Minuten"
 
 #: src/GMPreferencesDialog.cpp:662
-#, fuzzy
 msgid "30 minutes"
-msgstr "Minuten."
+msgstr "30 Minuten"
 
 #: src/GMPreferencesDialog.cpp:663
 msgid "1 hour"
-msgstr ""
+msgstr "1 Stunde"
 
 #: src/GMPreferencesDialog.cpp:664
-#, fuzzy
 msgid "2 hours"
-msgstr "Stunden und"
+msgstr "2 Stunden"
 
 #: src/GMPreferencesDialog.cpp:665
-#, fuzzy
 msgid "6 hours"
-msgstr "Stunden und"
+msgstr "6 Stunden"
 
 #: src/GMPreferencesDialog.cpp:666
 msgid "12 hours"
-msgstr ""
+msgstr "12 Stunden"
 
 #: src/GMPreferencesDialog.cpp:863
 msgid "Current"
@@ -1504,9 +1459,8 @@
 msgstr "Wähle normale Schriftart"
 
 #: src/GMRemote.cpp:79
-#, fuzzy
 msgid "\tShow Browser\tShow Browser"
-msgstr "Browser anzeigen"
+msgstr "\tBrowser anzeigen\tBrowser anzeigen"
 
 #: src/GMRemote.cpp:81 src/GMWindow.cpp:282
 msgid "\tStart Playback\tStart Playback"
@@ -1526,22 +1480,19 @@
 
 #: src/GMRemote.cpp:93
 msgid "\tAdjust Volume\tAdjust Volume"
-msgstr "\tLautstärke einstellen\tLautstärke einstellen"
+msgstr "\tLautstärke ändern\tLautstärke ändern"
 
 #: src/GMScanner.cpp:45
-#, fuzzy
 msgid "Unknown Artist"
-msgstr "Unbekannter host."
+msgstr "Unbekannter Künstler"
 
 #: src/GMScanner.cpp:46
-#, fuzzy
 msgid "Unknown Album"
-msgstr "Unbekannter host."
+msgstr "Unbekanntes Album"
 
 #: src/GMScanner.cpp:593
-#, fuzzy
 msgid "Various Artists"
-msgstr "\tKünstler teilen"
+msgstr "Diverse Künstler"
 
 #: src/GMSourceView.cpp:53
 msgid "Sources\tPress to change sorting order\tPress to change sorting order"
@@ -1550,14 +1501,12 @@
 "zu ändern"
 
 #: src/GMSourceView.cpp:294
-#, fuzzy
 msgid "Show Browser\tCtrl-B\tShow Browser"
-msgstr "Browser anzeigen"
+msgstr "Browser anzeigen\tCtrl-B\tBrowser anzeigen"
 
 #: src/GMSourceView.cpp:295
-#, fuzzy
 msgid "Show Tags\tCtrl-T\tShow Tags"
-msgstr "&Genre anzeigen\tCtrl-G\tZeige den Genre-Browser."
+msgstr "Genre anzeigen\tCtrl-G\tZeige den Genre-Browser"
 
 #: src/GMStreamSource.cpp:59
 msgid "Station"
@@ -1569,9 +1518,8 @@
 
 #: src/GMStreamSource.cpp:90 src/GMStreamSource.cpp:95
 #: src/GMStreamSource.cpp:101
-#, fuzzy
 msgid "Add Radio Station…"
-msgstr "Bearbeite Radiosender"
+msgstr "Radiosender hinzufügen…"
 
 #: src/GMStreamSource.cpp:100
 msgid "Edit…"
@@ -1579,7 +1527,7 @@
 
 #: src/GMStreamSource.cpp:102
 msgid "Remove\t\tRemove."
-msgstr "Entfernen\t\tEntfernen"
+msgstr "Entfernen\t\tEntfernen."
 
 #: src/GMStreamSource.cpp:144 src/GMStreamSource.cpp:145
 msgid "New Internet Radio Station"
@@ -1590,7 +1538,6 @@
 msgstr "Geben Sie die URL und eine Beschreibung des Senders ein"
 
 #: src/GMStreamSource.cpp:147
-#, fuzzy
 msgid "C&reate"
 msgstr "&Erstellen"
 
@@ -1619,9 +1566,9 @@
 msgstr "Radiosender aus der Bibliothek entfernen?"
 
 #: src/GMStreamSource.cpp:255
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to remove station from the library."
-msgstr "Der Künstler konnte nicht aus der Bibliothek gelöscht werden."
+msgstr "Der Sender konnte nicht aus der Bibliothek gelöscht werden."
 
 #: src/GMTrackDatabase.cpp:174 src/GMTrackDatabase.cpp:180
 #: src/GMTrackEditor.cpp:260 src/GMTrackEditor.cpp:276
@@ -1650,7 +1597,7 @@
 msgstr "Schwerwiegender Fehler"
 
 #: src/GMTrackDatabase.cpp:192
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Goggles Music Manager was unable to open the database.\n"
 "The database may have been corrupted. Please remove %s to try again.\n"
@@ -1659,9 +1606,9 @@
 msgstr ""
 "Google Music Manager konnte die Datenbank nicht öffnen.\n"
 "Die Datenbank wurde möglicherweise beschädigt. Bitte entfernen Sie die\n"
-"Datei ~/.goggles/goggles.db und versuchen Sie es erneut.\n"
-"Sollte der Fehler weiterhin bestehen, senden Sie bitte einen\n"
-"Fehlerbericht auf http://code.google.com/p/gogglesmm ein."
+"Datei %s und versuchen Sie es erneut.\n"
+"Sollte der Fehler weiterhin bestehen, erstellen Sie bitte einen\n"
+"Fehlerbericht auf http://gogglesmm.github.io"
 
 #: src/GMTrackEditor.cpp:233
 msgid "Invalid Template"
@@ -1683,9 +1630,8 @@
 msgstr "Oh je. Ein Datenbank-Fehler"
 
 #: src/GMTrackEditor.cpp:276
-#, fuzzy
 msgid "Failed to retrieve track filenames"
-msgstr "Datenbank-Fehler: Die Dateinamen konnten leider nicht gelesen werden."
+msgstr "Die Titel-Dateinamen konnten leider nicht gelesen werden"
 
 #: src/GMTrackEditor.cpp:281
 msgid "No changes"
@@ -1766,9 +1712,8 @@
 msgstr "Bearbeite die Titel-Informationen"
 
 #: src/GMTrackEditor.cpp:446
-#, fuzzy
 msgid "&Previous"
-msgstr "Vorheriges"
+msgstr "&Vorheriger"
 
 #: src/GMTrackEditor.cpp:447
 msgid "&Next"
@@ -1776,21 +1721,19 @@
 
 #: src/GMTrackEditor.cpp:470
 msgid "&Tag"
-msgstr ""
+msgstr "&Tag"
 
 #: src/GMTrackEditor.cpp:477
 msgid "L&yrics"
-msgstr ""
+msgstr "&Liedtext"
 
 #: src/GMTrackEditor.cpp:488 src/GMTrackView.cpp:269
-#, fuzzy
 msgid "&Find"
-msgstr "Suchen"
+msgstr "S&uchen"
 
 #: src/GMTrackEditor.cpp:495
-#, fuzzy
 msgid "&Properties"
-msgstr "Einstellungen"
+msgstr "&Eigenschaften"
 
 #: src/GMTrackEditor.cpp:503 cfox/lib/FXFileSelector.cpp:940
 msgid "Type"
@@ -1802,54 +1745,48 @@
 
 #: src/GMTrackEditor.cpp:520
 msgid "Co&ver"
-msgstr ""
+msgstr "Co&ver"
 
 #: src/GMTrackEditor.cpp:531
-#, fuzzy
 msgid "Trac&k"
-msgstr "Titel"
+msgstr "Titel&nummer"
 
 #: src/GMTrackEditor.cpp:537 src/GMTrackEditor.cpp:548
 #: src/GMTrackEditor.cpp:554
-#, fuzzy
 msgid "&Disc"
-msgstr "Disc"
+msgstr "C&D-Nummer"
 
 #: src/GMTrackEditor.cpp:541 src/GMTrackEditor.cpp:560
 msgid "Y&ear"
-msgstr ""
+msgstr "J&ahr"
 
 #: src/GMTrackEditor.cpp:564
-#, fuzzy
 msgid "T&itle"
-msgstr "Titelname"
+msgstr "T&itelname"
 
 #: src/GMTrackEditor.cpp:568
-#, fuzzy
 msgid "&Artist"
-msgstr "Künstler"
+msgstr "&Künstler"
 
 #: src/GMTrackEditor.cpp:571
-#, fuzzy
 msgid "Album A&rtist"
-msgstr "Künstlername des Albums"
+msgstr "&Albumkünstler"
 
 #: src/GMTrackEditor.cpp:574
-#, fuzzy
 msgid "A&lbum"
-msgstr "Album"
+msgstr "A&lbum"
 
 #: src/GMTrackEditor.cpp:577
 msgid "C&omposer"
-msgstr ""
+msgstr "Kom&ponist"
 
 #: src/GMTrackEditor.cpp:580
 msgid "Cond&uctor"
-msgstr ""
+msgstr "Dirig&ent"
 
 #: src/GMTrackEditor.cpp:583
 msgid "Ta&gs"
-msgstr ""
+msgstr "&Genre"
 
 #: src/GMTrackEditor.cpp:594
 msgid "Auto track number. Offset:"
@@ -1882,10 +1819,9 @@
 
 #: src/GMTrackView.cpp:268
 msgid "\tClose Filter\tClose Filter"
-msgstr ""
+msgstr "\tFilter Schließen\tFilter Schließen"
 
 #: src/GMTrackView.cpp:275
-#, fuzzy
 msgid "Tags\tPress to change sorting order\tPress to change sorting order"
 msgstr ""
 "Genres\tKlicken, um die Reihenfolge zu ändern\tKlicken, um die Reihenfolge "
@@ -1898,13 +1834,13 @@
 "Reihenfolge zu ändern"
 
 #: src/GMTrackView.cpp:283
-#, fuzzy
 msgid "\tPress to change sorting order\tPress to change sorting order"
 msgstr ""
-"Genres\tKlicken, um die Reihenfolge zu ändern\tKlicken, um die Reihenfolge "
-"zu ändern"
+"\tKlicken, um die Reihenfolge zu ändern\tKlicken, um die Reihenfolge zu "
+"ändern"
 
 #: src/GMTrackView.cpp:290
+#, fuzzy
 msgid "Browse"
 msgstr "Browser anzeigen"
 
@@ -1919,75 +1855,70 @@
 
 #: src/GMTrackView.cpp:303 src/GMTrackView.cpp:461
 msgid "&Configure Columns…"
-msgstr "Spalten &konfigurieren"
+msgstr "Spalten &konfigurieren…"
 
 #: src/GMTrackView.cpp:304 src/GMTrackView.cpp:462
 msgid "&Sort\t\tChange Sorting."
 msgstr "&Sortierung\t\tSortierung ändern."
 
 #: src/GMTrackView.cpp:1014
-#, fuzzy, c-format
+#, c-format
 msgid "All %d Tags"
-msgstr "Alle Genre"
+msgstr "Alle Genre (%d)"
 
 #: src/GMTrackView.cpp:1016
 msgid "All Tags"
-msgstr ""
+msgstr "Alle Genre"
 
 #: src/GMTrackView.cpp:1037
-#, fuzzy, c-format
+#, c-format
 msgid "All %d Artists"
-msgstr "Künstlername des Albums"
+msgstr "Alle Künstler (%d)"
 
 #: src/GMTrackView.cpp:1463
 #, c-format
 msgid "By %s"
-msgstr ""
+msgstr "Nach %s"
 
 #: src/GMTrackView.cpp:1819
-#, fuzzy
 msgid "Show Album Year"
-msgstr "Sortiere nach Erscheinungsjahr"
+msgstr "Zeige Erscheinungsjahr"
 
 #: src/GMTrackView.cpp:1820 src/GMTrackView.cpp:1993
 msgid "Sort by Album Year"
 msgstr "Sortiere nach Erscheinungsjahr"
 
 #: src/GMTrackView.cpp:1823
-#, fuzzy
 msgid "List View"
-msgstr "Vorherige Ansicht"
+msgstr "Listenansicht"
 
 #: src/GMTrackView.cpp:1824
 msgid "Cover View"
-msgstr ""
+msgstr "Cover-Ansicht"
 
 #: src/GMTrackView.cpp:1827
-#, fuzzy
 msgid "Small Cover"
-msgstr "Kleine Symbole"
+msgstr "Kleine Cover"
 
 #: src/GMTrackView.cpp:1828
-#, fuzzy
 msgid "Medium Cover"
-msgstr "Albencover"
+msgstr "Mittelgroße Cover"
 
 #: src/GMTrackView.cpp:1829
 msgid "Big Cover"
-msgstr ""
+msgstr "Große Cover"
 
 #: src/GMTrackView.cpp:1831
 msgid "Arrange By Rows"
-msgstr ""
+msgstr "In Zeilen anordnen"
 
 #: src/GMTrackView.cpp:1832
-#, fuzzy
 msgid "Arrange By Columns"
-msgstr "Spalten konfigurieren"
+msgstr "In Spalten anordnen"
 
 #: src/GMTrayIcon.cpp:299 src/GMWindow.cpp:956 src/GMWindow.cpp:984
 msgid "Play"
-msgstr "Play"
+msgstr "Abspielen"
 
 #: src/GMTrayIcon.cpp:300
 msgid "Stop"
@@ -1995,11 +1926,11 @@
 
 #: src/GMTrayIcon.cpp:301
 msgid "Previous Track"
-msgstr "Vorherigen Titel"
+msgstr "Vorheriger Titel"
 
 #: src/GMTrayIcon.cpp:302
 msgid "Next Track"
-msgstr "Nächsten Titel"
+msgstr "Nächster Titel"
 
 #: src/GMTrayIcon.cpp:304
 msgid "Quit"
@@ -2011,14 +1942,12 @@
 
 #: src/GMWindow.cpp:236
 msgid "Queue Play\t\tPlay tracks from queue."
-msgstr ""
+msgstr "Wiedergabeliste\t\tSpiele Titel aus Wiedergabeliste."
 
 #: src/GMWindow.cpp:237
-#, fuzzy
 msgid "Shuffle Play\tAlt-R\tPlay tracks in random order."
 msgstr ""
-"Zufällige Wiedergabe\tAlt-R\tGib die Titel in eine zufälligen Reihenfolge "
-"wieder"
+"Zufällige Wiedergabe\tAlt-R\tSpiele die Titel in zufälliger Reihenfolge."
 
 #: src/GMWindow.cpp:239
 msgid "Repeat Off\tCtrl-,\tRepeat current track."
@@ -2026,7 +1955,7 @@
 
 #: src/GMWindow.cpp:240
 msgid "Repeat Track\tCtrl-.\tRepeat current track."
-msgstr "Wiederholung\tCtrl-.\tWiederhole den aktuellen Titel."
+msgstr "Wiederhole Titel\tCtrl-.\tWiederhole den aktuellen Titel."
 
 #: src/GMWindow.cpp:241
 msgid "Repeat All Tracks\tCtrl-/\tRepeat all tracks."
@@ -2034,7 +1963,7 @@
 
 #: src/GMWindow.cpp:245
 msgid "Stop After Track\tCtrl-Shift-|\tStop playback at end of track."
-msgstr ""
+msgstr "Stop nach Titel\tCtrl-Shift-|\tBeende Wiedergabe nach aktuellem Titel."
 
 #: src/GMWindow.cpp:246
 msgid "Sleep Timer\t\tSetup sleeptimer."
@@ -2046,17 +1975,15 @@
 
 #: src/GMWindow.cpp:252
 msgid "Show Full Screen\tF12\tToggle fullscreen mode."
-msgstr "Vollbild\tF12\tVollbildmodus umschalten"
+msgstr "Vollbild\tF12\tVollbildmodus umschalten."
 
 #: src/GMWindow.cpp:253
-#, fuzzy
 msgid "Show Mini Player\tCtrl-M\tToggle Mini Player."
-msgstr "Fernbedienung anzeigen\tF11\tZeige ein kleines Wiedergabefenster an."
+msgstr "Mini-Player anzeigen\tF11\tZeige ein kleines Wiedergabefenster an."
 
 #: src/GMWindow.cpp:256
-#, fuzzy
 msgid "Show Presenter\t\tShow Presenter."
-msgstr "Browser anzeigen"
+msgstr "Zeige Cover-Presenter\t\tCover über den Bildschirm wandern lassen."
 
 #: src/GMWindow.cpp:260
 msgid "Find…\tCtrl-F\tShow search filter."
@@ -2068,7 +1995,7 @@
 
 #: src/GMWindow.cpp:263
 msgid "&About…"
-msgstr "Ü&ber"
+msgstr "Ü&ber…"
 
 #: src/GMWindow.cpp:265
 msgid "&Quit\tCtrl-Q\tQuit the application."
@@ -2079,50 +2006,44 @@
 msgstr "\tPause\tWiedergabe pausieren"
 
 #: src/GMWindow.cpp:951 src/GMWindow.cpp:979 src/GMWindow.cpp:985
-#, fuzzy
 msgid "Start playback."
-msgstr "Play\tCtrl-P\tStarte die Wiedergabe."
+msgstr "Wiedergabe starten."
 
 #: src/GMWindow.cpp:957 src/GMWindow.cpp:958
-#, fuzzy
 msgid "Start playback"
-msgstr "Play\tCtrl-P\tStarte die Wiedergabe."
+msgstr "Wiedergabe starten"
 
 #: src/GMWindow.cpp:965 src/GMWindow.cpp:972
-#, fuzzy
 msgid "Pause playback."
-msgstr "Pause\t\tDie Wiedergabe pausieren."
+msgstr "Wiedergabe pausieren."
 
 #: src/GMWindow.cpp:966
-#, fuzzy
 msgid "Pause playback"
-msgstr "Pause\t\tDie Wiedergabe pausieren."
+msgstr "Wiedergabe pausieren"
 
 #: src/GMWindow.cpp:971
 msgid "Pause"
-msgstr "Pause"
+msgstr "Pausieren"
 
 #: src/GMWindow.cpp:1221
 msgid "Play File or Stream"
-msgstr ""
+msgstr "Spiele eine Datei ab"
 
 #: src/GMWindow.cpp:1223
 msgid "&Play"
-msgstr "&Play"
+msgstr "&Abspielen"
 
 #: src/GMWindow.cpp:1228
 msgid "Please specify a file or url to play:"
-msgstr ""
+msgstr "Geben Sie den Dateipfad an:"
 
 #: src/GMWindow.cpp:1232
-#, fuzzy
 msgid "…"
-msgstr "Bearbeiten…"
+msgstr "…"
 
 #: src/GMWindow.cpp:1238
-#, fuzzy
 msgid "Select File"
-msgstr "Alles Auswählen"
+msgstr "Datei auswählen"
 
 #: src/GMWindow.cpp:1284
 msgid "Sleep Timer"
@@ -2153,14 +2074,12 @@
 msgstr "Minuten."
 
 #: src/GMWindow.cpp:1453
-#, fuzzy
 msgid "Show Album Cover"
-msgstr "Sortiere nach Erscheinungsjahr"
+msgstr "Zeige Albumcover"
 
 #: src/GMWindow.cpp:1454
-#, fuzzy
 msgid "Show Lyrics"
-msgstr "Beschriftungen anzeigen"
+msgstr "Zeige Liedtext"
 
 #: src/GMDatabaseSource.h:147
 msgid "Music Library"
@@ -2168,31 +2087,19 @@
 
 #: src/GMLocalSource.h:49
 msgid "File System"
-msgstr ""
+msgstr "Dateisystem"
 
 #: src/GMPodcastSource.h:113
 msgid "Feeds"
 msgstr ""
 
 #: src/GMSource.h:185
-#, fuzzy
 msgid "Albums"
-msgstr "Alben:"
+msgstr "Alben"
 
 #: src/GMStreamSource.h:55
-#, fuzzy
 msgid "Internet Radio"
-msgstr "Internetradiosender"
-
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr "&Ja"
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-msgid "&No"
-msgstr "&Nein"
+msgstr "Internetradio"
 
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 msgid "&Quit"
@@ -2211,14 +2118,12 @@
 msgstr "&Nicht Speichern"
 
 #: cfox/lib/FXMessageBox.cpp:149
-#, fuzzy
 msgid "Y&es to All"
-msgstr "&Entferne Alle"
+msgstr "J&a zu allen"
 
 #: cfox/lib/FXMessageBox.cpp:151
-#, fuzzy
 msgid "N&o to All"
-msgstr "&Entferne Alle"
+msgstr "N&ein zu allen"
 
 #: cfox/lib/FXColorSelector.cpp:222
 msgid "\tPick color"
@@ -2286,17 +2191,15 @@
 
 #: cfox/lib/FXDirSelector.cpp:141
 msgid "&Directory:"
-msgstr "Ver&zeichnis"
+msgstr "Ver&zeichnis:"
 
 #: cfox/lib/FXDirSelector.cpp:144
-#, fuzzy
 msgid "&Name"
-msgstr "Name"
+msgstr "&Name"
 
 #: cfox/lib/FXDirSelector.cpp:315 cfox/lib/FXFileSelector.cpp:720
-#, fuzzy
 msgid "folder"
-msgstr "Ordner:"
+msgstr "Ordner"
 
 #: cfox/lib/FXDirSelector.cpp:316 cfox/lib/FXFileSelector.cpp:721
 msgid "Create New Directory"
@@ -2375,9 +2278,8 @@
 msgstr "Lesezeichen erstellen"
 
 #: cfox/lib/FXDirSelector.cpp:429 cfox/lib/FXFileSelector.cpp:916
-#, fuzzy
 msgid "&Unset bookmark"
-msgstr "Lesezeichen erstellen"
+msgstr "Lesezeichen entfernen"
 
 #: cfox/lib/FXDirSelector.cpp:430
 msgid "Clear bookmarks"
@@ -2404,135 +2306,116 @@
 msgstr "Löschen..."
 
 #: cfox/lib/FXFileList.cpp:209
-#, fuzzy
 msgid "Name\tName"
-msgstr "Neuer Name"
+msgstr "Name\tName"
 
 #: cfox/lib/FXFileList.cpp:210
-#, fuzzy
 msgid "Type\tFile type"
-msgstr "Vorlage für Dateinamen"
+msgstr "Typ\tDateityp"
 
 #: cfox/lib/FXFileList.cpp:211
 msgid "Size\tFile size"
-msgstr ""
+msgstr "Größe\tDateigröße"
 
 #: cfox/lib/FXFileList.cpp:212
 msgid "Modified Date\tDate when last modified"
-msgstr ""
+msgstr "Änderungsdatum\tDatum der letzten Änderung"
 
 #: cfox/lib/FXFileList.cpp:213
-#, fuzzy
 msgid "User\tUser name"
-msgstr "Benutzername:"
+msgstr "Benutzer\tBenutzername"
 
 #: cfox/lib/FXFileList.cpp:214
 msgid "Group\tGroup name"
-msgstr ""
+msgstr "Gruppe\tGruppenname"
 
 #: cfox/lib/FXFileList.cpp:215
 msgid "Attributes\tFile attributes"
-msgstr ""
+msgstr "Berechtigungen\tDateiberechtigungen"
 
 #: cfox/lib/FXFileList.cpp:217
 msgid "Link\tSymbolic link to"
-msgstr ""
+msgstr "Verknüpfung\tSymbolische Verknüpfung zu"
 
 #: cfox/lib/FXFileList.cpp:583
-#, fuzzy
 msgid "Failed Deleting Files"
-msgstr "Dateien werden gelöscht"
+msgstr "Dateien konnte nicht gelöscht werden"
 
 #: cfox/lib/FXFileList.cpp:583
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to delete file: %s; continue?"
-msgstr ""
-"Die Datei:\n"
-"\n"
-"%s  konnte nicht gelöscht werden.\n"
-"\n"
-"Trotzdem fortfahren?"
+msgstr "Die Datei: %s; konnte nicht gelöscht werden. Trotzdem fortfahren?"
 
 #: cfox/lib/FXFileList.cpp:603 cfox/lib/FXFileList.cpp:632
-#, fuzzy
 msgid "Overwrite File"
-msgstr "Datei überschreiben?"
+msgstr "Datei überschreiben"
 
 #: cfox/lib/FXFileList.cpp:603 cfox/lib/FXFileList.cpp:632
-#, c-format
+#, fuzzy, c-format
 msgid "Overwrite existing file or directory: %s?"
-msgstr ""
+msgstr "Bestehende Datei oder Verzeichnis '%s' überschreiben?"
 
 #: cfox/lib/FXFileList.cpp:610
-#, fuzzy
 msgid "Failed Copying File"
-msgstr "Fehler während des Kopierens"
+msgstr "Dateien konnte nicht kopiert werden"
 
 #: cfox/lib/FXFileList.cpp:610 cfox/lib/FXFileList.cpp:639
 #, c-format
 msgid "Failed to overwrite file: %s; continue?"
-msgstr ""
+msgstr "Datei: %s; konnte nicht überschrieben werden. Trotzdem fortfahren?"
 
 #: cfox/lib/FXFileList.cpp:639
-#, fuzzy
 msgid "Failed Moving File"
-msgstr "Fehler während des Verschiebend"
+msgstr "Dateien konnte nicht verschoben werden"
 
 #: cfox/lib/FXFileList.cpp:647
-#, fuzzy
 msgid "Copying Files"
-msgstr "Kopiere Datei"
+msgstr "Kopiere Datein"
 
 #: cfox/lib/FXFileList.cpp:663
-#, fuzzy
 msgid ""
 "Copying file:\n"
 "\n"
-msgstr "Fehler während des Kopierens"
+msgstr ""
+"Kopiere Datei:\n"
+"\n"
 
 #: cfox/lib/FXFileList.cpp:714
-#, fuzzy
 msgid "Failed Linking File"
-msgstr "Fehler während der Erstellung der Verknüpfung"
+msgstr "Verknüpfung konnte nicht erstellt werden"
 
 #: cfox/lib/FXFileList.cpp:714
 #, c-format
 msgid "Failed to make symbolic link from: %s; continue?"
-msgstr ""
+msgstr "Die Datei: %s; konnte nicht verknüpft werden. Trotzdem fortfahren?"
 
 #: cfox/lib/FXFileList.cpp:731
-#, fuzzy
 msgid "Move Here"
-msgstr "Verschiebe Datei"
+msgstr "Hierhin verschieben"
 
 #: cfox/lib/FXFileList.cpp:732
-#, fuzzy
 msgid "Copy Here"
-msgstr "Kopiere Datei"
+msgstr "Hierhin kopieren"
 
 #: cfox/lib/FXFileList.cpp:733
-#, fuzzy
 msgid "Link Here"
-msgstr "Verknüpfung erstellen"
+msgstr "Hierhin verknüpfen"
 
 #: cfox/lib/FXFileList.cpp:735
-#, fuzzy
 msgid "Cancel"
 msgstr "A&bbrechen"
 
 #: cfox/lib/FXFileList.cpp:1432
-#, fuzzy
 msgid "Folder"
-msgstr "Ordner:"
+msgstr "Ordner"
 
 #: cfox/lib/FXFileList.cpp:1438
-#, fuzzy
 msgid "Application"
-msgstr "Ort"
+msgstr "Anwendung"
 
 #: cfox/lib/FXFileList.cpp:1444
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #: cfox/lib/FXFileSelector.cpp:721
 msgid "Create new directory with name: "
@@ -2549,7 +2432,7 @@
 msgstr "Das Verzeichnis %s kann nicht erstellt werden.\n"
 
 #: cfox/lib/FXFileSelector.cpp:756
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Rename file from:\n"
 "\n"
@@ -2557,24 +2440,22 @@
 "\n"
 "to: "
 msgstr ""
-"Verschiebe Datei von:\n"
+"Datei:\n"
 "\n"
 "%s\n"
 "\n"
-"nach: "
+"umbenennen in: "
 
 #: cfox/lib/FXFileSelector.cpp:757
-#, fuzzy
 msgid "Rename File"
-msgstr "Audio-Dateien umbenennen?"
+msgstr "Datei umbenennen"
 
 #: cfox/lib/FXFileSelector.cpp:763
-#, fuzzy
 msgid "Error Renaming File"
-msgstr "Fehler während der Erstellung der Verknüpfung"
+msgstr "Dateien konnte nicht umbenannt werden"
 
 #: cfox/lib/FXFileSelector.cpp:763
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to rename file:\n"
 "\n"
@@ -2584,7 +2465,7 @@
 msgstr ""
 "Konnte die Datei nicht von:\n"
 "\n"
-"%s  nach:  %s  verschieben.\n"
+"%s  in:  %s  umbenennen.\n"
 "\n"
 "Trotzdem fortfahren?"
 
@@ -2709,7 +2590,6 @@
 "Trotzdem fortfahren?"
 
 #: cfox/lib/FXFileSelector.cpp:917
-#, fuzzy
 msgid "Clear all bookmarks"
 msgstr "Lesezeichen leeren"
 
@@ -2730,7 +2610,6 @@
 msgstr "Ansicht"
 
 #: cfox/lib/FXFileSelector.cpp:951
-#, fuzzy
 msgid "Small icons"
 msgstr "Kleine Symbole"
 
@@ -2752,12 +2631,11 @@
 
 #: cfox/lib/FXFileSelector.cpp:959
 msgid "Preview images"
-msgstr "Vorschaubild"
+msgstr "Vorschaubilder"
 
 #: cfox/lib/FXFileSelector.cpp:961
-#, fuzzy
 msgid "Mini images"
-msgstr "Große Bilder"
+msgstr "Kleine Bilder"
 
 #: cfox/lib/FXFileSelector.cpp:962
 msgid "Normal images"
@@ -2772,33 +2650,30 @@
 msgstr "Große Bilder"
 
 #: cfox/lib/FXFileSelector.cpp:968
-#, fuzzy
 msgid "Rename..."
-msgstr "Um&benennen"
+msgstr "Umbenennen..."
 
 #: cfox/lib/FXReplaceDialog.cpp:129
 msgid "&Search\tSearch\tSearch for pattern."
-msgstr ""
+msgstr "&Suchen\tSuchen\tNach Muster suchen."
 
 #: cfox/lib/FXReplaceDialog.cpp:130
 msgid "&Replace\tReplace\tSearch and replace pattern."
-msgstr ""
+msgstr "&Ersetzen\tErstzen\tMuster Suchen und Ersetzen."
 
 #: cfox/lib/FXReplaceDialog.cpp:131
 msgid "Replace Sel\tReplace in selection\tReplace all in selection."
-msgstr ""
+msgstr "Auswahl erst.\tAuswahl ersetzen\tAlles in Auswahl ersetzen."
 
 #: cfox/lib/FXReplaceDialog.cpp:132
 msgid "Replace All\tReplace all\tReplace all."
-msgstr ""
+msgstr "Alles ersetzen\tAlles ersetzen\tAlles ersetzen."
 
 #: cfox/lib/FXReplaceDialog.cpp:138
-#, fuzzy
 msgid "Search &For:"
 msgstr "Such&en nach:"
 
 #: cfox/lib/FXReplaceDialog.cpp:146
-#, fuzzy
 msgid "Re&place With:"
 msgstr "Ersetzen &mit:"
 
@@ -2819,14 +2694,16 @@
 msgstr ""
 
 #: cfox/lib/FXReplaceDialog.cpp:159
-#, fuzzy
 msgid "Text to replace with."
-msgstr "Ersetzen &mit:"
+msgstr "Ersetzen mit."
 
 #: cfox/lib/FXStatusLine.cpp:83
 msgid "Ready."
 msgstr "Bereit."
 
+#~ msgid "Yes"
+#~ msgstr "Ja"
+
 #~ msgid "Exclude Filter\tFilter out directories and/or files based on pattern"
 #~ msgstr ""
 #~ "Ausfiltern\tFiltere Verzeichnisse und/oder Dateien nach einem Muster aus"

gogglesmm-1.2.1.tar.gz/po/es.mo -> gogglesmm-1.2.2.tar.gz/po/es.mo Changed

gogglesmm-1.2.1.tar.gz/po/es.po -> gogglesmm-1.2.2.tar.gz/po/es.po Changed

@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gogglesmm 0.10.x\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
 "PO-Revision-Date: 2018-06-28 08:24+0100\n"
 "Last-Translator: micrococo\n"
 "Language-Team: Spanish\n"
@@ -76,8 +76,7 @@
 msgid "Move Down"
 msgstr "Bajar"
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
 msgid "No"
 msgstr "N.º"
@@ -185,6 +184,10 @@
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr "Copiar\tCtrl-C\tCopiar pista(s) al portapapeles."
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr ""
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr "Eliminar…\tSupr\tEliminar pista(s) de la biblioteca."
@@ -563,8 +566,16 @@
 msgstr "¿Seguro que quiere borrar el filtro?"
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-msgid "Yes"
-msgstr "Sí"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
+msgstr "&Sí"
+
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
+msgstr "&No"
 
 #: src/GMFilterSource.cpp:207
 msgid "Edit"
@@ -938,11 +949,11 @@
 "para PNG en la biblioteca FOX. Si has compilado FOX por ti mismo, lo más\n"
 "probable es que encabezados de libpng no estén instalados en el sistema."
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr "Error de Last.FM"
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr "Error de reproducción"
 
@@ -2076,16 +2087,6 @@
 msgid "Internet Radio"
 msgstr "Radio de Internet"
 
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr "&Sí"
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-msgid "&No"
-msgstr "&No"
-
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 msgid "&Quit"
 msgstr "&Salir"
@@ -2705,6 +2706,9 @@
 msgid "Ready."
 msgstr "Listo."
 
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
 #~ msgid "Exclude Filter\tFilter out directories and/or files based on pattern"
 #~ msgstr ""
 #~ "Filtro de exclusión\tFiltra directorios y/o archivos según un patrón"

gogglesmm-1.2.1.tar.gz/po/fr.mo -> gogglesmm-1.2.2.tar.gz/po/fr.mo Changed

gogglesmm-1.2.1.tar.gz/po/fr.po -> gogglesmm-1.2.2.tar.gz/po/fr.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Goggles Music Manager\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Erwan Inyzant <mysthr21@gmail.com>\n"
 "Language-Team: \n"
@@ -73,8 +73,7 @@
 msgid "Move Down"
 msgstr "Vers le Bas"
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
 #, fuzzy
 msgid "No"
@@ -189,6 +188,10 @@
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr "Copier\tCtrl-C\tCopier le(s) morceau(x) dans le presse papier."
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr ""
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr "Supprimer...\tSuppr\tSupprimer le(s) morceau(x) de la bibliothèque."
@@ -589,10 +592,17 @@
 "%s"
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-#, fuzzy
-msgid "Yes"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
 msgstr "&Oui"
 
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
+msgstr "&Non"
+
 #: src/GMFilterSource.cpp:207
 #, fuzzy
 msgid "Edit"
@@ -996,11 +1006,11 @@
 "ne\n"
 "devait pas être installé sur votre système."
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr "Erreur Last.FM"
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr "Erreur de Lecture"
 
@@ -2187,16 +2197,6 @@
 msgid "Internet Radio"
 msgstr "Radio Internet"
 
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr "&Oui"
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-msgid "&No"
-msgstr "&Non"
-
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 msgid "&Quit"
 msgstr "&Quitter"
@@ -2829,6 +2829,10 @@
 msgid "Ready."
 msgstr "Prêts."
 
+#, fuzzy
+#~ msgid "Yes"
+#~ msgstr "&Oui"
+
 #~ msgid "Exclude Filter\tFilter out directories and/or files based on pattern"
 #~ msgstr ""
 #~ "Filtre d'exclusion\tPermet de filtrer les répertoires et/ou les fichiers "

gogglesmm-1.2.1.tar.gz/po/gogglesmm.pot -> gogglesmm-1.2.2.tar.gz/po/gogglesmm.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gogglesmm 1.0.0\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,8 +75,7 @@
 msgid "Move Down"
 msgstr ""
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
 msgid "No"
 msgstr ""
@@ -184,6 +183,10 @@
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr ""
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr ""
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr ""
@@ -556,7 +559,15 @@
 msgstr ""
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-msgid "Yes"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
+msgstr ""
+
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
 msgstr ""
 
 #: src/GMFilterSource.cpp:207
@@ -907,11 +918,11 @@
 "likely the libpng header files were not installed on your system."
 msgstr ""
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr ""
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr ""
 
@@ -1992,16 +2003,6 @@
 msgid "Internet Radio"
 msgstr ""
 
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr ""
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-msgid "&No"
-msgstr ""
-
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 msgid "&Quit"
 msgstr ""

gogglesmm-1.2.1.tar.gz/po/hu.mo -> gogglesmm-1.2.2.tar.gz/po/hu.mo Changed

gogglesmm-1.2.1.tar.gz/po/hu.po -> gogglesmm-1.2.2.tar.gz/po/hu.po Changed

@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
 "PO-Revision-Date: 2010-12-14 15:48+0100\n"
 "Last-Translator: Sipos Sándor <ss1978@lajt.hu>\n"
 "Language-Team:  <hu@li.org>\n"
@@ -76,8 +76,7 @@
 msgid "Move Down"
 msgstr "Lefelé mozgat"
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
 msgid "No"
 msgstr "Nem"
@@ -186,6 +185,10 @@
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr "Másolás\tCtrl-C\tSzám(ok) másolása a vágólapra."
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr ""
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr "Törlés…\tDel\tA szám(ok) eltávolítása a gyűjteményből."
@@ -585,8 +588,16 @@
 "%s"
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-msgid "Yes"
-msgstr "Igen"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
+msgstr "&Igen"
+
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
+msgstr "&Nem"
 
 #: src/GMFilterSource.cpp:207
 #, fuzzy
@@ -973,11 +984,11 @@
 "Ha a FOX könyvtárat Ön fordította, ellenőrizze, hogy a libpng fejlesztői "
 "fájlok telepítve legyenek a FOX lefordításakor."
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr "Last.FM hiba."
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr "Lejátszási hiba"
 
@@ -2152,16 +2163,6 @@
 msgid "Internet Radio"
 msgstr "Internet Rádió"
 
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr "&Igen"
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-msgid "&No"
-msgstr "&Nem"
-
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 msgid "&Quit"
 msgstr "&Kilépés"
@@ -2797,6 +2798,9 @@
 msgid "Ready."
 msgstr "Ok."
 
+#~ msgid "Yes"
+#~ msgstr "Igen"
+
 #~ msgid "Exclude Filter\tFilter out directories and/or files based on pattern"
 #~ msgstr ""
 #~ "Kizáró szűrő\tHagyja ki azokat a fájlokat/könyvtárakat amelyre teljesül a "

gogglesmm-1.2.2.tar.gz/po/ko.mo Added

gogglesmm-1.2.2.tar.gz/po/ko.po Added

@@ -0,0 +1,2658 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Sander Jansen
+# This file is distributed under the same license as the gogglesmm package.
+# JungHee Lee <daemul72@gmail.com>,  2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gogglesmm 1.0.0\n"
+"Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
+"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"PO-Revision-Date: 2020-10-04 09:37+0900\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.1\n"
+"Last-Translator: JungHee Lee <daemul72@gmail.com>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: ko\n"
+
+#: src/GMAbout.cpp:115
+msgid "&Homepage"
+msgstr "홈페이지(&H)"
+
+#: src/GMAbout.cpp:116
+msgid "&Report Issue"
+msgstr "이슈 보고(&R)"
+
+#: src/GMAbout.cpp:117 src/GMPreferencesDialog.cpp:688
+#: src/GMTrackEditor.cpp:401 src/GMTrackEditor.cpp:449
+#: src/GMTrackEditor.cpp:453 cfox/lib/FXReplaceDialog.cpp:133
+msgid "&Close"
+msgstr "닫기(&C)"
+
+#: src/GMAbout.cpp:123 src/GMAbout.cpp:150 src/GMPreferencesDialog.cpp:970
+#: src/GMPreferencesDialog.cpp:975 src/GMWindow.cpp:1176 src/GMWindow.cpp:1183
+msgid "Unable to launch webbrowser"
+msgstr "웹브라우저를 시작할 수 없음"
+
+#: src/GMColumnDialog.cpp:197
+msgid "Configure Columns"
+msgstr "열 구성하기"
+
+#: src/GMColumnDialog.cpp:200 cfox/lib/FXColorSelector.cpp:175
+msgid "&Accept"
+msgstr "수락(&A)"
+
+#: src/GMColumnDialog.cpp:201 src/GMDatabaseSource.cpp:1032
+#: src/GMDatabaseSource.cpp:1205 src/GMDatabaseSource.cpp:1307
+#: src/GMDatabaseSource.cpp:1547 src/GMDatabaseSource.cpp:1628
+#: src/GMFilterEditor.cpp:642 src/GMImportDialog.cpp:223
+#: src/GMImportDialog.cpp:583 src/GMPlayListSource.cpp:284
+#: src/GMPlayListSource.cpp:365 src/GMPodcastSource.cpp:433
+#: src/GMPodcastSource.cpp:1647 src/GMStreamSource.cpp:148
+#: src/GMStreamSource.cpp:185 src/GMStreamSource.cpp:246
+#: src/GMTrackEditor.cpp:292 src/GMWindow.cpp:1224 src/GMWindow.cpp:1288
+#: cfox/lib/FXMessageBox.cpp:108 cfox/lib/FXMessageBox.cpp:119
+#: cfox/lib/FXMessageBox.cpp:124 cfox/lib/FXMessageBox.cpp:130
+#: cfox/lib/FXMessageBox.cpp:136 cfox/lib/FXMessageBox.cpp:143
+#: cfox/lib/FXMessageBox.cpp:152 cfox/lib/FXColorSelector.cpp:176
+#: cfox/lib/FXDirSelector.cpp:139 cfox/lib/FXFileSelector.cpp:221
+msgid "&Cancel"
+msgstr "취소(&C)"
+
+#: src/GMColumnDialog.cpp:205
+msgid ""
+"Choose the order of information to appear\n"
+"in the track list."
+msgstr "곡 목록에 표시할 정보의 순서를 선택합니다."
+
+#: src/GMColumnDialog.cpp:211
+msgid "Move Up"
+msgstr "위로 이동"
+
+#: src/GMColumnDialog.cpp:212
+msgid "Move Down"
+msgstr "아래로 이동"
+
+#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
+#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMStreamSource.cpp:58
+msgid "No"
+msgstr "No"
+
+#: src/GMDatabaseSource.cpp:227 src/GMPlayQueue.cpp:68
+msgid "Queue"
+msgstr "대기열"
+
+#: src/GMDatabaseSource.cpp:228 src/GMFilterEditor.cpp:44
+#: src/GMPlayQueue.cpp:69 src/GMTrackView.cpp:262
+msgid "Artist"
+msgstr "아티스트"
+
+#: src/GMDatabaseSource.cpp:229 src/GMFilterEditor.cpp:41
+#: src/GMPlayQueue.cpp:70 src/GMPodcastSource.cpp:1316 src/GMTrackView.cpp:261
+msgid "Title"
+msgstr "제목"
+
+#: src/GMDatabaseSource.cpp:230 src/GMFilterEditor.cpp:43
+#: src/GMPlayQueue.cpp:73
+msgid "Album Artist"
+msgstr "앨범 아티스트"
+
+#: src/GMDatabaseSource.cpp:231 src/GMFilterEditor.cpp:42
+#: src/GMPlayQueue.cpp:71 src/GMPreferencesDialog.cpp:645
+#: src/GMTrackView.cpp:263
+msgid "Album"
+msgstr "앨범"
+
+#: src/GMDatabaseSource.cpp:232 src/GMPlayQueue.cpp:74
+msgid "Disc"
+msgstr "디스크"
+
+#: src/GMDatabaseSource.cpp:234 src/GMFilterEditor.cpp:48
+#: src/GMPlayQueue.cpp:72
+msgid "Year"
+msgstr "연도"
+
+#: src/GMDatabaseSource.cpp:235 src/GMFilterEditor.cpp:49
+#: src/GMPlayQueue.cpp:75 src/GMPodcastSource.cpp:1317
+#: cfox/lib/FXFileSelector.cpp:942
+msgid "Time"
+msgstr "시간"
+
+#: src/GMDatabaseSource.cpp:236 src/GMFilterEditor.cpp:53
+#: src/GMPlayQueue.cpp:76
+msgid "Play Count"
+msgstr "재생 횟수"
+
+#: src/GMDatabaseSource.cpp:237 src/GMPlayQueue.cpp:77
+msgid "Play Date"
+msgstr "재생 날짜"
+
+#: src/GMDatabaseSource.cpp:238 src/GMFilterEditor.cpp:57
+#: src/GMImportDialog.cpp:499 src/GMLocalSource.cpp:56 src/GMPlayQueue.cpp:78
+#: src/GMTrackEditor.cpp:500
+msgid "Path"
+msgstr "경로"
+
+#: src/GMDatabaseSource.cpp:239 src/GMFilterEditor.cpp:56
+#: src/GMPlayQueue.cpp:79
+msgid "File Type"
+msgstr "파일 유형"
+
+#: src/GMDatabaseSource.cpp:240 src/GMPlayQueue.cpp:80
+msgid "Format"
+msgstr "형식"
+
+#: src/GMDatabaseSource.cpp:241 src/GMFilterEditor.cpp:45
+#: src/GMPlayQueue.cpp:81
+msgid "Composer"
+msgstr "작곡가"
+
+#: src/GMDatabaseSource.cpp:242 src/GMFilterEditor.cpp:46
+#: src/GMPlayQueue.cpp:82
+msgid "Conductor"
+msgstr "지휘자"
+
+#: src/GMDatabaseSource.cpp:243 src/GMFilterEditor.cpp:50
+#: src/GMPlayQueue.cpp:83
+msgid "Rating"
+msgstr "별점"
+
+#: src/GMDatabaseSource.cpp:323 src/GMDatabaseSource.cpp:330
+msgid "Copy\tCtrl-C\tCopy associated tracks to the clipboard."
+msgstr "복사\tCtrl-C\t관련 곡을 클립보드에 복사하기."
+
+#: src/GMDatabaseSource.cpp:325 src/GMDatabaseSource.cpp:333
+msgid "Remove…\tDel\tRemove associated tracks from library."
+msgstr "제거…\t삭제\t라이브러리에서 관련 곡 제거하기."
+
+#: src/GMDatabaseSource.cpp:331 src/GMDatabaseSource.cpp:346
+msgid "Find Cover…\t\tFind Cover with Google Image Search"
+msgstr "표지 찾기…\t\t구글 이미지 검색으로 표지 찾기"
+
+#: src/GMDatabaseSource.cpp:338 src/GMPlayQueue.cpp:142
+msgid "Edit…\tF2\tEdit Track Information."
+msgstr "편집…\tF2\t곡 정보 편집하기."
+
+#: src/GMDatabaseSource.cpp:339
+msgid "Set Cover…\t\t"
+msgstr "표지 넣기…\t\t"
+
+#: src/GMDatabaseSource.cpp:341 src/GMPlayQueue.cpp:143
+msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
+msgstr "복사\tCtrl-C\t곡을 클립보드로 복사하기."
+
+#: src/GMDatabaseSource.cpp:350
+msgid "Remove…\tDel\tRemove track(s) from library."
+msgstr "제거…\tDel\t라이브러리에서 곡 제거하기."
+
+#: src/GMDatabaseSource.cpp:356 src/GMPlayListSource.cpp:184
+msgid "Export As…"
+msgstr "다른 이름으로 내보내기…"
+
+#: src/GMDatabaseSource.cpp:358
+msgid "Remove Folder…\t\tRemove tracks in folder from library"
+msgstr "폴더 제거…\t\t라이브러리에서 폴더의 곡 제거"
+
+#: src/GMDatabaseSource.cpp:359
+msgid "Remove All Tracks\t\tRemove all tracks from the library"
+msgstr "모든 곡 제거\t\t라이브러리에서 모든 곡 제거"
+
+#: src/GMDatabaseSource.cpp:365
+msgid "Import Folder…\tCtrl-O\tImport Music from folder into Library"
+msgstr "폴더 가져오기…\tCtrl-O\t폴더에서 라이브러리로 음악 가져오기"
+
+#: src/GMDatabaseSource.cpp:366
+msgid "Sync Folder…\t\tSynchronize Folder with Music in Library"
+msgstr "폴더 동기화…\t\t라이브러리의 음악과 폴더 동기화"
+
+#: src/GMDatabaseSource.cpp:368
+msgid "Play File or Stream…\t\tPlay File or Stream"
+msgstr "파일 또는 스트림 재생…\t\t파일 또는 스트림 재생"
+
+#: src/GMDatabaseSource.cpp:370
+msgid "New Filter…\t\tCreate a new filter"
+msgstr "새 필터…\t\t새 필터 생성"
+
+#: src/GMDatabaseSource.cpp:371
+msgid "New Playlist…\t\tCreate a new playlist"
+msgstr "새 재생목록…\t\t새 재생목록 생성"
+
+#: src/GMDatabaseSource.cpp:372
+msgid "Import Playlist…\t\tImport existing playlist"
+msgstr "재생목록 가져오기…\t\t기존 재생목록 가져 오기"
+
+#: src/GMDatabaseSource.cpp:717
+#, c-format
+msgid "All %d Albums"
+msgstr "앨범 모두 %d개"
+
+#: src/GMDatabaseSource.cpp:1028
+msgid "Remove Audio Files?"
+msgstr "오디오 파일을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1029
+msgid "Remove Audio Files..."
+msgstr "오디오 파일 제거..."
+
+#: src/GMDatabaseSource.cpp:1029
+msgid "The following audio files are going to be removed"
+msgstr "다음과 같은 오디오 파일이 제거될 예정입니다"
+
+#: src/GMDatabaseSource.cpp:1031 src/GMDatabaseSource.cpp:1306
+#: src/GMImportDialog.cpp:580 src/GMPlayListSource.cpp:283
+#: src/GMStreamSource.cpp:245
+msgid "&Remove"
+msgstr "제거(&R)"
+
+#: src/GMDatabaseSource.cpp:1059
+msgid "Export Main Library"
+msgstr "기본 라이브러리 내보내기"
+
+#: src/GMDatabaseSource.cpp:1061
+msgid "Export Playlist"
+msgstr "재생목록 내보내기"
+
+#: src/GMDatabaseSource.cpp:1072
+msgid "Overwrite File?"
+msgstr "파일을 덮어쓰시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1072
+msgid "File already exists. Would you like to overwrite it?"
+msgstr "존재하는 파일입니다. 덮어쓰시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1204 src/GMImportDialog.cpp:215
+#: cfox/lib/FXMessageBox.cpp:103 cfox/lib/FXMessageBox.cpp:107
+#: cfox/lib/FXDirSelector.cpp:138 cfox/lib/FXFileSelector.cpp:213
+msgid "&OK"
+msgstr "확인(&O)"
+
+#: src/GMDatabaseSource.cpp:1217
+msgid "Dimensions:"
+msgstr "공간 크기:"
+
+#: src/GMDatabaseSource.cpp:1220
+msgid "Size:"
+msgstr "크기:"
+
+#: src/GMDatabaseSource.cpp:1223
+msgid "Cover Type:"
+msgstr "표지 유형:"
+
+#: src/GMDatabaseSource.cpp:1231
+msgid "Description:"
+msgstr "설명:"
+
+#: src/GMDatabaseSource.cpp:1234
+msgid "Tag Mode:"
+msgstr "태그 모드:"
+
+#: src/GMDatabaseSource.cpp:1284 src/GMPlayListSource.cpp:268
+msgid "Remove Artist?"
+msgstr "아티스트를 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1285
+msgid "Remove tracks from artist from library?"
+msgstr "라이브러리에서 아티스트의 곡을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1289 src/GMPlayListSource.cpp:271
+msgid "Remove Album?"
+msgstr "앨범을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1290
+msgid "Remove tracks from album from library?"
+msgstr "라이브러리에서 앨범의 곡을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1294 src/GMPlayListSource.cpp:274
+msgid "Remove Track(s)?"
+msgstr "곡을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1295
+msgid "Remove track(s) from library?"
+msgstr "라이브러리에서 곡을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1310 src/GMPlayListSource.cpp:288
+msgid "Remove tracks from disk"
+msgstr "디스크에서 곡 제거"
+
+#: src/GMDatabaseSource.cpp:1322 src/GMDatabaseSource.cpp:1326
+#: src/GMDatabaseSource.cpp:1335 src/GMStreamSource.cpp:255
+msgid "Library Error"
+msgstr "라이브러리 오류"
+
+#: src/GMDatabaseSource.cpp:1322
+msgid "Unable to remove artist from the library"
+msgstr "라이브러리에서 아티스트를 제거할 수 없음"
+
+#: src/GMDatabaseSource.cpp:1326
+msgid "Unable to remove album from the library"
+msgstr "라이브러리에서 앨범을 제거할 수 없음"
+
+#: src/GMDatabaseSource.cpp:1335
+msgid "Unable to remove track from the library."
+msgstr "라이브러리에서 곡을 제거할 수 없습니다."
+
+#: src/GMDatabaseSource.cpp:1543 src/GMDatabaseSource.cpp:1544
+msgid "Create Playlist"
+msgstr "재생목록 생성"
+
+#: src/GMDatabaseSource.cpp:1544
+msgid "Specify name of the new playlist"
+msgstr "새 재생 목록의 이름 지정하기"
+
+#: src/GMDatabaseSource.cpp:1546
+msgid "&Create"
+msgstr "생성(&C)"
+
+#: src/GMDatabaseSource.cpp:1551 src/GMPlayListSource.cpp:369
+#: cfox/lib/FXFileSelector.cpp:939
+msgid "Name"
+msgstr "이름"
+
+#: src/GMDatabaseSource.cpp:1553
+msgid "New Playlist"
+msgstr "새 재생목록"
+
+#: src/GMDatabaseSource.cpp:1624 src/GMDatabaseSource.cpp:1625
+msgid "Clear Music Library?"
+msgstr "음악 라이브러리를 지우시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1625
+msgid "Remove all tracks from the music library?"
+msgstr "음악 라이브러리에서 모든 곡을 제거하시겠습니까?"
+
+#: src/GMDatabaseSource.cpp:1627
+msgid "&Remove All"
+msgstr "모두 제거(&R)"
+
+#: src/GMDatabaseSource.cpp:1631
+msgid "Keep play lists"
+msgstr "재생 목록 유지"
+
+#: src/GMFilterEditor.cpp:47 src/GMImportDialog.cpp:498
+#: src/GMStreamSource.cpp:156 src/GMTrackView.cpp:264
+msgid "Tag"
+msgstr "태그"
+
+#: src/GMFilterEditor.cpp:51
+msgid "Track Number"
+msgstr "곡 번호"
+
+#: src/GMFilterEditor.cpp:52
+msgid "Disc Number"
+msgstr "디스크 번호"
+
+#: src/GMFilterEditor.cpp:54
+msgid "Last Played"
+msgstr "마지막 재생"
+
+#: src/GMFilterEditor.cpp:55
+msgid "Last Updated"
+msgstr "마지막 업데이트"
+
+#: src/GMFilterEditor.cpp:58 src/GMTrackEditor.cpp:515
+msgid "Channels"
+msgstr "채널"
+
+#: src/GMFilterEditor.cpp:59 src/GMStreamSource.cpp:60
+#: src/GMTrackEditor.cpp:775
+msgid "Bit Rate"
+msgstr "비트 레이트"
+
+#: src/GMFilterEditor.cpp:60 src/GMTrackEditor.cpp:512
+msgid "Sample Rate"
+msgstr "샘플 레이트"
+
+#: src/GMFilterEditor.cpp:61 src/GMTrackEditor.cpp:771
+msgid "Sample Size"
+msgstr "샘플 크기"
+
+#: src/GMFilterEditor.cpp:62
+msgid "Lyrics"
+msgstr "가사"
+
+#: src/GMFilterEditor.cpp:193
+msgid "\tRemove Rule\tRemove Rule"
+msgstr "\t규칙 제거\t규칙 제거"
+
+#: src/GMFilterEditor.cpp:208
+msgid "Minutes"
+msgstr "분"
+
+#: src/GMFilterEditor.cpp:209
+msgid "Hours"
+msgstr "시간"
+
+#: src/GMFilterEditor.cpp:210
+msgid "Days"
+msgstr "일"
+
+#: src/GMFilterEditor.cpp:211
+msgid "Weeks"
+msgstr "주"
+
+#: src/GMFilterEditor.cpp:386
+msgid "contains"
+msgstr "포함"
+
+#: src/GMFilterEditor.cpp:387
+msgid "does not contain"
+msgstr "포함하지 않음"
+
+#: src/GMFilterEditor.cpp:388 src/GMFilterEditor.cpp:410
+#: src/GMFilterEditor.cpp:420
+msgid "equals"
+msgstr "같음"
+
+#: src/GMFilterEditor.cpp:389 src/GMFilterEditor.cpp:411
+#: src/GMFilterEditor.cpp:421
+msgid "not equal to"
+msgstr "같지 않음"
+
+#: src/GMFilterEditor.cpp:390
+msgid "starts with"
+msgstr "시작:"
+
+#: src/GMFilterEditor.cpp:391
+msgid "ends with"
+msgstr "끝:"
+
+#: src/GMFilterEditor.cpp:392
+msgid "matches"
+msgstr "일치"
+
+#: src/GMFilterEditor.cpp:397
+msgid "in"
+msgstr ""
+
+#: src/GMFilterEditor.cpp:398
+msgid "not in"
+msgstr ""
+
+#: src/GMFilterEditor.cpp:399
+msgid "before"
+msgstr ""
+
+#: src/GMFilterEditor.cpp:400
+msgid "after"
+msgstr ""
+
+#: src/GMFilterEditor.cpp:404
+msgid "in the last"
+msgstr "마지막에"
+
+#: src/GMFilterEditor.cpp:405
+msgid "not in the last"
+msgstr "마지막에 있지 않음"
+
+#: src/GMFilterEditor.cpp:412
+msgid "at least"
+msgstr "적어도"
+
+#: src/GMFilterEditor.cpp:413
+msgid "at most"
+msgstr "기껏해야"
+
+#: src/GMFilterEditor.cpp:596
+msgid "Ascending"
+msgstr "오름차순"
+
+#: src/GMFilterEditor.cpp:597
+msgid "Descending"
+msgstr "내림차순"
+
+#: src/GMFilterEditor.cpp:600
+msgid "\tRemove Column\tRemove Column"
+msgstr "\t열 제거\t열 제거"
+
+#: src/GMFilterEditor.cpp:641
+msgid "&Update"
+msgstr "업데이트(&U)"
+
+#: src/GMFilterEditor.cpp:649
+msgid "Name:"
+msgstr "이름:"
+
+#: src/GMFilterEditor.cpp:653
+msgid "Match:"
+msgstr "일치:"
+
+#: src/GMFilterEditor.cpp:655
+msgid "All"
+msgstr "모두"
+
+#: src/GMFilterEditor.cpp:656
+msgid "Any"
+msgstr "아무거나"
+
+#: src/GMFilterEditor.cpp:660
+msgid "Filter:"
+msgstr "필터:"
+
+#: src/GMFilterEditor.cpp:669
+msgid "\tAdd Filter\tAdd Filter"
+msgstr "\t필터 추가\t필터 추가"
+
+#: src/GMFilterEditor.cpp:672
+msgid "Limit:"
+msgstr "제한:"
+
+#: src/GMFilterEditor.cpp:676
+msgid "tracks sorted by:"
+msgstr "곡 정렬 기준:"
+
+#: src/GMFilterEditor.cpp:683
+msgid "\tAdd Column\tAdd Column"
+msgstr "\t열 추가\t열 추가"
+
+#: src/GMFilterSource.cpp:197 src/GMFilterSource.cpp:208
+msgid "Remove Filter"
+msgstr "필터 제거"
+
+#: src/GMFilterSource.cpp:197
+msgid "Are you sure you want to remove the filter?"
+msgstr "필터를 제거 하시겠습니까?"
+
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+msgid "Yes"
+msgstr "예"
+
+#: src/GMFilterSource.cpp:207
+msgid "Edit"
+msgstr "편집"
+
+#: src/GMFontDialog.cpp:189
+msgid "Ultra Condensed"
+msgstr "매우 압축됨"
+
+#: src/GMFontDialog.cpp:190
+msgid "Extra Condensed"
+msgstr "추가 압축됨"
+
+#: src/GMFontDialog.cpp:191
+msgid "Condensed"
+msgstr "압축됨"
+
+#: src/GMFontDialog.cpp:192
+msgid "Semi Condensed"
+msgstr "절반 압축됨"
+
+#: src/GMFontDialog.cpp:194
+msgid "Semi Expanded"
+msgstr "절반 확장됨"
+
+#: src/GMFontDialog.cpp:195
+msgid "Expanded"
+msgstr "확장됨"
+
+#: src/GMFontDialog.cpp:196
+msgid "Extra Expanded"
+msgstr "추가 확장됨"
+
+#: src/GMFontDialog.cpp:197
+msgid "Ultra Expanded"
+msgstr "매우 확장됨"
+
+#: src/GMFontDialog.cpp:204 src/GMPreferencesDialog.cpp:1425
+msgid "Thin"
+msgstr "얇게"
+
+#: src/GMFontDialog.cpp:205 src/GMPreferencesDialog.cpp:1426
+msgid "Extra Light"
+msgstr "매우 가늘게"
+
+#: src/GMFontDialog.cpp:206 src/GMPreferencesDialog.cpp:1427
+msgid "Light"
+msgstr "가늘게"
+
+#: src/GMFontDialog.cpp:208 src/GMPreferencesDialog.cpp:1429
+msgid "Medium"
+msgstr "보통"
+
+#: src/GMFontDialog.cpp:209 src/GMPreferencesDialog.cpp:1430
+msgid "Demibold"
+msgstr "약간 굵게"
+
+#: src/GMFontDialog.cpp:210 src/GMPreferencesDialog.cpp:1431
+msgid "Bold"
+msgstr "굵게"
+
+#: src/GMFontDialog.cpp:211 src/GMPreferencesDialog.cpp:1432
+msgid "Extra Bold"
+msgstr "매우 굵게"
+
+#: src/GMFontDialog.cpp:212 src/GMPreferencesDialog.cpp:1433
+msgid "Heavy"
+msgstr "두껍게"
+
+#: src/GMFontDialog.cpp:219
+msgid "Reverse Oblique"
+msgstr "왼쪽으로 기울이기"
+
+#: src/GMFontDialog.cpp:220
+msgid "Reverse Italic"
+msgstr "역방향 기울임꼴"
+
+#: src/GMFontDialog.cpp:222
+msgid "Italic"
+msgstr "기울임꼴"
+
+#: src/GMFontDialog.cpp:223
+msgid "Oblique"
+msgstr "기울이기"
+
+#: src/GMFontDialog.cpp:245
+msgid "Normal"
+msgstr "보통"
+
+#: src/GMImportDialog.cpp:163
+msgid "&Folder:"
+msgstr "폴더(&F)"
+
+#: src/GMImportDialog.cpp:213 cfox/lib/FXFileSelector.cpp:211
+msgid "&File Name:"
+msgstr "파일 이름(&F)"
+
+#: src/GMImportDialog.cpp:218 cfox/lib/FXFileSelector.cpp:216
+msgid "File F&ilter:"
+msgstr "파일 필터(&I)"
+
+#: src/GMImportDialog.cpp:222 cfox/lib/FXFileSelector.cpp:220
+msgid "Read Only"
+msgstr "읽기 전용"
+
+#: src/GMImportDialog.cpp:229 cfox/lib/FXFileSelector.cpp:226
+msgid "Directory:"
+msgstr "디렉토리:"
+
+#: src/GMImportDialog.cpp:237 cfox/lib/FXFileSelector.cpp:250
+msgid "&Set bookmark\t\tBookmark current directory."
+msgstr "북마크 지정(&S)\t\t북마크 현재 디렉토리."
+
+#: src/GMImportDialog.cpp:238 cfox/lib/FXFileSelector.cpp:251
+msgid "&Unset bookmark\t\tRemove current directory bookmark."
+msgstr "북마크 지정해제(&U)\t\t현재 디렉토리 북마크 제거."
+
+#: src/GMImportDialog.cpp:239 cfox/lib/FXFileSelector.cpp:252
+msgid "&Clear all bookmarks\t\tClear all bookmarks."
+msgstr "북마크 모두 지우기(&C)\t\t북마크 모두 지우기."
+
+#: src/GMImportDialog.cpp:259 cfox/lib/FXFileSelector.cpp:272
+msgid "\tGo up one directory\tMove up to higher directory."
+msgstr "\t디렉토리 하나 위로 이동\t상위 디렉토리로 이동하기."
+
+#: src/GMImportDialog.cpp:260 cfox/lib/FXFileSelector.cpp:273
+msgid "\tGo to home directory\tBack to home directory."
+msgstr "\t홈 디렉토리로 가기\t홈 디렉토리로 돌아가기."
+
+#: src/GMImportDialog.cpp:261 cfox/lib/FXFileSelector.cpp:274
+msgid "\tGo to work directory\tBack to working directory."
+msgstr "\t작업 디렉토리로 가기\t작업중인 디렉토리로 돌아가기."
+
+#: src/GMImportDialog.cpp:262 cfox/lib/FXFileSelector.cpp:275
+msgid "\tBookmarks\tVisit bookmarked directories."
+msgstr "\t북마크\t북마크된 디렉토리 방문하기."
+
+#: src/GMImportDialog.cpp:265 cfox/lib/FXFileSelector.cpp:278
+msgid "\tCreate new directory\tCreate new directory."
+msgstr "\t새 디렉토리 생성\t새 디렉토리 만들기."
+
+#: src/GMImportDialog.cpp:266 cfox/lib/FXFileSelector.cpp:279
+msgid "\tShow list\tDisplay directory with small icons."
+msgstr "\t목록 표시\t작은 아이콘으로 디렉토리 보여주기."
+
+#: src/GMImportDialog.cpp:267 cfox/lib/FXFileSelector.cpp:280
+msgid "\tShow icons\tDisplay directory with big icons."
+msgstr "\t아이콘 표시\t큰 아이콘으로 디렉토리 보여주기."
+
+#: src/GMImportDialog.cpp:268 cfox/lib/FXFileSelector.cpp:281
+msgid "\tShow details\tDisplay detailed directory listing."
+msgstr "\t세부사항 표시\t상세한 디렉토리 목록 보여주기."
+
+#: src/GMImportDialog.cpp:269 cfox/lib/FXFileSelector.cpp:282
+msgid "\tShow hidden files\tShow hidden files and directories."
+msgstr "\t숨김 파일 표시\t숨김 파일 및 디렉터리 표시하기."
+
+#: src/GMImportDialog.cpp:269 cfox/lib/FXFileSelector.cpp:282
+msgid "\tHide Hidden Files\tHide hidden files and directories."
+msgstr "\t숨김 파일 숨기기\t숨김 파일 및 디렉토리 숨기기."
+
+#: src/GMImportDialog.cpp:295 cfox/lib/FXFileSelector.cpp:308
+#: cfox/lib/FXFileSelector.cpp:1113
+msgid "All Files (*)"
+msgstr "모든 파일 (*)"
+
+#: src/GMImportDialog.cpp:369 src/GMImportDialog.cpp:379
+msgid "&Options:"
+msgstr "옵션(&O)"
+
+#: src/GMImportDialog.cpp:399
+msgid "Remove Folder"
+msgstr "폴더 제거"
+
+#: src/GMImportDialog.cpp:401
+msgid "Synchronize Folder"
+msgstr "폴더 동기화"
+
+#: src/GMImportDialog.cpp:403
+msgid "Import Playlist"
+msgstr "재생목록 가져오기"
+
+#: src/GMImportDialog.cpp:405
+msgid "Import Music"
+msgstr "음악 가져오기"
+
+#: src/GMImportDialog.cpp:439
+msgid "&File(s)"
+msgstr "파일(&F)"
+
+#: src/GMImportDialog.cpp:462
+msgid "&Folder"
+msgstr "폴더(&F)"
+
+#: src/GMImportDialog.cpp:472 src/GMImportDialog.cpp:578
+msgid "&Sync"
+msgstr "동기화(&S)"
+
+#: src/GMImportDialog.cpp:474
+msgid "Sync Operation"
+msgstr "동기화 작업"
+
+#: src/GMImportDialog.cpp:477
+msgid "Import new tracks\tImports files not yet in the database."
+msgstr "새 곡 가져오기\t아직 데이터베이스에 없는 파일 가져오기."
+
+#: src/GMImportDialog.cpp:478
+msgid "Remove tracks that have been deleted from disk"
+msgstr "디스크에서 삭제된 트랙 제거"
+
+#: src/GMImportDialog.cpp:480
+msgid "Update existing tracks:"
+msgstr "기존 곡 업데이트:"
+
+#: src/GMImportDialog.cpp:481
+msgid ""
+"Modified since last import\tOnly reread the tag when the file has been "
+"modified."
+msgstr ""
+"마지막 가져오기 이후 수정됨\t파일이 수정된 경우에만 태그를 다시 읽습니다."
+
+#: src/GMImportDialog.cpp:483
+msgid "All\tAlways read the tags"
+msgstr "모두\t항상 태그 읽기"
+
+#: src/GMImportDialog.cpp:488
+msgid "&Track"
+msgstr "곡(&T)"
+
+#: src/GMImportDialog.cpp:491
+msgid "Parse Settings"
+msgstr "구문분석 설정"
+
+#: src/GMImportDialog.cpp:495
+msgid "Parse info from:"
+msgstr "구문분석 정보:"
+
+#: src/GMImportDialog.cpp:500
+msgid "Both"
+msgstr "모두"
+
+#: src/GMImportDialog.cpp:502
+msgid "ID3v1 Encoding:"
+msgstr "ID3v1 인코딩:"
+
+#: src/GMImportDialog.cpp:513
+msgid "Set track number based on scan order."
+msgstr "검색 순서에 따라 곡 번호 지정하기."
+
+#: src/GMImportDialog.cpp:516
+msgid ""
+"Group albums by audio format.\tImported tracks that differ in audio format "
+"will be grouped in separate albums."
+msgstr ""
+"오디오 형식으로 앨범 그룹화하기.\t오디오 형식이 다른 가져온 곡은 별도의 앨범"
+"으로 그룹화됨."
+
+#: src/GMImportDialog.cpp:519
+msgid ""
+"Detect compilations by folder.\tGroup tracks from the same folder without "
+"specific compilation/albumartist tags."
+msgstr ""
+"폴더별로 모음집 감지하기.\t특정 모음집/앨범아티스트 태그 없이 동일한 폴더의 "
+"곡을 그룹화하기."
+
+#: src/GMImportDialog.cpp:522
+msgid "Fetch Lyrics.\tFetch Lyrics"
+msgstr "가사 가져오기.\t가사 가져오기"
+
+#: src/GMImportDialog.cpp:524
+msgid "Path Template"
+msgstr "경로 템플릿"
+
+#: src/GMImportDialog.cpp:527
+msgid ""
+"%T - title              %A - album name\n"
+"%P - album artist name  %p - track artist name \n"
+"%N - track number       %d - disc number\n"
+"%y - year"
+msgstr ""
+"%T - 제목              %A - 앨범 이름\n"
+"%P - 앨범 아티스트 이름  %p - 곡 아티스트 이름 \n"
+"%N - 곡 번호       %d - 디스크 번호\n"
+"%y - 연도"
+
+#: src/GMImportDialog.cpp:538 src/GMTrackEditor.cpp:378
+msgid "Template:"
+msgstr "템플릿:"
+
+#: src/GMImportDialog.cpp:541
+msgid "Replace underscores with spaces"
+msgstr "밑줄을 공백으로 바꾸기"
+
+#: src/GMImportDialog.cpp:552
+msgid "&Filter"
+msgstr "필터(&F)"
+
+#: src/GMImportDialog.cpp:555
+msgid "Exclude Files"
+msgstr "파일 제외"
+
+#: src/GMImportDialog.cpp:556
+msgid "Unsupported Playback Formats"
+msgstr "지원되지 않는 재생 형식"
+
+#: src/GMImportDialog.cpp:558
+msgid "Exclude by Pattern"
+msgstr "패턴으로 제외"
+
+#: src/GMImportDialog.cpp:562
+msgid "Folders:"
+msgstr "폴더:"
+
+#: src/GMImportDialog.cpp:564
+msgid "Files:"
+msgstr "파일:"
+
+#: src/GMImportDialog.cpp:582
+msgid "&Import"
+msgstr "가져오기(&I)"
+
+#: src/GMNotifyDaemon.cpp:274
+#, c-format
+msgid ""
+"%s\n"
+"%s (%d)"
+msgstr ""
+"%s\n"
+"%s (%d)"
+
+#: src/GMPlayerManager.cpp:313
+#, c-format
+msgid "Unable to create directory %s\n"
+msgstr "%s 디렉토리를 만들 수 없음\n"
+
+#: src/GMPlayerManager.cpp:578
+msgid "Session bus not available. All features requiring dbus are disabled."
+msgstr ""
+"세션 버스를 사용할 수 없습니다. dbus가 필요한 모든 기능은 사용할 수 없습니다."
+
+#: src/GMPlayerManager.cpp:597
+msgid ""
+"Session Bus not available. All features requiring sessionbus are disabled."
+msgstr ""
+"세션 버스를 사용할 수 없습니다. 세션버스가 필요한 모든 기능은 사용할 수 없습"
+"니다."
+
+#: src/GMPlayerManager.cpp:671
+#, c-format
+msgid ""
+"A non threadsafe version of SQLite (%s) is being used.\n"
+"Goggles Music Manager requires a threadsafe SQLite.\n"
+"Please upgrade your SQLite installation."
+msgstr ""
+"SQLite(%s)의 안전하지 않은 버전이 사용되고 있습니다.\n"
+"Goggles Music Manager는 안전한 SQLite가 필요합니다.\n"
+"SQLite 설치를 업그레이드해 주십시오."
+
+#: src/GMPlayerManager.cpp:680
+msgid ""
+"For some reason the FOX library was compiled without PNG support.\n"
+"In order to show all icons, Goggles Music Manager requires PNG\n"
+"support in the FOX library. If you've compiled FOX yourself, most\n"
+"likely the libpng header files were not installed on your system."
+msgstr ""
+"어떤 이유에서인지 FOX 라이브러리는 PNG 지원 없이 컴파일되었습니다.\n"
+"모든 아이콘을 표시하기 위해 Goggles Music Manager는 FOX 라이브러리\n"
+"에서 PNG 지원을 필요로 합니다. FOX를 직접 컴파일한 경우,\n"
+"libpng 헤더 파일이 시스템에 설치되지 않았을 가능성이 높습니다."
+
+#: src/GMPlayerManager.cpp:1402
+msgid "Last.FM Error"
+msgstr "Last.FM 오류"
+
+#: src/GMPlayerManager.cpp:1776
+msgid "Playback Error"
+msgstr "재생 오류"
+
+#: src/GMPlayListSource.cpp:182
+msgid "Rename…"
+msgstr "이름변경…"
+
+#: src/GMPlayListSource.cpp:183
+msgid "Import Playlist…"
+msgstr "재생목록 가져오기…"
+
+#: src/GMPlayListSource.cpp:185
+msgid "Remove Playlist"
+msgstr "재생목록 제거"
+
+#: src/GMPlayListSource.cpp:265
+msgid "Remove Tag?"
+msgstr "태그를 제거하시겠습니까?"
+
+#: src/GMPlayListSource.cpp:266
+msgid "Remove tracks with tag from play list?"
+msgstr "재생 목록에서 태그가 있는 곡을 제거하시겠습니까?"
+
+#: src/GMPlayListSource.cpp:269
+msgid "Remove tracks from artist from play list?"
+msgstr "재생 목록에서 아티스트의 곡을 제거하시겠습니까?"
+
+#: src/GMPlayListSource.cpp:272
+msgid "Remove tracks from album from play list?"
+msgstr "재생 목록에서 앨범의 곡을 제거하시겠습니까?"
+
+#: src/GMPlayListSource.cpp:275
+msgid "Remove track(s) from play list?"
+msgstr "재생 목록에서 곡을 제거하시겠습니까?"
+
+#: src/GMPlayListSource.cpp:287
+msgid "Remove tracks from music library"
+msgstr "음악 라이브러리에서 곡 제거"
+
+#: src/GMPlayListSource.cpp:361 src/GMPlayListSource.cpp:362
+msgid "Edit Playlist"
+msgstr "재생목록 편집"
+
+#: src/GMPlayListSource.cpp:362
+msgid "Change playlist name"
+msgstr "재생목록 이름 변경"
+
+#: src/GMPlayListSource.cpp:364 src/GMStreamSource.cpp:184
+#: src/GMTrackEditor.cpp:448 src/GMTrackEditor.cpp:452
+#: cfox/lib/FXMessageBox.cpp:129 cfox/lib/FXMessageBox.cpp:144
+msgid "&Save"
+msgstr "저장(&S)"
+
+#: src/GMPlayListSource.cpp:387
+msgid "Delete Play List?"
+msgstr "재생 목록을 삭제하시겠습니까?"
+
+#: src/GMPlayListSource.cpp:387
+msgid "Are you sure you want to delete the playlist?"
+msgstr "재생목록을 삭제하시겠습니까?"
+
+#: src/GMPlayQueue.cpp:114
+msgid "Clear"
+msgstr "지우기"
+
+#: src/GMPlayQueue.cpp:145
+msgid "Remove…\tDel\tRemove track(s) from play queue."
+msgstr "제거…\t삭제\t재생 대기열에서 곡 제거하기."
+
+#: src/GMPodcastSource.cpp:430
+msgid "Select Feed"
+msgstr "피드 선택"
+
+#: src/GMPodcastSource.cpp:432 src/GMPodcastSource.cpp:1646
+msgid "Subscribe"
+msgstr "구독하기"
+
+#: src/GMPodcastSource.cpp:436
+msgid "Feed:"
+msgstr "피드:"
+
+#: src/GMPodcastSource.cpp:1249
+#, c-format
+msgid "Podcasts (%d)"
+msgstr "팟캐스트 (%d)"
+
+#: src/GMPodcastSource.cpp:1251
+msgid "Podcasts"
+msgstr "팟캐스트"
+
+#: src/GMPodcastSource.cpp:1314
+msgid "Date"
+msgstr "날짜"
+
+#: src/GMPodcastSource.cpp:1315
+msgid "Feed"
+msgstr "피드"
+
+#: src/GMPodcastSource.cpp:1351 src/GMPodcastSource.cpp:1357
+msgid "Add Podcast…"
+msgstr "팟캐스트 추가…"
+
+#: src/GMPodcastSource.cpp:1356
+msgid "Refresh\t\t"
+msgstr "새로고침\t\t"
+
+#: src/GMPodcastSource.cpp:1363
+msgid "Auto Download"
+msgstr "자동 다운로드"
+
+#: src/GMPodcastSource.cpp:1367
+msgid "Remove Podcast"
+msgstr "팟캐스트 제거"
+
+#: src/GMPodcastSource.cpp:1372
+msgid "Download"
+msgstr "다운로드"
+
+#: src/GMPodcastSource.cpp:1373
+msgid "Mark Played"
+msgstr "표시 재생함"
+
+#: src/GMPodcastSource.cpp:1374
+msgid "Mark New"
+msgstr "새로 표시"
+
+#: src/GMPodcastSource.cpp:1375
+msgid "Remove Local"
+msgstr "로컬 제거"
+
+#: src/GMPodcastSource.cpp:1415
+#, c-format
+msgid "All %d Feeds"
+msgstr "피드 모두 %d개"
+
+#: src/GMPodcastSource.cpp:1643 src/GMPodcastSource.cpp:1644
+msgid "Subscribe to Podcast"
+msgstr "팟캐스트 구독하기"
+
+#: src/GMPodcastSource.cpp:1644
+msgid "Specify url for the rss feed"
+msgstr "rss 피드의 URL 지정하기"
+
+#: src/GMPodcastSource.cpp:1651 src/GMStreamSource.cpp:152
+#: src/GMStreamSource.cpp:190
+msgid "Location"
+msgstr "위치"
+
+#: src/GMPodcastSource.cpp:1666
+msgid "Remove Feed?"
+msgstr "피드를 제거하시겠습니까?"
+
+#: src/GMPodcastSource.cpp:1666
+msgid "Remove feed and all downloaded episodes?"
+msgstr "피드와 다운로드한 모든 에피소드를 제거 하시겠습니까?"
+
+#: src/GMPreferencesDialog.cpp:285
+msgid "Preferences"
+msgstr "환경설정"
+
+#: src/GMPreferencesDialog.cpp:315
+msgid "&General"
+msgstr "일반(&G)"
+
+#: src/GMPreferencesDialog.cpp:318
+msgid "Sort Options"
+msgstr "정렬 옵션"
+
+#: src/GMPreferencesDialog.cpp:322
+msgid "Ignore leading words"
+msgstr "선행 단어 무시"
+
+#: src/GMPreferencesDialog.cpp:325
+msgid "Additional Track Information"
+msgstr "추가 곡 정보"
+
+#: src/GMPreferencesDialog.cpp:328
+msgid "Show Album Cover\tShow album cover of playing track"
+msgstr "앨범 표지 표시\t재생중인 곡의 앨범 표지 표시"
+
+#: src/GMPreferencesDialog.cpp:329
+msgid "Show Lyrics\tShow lyrics of playing track"
+msgstr "가사 표시\t재생중인 곡의 가사 표시"
+
+#: src/GMPreferencesDialog.cpp:332
+msgid "System Tray"
+msgstr "시스템 트레이"
+
+#: src/GMPreferencesDialog.cpp:336
+msgid "Show Tray Icon\tShow tray icon in the system tray."
+msgstr "트레이 아이콘 표시\t시스템 트레이에 트레이 아이콘 표시하기."
+
+#: src/GMPreferencesDialog.cpp:339
+msgid ""
+"Show Track Change Notifications\tInform notification daemon of track changes."
+msgstr "곡 변경 알림 표시\t알림 데몬에 곡 변경 사항을 알립니다."
+
+#: src/GMPreferencesDialog.cpp:340
+msgid "MPRIS v1 Connectivity\tEnable MPRIS v1 connectivity"
+msgstr "MPRIS v1 연결\tMPRIS v1 연결 활성화"
+
+#: src/GMPreferencesDialog.cpp:344
+msgid "Last.fm"
+msgstr "Last.fm"
+
+#: src/GMPreferencesDialog.cpp:349
+msgid ""
+"This version of Goggles Music Manager is\n"
+"not supported by Last-FM. Please upgrade\n"
+"to a newer version of GMM."
+msgstr ""
+"이 버전의 Goggles Music Manager는 \n"
+"Last-FM에서 지원하지 않습니다.\n"
+"최신 버전의 GMM으로 업그레이드하십시오."
+
+#: src/GMPreferencesDialog.cpp:355
+msgid "Service:"
+msgstr "서비스:"
+
+#: src/GMPreferencesDialog.cpp:372
+msgid "&Sign up…"
+msgstr "가입하기(&S)…"
+
+#: src/GMPreferencesDialog.cpp:378
+msgid "Username:"
+msgstr "사용자이름:"
+
+#: src/GMPreferencesDialog.cpp:380
+msgid "Password:"
+msgstr "비밀번호:"
+
+#: src/GMPreferencesDialog.cpp:384
+msgid "Scrobble"
+msgstr "퍼올리기"
+
+#: src/GMPreferencesDialog.cpp:408
+msgid "&Window"
+msgstr "창(&W)"
+
+#: src/GMPreferencesDialog.cpp:411
+msgid "Window"
+msgstr "창"
+
+#: src/GMPreferencesDialog.cpp:414
+msgid "Close button minimizes to tray"
+msgstr "닫기 버튼을 눌러 트레이로 최소화"
+
+#: src/GMPreferencesDialog.cpp:415
+msgid "Show Status Bar"
+msgstr "상태 표시줄 표시"
+
+#: src/GMPreferencesDialog.cpp:418
+msgid "Display playing track in title bar"
+msgstr "제목 표시줄에 재생중인 곡 보여주기"
+
+#: src/GMPreferencesDialog.cpp:421
+msgid "Toolbar"
+msgstr "도구모음"
+
+#: src/GMPreferencesDialog.cpp:425
+msgid "Location:"
+msgstr "위치:"
+
+#: src/GMPreferencesDialog.cpp:427
+msgid "Top"
+msgstr "상단"
+
+#: src/GMPreferencesDialog.cpp:428
+msgid "Bottom"
+msgstr "하단"
+
+#: src/GMPreferencesDialog.cpp:431
+msgid "Title Format:"
+msgstr "제목 형식:"
+
+#: src/GMPreferencesDialog.cpp:439 src/GMTrackEditor.cpp:361
+msgid ""
+"%T - title                   %A - album name\n"
+"%P - album artist name       %p - track artist name\n"
+"%w - composer                %c - conductor\n"
+"%y - year                    %d - disc number\n"
+"%N - track number (2 digits) %n - track number      \n"
+"%G - genre"
+msgstr ""
+"%T - title                   %A - album name\n"
+"%P - album artist name       %p - track artist name\n"
+"%w - composer                %c - conductor\n"
+"%y - year                    %d - disc number\n"
+"%N - track number (2 digits) %n - track number      \n"
+"%G - genre"
+
+#: src/GMPreferencesDialog.cpp:457
+msgid "A&ppearance"
+msgstr "모양새(&P)"
+
+#: src/GMPreferencesDialog.cpp:459
+msgid "Colors"
+msgstr "색상"
+
+#: src/GMPreferencesDialog.cpp:465
+msgid "fg\tForeground Color"
+msgstr "fg\t전경색"
+
+#: src/GMPreferencesDialog.cpp:466
+msgid "bg\tBackground Color"
+msgstr "bg\t배경색"
+
+#: src/GMPreferencesDialog.cpp:467
+msgid "alt bg\tAlternative Background Color"
+msgstr "alt bg\t대체 배경색"
+
+#: src/GMPreferencesDialog.cpp:478
+msgid "Normal\tNormal Text Color"
+msgstr "일반\t일반 텍스트 색상"
+
+#: src/GMPreferencesDialog.cpp:482
+msgid "Base\tBase Color"
+msgstr "기본\t기본 색상"
+
+#: src/GMPreferencesDialog.cpp:485
+msgid "Selected\tSelected Text Color"
+msgstr "선택됨\t텍스트 색상 선택됨"
+
+#: src/GMPreferencesDialog.cpp:489
+msgid "Menu\tMenu Base Color"
+msgstr "메뉴\t메뉴 기본 색상"
+
+#: src/GMPreferencesDialog.cpp:493
+msgid "Menu\tMenu Text Color"
+msgstr "메뉴\t메뉴 텍스트 색상"
+
+#: src/GMPreferencesDialog.cpp:497
+msgid "Border\tBorder Color"
+msgstr "테두리\t테두리 색상"
+
+#: src/GMPreferencesDialog.cpp:501
+msgid "Tooltip\tTooltip Color"
+msgstr "도구설명\t도구설명 색상"
+
+#: src/GMPreferencesDialog.cpp:505
+msgid "Hilite\tHilite Color"
+msgstr "강조\t강조 색상"
+
+#: src/GMPreferencesDialog.cpp:512
+msgid "Shadow\tShadow Color"
+msgstr "그림자\t그림자 색상"
+
+#: src/GMPreferencesDialog.cpp:515
+msgid "Playing\tPlaying Track Color"
+msgstr "재생중\t재생중 곡 색상"
+
+#: src/GMPreferencesDialog.cpp:519
+msgid "Tray\tTray Background Color"
+msgstr "트레이\t트레이 배경색"
+
+#: src/GMPreferencesDialog.cpp:529
+msgid "Presets:"
+msgstr "프리셋:"
+
+#: src/GMPreferencesDialog.cpp:537
+msgid "Font & Icons"
+msgstr "글꼴 & 아이콘"
+
+#: src/GMPreferencesDialog.cpp:542
+msgid "Default Font"
+msgstr "기본 글꼴"
+
+#: src/GMPreferencesDialog.cpp:544
+msgid "Change…"
+msgstr "변경…"
+
+#: src/GMPreferencesDialog.cpp:546
+msgid "Display DPI"
+msgstr "DPI 보여주기"
+
+#: src/GMPreferencesDialog.cpp:553
+msgid "Icons"
+msgstr "아이콘"
+
+#: src/GMPreferencesDialog.cpp:572
+msgid "&Audio"
+msgstr "오디오(&A)"
+
+#: src/GMPreferencesDialog.cpp:575
+msgid "Output"
+msgstr "출력"
+
+#: src/GMPreferencesDialog.cpp:579
+msgid "Driver:"
+msgstr "드라이버:"
+
+#: src/GMPreferencesDialog.cpp:613 src/GMPreferencesDialog.cpp:626
+msgid "Device:"
+msgstr "장치:"
+
+#: src/GMPreferencesDialog.cpp:633
+msgid "Apply Changes"
+msgstr "변경 적용"
+
+#: src/GMPreferencesDialog.cpp:635
+msgid "Playback"
+msgstr "재생"
+
+#: src/GMPreferencesDialog.cpp:640
+msgid "Replay Gain:"
+msgstr "리플레이 게인:"
+
+#: src/GMPreferencesDialog.cpp:643
+msgid "Off"
+msgstr "끄기"
+
+#: src/GMPreferencesDialog.cpp:644
+msgid "Track"
+msgstr "곡"
+
+#: src/GMPreferencesDialog.cpp:650
+msgid "&Podcasts"
+msgstr "팟캐스트(&P)"
+
+#: src/GMPreferencesDialog.cpp:653
+msgid "Updates"
+msgstr "업데이트"
+
+#: src/GMPreferencesDialog.cpp:657
+msgid "Update Interval"
+msgstr "업데이트 간격"
+
+#: src/GMPreferencesDialog.cpp:659
+msgid "Disabled"
+msgstr "사용안함"
+
+#: src/GMPreferencesDialog.cpp:660
+msgid "10 minutes"
+msgstr "10분"
+
+#: src/GMPreferencesDialog.cpp:661
+msgid "20 minutes"
+msgstr "20분"
+
+#: src/GMPreferencesDialog.cpp:662
+msgid "30 minutes"
+msgstr "30분"
+
+#: src/GMPreferencesDialog.cpp:663
+msgid "1 hour"
+msgstr "1시간"
+
+#: src/GMPreferencesDialog.cpp:664
+msgid "2 hours"
+msgstr "2시간"
+
+#: src/GMPreferencesDialog.cpp:665
+msgid "6 hours"
+msgstr "6시간"
+
+#: src/GMPreferencesDialog.cpp:666
+msgid "12 hours"
+msgstr "12시간"
+
+#: src/GMPreferencesDialog.cpp:863
+msgid "Current"
+msgstr "현재"
+
+#: src/GMPreferencesDialog.cpp:881
+msgid "Custom"
+msgstr "사용자지정"
+
+#: src/GMPreferencesDialog.cpp:1469
+msgid "Select Normal Font"
+msgstr "일반 글꼴 선택"
+
+#: src/GMRemote.cpp:79
+msgid "\tShow Browser\tShow Browser"
+msgstr "\t탐색기 표시\t탐색기 표시"
+
+#: src/GMRemote.cpp:81 src/GMWindow.cpp:282
+msgid "\tStart Playback\tStart Playback"
+msgstr "\t재생 시작\t재생 시작"
+
+#: src/GMRemote.cpp:82 src/GMWindow.cpp:283
+msgid "\tStop Playback\tStop Playback"
+msgstr "\t재생 중지\t재생 중지"
+
+#: src/GMRemote.cpp:84 src/GMWindow.cpp:284
+msgid "\tPlay Previous Track\tPlay previous track."
+msgstr "\t이전 곡 재생\t이전 곡 재생하기."
+
+#: src/GMRemote.cpp:85 src/GMWindow.cpp:285
+msgid "\tPlay Next Track\tPlay next track."
+msgstr "\t다음 곡 재생\t다음 곡 재생하기."
+
+#: src/GMRemote.cpp:93
+msgid "\tAdjust Volume\tAdjust Volume"
+msgstr "\t음량 조정\t음량 조정"
+
+#: src/GMScanner.cpp:45
+msgid "Unknown Artist"
+msgstr "알 수 없는 아티스트"
+
+#: src/GMScanner.cpp:46
+msgid "Unknown Album"
+msgstr "알 수 없는 앨범"
+
+#: src/GMScanner.cpp:593
+msgid "Various Artists"
+msgstr "여러 아티스트"
+
+#: src/GMSourceView.cpp:53
+msgid "Sources\tPress to change sorting order\tPress to change sorting order"
+msgstr ""
+"소스\t정렬 순서를 변경하려면 누르십시오\t정렬 순서를 변경하려면 누르십시오"
+
+#: src/GMSourceView.cpp:294
+msgid "Show Browser\tCtrl-B\tShow Browser"
+msgstr "탐색기 표시\tCtrl-B\t탐색기 표시"
+
+#: src/GMSourceView.cpp:295
+msgid "Show Tags\tCtrl-T\tShow Tags"
+msgstr "태그 표시\tCtrl-T\t태그 표시"
+
+#: src/GMStreamSource.cpp:59
+msgid "Station"
+msgstr "방송국"
+
+#: src/GMStreamSource.cpp:61 src/GMStreamSource.cpp:195
+msgid "Genre"
+msgstr "장르"
+
+#: src/GMStreamSource.cpp:90 src/GMStreamSource.cpp:95
+#: src/GMStreamSource.cpp:101
+msgid "Add Radio Station…"
+msgstr "라디오 방송국 추가…"
+
+#: src/GMStreamSource.cpp:100
+msgid "Edit…"
+msgstr "편집…"
+
+#: src/GMStreamSource.cpp:102
+msgid "Remove\t\tRemove."
+msgstr "제거\t\t제거."
+
+#: src/GMStreamSource.cpp:144 src/GMStreamSource.cpp:145
+msgid "New Internet Radio Station"
+msgstr "새 인터넷 라디오 방송국"
+
+#: src/GMStreamSource.cpp:145
+msgid "Specify url and description of new station"
+msgstr "새 스테이션의 URL 및 설명 지정하기"
+
+#: src/GMStreamSource.cpp:147
+msgid "C&reate"
+msgstr "생성(&R)"
+
+#: src/GMStreamSource.cpp:154 src/GMStreamSource.cpp:193
+msgid "Description"
+msgstr "설명"
+
+#: src/GMStreamSource.cpp:168
+msgid "Untitled"
+msgstr "제목 없음"
+
+#: src/GMStreamSource.cpp:181 src/GMStreamSource.cpp:182
+msgid "Edit Internet Radio Station"
+msgstr "인터넷 라디오 방송국 편집"
+
+#: src/GMStreamSource.cpp:182
+msgid "Update url and description of station"
+msgstr "URL 업데이트 및 방송국에 대한 설명"
+
+#: src/GMStreamSource.cpp:240
+msgid "Remove Internet Radio Station(s)?"
+msgstr "인터넷 라디오 방송국을 제거하시겠습니까?"
+
+#: src/GMStreamSource.cpp:241
+msgid "Remove Internet Radio Station(s) from library?"
+msgstr "라이브러리에서 인터넷 라디오 방송국을 제거하시겠습니까?"
+
+#: src/GMStreamSource.cpp:255
+#, c-format
+msgid "Unable to remove station from the library."
+msgstr "라이브러리에서 방송국을 제거할 수 없습니다."
+
+#: src/GMTrackDatabase.cpp:174 src/GMTrackDatabase.cpp:180
+#: src/GMTrackEditor.cpp:260 src/GMTrackEditor.cpp:276
+msgid "Database Error"
+msgstr "데이터베이스 오류"
+
+#: src/GMTrackDatabase.cpp:174
+msgid ""
+"An incompatible (future) version of the database was found.\n"
+"This usually happens when you try to downgrade to a older version of GMM\n"
+"Press OK to continue and reset the database (all information will be "
+"lost!).\n"
+"Press Cancel to quit now and leave the database as is."
+msgstr ""
+"호환되지 않는(향후) 버전의 데이터베이스를 찾았습니다.\n"
+"이 문제는 일반적으로 이전 버전의 GMM으로 다운그레이드하려고 할 때 발생합니"
+"다.\n"
+"OK를 눌러 계속 진행하고 데이터베이스를 재설정합니다. (모든 정보가 손실됨!)\n"
+"지금 종료하고 데이터베이스를 그대로 두려면 취소를 누릅니다."
+
+#: src/GMTrackDatabase.cpp:180
+msgid ""
+"An incompatible (older) version of the database was found.\n"
+"Press OK to continue and reset the database (all information will be "
+"lost!).\n"
+"Press Cancel to quit now and leave the database as is."
+msgstr ""
+"호환되지 않는(이전) 버전의 데이터베이스를 찾았습니다.\n"
+"OK를 눌러 계속 진행하고 데이터베이스를 재설정합니다(모든 정보가 손실됨!).\n"
+"지금 종료하고 데이터베이스를 그대로 두려면 취소를 누릅니다."
+
+#: src/GMTrackDatabase.cpp:192
+msgid "Fatal Error"
+msgstr "치명적인 오류"
+
+#: src/GMTrackDatabase.cpp:192
+#, c-format
+msgid ""
+"Goggles Music Manager was unable to open the database.\n"
+"The database may have been corrupted. Please remove %s to try again.\n"
+"if the error keeps occuring, please file an issue at http://gogglesmm.github."
+"io"
+msgstr ""
+"Goggles Music Manager에서 데이터베이스를 열 수 없습니다.\n"
+"데이터베이스가 손상되었을 수 있습니다. %s을(를) 제거하고 다시 시도하십시오.\n"
+"오류가 계속 발생한다면, http://gogglesmm.github.io 에 문제를 제기해 주십시오"
+
+#: src/GMTrackEditor.cpp:233
+msgid "Invalid Template"
+msgstr "잘못된 템플릿"
+
+#: src/GMTrackEditor.cpp:233
+#, c-format
+msgid ""
+"The provided template is invalid. The track title %%T needs to be "
+"specified.\n"
+"Please fix the filename template in the preference panel."
+msgstr ""
+"제공된 템플릿이 잘못되었습니다. 곡 제목 %%T를 지정해야 합니다.\n"
+"기본 설정 패널에서 파일 이름 템플릿을 수정해 주십시오."
+
+#: src/GMTrackEditor.cpp:260
+msgid "Oops. Database Error"
+msgstr "에구머니. 데이터베이스 오류"
+
+#: src/GMTrackEditor.cpp:276
+msgid "Failed to retrieve track filenames"
+msgstr "곡 파일이름을 검색하지 못함"
+
+#: src/GMTrackEditor.cpp:281
+msgid "No changes"
+msgstr "변경사항 없음"
+
+#: src/GMTrackEditor.cpp:281
+msgid "Filenames did not require any changes"
+msgstr "파일이름을 변경할 필요가 없음"
+
+#: src/GMTrackEditor.cpp:287
+msgid "Rename Audio Files?"
+msgstr "오디오 파일의 이름을 바꾸시겠습니까?"
+
+#: src/GMTrackEditor.cpp:288
+msgid "Renaming Audio Files…"
+msgstr "오디오 파일 이름변경 중…"
+
+#: src/GMTrackEditor.cpp:288
+msgid "The following audio files are going to be renamed"
+msgstr "다음 오디오 파일의 이름이 변경됨"
+
+#: src/GMTrackEditor.cpp:291
+msgid "&Rename"
+msgstr "이름변경(&R)"
+
+#: src/GMTrackEditor.cpp:343
+msgid "Filename Template"
+msgstr "파일이름 템플릿"
+
+#: src/GMTrackEditor.cpp:360
+msgid ""
+"Template may contain absolute or relative path, environment variables\n"
+"and ~. Relative paths are based on the location of the original file. The\n"
+"file extension gets automatically added. The following macros\n"
+"may be used:"
+msgstr ""
+"템플릿에는 절대 또는 상대 경로, 환경 변수 및 ~가 포함될 수 있습니다. \n"
+"상대 경로는 원본 파일의 위치를 기준으로 합니다. 파일 확장명이 자동으로 \n"
+"추가됩니다. 다음과 같은 매크로를 사용할 수 있습니다:"
+
+#: src/GMTrackEditor.cpp:368
+msgid "Conditions may be used as well:"
+msgstr "다음과 같은 조건도 사용할 수 있음:"
+
+#: src/GMTrackEditor.cpp:369
+msgid ""
+"?c<a|b> - display a if c is not empty else display b.\n"
+"?c      - display c if not empty\n"
+msgstr ""
+"?c<a|b> - c가 비어 있지 않으면 a를 보여주고 그렇지 않으면 b를 보여줍니다.\n"
+"?c      - 비어 있지 않은 경우 c를 보여줍니다\n"
+
+#: src/GMTrackEditor.cpp:382
+msgid "Encoding:"
+msgstr "인코딩:"
+
+#: src/GMTrackEditor.cpp:388
+msgid "Exclude:"
+msgstr "제외:"
+
+#: src/GMTrackEditor.cpp:392
+msgid "Options:"
+msgstr "옵션:"
+
+#: src/GMTrackEditor.cpp:393
+msgid "Replace spaces with underscores"
+msgstr "공백을 밑줄로 바꾸기"
+
+#: src/GMTrackEditor.cpp:395
+msgid "Lower case"
+msgstr "소문자"
+
+#: src/GMTrackEditor.cpp:397
+msgid "Lower case extension"
+msgstr "소문자 확장"
+
+#: src/GMTrackEditor.cpp:443
+msgid "Edit Track Information"
+msgstr "곡 정보 편집"
+
+#: src/GMTrackEditor.cpp:446
+msgid "&Previous"
+msgstr "이전(&P)"
+
+#: src/GMTrackEditor.cpp:447
+msgid "&Next"
+msgstr "다음(&N)"
+
+#: src/GMTrackEditor.cpp:470
+msgid "&Tag"
+msgstr "태그(&T)"
+
+#: src/GMTrackEditor.cpp:477
+msgid "L&yrics"
+msgstr "가사(&Y)"
+
+#: src/GMTrackEditor.cpp:488 src/GMTrackView.cpp:269
+msgid "&Find"
+msgstr "찾기(&F)"
+
+#: src/GMTrackEditor.cpp:495
+msgid "&Properties"
+msgstr "속성(&P)"
+
+#: src/GMTrackEditor.cpp:503 cfox/lib/FXFileSelector.cpp:940
+msgid "Type"
+msgstr "유형"
+
+#: src/GMTrackEditor.cpp:506 cfox/lib/FXFileSelector.cpp:941
+msgid "Size"
+msgstr "크기"
+
+#: src/GMTrackEditor.cpp:520
+msgid "Co&ver"
+msgstr "표지(&V)"
+
+#: src/GMTrackEditor.cpp:531
+msgid "Trac&k"
+msgstr "곡(&K)"
+
+#: src/GMTrackEditor.cpp:537 src/GMTrackEditor.cpp:548
+#: src/GMTrackEditor.cpp:554
+msgid "&Disc"
+msgstr "디스크(&D)"
+
+#: src/GMTrackEditor.cpp:541 src/GMTrackEditor.cpp:560
+msgid "Y&ear"
+msgstr "연도(&E)"
+
+#: src/GMTrackEditor.cpp:564
+msgid "T&itle"
+msgstr "제목(&I)"
+
+#: src/GMTrackEditor.cpp:568
+msgid "&Artist"
+msgstr "아티스트(&A)"
+
+#: src/GMTrackEditor.cpp:571
+msgid "Album A&rtist"
+msgstr "앨범 아티스트(&R)"
+
+#: src/GMTrackEditor.cpp:574
+msgid "A&lbum"
+msgstr "앨범(&L)"
+
+#: src/GMTrackEditor.cpp:577
+msgid "C&omposer"
+msgstr "작곡가"
+
+#: src/GMTrackEditor.cpp:580
+msgid "Cond&uctor"
+msgstr "지휘자"
+
+#: src/GMTrackEditor.cpp:583
+msgid "Ta&gs"
+msgstr "태그(&G)"
+
+#: src/GMTrackEditor.cpp:594
+msgid "Auto track number. Offset:"
+msgstr "자동 곡 번호 오프셋:"
+
+#: src/GMTrackEditor.cpp:603
+msgid "Update Tag in File"
+msgstr "파일에서 태그 업데이트"
+
+#: src/GMTrackEditor.cpp:608
+msgid "Update Filename"
+msgstr "파일이름 업데이트"
+
+#: src/GMTrackEditor.cpp:609
+msgid "Set export template…"
+msgstr "내보내기 템플릿 지정…"
+
+#: src/GMTrackEditor.cpp:990
+msgid "Update Tags?"
+msgstr "태그를 업데이트 하시겠습니까?"
+
+#: src/GMTrackEditor.cpp:990
+msgid ""
+"No tracks were updated.\n"
+"Would you still like to write the tags for the selected tracks?"
+msgstr ""
+"업데이트된 곡이 없습니다.\n"
+"선택한 곡에 대한 태그를 계속 작성하시겠습니까?"
+
+#: src/GMTrackView.cpp:268
+msgid "\tClose Filter\tClose Filter"
+msgstr "\t필터 닫기\t필터 닫기"
+
+#: src/GMTrackView.cpp:275
+msgid "Tags\tPress to change sorting order\tPress to change sorting order"
+msgstr ""
+"태그\t정렬 순서를 변경하려면 누르십시오\t정렬 순서를 변경하려면 누르십시오"
+
+#: src/GMTrackView.cpp:279
+msgid "Artists\tPress to change sorting order\tPress to change sorting order"
+msgstr ""
+"아티스트\t정렬 순서를 변경하려면 누르십시오\t정렬 순서를 변경하려면 누르십시"
+"오"
+
+#: src/GMTrackView.cpp:283
+msgid "\tPress to change sorting order\tPress to change sorting order"
+msgstr "\t정렬 순서를 변경하려면 누르십시오\t정렬 순서를 변경하려면 누르십시오"
+
+#: src/GMTrackView.cpp:290
+msgid "Browse"
+msgstr "찾아보기"
+
+#: src/GMTrackView.cpp:291
+msgid "Shuffle\tCtrl-R"
+msgstr "순서섞기\tCtrl-R"
+
+#: src/GMTrackView.cpp:299 cfox/lib/FXDirSelector.cpp:422
+#: cfox/lib/FXFileSelector.cpp:946
+msgid "Reverse"
+msgstr "반복"
+
+#: src/GMTrackView.cpp:303 src/GMTrackView.cpp:461
+msgid "&Configure Columns…"
+msgstr "열 구성(&C)…"
+
+#: src/GMTrackView.cpp:304 src/GMTrackView.cpp:462
+msgid "&Sort\t\tChange Sorting."
+msgstr "정렬(&S)\t\t정렬 변경."
+
+#: src/GMTrackView.cpp:1014
+#, c-format
+msgid "All %d Tags"
+msgstr "태그 모두 %d개"
+
+#: src/GMTrackView.cpp:1016
+msgid "All Tags"
+msgstr "모든 태그"
+
+#: src/GMTrackView.cpp:1037
+#, c-format
+msgid "All %d Artists"
+msgstr "아티스트 모두 %d명"
+
+#: src/GMTrackView.cpp:1463
+#, c-format
+msgid "By %s"
+msgstr "%s별로"
+
+#: src/GMTrackView.cpp:1819
+msgid "Show Album Year"
+msgstr "앨범 연도 표시"
+
+#: src/GMTrackView.cpp:1820 src/GMTrackView.cpp:1993
+msgid "Sort by Album Year"
+msgstr "앨범 연도별로 정렬"
+
+#: src/GMTrackView.cpp:1823
+msgid "List View"
+msgstr "목록 보기"
+
+#: src/GMTrackView.cpp:1824
+msgid "Cover View"
+msgstr "표지 보기"
+
+#: src/GMTrackView.cpp:1827
+msgid "Small Cover"
+msgstr "작은 표지"
+
+#: src/GMTrackView.cpp:1828
+msgid "Medium Cover"
+msgstr "중간 표지"
+
+#: src/GMTrackView.cpp:1829
+msgid "Big Cover"
+msgstr "큰 표지"
+
+#: src/GMTrackView.cpp:1831
+msgid "Arrange By Rows"
+msgstr "행별로 정렬"
+
+#: src/GMTrackView.cpp:1832
+msgid "Arrange By Columns"
+msgstr "열별로 정렬"
+
+#: src/GMTrayIcon.cpp:299 src/GMWindow.cpp:956 src/GMWindow.cpp:984
+msgid "Play"
+msgstr "재생"
+
+#: src/GMTrayIcon.cpp:300
+msgid "Stop"
+msgstr "중지"
+
+#: src/GMTrayIcon.cpp:301
+msgid "Previous Track"
+msgstr "이전 곡"
+
+#: src/GMTrayIcon.cpp:302
+msgid "Next Track"
+msgstr "다음 곡"
+
+#: src/GMTrayIcon.cpp:304
+msgid "Quit"
+msgstr "종료"
+
+#: src/GMWindow.cpp:191
+msgid "\tCancel Task\tCancel Task"
+msgstr "\t작업 취소\t작업 취소"
+
+#: src/GMWindow.cpp:236
+msgid "Queue Play\t\tPlay tracks from queue."
+msgstr "대기열 재생\t\t대기열에서 곡 재생하기."
+
+#: src/GMWindow.cpp:237
+msgid "Shuffle Play\tAlt-R\tPlay tracks in random order."
+msgstr "재생 순서섞기\tAlt-R\t무작위 순서로 곡 재생하기."
+
+#: src/GMWindow.cpp:239
+msgid "Repeat Off\tCtrl-,\tRepeat current track."
+msgstr "반복 끄기\tCtrl-,\t현재 곡 반복하기."
+
+#: src/GMWindow.cpp:240
+msgid "Repeat Track\tCtrl-.\tRepeat current track."
+msgstr "곡 반복\tCtrl-.\t현재 곡 반복하기."
+
+#: src/GMWindow.cpp:241
+msgid "Repeat All Tracks\tCtrl-/\tRepeat all tracks."
+msgstr "모든 곡 반복\tCtrl-/\t모든 곡 반복하기."
+
+#: src/GMWindow.cpp:245
+msgid "Stop After Track\tCtrl-Shift-|\tStop playback at end of track."
+msgstr "음악이 끝나면 중지\tCtrl-Shift-|\t음악이 끝나면 재생 중지하기."
+
+#: src/GMWindow.cpp:246
+msgid "Sleep Timer\t\tSetup sleeptimer."
+msgstr "수면 타이머\t\t수면 타이머 설정하기."
+
+#: src/GMWindow.cpp:251
+msgid "Show &Sources\tCtrl-S\tShow source browser "
+msgstr "소스 표시(&S)\tCtrl-S\\소 탐색기 표시 "
+
+#: src/GMWindow.cpp:252
+msgid "Show Full Screen\tF12\tToggle fullscreen mode."
+msgstr "전체 화면 표시\tF12\t전체화면 모드로 전환하기."
+
+#: src/GMWindow.cpp:253
+msgid "Show Mini Player\tCtrl-M\tToggle Mini Player."
+msgstr "소형 재생기 표시\tCtrl-M\t소형 재생기로 전환하기."
+
+#: src/GMWindow.cpp:256
+msgid "Show Presenter\t\tShow Presenter."
+msgstr "표지 화면보호기\t\t표지 화면보호기."
+
+#: src/GMWindow.cpp:260
+msgid "Find…\tCtrl-F\tShow search filter."
+msgstr "찾기…\tCtrl-F\t검색 필터 표시."
+
+#: src/GMWindow.cpp:262
+msgid "Preferences…"
+msgstr "환경설정…"
+
+#: src/GMWindow.cpp:263
+msgid "&About…"
+msgstr "프로그램 정보(&A)…"
+
+#: src/GMWindow.cpp:265
+msgid "&Quit\tCtrl-Q\tQuit the application."
+msgstr "종료(&Q)\tCtrl-Q\t응용프로그램 종료."
+
+#: src/GMWindow.cpp:282
+msgid "\tPause\tPause Playback"
+msgstr "\t일시중지\t재생 일시중지"
+
+#: src/GMWindow.cpp:951 src/GMWindow.cpp:979 src/GMWindow.cpp:985
+msgid "Start playback."
+msgstr "재생 시작하기."
+
+#: src/GMWindow.cpp:957 src/GMWindow.cpp:958
+msgid "Start playback"
+msgstr "재생 시작"
+
+#: src/GMWindow.cpp:965 src/GMWindow.cpp:972
+msgid "Pause playback."
+msgstr "재생 일시중지하기."
+
+#: src/GMWindow.cpp:966
+msgid "Pause playback"
+msgstr "재생 일시중지"
+
+#: src/GMWindow.cpp:971
+msgid "Pause"
+msgstr "일시중지"
+
+#: src/GMWindow.cpp:1221
+msgid "Play File or Stream"
+msgstr "파일 또는 스트림 재생"
+
+#: src/GMWindow.cpp:1223
+msgid "&Play"
+msgstr "재생(&P)"
+
+#: src/GMWindow.cpp:1228
+msgid "Please specify a file or url to play:"
+msgstr "재생할 파일 또는 URL을 지정하십시오:"
+
+#: src/GMWindow.cpp:1232
+msgid "…"
+msgstr "…"
+
+#: src/GMWindow.cpp:1238
+msgid "Select File"
+msgstr "파일 선택"
+
+#: src/GMWindow.cpp:1284
+msgid "Sleep Timer"
+msgstr "수면 타이머"
+
+#: src/GMWindow.cpp:1285
+msgid "Setup sleep timer"
+msgstr "수면 타이며 설정"
+
+#: src/GMWindow.cpp:1285
+msgid "Stop playback within a certain time"
+msgstr "특정 시간 내에 재생을 중지합니다"
+
+#: src/GMWindow.cpp:1287
+msgid "&Start Timer"
+msgstr "타이머 시작(&S)"
+
+#: src/GMWindow.cpp:1292
+msgid "Sleep in"
+msgstr "숙면 예정"
+
+#: src/GMWindow.cpp:1294
+msgid "hours and"
+msgstr "시간"
+
+#: src/GMWindow.cpp:1296
+msgid "minutes."
+msgstr "분."
+
+#: src/GMWindow.cpp:1453
+msgid "Show Album Cover"
+msgstr "앨범 표지 표시"
+
+#: src/GMWindow.cpp:1454
+msgid "Show Lyrics"
+msgstr "가사 표시"
+
+#: src/GMDatabaseSource.h:147
+msgid "Music Library"
+msgstr "음악 라이브러리"
+
+#: src/GMLocalSource.h:49
+msgid "File System"
+msgstr "파일 시스템"
+
+#: src/GMPodcastSource.h:113
+msgid "Feeds"
+msgstr "피드"
+
+#: src/GMSource.h:185
+msgid "Albums"
+msgstr "앨범"
+
+#: src/GMStreamSource.h:55
+msgid "Internet Radio"
+msgstr "인터넷 라디오"
+
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
+msgstr "예(&Y)"
+
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
+msgstr ""
+
+#: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
+msgid "&Quit"
+msgstr "종료(&Q)"
+
+#: cfox/lib/FXMessageBox.cpp:134
+msgid "&Skip"
+msgstr "건너뛰기(&S)"
+
+#: cfox/lib/FXMessageBox.cpp:135
+msgid "Skip &All"
+msgstr "모두 건너뛰기(&A)"
+
+#: cfox/lib/FXMessageBox.cpp:141
+msgid "&Don't Save"
+msgstr "저장 안함(&D)"
+
+#: cfox/lib/FXMessageBox.cpp:149
+msgid "Y&es to All"
+msgstr "모두 예(&E)"
+
+#: cfox/lib/FXMessageBox.cpp:151
+msgid "N&o to All"
+msgstr "모두 아니요(&O)"
+
+#: cfox/lib/FXColorSelector.cpp:222
+msgid "\tPick color"
+msgstr "\t색상 고르기"
+
+#: cfox/lib/FXColorSelector.cpp:231 cfox/lib/FXColorSelector.cpp:274
+msgid "\tHue, Saturation, Value"
+msgstr "\t색조, 채도, 값"
+
+#: cfox/lib/FXColorSelector.cpp:239
+msgid "\tRed, Green, Blue"
+msgstr "\t적색, 녹색, 청색"
+
+#: cfox/lib/FXColorSelector.cpp:245
+msgid "&Red:"
+msgstr "적색(&R):"
+
+#: cfox/lib/FXColorSelector.cpp:250
+msgid "&Green:"
+msgstr "녹색(&G):"
+
+#: cfox/lib/FXColorSelector.cpp:255
+msgid "&Blue:"
+msgstr "청색(&B):"
+
+#: cfox/lib/FXColorSelector.cpp:260
+msgid "&Alpha:"
+msgstr "알파(&A):"
+
+#: cfox/lib/FXColorSelector.cpp:280
+msgid "Hue:"
+msgstr "색조:"
+
+#: cfox/lib/FXColorSelector.cpp:285
+msgid "Saturation:"
+msgstr "채도:"
+
+#: cfox/lib/FXColorSelector.cpp:290
+msgid "Value:"
+msgstr "값:"
+
+#: cfox/lib/FXColorSelector.cpp:295 cfox/lib/FXColorSelector.cpp:330
+msgid "Alpha:"
+msgstr "알파:"
+
+#: cfox/lib/FXColorSelector.cpp:309
+msgid "\tCyan, Magenta, Yellow"
+msgstr "\t청록색, 자홍색, 노란색"
+
+#: cfox/lib/FXColorSelector.cpp:315
+msgid "Cyan:"
+msgstr "청록색:"
+
+#: cfox/lib/FXColorSelector.cpp:320
+msgid "Magenta:"
+msgstr "자홍색:"
+
+#: cfox/lib/FXColorSelector.cpp:325
+msgid "Yellow:"
+msgstr "노란색:"
+
+#: cfox/lib/FXColorSelector.cpp:344
+msgid "\tBy Name"
+msgstr "\t이름별로"
+
+#: cfox/lib/FXDirSelector.cpp:141
+msgid "&Directory:"
+msgstr "디렉토리(&D):"
+
+#: cfox/lib/FXDirSelector.cpp:144
+msgid "&Name"
+msgstr "이름(&N)"
+
+#: cfox/lib/FXDirSelector.cpp:315 cfox/lib/FXFileSelector.cpp:720
+msgid "folder"
+msgstr "폴더"
+
+#: cfox/lib/FXDirSelector.cpp:316 cfox/lib/FXFileSelector.cpp:721
+msgid "Create New Directory"
+msgstr "새 디렉토리 생성"
+
+#: cfox/lib/FXDirSelector.cpp:319 cfox/lib/FXFileSelector.cpp:724
+msgid "Already Exists"
+msgstr "이미 존재함"
+
+#: cfox/lib/FXDirSelector.cpp:323 cfox/lib/FXFileSelector.cpp:728
+msgid "Cannot Create"
+msgstr "만들 수 없음"
+
+#: cfox/lib/FXDirSelector.cpp:343 cfox/lib/FXFileSelector.cpp:780
+msgid "Copy File"
+msgstr "파일 복사"
+
+#: cfox/lib/FXDirSelector.cpp:349 cfox/lib/FXFileSelector.cpp:786
+msgid "Error Copying File"
+msgstr "파일 복사중 오류"
+
+#: cfox/lib/FXDirSelector.cpp:360 cfox/lib/FXFileSelector.cpp:803
+msgid "Move File"
+msgstr "파일 이동"
+
+#: cfox/lib/FXDirSelector.cpp:366 cfox/lib/FXFileSelector.cpp:809
+msgid "Error Moving File"
+msgstr "파일 이동중 오류"
+
+#: cfox/lib/FXDirSelector.cpp:377 cfox/lib/FXFileSelector.cpp:826
+msgid "Link File"
+msgstr "링크 파일"
+
+#: cfox/lib/FXDirSelector.cpp:383 cfox/lib/FXFileSelector.cpp:832
+msgid "Error Linking File"
+msgstr "파일 연결중 오류"
+
+#: cfox/lib/FXDirSelector.cpp:393
+msgid "Deleting file"
+msgstr "파일 삭제중"
+
+#: cfox/lib/FXDirSelector.cpp:395 cfox/lib/FXFileSelector.cpp:852
+msgid "Error Deleting File"
+msgstr "파일 삭제중 오류"
+
+#: cfox/lib/FXDirSelector.cpp:415 cfox/lib/FXFileSelector.cpp:906
+msgid "Up one level"
+msgstr "한 단계 위로"
+
+#: cfox/lib/FXDirSelector.cpp:416 cfox/lib/FXFileSelector.cpp:907
+msgid "Home directory"
+msgstr "홈 디렉토리"
+
+#: cfox/lib/FXDirSelector.cpp:417 cfox/lib/FXFileSelector.cpp:908
+msgid "Work directory"
+msgstr "작업 디렉토리"
+
+#: cfox/lib/FXDirSelector.cpp:421
+msgid "Sorting"
+msgstr "정렬"
+
+#: cfox/lib/FXDirSelector.cpp:423 cfox/lib/FXFileSelector.cpp:947
+msgid "Ignore case"
+msgstr "대/소문자 무시"
+
+#: cfox/lib/FXDirSelector.cpp:424 cfox/lib/FXFileSelector.cpp:958
+msgid "Hidden files"
+msgstr "숨김 파일"
+
+#: cfox/lib/FXDirSelector.cpp:427 cfox/lib/FXFileSelector.cpp:912
+msgid "Bookmarks"
+msgstr "북마크"
+
+#: cfox/lib/FXDirSelector.cpp:428 cfox/lib/FXFileSelector.cpp:915
+msgid "Set bookmark"
+msgstr "북마크 지정"
+
+#: cfox/lib/FXDirSelector.cpp:429 cfox/lib/FXFileSelector.cpp:916
+msgid "&Unset bookmark"
+msgstr "북마크 지정해제(&U)"
+
+#: cfox/lib/FXDirSelector.cpp:430
+msgid "Clear bookmarks"
+msgstr "북마크 지우기"
+
+#: cfox/lib/FXDirSelector.cpp:446 cfox/lib/FXFileSelector.cpp:967
+msgid "New directory..."
+msgstr "새 디렉토리..."
+
+#: cfox/lib/FXDirSelector.cpp:447 cfox/lib/FXFileSelector.cpp:969
+msgid "Copy..."
+msgstr "복사..."
+
+#: cfox/lib/FXDirSelector.cpp:448 cfox/lib/FXFileSelector.cpp:970
+msgid "Move..."
+msgstr "이동..."
+
+#: cfox/lib/FXDirSelector.cpp:449 cfox/lib/FXFileSelector.cpp:971
+msgid "Link..."
+msgstr "링크..."
+
+#: cfox/lib/FXDirSelector.cpp:450 cfox/lib/FXFileSelector.cpp:972
+msgid "Delete..."
+msgstr "삭제..."
+
+#: cfox/lib/FXFileList.cpp:209
+msgid "Name\tName"
+msgstr "이름\t이름"
+
+#: cfox/lib/FXFileList.cpp:210
+msgid "Type\tFile type"
+msgstr "유형\t파일 유형"
+
+#: cfox/lib/FXFileList.cpp:211
+msgid "Size\tFile size"
+msgstr "크기\t파일 크기"
+
+#: cfox/lib/FXFileList.cpp:212
+msgid "Modified Date\tDate when last modified"
+msgstr "수정한 날짜\t마지막으로 수정한 날짜"
+
+#: cfox/lib/FXFileList.cpp:213
+msgid "User\tUser name"
+msgstr "사용자\t사용자 이름"
+
+#: cfox/lib/FXFileList.cpp:214
+msgid "Group\tGroup name"
+msgstr "그룹\t그룹 이름"
+
+#: cfox/lib/FXFileList.cpp:215
+msgid "Attributes\tFile attributes"
+msgstr "속성\t파일 속성"
+
+#: cfox/lib/FXFileList.cpp:217
+msgid "Link\tSymbolic link to"
+msgstr "링크\t심볼릭 링크:"
+
+#: cfox/lib/FXFileList.cpp:583
+msgid "Failed Deleting Files"
+msgstr "파일 삭제중 실패함"
+
+#: cfox/lib/FXFileList.cpp:583
+#, c-format
+msgid "Failed to delete file: %s; continue?"
+msgstr "파일 삭제 실패함: %s; 계속하시겠습니까?"
+
+#: cfox/lib/FXFileList.cpp:603 cfox/lib/FXFileList.cpp:632
+msgid "Overwrite File"
+msgstr "파일 덮어쓰기"
+
+#: cfox/lib/FXFileList.cpp:603 cfox/lib/FXFileList.cpp:632
+#, c-format
+msgid "Overwrite existing file or directory: %s?"
+msgstr "기존 파일 또는 디렉터리 덮어쓰기: %s하시겠습니까?"
+
+#: cfox/lib/FXFileList.cpp:610
+msgid "Failed Copying File"
+msgstr "파일 복사중 실패함"
+
+#: cfox/lib/FXFileList.cpp:610 cfox/lib/FXFileList.cpp:639
+#, c-format
+msgid "Failed to overwrite file: %s; continue?"
+msgstr "파일 덮어쓰기에 실패함: %s; 계속하시겠습니까?"
+
+#: cfox/lib/FXFileList.cpp:639
+msgid "Failed Moving File"
+msgstr "파일 이동중 실패함"
+
+#: cfox/lib/FXFileList.cpp:647
+msgid "Copying Files"
+msgstr "파일 복사중"
+
+#: cfox/lib/FXFileList.cpp:663
+msgid ""
+"Copying file:\n"
+"\n"
+msgstr ""
+"파일 복사중:\n"
+"\n"
+
+#: cfox/lib/FXFileList.cpp:714
+msgid "Failed Linking File"
+msgstr "파일 연결중 실패함"
+
+#: cfox/lib/FXFileList.cpp:714
+#, c-format
+msgid "Failed to make symbolic link from: %s; continue?"
+msgstr "심볼릭 링크를 만들지 못함: %s; 계속하시겠습니까?"
+
+#: cfox/lib/FXFileList.cpp:731
+msgid "Move Here"
+msgstr "여기에 이동"
+
+#: cfox/lib/FXFileList.cpp:732
+msgid "Copy Here"
+msgstr "여기에 복사"
+
+#: cfox/lib/FXFileList.cpp:733
+msgid "Link Here"
+msgstr "여기에 링크"
+
+#: cfox/lib/FXFileList.cpp:735
+msgid "Cancel"
+msgstr "취소"
+
+#: cfox/lib/FXFileList.cpp:1432
+msgid "Folder"
+msgstr "폴더"
+
+#: cfox/lib/FXFileList.cpp:1438
+msgid "Application"
+msgstr "응용프로그램"
+
+#: cfox/lib/FXFileList.cpp:1444
+msgid "Document"
+msgstr "문서"
+
+#: cfox/lib/FXFileSelector.cpp:721
+msgid "Create new directory with name: "
+msgstr "이름으로 새 디렉토리 생성: "
+
+#: cfox/lib/FXFileSelector.cpp:724
+#, c-format
+msgid "File or directory %s already exists.\n"
+msgstr "파일 또는 %s 디렉토리가 이미 존재합니다.\n"
+
+#: cfox/lib/FXFileSelector.cpp:728
+#, c-format
+msgid "Cannot create directory %s.\n"
+msgstr "%s 디렉터리를 만들 수 없습니다.\n"
+
+#: cfox/lib/FXFileSelector.cpp:756
+#, c-format
+msgid ""
+"Rename file from:\n"
+"\n"
+"%s\n"
+"\n"
+"to: "
+msgstr ""
+"다음에서 파일 이름변경:\n"
+"\n"
+"%s\n"
+"\n"
+"to: "
+
+#: cfox/lib/FXFileSelector.cpp:757
+msgid "Rename File"
+msgstr "파일 이름변경"
+
+#: cfox/lib/FXFileSelector.cpp:763
+msgid "Error Renaming File"
+msgstr "파일 이름변경중 오류"
+
+#: cfox/lib/FXFileSelector.cpp:763
+#, c-format
+msgid ""
+"Unable to rename file:\n"
+"\n"
+"%s  to:  %s\n"
+"\n"
+"Continue with operation?"
+msgstr ""
+"파일 이름을 바꿀 수 없음:\n"
+"\n"
+"%s  ⇒  %s\n"
+"\n"
+"작업을 계속하시겠습니까?"
+
+#: cfox/lib/FXFileSelector.cpp:779
+#, c-format
+msgid ""
+"Copy file from location:\n"
+"\n"
+"%s\n"
+"\n"
+"to location: "
+msgstr ""
+"다음 위치에서 파일 복사:\n"
+"\n"
+"%s\n"
+"\n"
+"다음 위치로: "
+
+#: cfox/lib/FXFileSelector.cpp:786
+#, c-format
+msgid ""
+"Unable to copy file:\n"
+"\n"
+"%s  to:  %s\n"
+"\n"
+"Continue with operation?"
+msgstr ""
+"파일을 복사할 수 없음:\n"
+"\n"
+"%s  ⇒  %s\n"
+"\n"
+"작업을 계속하시겠습니까?"
+
+#: cfox/lib/FXFileSelector.cpp:802
+#, c-format
+msgid ""
+"Move file from location:\n"
+"\n"
+"%s\n"
+"\n"
+"to location: "
+msgstr ""
+"다음 위치에서 파일 이동:\n"
+"\n"
+"%s\n"
+"\n"
+"다음 위치로: "
+
+#: cfox/lib/FXFileSelector.cpp:809
+#, c-format
+msgid ""
+"Unable to move file:\n"
+"\n"
+"%s  to:  %s\n"
+"\n"
+"Continue with operation?"
+msgstr ""
+"파일을 이동할 수 없음:\n"
+"\n"
+"%s  ⇒  %s\n"
+"\n"
+"작업을 계속하시겠습니까?"
+
+#: cfox/lib/FXFileSelector.cpp:825
+#, c-format
+msgid ""
+"Link file from location:\n"
+"\n"
+"%s\n"
+"\n"
+"to location: "
+msgstr ""
+"다음 위치에서 파일 링크:\n"
+"\n"
+"%s\n"
+"\n"
+"다음 위치로: "
+
+#: cfox/lib/FXFileSelector.cpp:832
+#, c-format
+msgid ""
+"Unable to link file:\n"
+"\n"
+"%s  to:  %s\n"
+"\n"
+"Continue with operation?"
+msgstr ""
+"파일을 링크할 수 없음:\n"
+"\n"
+"%s  ⇒  %s\n"
+"\n"
+"작업을 계속하시겠습니까?"
+
+#: cfox/lib/FXFileSelector.cpp:848
+msgid "Deleting files"
+msgstr "파일 삭제중"
+
+#: cfox/lib/FXFileSelector.cpp:848
+#, c-format
+msgid ""
+"Are you sure you want to delete the file:\n"
+"\n"
+"%s"
+msgstr ""
+"파일을 삭제하시겠습니까:\n"
+"\n"
+"%s"
+
+#: cfox/lib/FXFileSelector.cpp:852
+#, c-format
+msgid ""
+"Unable to delete file:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with operation?"
+msgstr ""
+"파일을 삭제할 수 없음:\n"
+"\n"
+"%s\n"
+"\n"
+"작업을 계속하시겠습니까?"
+
+#: cfox/lib/FXFileSelector.cpp:917
+msgid "Clear all bookmarks"
+msgstr "북마크 모두 지우기"
+
+#: cfox/lib/FXFileSelector.cpp:938
+msgid "Sort by"
+msgstr "정렬 기준"
+
+#: cfox/lib/FXFileSelector.cpp:943
+msgid "User"
+msgstr "사용자"
+
+#: cfox/lib/FXFileSelector.cpp:944
+msgid "Group"
+msgstr "그룹"
+
+#: cfox/lib/FXFileSelector.cpp:950
+msgid "View"
+msgstr "보기"
+
+#: cfox/lib/FXFileSelector.cpp:951
+msgid "Small icons"
+msgstr "작은 아이콘"
+
+#: cfox/lib/FXFileSelector.cpp:952
+msgid "Big icons"
+msgstr "큰 아이콘"
+
+#: cfox/lib/FXFileSelector.cpp:953
+msgid "Details"
+msgstr "세부사항"
+
+#: cfox/lib/FXFileSelector.cpp:955
+msgid "Rows"
+msgstr "행"
+
+#: cfox/lib/FXFileSelector.cpp:956
+msgid "Columns"
+msgstr "열"
+
+#: cfox/lib/FXFileSelector.cpp:959
+msgid "Preview images"
+msgstr "미리보기 이미지"
+
+#: cfox/lib/FXFileSelector.cpp:961
+msgid "Mini images"
+msgstr "소형 이미지"
+
+#: cfox/lib/FXFileSelector.cpp:962
+msgid "Normal images"
+msgstr "정상 이미지"
+
+#: cfox/lib/FXFileSelector.cpp:963
+msgid "Medium images"
+msgstr "중형 이미지"
+
+#: cfox/lib/FXFileSelector.cpp:964
+msgid "Giant images"
+msgstr "대형 이미지"
+
+#: cfox/lib/FXFileSelector.cpp:968
+msgid "Rename..."
+msgstr "이름변경..."
+
+#: cfox/lib/FXReplaceDialog.cpp:129
+msgid "&Search\tSearch\tSearch for pattern."
+msgstr "검색(&S)\t검색\t패턴 검색하기."
+
+#: cfox/lib/FXReplaceDialog.cpp:130
+msgid "&Replace\tReplace\tSearch and replace pattern."
+msgstr "바꾸기(&R)\t바꾸기\t패턴 검색 및 바꾸기."
+
+#: cfox/lib/FXReplaceDialog.cpp:131
+msgid "Replace Sel\tReplace in selection\tReplace all in selection."
+msgstr "선택 바꾸기\t선택에서 바꾸기\t선택에서 모두 바꾸기."
+
+#: cfox/lib/FXReplaceDialog.cpp:132
+msgid "Replace All\tReplace all\tReplace all."
+msgstr "모두 바꾸기\t모두 바꾸기\t모두 바꾸기."
+
+#: cfox/lib/FXReplaceDialog.cpp:138
+msgid "Search &For:"
+msgstr "검색 대상(&F):"
+
+#: cfox/lib/FXReplaceDialog.cpp:146
+msgid "Re&place With:"
+msgstr "바꾸기 대상(&P):"
+
+#: cfox/lib/FXReplaceDialog.cpp:155
+msgid "&Expression\tRegular Expression\tPerform regular-expression match."
+msgstr "표현식(&E)\t정규식\t정규식 일치 수행하기."
+
+#: cfox/lib/FXReplaceDialog.cpp:156
+msgid "&Ignore Case\tCase Insensitive\tPerform case-insentive match."
+msgstr "대/소문자 무시(&I)\t대/소문자 구분안함\t대/소문자 일치 수행하기."
+
+#: cfox/lib/FXReplaceDialog.cpp:157
+msgid "&Wrap\tWrap Around\tWrap around when searching."
+msgstr "줄바꿈(&W)\t순환\t검색시 둘러보기."
+
+#: cfox/lib/FXReplaceDialog.cpp:158
+msgid "&Backward\tSearch Direction\tChange search direction."
+msgstr "역방향(&B)\t검색 방향\t검색 방향 변경하기."
+
+#: cfox/lib/FXReplaceDialog.cpp:159
+msgid "Text to replace with."
+msgstr "대체할 텍스트입니다."
+
+#: cfox/lib/FXStatusLine.cpp:83
+msgid "Ready."
+msgstr "준비됨."

gogglesmm-1.2.1.tar.gz/po/pt.mo -> gogglesmm-1.2.2.tar.gz/po/pt.mo Changed

gogglesmm-1.2.1.tar.gz/po/pt.po -> gogglesmm-1.2.2.tar.gz/po/pt.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gogglesmm\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
 "PO-Revision-Date: 2011-11-16 22:22-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
@@ -80,8 +80,7 @@
 msgid "Move Down"
 msgstr "Para baixo"
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
 msgid "No"
 msgstr "Não"
@@ -191,6 +190,10 @@
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr "Copiar\tCtrl-C\tCopiar faixa(s) para a área de transferência"
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr "Abrir local da pasta\t\tAbrir local da pasta"
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr "Remover…\tDel\tRemover faixa(s) da coleção"
@@ -587,8 +590,16 @@
 "%s ?"
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-msgid "Yes"
-msgstr "Sim"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
+msgstr "&Sim"
+
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+msgid "&No"
+msgstr "&Não"
 
 #: src/GMFilterSource.cpp:207
 #, fuzzy
@@ -965,11 +976,11 @@
 "disponibilizado pela biblioteca FOX. Se foi você que compilou o FOX,\n"
 "verifique se ficheiros libpng estão instalados."
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr "Erro last.fm"
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr "Erro de reprodução"
 
@@ -2125,16 +2136,6 @@
 msgid "Internet Radio"
 msgstr "Rádio na internet"
 
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr "&Sim"
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-msgid "&No"
-msgstr "&Não"
-
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 msgid "&Quit"
 msgstr "&Sair"
@@ -2755,6 +2756,9 @@
 msgid "Ready."
 msgstr "Pronto"
 
+#~ msgid "Yes"
+#~ msgstr "Sim"
+
 #~ msgid "Exclude Filter\tFilter out directories and/or files based on pattern"
 #~ msgstr "Exclusão\tFiltrar diretórios e/ou ficheiros com base num padrão"
 
@@ -2985,9 +2989,6 @@
 #~ "\n"
 #~ "para: %s"
 
-#~ msgid "Open Folder Location\t\tOpen Folder Location."
-#~ msgstr "Abrir local da pasta\t\tAbrir local da pasta"
-
 #~ msgid "New Play List…\t\tCreate a new play list."
 #~ msgstr "Nova lista de reprodução…\t\tCriar nova lista de reprodução"

gogglesmm-1.2.1.tar.gz/po/ru.mo -> gogglesmm-1.2.2.tar.gz/po/ru.mo Changed

gogglesmm-1.2.1.tar.gz/po/ru.po -> gogglesmm-1.2.2.tar.gz/po/ru.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gogglesmm 0.10.0\n"
 "Report-Msgid-Bugs-To: s.jansen@gmail.com\n"
-"POT-Creation-Date: 2018-07-03 04:28-0500\n"
+"POT-Creation-Date: 2020-04-19 11:19-0500\n"
 "PO-Revision-Date: 2011-07-12 20:14+0300\n"
 "Last-Translator: L Lawliet <lestat.de.lionkur@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -78,8 +78,7 @@
 msgid "Move Down"
 msgstr "Переместить вниз"
 
-#: src/GMDatabaseSource.cpp:226 src/GMFilterSource.cpp:197
-#: src/GMPlayListSource.cpp:387 src/GMPlayQueue.cpp:67
+#: src/GMDatabaseSource.cpp:226 src/GMPlayQueue.cpp:67
 #: src/GMStreamSource.cpp:58
 msgid "No"
 msgstr "Нет"
@@ -188,6 +187,10 @@
 msgid "Copy\tCtrl-C\tCopy track(s) to clipboard."
 msgstr "Копировать\tCtrl-C\tКопировать трек(и) в буфер обмена."
 
+#: src/GMDatabaseSource.cpp:345
+msgid "Open Folder Location\t\tOpen Folder Location."
+msgstr ""
+
 #: src/GMDatabaseSource.cpp:350
 msgid "Remove…\tDel\tRemove track(s) from library."
 msgstr "Удалить…\tDel\tУдалить трек(и) из библиотеки."
@@ -586,9 +589,18 @@
 "%s"
 
 #: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
-msgid "Yes"
+#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
+#: cfox/lib/FXMessageBox.cpp:148
+msgid "&Yes"
 msgstr "Да"
 
+#: src/GMFilterSource.cpp:197 src/GMPlayListSource.cpp:387
+#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
+#: cfox/lib/FXMessageBox.cpp:150
+#, fuzzy
+msgid "&No"
+msgstr "Нет"
+
 #: src/GMFilterSource.cpp:207
 #, fuzzy
 msgid "Edit"
@@ -964,11 +976,11 @@
 "библиотеке FOX. Если Вы сами компилируете FOX, вероятно заголовочные файлы\n"
 "libpng не установлены в Вашей системе."
 
-#: src/GMPlayerManager.cpp:1402
+#: src/GMPlayerManager.cpp:1397
 msgid "Last.FM Error"
 msgstr "Ошибка Last.FM"
 
-#: src/GMPlayerManager.cpp:1776
+#: src/GMPlayerManager.cpp:1769
 msgid "Playback Error"
 msgstr "Ошибка воспроизведения"
 
@@ -2129,17 +2141,6 @@
 msgid "Internet Radio"
 msgstr "Интернет радио"
 
-#: cfox/lib/FXMessageBox.cpp:112 cfox/lib/FXMessageBox.cpp:117
-#: cfox/lib/FXMessageBox.cpp:148
-msgid "&Yes"
-msgstr "Да"
-
-#: cfox/lib/FXMessageBox.cpp:113 cfox/lib/FXMessageBox.cpp:118
-#: cfox/lib/FXMessageBox.cpp:150
-#, fuzzy
-msgid "&No"
-msgstr "Нет"
-
 #: cfox/lib/FXMessageBox.cpp:123 cfox/lib/FXMessageBox.cpp:128
 #, fuzzy
 msgid "&Quit"
@@ -2791,6 +2792,9 @@
 msgid "Ready."
 msgstr "Готово."
 
+#~ msgid "Yes"
+#~ msgstr "Да"
+
 #~ msgid "Exclude Filter\tFilter out directories and/or files based on pattern"
 #~ msgstr "Отключить фильтр\tОтфильтровать папки и/или файлы по шаблону"

gogglesmm-1.2.1.tar.gz/src/CMakeLists.txt -> gogglesmm-1.2.2.tar.gz/src/CMakeLists.txt Changed

gogglesmm-1.2.1.tar.gz/src/GMAbout.cpp -> gogglesmm-1.2.2.tar.gz/src/GMAbout.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -84,7 +84,7 @@
                  "as published by the Free Software Foundation,\n"
                  "either version 3 of the License, or (at your\n"
                  "option) any later version.\n\n"
-                 "This software uses the FOX Toolkit Library\n(http://www.fox-toolkit.org)\nCopyright " UTF8_COPYRIGHT_SIGN " 2001-2018 Jeroen van der Zijp.\n\n"
+                 "This software uses the FOX Toolkit Library\n(http://www.fox-toolkit.org)\nCopyright " UTF8_COPYRIGHT_SIGN " 2001-2021 Jeroen van der Zijp.\n\n"
                  "ALAC decoder (MIT Licensed)\n"
                  "Copyright " UTF8_COPYRIGHT_SIGN " 2005 David Hammerton\n"
                  "All rights reserved.\n"
@@ -101,7 +101,7 @@
   label->setBackColor(FXRGB(255,255,255));
   label->setTextColor(FXRGB(0,0,0));
 
-  label = new FXLabel(this,"Copyright " UTF8_COPYRIGHT_SIGN " 2004-2018 Sander Jansen",nullptr,LAYOUT_CENTER_X|LAYOUT_FILL_X,0,0,0,0,5,5,0,0);
+  label = new FXLabel(this,"Copyright " UTF8_COPYRIGHT_SIGN " 2004-2021 Sander Jansen",nullptr,LAYOUT_CENTER_X|LAYOUT_FILL_X,0,0,0,0,5,5,0,0);
   label->setBackColor(FXRGB(255,255,255));
   label->setTextColor(FXRGB(0,0,0));
 
@@ -127,11 +127,13 @@
 
 long GMAboutDialog::onCmdReportIssue(FXObject*,FXSelector,void*){
 
+
+
   // github issue template
   const char issuetemplate="- x gogglesmm version: " GOGGLESMM_VERSION_STRING "\n"
                              "- x fox version: %d.%d.%d\n"
                              "- x sqlite version: %s\n"
-                             "-   OS / Distribution:\n\n"
+                             "- x OS / Distribution: %s\n\n"
                              "Please describe your request or problem";
 
   // Construct the body text
@@ -139,7 +141,8 @@
                                                 fxversion0,
                                                 fxversion1,
                                                 fxversion2,
-                                                sqlite3_libversion()));
+                                                sqlite3_libversion(),
+                                                gm_os_information().text()));
 
   // Construct the url
   FXString url = FXString::value("https://github.com/gogglesmm/gogglesmm/issues/new?body=%s",body.text());

gogglesmm-1.2.1.tar.gz/src/GMAbout.h -> gogglesmm-1.2.2.tar.gz/src/GMAbout.h Changed

gogglesmm-1.2.1.tar.gz/src/GMAnimImage.cpp -> gogglesmm-1.2.2.tar.gz/src/GMAnimImage.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMAnimImage.h -> gogglesmm-1.2.2.tar.gz/src/GMAnimImage.h Changed

gogglesmm-1.2.1.tar.gz/src/GMApp.cpp -> gogglesmm-1.2.2.tar.gz/src/GMApp.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMApp.h -> gogglesmm-1.2.2.tar.gz/src/GMApp.h Changed

gogglesmm-1.2.1.tar.gz/src/GMAppStatusNotify.cpp -> gogglesmm-1.2.2.tar.gz/src/GMAppStatusNotify.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMAppStatusNotify.h -> gogglesmm-1.2.2.tar.gz/src/GMAppStatusNotify.h Changed

gogglesmm-1.2.1.tar.gz/src/GMAudioScrobbler.cpp -> gogglesmm-1.2.2.tar.gz/src/GMAudioScrobbler.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMAudioScrobbler.h -> gogglesmm-1.2.2.tar.gz/src/GMAudioScrobbler.h Changed

gogglesmm-1.2.1.tar.gz/src/GMClipboard.cpp -> gogglesmm-1.2.2.tar.gz/src/GMClipboard.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMClipboard.h -> gogglesmm-1.2.2.tar.gz/src/GMClipboard.h Changed

gogglesmm-1.2.1.tar.gz/src/GMColumnDialog.cpp -> gogglesmm-1.2.2.tar.gz/src/GMColumnDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMColumnDialog.h -> gogglesmm-1.2.2.tar.gz/src/GMColumnDialog.h Changed

gogglesmm-1.2.1.tar.gz/src/GMCover.cpp -> gogglesmm-1.2.2.tar.gz/src/GMCover.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMCover.h -> gogglesmm-1.2.2.tar.gz/src/GMCover.h Changed

gogglesmm-1.2.1.tar.gz/src/GMCoverCache.cpp -> gogglesmm-1.2.2.tar.gz/src/GMCoverCache.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMCoverCache.h -> gogglesmm-1.2.2.tar.gz/src/GMCoverCache.h Changed

gogglesmm-1.2.1.tar.gz/src/GMCoverLoader.h -> gogglesmm-1.2.2.tar.gz/src/GMCoverLoader.h Changed

gogglesmm-1.2.1.tar.gz/src/GMCoverManager.cpp -> gogglesmm-1.2.2.tar.gz/src/GMCoverManager.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMCoverManager.h -> gogglesmm-1.2.2.tar.gz/src/GMCoverManager.h Changed

gogglesmm-1.2.1.tar.gz/src/GMDBus.cpp -> gogglesmm-1.2.2.tar.gz/src/GMDBus.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2007-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2007-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -60,7 +60,7 @@
   void setuphooks() {
     for (FXint i=0;i<connections.no();i++) {
       if (!connections.empty(i)) {
-        static_cast<GMDBus*>(connections.value(i))->setup_event_loop();
+        static_cast<GMDBus*>(connections.data(i))->setup_event_loop();
         }
       }
     }
@@ -532,7 +532,7 @@
   /// remove any pending proxy replies;
   for (FXint i=0;i<serial.no();i++) {
     if (!serial.empty(i)) {
-      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.value(i));
+      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.data(i));
       delete reply;
       }
     }

gogglesmm-1.2.1.tar.gz/src/GMDBus.h -> gogglesmm-1.2.2.tar.gz/src/GMDBus.h Changed

gogglesmm-1.2.1.tar.gz/src/GMDatabase.cpp -> gogglesmm-1.2.2.tar.gz/src/GMDatabase.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMDatabase.h -> gogglesmm-1.2.2.tar.gz/src/GMDatabase.h Changed

gogglesmm-1.2.1.tar.gz/src/GMDatabaseSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMDatabaseSource.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -342,7 +342,7 @@
   new FXMenuSeparator(pane);
 
   if (GMPlayerManager::instance()->getTrackView()->numTrackSelected()==1){
-    new GMMenuCommand(pane,"Open Folder Location\t\tOpen Folder Location.",nullptr,this,ID_OPEN_FOLDER);
+    new GMMenuCommand(pane,fxtr("Open Folder Location\t\tOpen Folder Location."),nullptr,this,ID_OPEN_FOLDER);
     new GMMenuCommand(pane,fxtr("Find Cover…\t\tFind Cover with Google Image Search"),nullptr,this,ID_SEARCH_COVER);
     new FXMenuSeparator(pane);
     }

gogglesmm-1.2.1.tar.gz/src/GMDatabaseSource.h -> gogglesmm-1.2.2.tar.gz/src/GMDatabaseSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMFilename.cpp -> gogglesmm-1.2.2.tar.gz/src/GMFilename.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -167,7 +167,7 @@
     else if (Unicode::isPrint(src.wc(i))) {
       if (codec->wc2mb(&c,1,src.wc(i))==1) {
         if (c==undefined_character) {
-          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
+          FXString dcm = FXString::decompose(src.mid(i,src.extent(i)),false);
           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=0x1a) {
               n++;
@@ -190,7 +190,7 @@
         if (c==undefined_character) {
           /* If codec didn't contain a mapping to the required character,
              do a compatibility decomposition and try mapping those */
-          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
+          FXString dcm = FXString::decompose(src.mid(i,src.extent(i)),false);
           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=undefined_character) {
               dstn++=c;
@@ -208,7 +208,7 @@
 
 
 FXString TextConverter::convert_to_ascii(const FXString & input) const {
-  FXString src = decompose(input,false);
+  FXString src = FXString::decompose(input,false);
   FXString dst;
   FXint i,n=0;

gogglesmm-1.2.1.tar.gz/src/GMFilename.h -> gogglesmm-1.2.2.tar.gz/src/GMFilename.h Changed

gogglesmm-1.2.1.tar.gz/src/GMFilter.cpp -> gogglesmm-1.2.2.tar.gz/src/GMFilter.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMFilter.h -> gogglesmm-1.2.2.tar.gz/src/GMFilter.h Changed

gogglesmm-1.2.1.tar.gz/src/GMFilterEditor.cpp -> gogglesmm-1.2.2.tar.gz/src/GMFilterEditor.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMFilterEditor.h -> gogglesmm-1.2.2.tar.gz/src/GMFilterEditor.h Changed

gogglesmm-1.2.1.tar.gz/src/GMFilterSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMFilterSource.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2015-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2015-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -194,7 +194,7 @@
 
 
 long GMFilterSource::onCmdRemove(FXObject*,FXSelector,void *){
-  if (GMPlayerManager::instance()->getMainWindow()->question(fxtr("Remove Filter"),fxtr("Are you sure you want to remove the filter?"),fxtr("Yes"),fxtr("No"))){
+  if (GMPlayerManager::instance()->getMainWindow()->question(fxtr("Remove Filter"),fxtr("Are you sure you want to remove the filter?"),fxtr("&Yes"),fxtr("&No"))){
     sources.remove(this);
     GMFilterSource::save();
     GMPlayerManager::instance()->removeSource(this);

gogglesmm-1.2.1.tar.gz/src/GMFilterSource.h -> gogglesmm-1.2.2.tar.gz/src/GMFilterSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMFontDialog.cpp -> gogglesmm-1.2.2.tar.gz/src/GMFontDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMFontDialog.h -> gogglesmm-1.2.2.tar.gz/src/GMFontDialog.h Changed

gogglesmm-1.2.1.tar.gz/src/GMIconTheme.h -> gogglesmm-1.2.2.tar.gz/src/GMIconTheme.h Changed

gogglesmm-1.2.1.tar.gz/src/GMImageView.cpp -> gogglesmm-1.2.2.tar.gz/src/GMImageView.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMImageView.h -> gogglesmm-1.2.2.tar.gz/src/GMImageView.h Changed

gogglesmm-1.2.1.tar.gz/src/GMImportDialog.cpp -> gogglesmm-1.2.2.tar.gz/src/GMImportDialog.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMImportDialog.h -> gogglesmm-1.2.2.tar.gz/src/GMImportDialog.h Changed

gogglesmm-1.2.1.tar.gz/src/GMList.cpp -> gogglesmm-1.2.2.tar.gz/src/GMList.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMList.h -> gogglesmm-1.2.2.tar.gz/src/GMList.h Changed

gogglesmm-1.2.1.tar.gz/src/GMLocalSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMLocalSource.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMLocalSource.h -> gogglesmm-1.2.2.tar.gz/src/GMLocalSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMLyrics.cpp -> gogglesmm-1.2.2.tar.gz/src/GMLyrics.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMLyrics.h -> gogglesmm-1.2.2.tar.gz/src/GMLyrics.h Changed

gogglesmm-1.2.1.tar.gz/src/GMMediaPlayerService.cpp -> gogglesmm-1.2.2.tar.gz/src/GMMediaPlayerService.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMMediaPlayerService.h -> gogglesmm-1.2.2.tar.gz/src/GMMediaPlayerService.h Changed

gogglesmm-1.2.1.tar.gz/src/GMNotifyDaemon.cpp -> gogglesmm-1.2.2.tar.gz/src/GMNotifyDaemon.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMNotifyDaemon.h -> gogglesmm-1.2.2.tar.gz/src/GMNotifyDaemon.h Changed

gogglesmm-1.2.1.tar.gz/src/GMPlayListSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPlayListSource.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -384,7 +384,7 @@
 
 
 long GMPlayListSource::onCmdRemove(FXObject*,FXSelector,void *){
-  if (GMPlayerManager::instance()->getMainWindow()->question(fxtr("Delete Play List?"),fxtr("Are you sure you want to delete the playlist?"),fxtr("Yes"),fxtr("No"))){
+  if (GMPlayerManager::instance()->getMainWindow()->question(fxtr("Delete Play List?"),fxtr("Are you sure you want to delete the playlist?"),fxtr("&Yes"),fxtr("&No"))){
     if (db->removePlaylist(playlist)) {
       FXApp::instance()->reg().deleteSection(settingKey().text());
       GMPlayerManager::instance()->removeSource(this);

gogglesmm-1.2.1.tar.gz/src/GMPlayListSource.h -> gogglesmm-1.2.2.tar.gz/src/GMPlayListSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMPlayQueue.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPlayQueue.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMPlayQueue.h -> gogglesmm-1.2.2.tar.gz/src/GMPlayQueue.h Changed

gogglesmm-1.2.1.tar.gz/src/GMPlayerManager.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPlayerManager.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -732,6 +732,10 @@
     case 2: player->setReplayGain(ReplayGainAlbum); break;
     }
 
+  if (preferences.play_crossfade)
+    player->setCrossFade(preferences.play_crossfade_duration);
+
+
   /// Receive events from fifo
   if (fifo.isOpen()) {
     application->addInput(this,GMPlayerManager::ID_DDE_MESSAGE,fifo.handle(),INPUT_READ);

gogglesmm-1.2.1.tar.gz/src/GMPlayerManager.h -> gogglesmm-1.2.2.tar.gz/src/GMPlayerManager.h Changed

gogglesmm-1.2.1.tar.gz/src/GMPodcastSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPodcastSource.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMPodcastSource.h -> gogglesmm-1.2.2.tar.gz/src/GMPodcastSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMPreferences.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPreferences.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -77,6 +77,9 @@
 const char key_play_replaygain="replay-gain";
 const char key_play_shuffle="shuffle";
 const char key_play_from_queue="play-from-queue";
+const char key_play_crossfade="crossfade";
+const char key_play_crossfade_duration="crossfade-duration";
+
 
 #ifdef HAVE_DBUS
 const char key_dbus_notify_daemon="notification-daemon";
@@ -193,6 +196,9 @@
   reg.writeIntEntry(section_player,key_play_replaygain,play_replaygain);
   reg.writeBoolEntry(section_player,key_play_shuffle,play_shuffle);
   reg.writeBoolEntry(section_player,key_play_from_queue,play_from_queue);
+  reg.writeBoolEntry(section_player,key_play_crossfade,play_crossfade);
+  reg.writeUIntEntry(section_player,key_play_crossfade_duration,play_crossfade_duration);
+
 
 #ifdef HAVE_DBUS
   /// Dbus
@@ -280,6 +286,8 @@
   play_replaygain               = reg.readIntEntry(section_player,key_play_replaygain,play_replaygain);
   play_shuffle                  = reg.readBoolEntry(section_player,key_play_shuffle,play_shuffle);
   play_from_queue               = reg.readBoolEntry(section_player,key_play_from_queue,play_from_queue);
+  play_crossfade                = reg.readBoolEntry(section_player,key_play_crossfade,play_crossfade);
+  play_crossfade_duration       = reg.readUIntEntry(section_player,key_play_crossfade_duration,play_crossfade_duration);
 
   /// Dbus
 #ifdef HAVE_DBUS

gogglesmm-1.2.1.tar.gz/src/GMPreferences.h -> gogglesmm-1.2.2.tar.gz/src/GMPreferences.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -149,6 +149,8 @@
   FXuint play_repeat                    = REPEAT_ALL;
   FXbool play_shuffle                   = false;
   FXbool play_from_queue                = false;
+  FXbool play_crossfade                 = false;
+  FXuint play_crossfade_duration        = 5000;
 
   FXuint export_encoding                = GMFilename::ENCODING_ASCII;
   FXbool export_lowercase               = false;

gogglesmm-1.2.1.tar.gz/src/GMPreferencesDialog.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPreferencesDialog.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -267,6 +267,7 @@
   FXMAPFUNC(SEL_COMMAND,GMPreferencesDialog::ID_AUDIO_DRIVER,GMPreferencesDialog::onCmdAudioDriver),
   FXMAPFUNC(SEL_CHANGED,GMPreferencesDialog::ID_AUDIO_DRIVER,GMPreferencesDialog::onCmdAudioDriver),
   FXMAPFUNC(SEL_COMMAND,GMPreferencesDialog::ID_REPLAY_GAIN,GMPreferencesDialog::onCmdReplayGain),
+  FXMAPFUNC(SEL_COMMAND,GMPreferencesDialog::ID_CROSS_FADE,GMPreferencesDialog::onCmdCrossFade),
   FXMAPFUNC(SEL_COMMAND,GMPreferencesDialog::ID_TITLE_FORMAT,GMPreferencesDialog::onCmdTitleFormat),
   FXMAPFUNC(SEL_UPDATE,GMPreferencesDialog::ID_TITLE_FORMAT,GMPreferencesDialog::onUpdTitleFormat),
   FXMAPFUNC(SEL_UPDATE,GMPreferencesDialog::ID_TITLE_FORMAT_LABEL,GMPreferencesDialog::onUpdTitleFormat),
@@ -298,6 +299,9 @@
   target_gui_show_playing_titlebar.connect(GMPlayerManager::instance()->getPreferences().gui_show_playing_titlebar);
   target_gui_format_title.connect(GMPlayerManager::instance()->getPreferences().gui_format_title);
 
+  target_crossfade.connect(GMPlayerManager::instance()->getPreferences().play_crossfade, this,ID_CROSS_FADE);
+  target_crossfade_duration.connect(GMPlayerManager::instance()->getPreferences().play_crossfade_duration, this,ID_CROSS_FADE);
+
   GMPlayerManager::instance()->getPreferences().getKeyWords(keywords);
 
   const FXuint labelstyle=LAYOUT_CENTER_Y|LABEL_NORMAL|LAYOUT_RIGHT;
@@ -598,6 +602,9 @@
   if (AP_HAS_PLUGIN(devices,DeviceJack))
     driverlist->appendItem("Jack",nullptr,(void*)DeviceJack);
 
+  if (AP_HAS_PLUGIN(devices,DeviceSndio))
+    driverlist->appendItem("Sndio",nullptr,(void*)DeviceSndio);
+
   if (AP_HAS_PLUGIN(devices,DeviceWav))
     driverlist->appendItem("Wave File Output",nullptr,(void*)DeviceWav);
 
@@ -627,6 +634,11 @@
   oss_device = new GMTextField(matrix,20,nullptr,0,TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
   oss_device->setText(config.oss.device);
 
+  /// Sndio
+  sndio_device_label = new FXLabel(matrix,tr("Device:"),nullptr,labelstyle);
+  sndio_device = new GMTextField(matrix,20,nullptr,0,TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
+  sndio_device->setText(config.sndio.device);
+
   showDriverSettings(config.device);
 
   new FXFrame(matrix,FRAME_NONE);
@@ -635,7 +647,7 @@
   grpbox =  new FXGroupBox(vframe,tr("Playback"),FRAME_NONE|LAYOUT_FILL_X,0,0,0,0,20);
   grpbox->setFont(GMApp::instance()->getThickFont());
 
-  matrix = new FXMatrix(grpbox,2,MATRIX_BY_COLUMNS|LAYOUT_SIDE_TOP,0,0,0,0,0,0,0,0);
+  matrix = new FXMatrix(grpbox,4,MATRIX_BY_COLUMNS|LAYOUT_SIDE_TOP,0,0,0,0,0,0,0,0);
 
   new FXLabel(matrix,tr("Replay Gain:"),nullptr,labelstyle);
 
@@ -644,6 +656,19 @@
   gainlist->appendItem(tr("Track"));
   gainlist->appendItem(tr("Album"));
   gainlist->setNumVisible(3);
+  new FXFrame(matrix,FRAME_NONE);
+  new FXFrame(matrix,FRAME_NONE);
+
+
+  new FXLabel(matrix,tr("Crossfade:"),nullptr,labelstyle);
+  auto crossfade_list = new GMListBox(matrix,&target_crossfade,FXDataTarget::ID_VALUE,LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
+  crossfade_list->appendItem(tr("Off"));
+  crossfade_list->appendItem(tr("On"));
+  crossfade_list->setNumVisible(2);
+  auto crossfade_duration = new GMSpinner(matrix,5,&target_crossfade_duration,FXDataTarget::ID_VALUE,LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
+  crossfade_duration->setRange(1,20000);
+  new FXLabel(matrix, tr("ms"), nullptr, labelstyle);
+
 
 
   // Podcast Settings
@@ -718,6 +743,9 @@
         alsa_hardware_only_frame->show();
         oss_device->hide();
         oss_device_label->hide();
+        sndio_device->hide();
+        sndio_device_label->hide();
+
       } break;
 
     case DeviceOSS:
@@ -726,6 +754,8 @@
         alsa_device->hide();
         alsa_hardware_only->hide();
         alsa_hardware_only_frame->hide();
+        sndio_device->hide();
+        sndio_device_label->hide();
         oss_device->show();
         oss_device_label->show();
       } break;
@@ -738,6 +768,20 @@
         alsa_hardware_only_frame->hide();
         oss_device->hide();
         oss_device_label->hide();
+        sndio_device->hide();
+        sndio_device_label->hide();
+      } break;
+
+    case DeviceSndio:
+      {
+        alsa_device_label->hide();
+        alsa_device->hide();
+        alsa_hardware_only->hide();
+        alsa_hardware_only_frame->hide();
+        oss_device->hide();
+        oss_device_label->hide();
+        sndio_device->show();
+        sndio_device_label->show();
       } break;
 
     default:
@@ -748,6 +792,8 @@
         alsa_hardware_only_frame->hide();
         oss_device->hide();
         oss_device_label->hide();
+        sndio_device->hide();
+        sndio_device_label->hide();
       } break;
 
     }
@@ -772,6 +818,7 @@
     config.alsa.flags&=~AlsaConfig::DeviceNoResample;
 
   config.oss.device = oss_device->getText();
+  config.sndio.device = sndio_device->getText();
 
   GMPlayerManager::instance()->getPlayer()->setOutputConfig(config);
   return 1;
@@ -785,6 +832,14 @@
   return 1;
   }
 
+long GMPreferencesDialog::onCmdCrossFade(FXObject*,FXSelector,void*){
+  if (GMPlayerManager::instance()->getPreferences().play_crossfade)
+    GMPlayerManager::instance()->getPlayer()->setCrossFade(GMPlayerManager::instance()->getPreferences().play_crossfade_duration);
+  else
+    GMPlayerManager::instance()->getPlayer()->setCrossFade(0);
+  return 1;
+  }
+
 long GMPreferencesDialog::onCmdReplayGain(FXObject*,FXSelector,void*){
   switch(GMPlayerManager::instance()->getPreferences().play_replaygain){
     case 0: GMPlayerManager::instance()->getPlayer()->setReplayGain(ReplayGainOff); break;

gogglesmm-1.2.1.tar.gz/src/GMPreferencesDialog.h -> gogglesmm-1.2.2.tar.gz/src/GMPreferencesDialog.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -27,6 +27,8 @@
   FXDataTarget target_closeishide;
   FXDataTarget target_keywords;
   FXDataTarget target_replaygain;
+  FXDataTarget target_crossfade;
+  FXDataTarget target_crossfade_duration;
   FXDataTarget target_show_playing_albumcover;
   FXDataTarget target_show_playing_lyrics;
 #ifdef HAVE_DBUS
@@ -50,6 +52,9 @@
   FXLabel     * oss_device_label = nullptr;
   FXTextField * oss_device = nullptr;
 
+  FXLabel     * sndio_device_label = nullptr;
+  FXTextField * sndio_device = nullptr;
+
 protected:
   void showDriverSettings(FXuchar driver);
 public:
@@ -108,6 +113,7 @@
     ID_CHANGE_FONT,
     ID_AUDIO_DRIVER,
     ID_REPLAY_GAIN,
+    ID_CROSS_FADE,
     ID_ICON_THEME,
     ID_TITLE_FORMAT,
     ID_TITLE_FORMAT_LABEL,
@@ -135,6 +141,7 @@
   long onCmdDisplayDPI(FXObject*,FXSelector,void*);
   long onCmdIconTheme(FXObject*,FXSelector,void*);
   long onCmdApplyAudio(FXObject*,FXSelector,void*);
+  long onCmdCrossFade(FXObject*,FXSelector,void*);
 protected:
   GMPreferencesDialog(){}
 private:

gogglesmm-1.2.1.tar.gz/src/GMPresenter.cpp -> gogglesmm-1.2.2.tar.gz/src/GMPresenter.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMPresenter.h -> gogglesmm-1.2.2.tar.gz/src/GMPresenter.h Changed

gogglesmm-1.2.1.tar.gz/src/GMRemote.cpp -> gogglesmm-1.2.2.tar.gz/src/GMRemote.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -60,12 +60,14 @@
   font_title = new FXFont(getApp(),fontdescription);
   font_title->create();
 
+  coversize = getApp()->reg().readUIntEntry("window","remote-cover-size",coversize);
+
   img_default = new FXPNGImage(getApp(),about_png);
-  img_default->scale(64,64,FOX_SCALE_BEST);
+  img_default->scale(coversize,coversize,FOX_SCALE_BEST);
   img_default->blend(getApp()->getBackColor());
   img_default->create();
 
-  cover_label = new FXImageFrame(this,img_default,LAYOUT_SIDE_LEFT|FRAME_SUNKEN|LAYOUT_FIX_WIDTH|JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y|LAYOUT_FILL_Y,0,0,64,64);
+  cover_label = new FXImageFrame(this,img_default,LAYOUT_SIDE_LEFT|FRAME_SUNKEN|LAYOUT_FIX_WIDTH|JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y|LAYOUT_FILL_Y,0,0,coversize,coversize);
   cover_label->setBackColor(getApp()->getBackColor());
 
   /// Popup Volume Menu
@@ -111,15 +113,15 @@
   trackslider->setDefaultCursor(GMIconTheme::instance()->cursor_hand);
   trackslider->setDragCursor(GMIconTheme::instance()->cursor_hand);
 
-  getAccelTable()->addAccel(parseAccel("F11"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_SHOW_BROWSER));
-  getAccelTable()->addAccel(parseAccel("Ctrl-M"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_SHOW_BROWSER));
-  getAccelTable()->addAccel(parseAccel("Ctrl-W"),this,FXSEL(SEL_CLOSE,0));
-  getAccelTable()->addAccel(parseAccel("Ctrl-Q"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_QUIT));
+  getAccelTable()->addAccel("F11",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_SHOW_BROWSER));
+  getAccelTable()->addAccel("Ctrl-M",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_SHOW_BROWSER));
+  getAccelTable()->addAccel("Ctrl-W",this,FXSEL(SEL_CLOSE,0));
+  getAccelTable()->addAccel("Ctrl-Q",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_QUIT));
 
-  getAccelTable()->addAccel(parseAccel("Ctrl-P"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_PLAYPAUSEMENU));
-  getAccelTable()->addAccel(parseAccel("Ctrl-\\"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_STOP));
-  getAccelTable()->addAccel(parseAccel("Ctrl-"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_PREV));
-  getAccelTable()->addAccel(parseAccel("Ctrl-"),GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_NEXT));
+  getAccelTable()->addAccel("Ctrl-P",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_PLAYPAUSEMENU));
+  getAccelTable()->addAccel("Ctrl-\\",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_STOP));
+  getAccelTable()->addAccel("Ctrl-",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_PREV));
+  getAccelTable()->addAccel("Ctrl-",GMPlayerManager::instance()->getMainWindow(),FXSEL(SEL_COMMAND,GMWindow::ID_NEXT));
 
   reset();
   }
@@ -258,7 +260,7 @@
     delete cover;
     cover=nullptr;
     }
-  cover = GMCover::copyToImage(GMPlayerManager::instance()->getCoverManager()->getCover(),64);
+  cover = GMCover::copyToImage(GMPlayerManager::instance()->getCoverManager()->getCover(),coversize);
   updateCover();
   }
 
@@ -266,6 +268,7 @@
 // Create and show window
 void GMRemote::create(){
   FXMainWindow::create();
+
   if (getApp()->reg().readIntEntry("window","remote-x",-1)!=-1) {
     FXint xx=getApp()->reg().readIntEntry("window","remote-x",getX());
     FXint yy=getApp()->reg().readIntEntry("window","remote-y",getY());

gogglesmm-1.2.1.tar.gz/src/GMRemote.h -> gogglesmm-1.2.2.tar.gz/src/GMRemote.h Changed

gogglesmm-1.2.1.tar.gz/src/GMScanner.cpp -> gogglesmm-1.2.2.tar.gz/src/GMScanner.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMScanner.h -> gogglesmm-1.2.2.tar.gz/src/GMScanner.h Changed

gogglesmm-1.2.1.tar.gz/src/GMSession.cpp -> gogglesmm-1.2.2.tar.gz/src/GMSession.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMSession.h -> gogglesmm-1.2.2.tar.gz/src/GMSession.h Changed

gogglesmm-1.2.1.tar.gz/src/GMSettingsDaemon.cpp -> gogglesmm-1.2.2.tar.gz/src/GMSettingsDaemon.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMSettingsDaemon.h -> gogglesmm-1.2.2.tar.gz/src/GMSettingsDaemon.h Changed

gogglesmm-1.2.1.tar.gz/src/GMSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMSource.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMSource.h -> gogglesmm-1.2.2.tar.gz/src/GMSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMSourceView.cpp -> gogglesmm-1.2.2.tar.gz/src/GMSourceView.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMSourceView.h -> gogglesmm-1.2.2.tar.gz/src/GMSourceView.h Changed

gogglesmm-1.2.1.tar.gz/src/GMStreamSource.cpp -> gogglesmm-1.2.2.tar.gz/src/GMStreamSource.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMStreamSource.h -> gogglesmm-1.2.2.tar.gz/src/GMStreamSource.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTag.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTag.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMTag.h -> gogglesmm-1.2.2.tar.gz/src/GMTag.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTaskManager.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTaskManager.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMTaskManager.h -> gogglesmm-1.2.2.tar.gz/src/GMTaskManager.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTrack.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrack.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -20,22 +20,6 @@
 #include "GMTrack.h"
 #include "GMTag.h"
 
-GMTrack::GMTrack() {
-  }
-
-GMTrack::GMTrack(const GMTrack & t) {
-  url=t.url;
-  title=t.title;
-  artist=t.artist;
-  }
-
-GMTrack::GMTrack(GMTrack & t) {
-  url=t.url;
-  title=t.title;
-  artist=t.artist;
-  }
-
-
 
 FXbool GMTrack::hasMissingLyrics() const {
   if (!lyrics.empty() && compare(lyrics,"\0",1)==0)

gogglesmm-1.2.1.tar.gz/src/GMTrack.h -> gogglesmm-1.2.2.tar.gz/src/GMTrack.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2010-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2010-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -75,11 +75,7 @@
   FXint         samplerate    = 0;
   FXuchar       filetype      = FILETYPE_UNKNOWN;
 public:
-  GMTrack();
-
-  GMTrack(const GMTrack &);
-  GMTrack(GMTrack &);
-
+  GMTrack() = default;
 
   FXbool hasMissingLyrics() const;
 
@@ -109,8 +105,6 @@
   /// Get Artist
   const FXString & getArtist(const FXString & def) const;
 
-
-
   void setTagsFromString(const FXString &);
 
   /// Load from tag in given filename. Note that mrl is not set

gogglesmm-1.2.1.tar.gz/src/GMTrackDatabase.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrackDatabase.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -1372,8 +1372,8 @@
 void GMTrackDatabase::clear_path_lookup() {
   DEBUG_DB_GET();
   for (FXint i=0;i<pathdict.no();i++) {
-    if (!pathdict.empty(i) && pathdict.value(i)!=nullptr) {
-      free(pathdict.value(i));
+    if (!pathdict.empty(i) && pathdict.data(i)!=nullptr) {
+      free(pathdict.data(i));
       }
     }
   pathdict.clear();
@@ -1424,8 +1424,8 @@
 void GMTrackDatabase::clear_artist_lookup() {
   DEBUG_DB_GET();
   for (FXint i=0;i<artistdict.no();i++) {
-    if (!artistdict.empty(i) && artistdict.value(i)!=nullptr) {
-      FXString * a = (FXString*)artistdict.value(i);
+    if (!artistdict.empty(i) && artistdict.data(i)!=nullptr) {
+      FXString * a = (FXString*)artistdict.data(i);
       delete a;
       }
     }

gogglesmm-1.2.1.tar.gz/src/GMTrackDatabase.h -> gogglesmm-1.2.2.tar.gz/src/GMTrackDatabase.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTrackEditor.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrackEditor.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMTrackEditor.h -> gogglesmm-1.2.2.tar.gz/src/GMTrackEditor.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTrackItem.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrackItem.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -927,7 +927,7 @@
   switch(type){
     case HEADER_ALBUM   : textptr = &feed;  			break;
     case HEADER_TITLE   : textptr = &title;  			break;
-    case HEADER_DATE    : text=FXSystem::localTime("%b %d, %Y",date);
+    case HEADER_DATE    : text=FXSystem::localTime(date, "%b %d, %Y");
                           textptr=&text;
                           break;
     case HEADER_STATUS  : if (flags&(1<<ITEM_FLAG_LOCAL))

gogglesmm-1.2.1.tar.gz/src/GMTrackItem.h -> gogglesmm-1.2.2.tar.gz/src/GMTrackItem.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTrackList.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrackList.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMTrackList.h -> gogglesmm-1.2.2.tar.gz/src/GMTrackList.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTrackView.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrackView.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2007-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2007-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -334,7 +334,7 @@
 
   view=0;
 
-  getShell()->getAccelTable()->addAccel(parseAccel("Ctrl-N"),this,FXSEL(SEL_COMMAND,ID_SORT_DEFAULT));
+  getShell()->getAccelTable()->addAccel("Ctrl-N",this,FXSEL(SEL_COMMAND,ID_SORT_DEFAULT));
   updateColors();
   }
 
@@ -1844,7 +1844,7 @@
       sortAlbums();
       if (tracklist->getSortMethod()==HEADER_BROWSE) {
         tracklist->setSortFunc(source->getSortBrowse(albumlist->getListStyle()&ALBUMLIST_BROWSER));
-        }    
+        }
       sortTracks();
       }

gogglesmm-1.2.1.tar.gz/src/GMTrackView.h -> gogglesmm-1.2.2.tar.gz/src/GMTrackView.h Changed

gogglesmm-1.2.1.tar.gz/src/GMTrayIcon.cpp -> gogglesmm-1.2.2.tar.gz/src/GMTrayIcon.cpp Changed

gogglesmm-1.2.1.tar.gz/src/GMTrayIcon.h -> gogglesmm-1.2.2.tar.gz/src/GMTrayIcon.h Changed

gogglesmm-1.2.1.tar.gz/src/GMWindow.cpp -> gogglesmm-1.2.2.tar.gz/src/GMWindow.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2006-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2006-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -303,29 +303,28 @@
   trackslider->setDragCursor(GMIconTheme::instance()->cursor_hand);
 
 
-  getAccelTable()->addAccel(parseAccel("F11"),this,FXSEL(SEL_COMMAND,ID_SHOW_MINIPLAYER));
-  getAccelTable()->addAccel(parseAccel("Ctrl-W"),this,FXSEL(SEL_CLOSE,0));
-  getAccelTable()->addAccel(parseAccel("/"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_TOGGLE_FILTER));
+  getAccelTable()->addAccel("F11",this,FXSEL(SEL_COMMAND,ID_SHOW_MINIPLAYER));
+  getAccelTable()->addAccel("Ctrl-W",this,FXSEL(SEL_CLOSE,0));
+  getAccelTable()->addAccel("/",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_TOGGLE_FILTER));
 
+  getAccelTable()->addAccel("Ctrl-P",this,FXSEL(SEL_COMMAND,ID_PLAYPAUSE));
+  getAccelTable()->addAccel("Ctrl-\\",this,FXSEL(SEL_COMMAND,ID_STOP));
+  getAccelTable()->addAccel("Ctrl-",this,FXSEL(SEL_COMMAND,ID_PREV));
+  getAccelTable()->addAccel("Ctrl-",this,FXSEL(SEL_COMMAND,ID_NEXT));
 
-  getAccelTable()->addAccel(parseAccel("Ctrl-P"),this,FXSEL(SEL_COMMAND,ID_PLAYPAUSE));
-  getAccelTable()->addAccel(parseAccel("Ctrl-\\"),this,FXSEL(SEL_COMMAND,ID_STOP));
-  getAccelTable()->addAccel(parseAccel("Ctrl-"),this,FXSEL(SEL_COMMAND,ID_PREV));
-  getAccelTable()->addAccel(parseAccel("Ctrl-"),this,FXSEL(SEL_COMMAND,ID_NEXT));
+  getAccelTable()->addAccel("Ctrl-;",this,FXSEL(SEL_COMMAND,ID_SEEK_BACKWARD_1MIN));
+  getAccelTable()->addAccel("Ctrl-'",this,FXSEL(SEL_COMMAND,ID_SEEK_FORWARD_1MIN));
+  getAccelTable()->addAccel("Ctrl-,",this,FXSEL(SEL_COMMAND,ID_SEEK_BACKWARD_10SEC));
+  getAccelTable()->addAccel("Ctrl-.",this,FXSEL(SEL_COMMAND,ID_SEEK_FORWARD_10SEC));
 
-  getAccelTable()->addAccel(parseAccel("Ctrl-;"),this,FXSEL(SEL_COMMAND,ID_SEEK_BACKWARD_1MIN));
-  getAccelTable()->addAccel(parseAccel("Ctrl-'"),this,FXSEL(SEL_COMMAND,ID_SEEK_FORWARD_1MIN));
-  getAccelTable()->addAccel(parseAccel("Ctrl-,"),this,FXSEL(SEL_COMMAND,ID_SEEK_BACKWARD_10SEC));
-  getAccelTable()->addAccel(parseAccel("Ctrl-."),this,FXSEL(SEL_COMMAND,ID_SEEK_FORWARD_10SEC));
+  getAccelTable()->addAccel("Ctrl-L",this,FXSEL(SEL_COMMAND,ID_NEXT_FOCUS));
 
-  getAccelTable()->addAccel(parseAccel("Ctrl-L"),this,FXSEL(SEL_COMMAND,ID_NEXT_FOCUS));
-
-  getAccelTable()->addAccel(parseAccel("Ctrl-C"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_COPY));
-  getAccelTable()->addAccel(parseAccel("Ctrl-X"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_CUT));
-  getAccelTable()->addAccel(parseAccel("Ctrl-V"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_PASTE));
-  getAccelTable()->addAccel(parseAccel("Ctrl-J"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_SHOW_CURRENT));
-  getAccelTable()->addAccel(parseAccel("Ctrl-B"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_TOGGLE_BROWSER));
-  getAccelTable()->addAccel(parseAccel("Ctrl-T"),trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_TOGGLE_TAGS));
+  getAccelTable()->addAccel("Ctrl-C",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_COPY));
+  getAccelTable()->addAccel("Ctrl-X",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_CUT));
+  getAccelTable()->addAccel("Ctrl-V",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_PASTE));
+  getAccelTable()->addAccel("Ctrl-J",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_SHOW_CURRENT));
+  getAccelTable()->addAccel("Ctrl-B",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_TOGGLE_BROWSER));
+  getAccelTable()->addAccel("Ctrl-T",trackview,FXSEL(SEL_COMMAND,GMTrackView::ID_TOGGLE_TAGS));
   }
 
 
@@ -386,9 +385,9 @@
   gm_set_window_cursor(menu_library,getApp()->getDefaultCursor(DEF_ARROW_CURSOR));
 
 
-
-
   mainsplitter->setHSplit(getApp()->reg().readIntEntry("window","source-list-hsplit",2500));
+  mainsplitter->setVSplit(getApp()->reg().readIntEntry("window","source-list-vsplit",5000));
+
 
   configureStatusbar(GMPlayerManager::instance()->getPreferences().gui_show_status_bar);
 
@@ -745,6 +744,7 @@
   getApp()->reg().writeBoolEntry("window","fullscreen",isFullScreen());
   getApp()->reg().writeBoolEntry("window","maximized",isMaximized());
   getApp()->reg().writeIntEntry("window","source-list-hsplit",mainsplitter->getHSplit());
+  getApp()->reg().writeIntEntry("window","source-list-vsplit",mainsplitter->getVSplit());
 
 
   /// Get rid of remote

gogglesmm-1.2.1.tar.gz/src/GMWindow.h -> gogglesmm-1.2.2.tar.gz/src/GMWindow.h Changed

gogglesmm-1.2.1.tar.gz/src/fxext.cpp -> gogglesmm-1.2.2.tar.gz/src/fxext.cpp Changed

gogglesmm-1.2.1.tar.gz/src/fxext.h -> gogglesmm-1.2.2.tar.gz/src/fxext.h Changed

gogglesmm-1.2.1.tar.gz/src/gmdefs.h -> gogglesmm-1.2.2.tar.gz/src/gmdefs.h Changed

gogglesmm-1.2.1.tar.gz/src/gmutils.cpp -> gogglesmm-1.2.2.tar.gz/src/gmutils.cpp Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2009-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2009-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -33,10 +33,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
-
-
-
-
+#include <sys/utsname.h>
 
 
 void FXIntMap::save(FXStream & store) const {
@@ -46,7 +43,7 @@
   for (FXint i=0;i<t;i++){
     if (!empty(i)) {
       store << key(i);
-      store << value(i);
+      store << data(i);
       }
     }
   }
@@ -68,7 +65,7 @@
   // Populate with new entries
   for (FXint i=0;i<other.no();i++){
     if (!other.empty(i)) {
-      insert(other.key(i),other.value(i));
+      insert(other.key(i),other.data(i));
       }
     }
 
@@ -109,6 +106,42 @@
   }
 
 
+FXString gm_os_information() {
+  FXString osrelease;
+
+  FXSettings settings;
+  FXFile file("/etc/os-release",FXFile::Reading);
+  if(file.isOpen()){
+    FXString string;
+    string.length(file.size());
+    if(file.readBlock(string.text(),string.length())==string.length()){
+      string.prepend("info\n");
+      settings.parse(string);
+      if (settings.existingEntry("info", "PRETTY_NAME")) {
+        osrelease = settings.readStringEntry("info", "PRETTY_NAME");
+        }
+      else {
+        FXString osname = settings.readStringEntry("info", "NAME");
+        if (osname.length()) {
+          FXString osversion = settings.readStringEntry("info", "VERSION");
+          if (osversion.length())
+            osrelease = osname + " " + osversion;
+          else
+            osrelease = osname;
+          }
+        }
+      }
+    }
+
+  struct utsname osname;
+  uname(&osname);
+
+  if (osrelease.length())
+    return FXString::value("%s %s (%s) / %s", osname.sysname, osname.release, osname.machine, osrelease.text());
+  else
+    return FXString::value("%s %s (%s)", osname.sysname, osname.release, osname.machine);
+}
+
 /******************************************************************************/

gogglesmm-1.2.1.tar.gz/src/gmutils.h -> gogglesmm-1.2.2.tar.gz/src/gmutils.h Changed

@@ -1,7 +1,7 @@
 /*******************************************************************************
 *                         Goggles Music Manager                                *
 ********************************************************************************
-*           Copyright (C) 2009-2018 by Sander Jansen. All Rights Reserved      *
+*           Copyright (C) 2009-2021 by Sander Jansen. All Rights Reserved      *
 *                               ---                                            *
 * This program is free software: you can redistribute it and/or modify         *
 * it under the terms of the GNU General Public License as published by         *
@@ -22,12 +22,12 @@
 
 class FXIntMap : public FXHash {
 public:
-  FXint insert(FXint name,FXint val) { return (FXint)(FXival)FXHash::insert((void*)(FXival)name,(void*)(FXival)val); }
-  FXint remove(FXint name) {  return (FXint)(FXival)FXHash::remove((void*)(FXival)name); }
-  //FXint find(FXint name) const { return (FXint)(FXival)FXHash::find((void*)(FXival)name); }
-  FXint at(FXint name) const { return (FXint)(FXival)FXHash::at((void*)(FXival)name); }
-  FXint key(FXuint pos) const { return (FXint)(FXival)tablepos.name; }
-  FXint value(FXuint pos) const { return (FXint)(FXival)tablepos.data; }
+  FXint insert(FXint key,FXint data) { return (FXint)(FXival)FXHash::insert((void*)(FXival)key,(void*)(FXival)data); }
+  FXint remove(FXint key) {  return (FXint)(FXival)FXHash::remove((void*)(FXival)key); }
+  //FXint find(FXint key) const { return (FXint)(FXival)FXHash::find((void*)(FXival)key); }
+  FXint at(FXint key) const { return (FXint)(FXival)FXHash::at((void*)(FXival)key); }
+  FXint key(FXuint pos) const { return (FXint)(FXival)tablepos.key; }
+  FXint data(FXuint pos) const { return (FXint)(FXival)tablepos.data; }
   void adopt(FXIntMap &);
   void load(FXStream & store);
   void save(FXStream & store) const;
@@ -45,6 +45,8 @@
 
 extern FXuint gm_desktop_session();
 
+extern FXString gm_os_information();
+
 extern FXbool gm_open_folder(const FXString & folder);
 
 extern FXbool gm_open_browser(const FXString & folder);

gogglesmm-1.2.1.tar.gz/src/main.cpp -> gogglesmm-1.2.2.tar.gz/src/main.cpp Changed

Changes of Revision 17