/[svn]/gigedit/trunk/src/gigedit/global.h
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/global.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3089 by schoenebeck, Sun Jan 15 19:18:39 2017 UTC revision 3157 by schoenebeck, Mon May 8 17:30:10 2017 UTC
# Line 24  Line 24 
24  # include <config.h>  # include <config.h>
25  #endif  #endif
26    
27    #include <cstring>
28    
29    #include <glibmmconfig.h>
30    // threads.h must be included first to be able to build with
31    // G_DISABLE_DEPRECATED
32    #if (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION == 31 && GLIBMM_MICRO_VERSION >= 2) || \
33        (GLIBMM_MAJOR_VERSION == 2 && GLIBMM_MINOR_VERSION > 31) || GLIBMM_MAJOR_VERSION > 2
34    #include <glibmm/threads.h>
35    #endif
36    
37  #if !defined(WIN32)  #if !defined(WIN32)
38  # include <unistd.h>  # include <unistd.h>
39  # include <errno.h>  # include <errno.h>
# Line 34  Line 44 
44    
45  #ifdef LIBGIG_HEADER_FILE  #ifdef LIBGIG_HEADER_FILE
46  # include LIBGIG_HEADER_FILE(gig.h)  # include LIBGIG_HEADER_FILE(gig.h)
47    # include LIBGIG_HEADER_FILE(Serialization.h)
48  #else  #else
49  # include <gig.h>  # include <gig.h>
50    # include <Serialization.h>
51  #endif  #endif
52    
53  //FIXME: for some reason AC GETTEXT check fails on the Mac cross compiler?  //FIXME: for some reason AC GETTEXT check fails on the Mac cross compiler?
# Line 54  Line 66 
66    
67  #define UNICODE_RIGHT_ARROW     Glib::ustring(1, gunichar(0x2192))  #define UNICODE_RIGHT_ARROW     Glib::ustring(1, gunichar(0x2192))
68  #define UNICODE_LEFT_ARROW      Glib::ustring(1, gunichar(0x2190))  #define UNICODE_LEFT_ARROW      Glib::ustring(1, gunichar(0x2190))
69    #define UNICODE_SHIFT_KEY_SYMBOL    Glib::ustring("\xe2\x87\xa7")
70    #if defined(__APPLE__)
71    # define UNICODE_ALT_KEY_SYMBOL     Glib::ustring("\xe2\x8c\xa5")
72    #else
73    # define UNICODE_ALT_KEY_SYMBOL     Glib::ustring("Alt")
74    #endif
75    #define UNICODE_ERASE_KEY_SYMBOL    Glib::ustring("\xe2\x8c\xab")
76    #define UNICODE_CTRL_KEY_SYMBOL     Glib::ustring("Ctrl")
77    #define UNICODE_CMD_KEY_SYMBOL      Glib::ustring(1, gunichar(0x2318))
78    #if defined(__APPLE__)
79    # define UNICODE_PRIMARY_KEY_SYMBOL     UNICODE_CMD_KEY_SYMBOL
80    #else
81    # define UNICODE_PRIMARY_KEY_SYMBOL     UNICODE_CTRL_KEY_SYMBOL
82    #endif
83    
84    // taken from gdk/gdkkeysyms.h
85    // (define on demand, to avoid unnecessary dev lib package build dependency)
86    #ifndef GDK_KEY_Control_L
87    # define GDK_KEY_Control_L 0xffe3
88    #endif
89    #ifndef GDK_KEY_Control_R
90    # define GDK_KEY_Control_R 0xffe4
91    #endif
92    #ifndef GDK_KEY_Left
93    # define GDK_KEY_Left 0xff51
94    #endif
95    #ifndef GDK_KEY_Right
96    # define GDK_KEY_Right 0xff53
97    #endif
98    #ifndef GDK_KEY_Up
99    # define GDK_KEY_Up 0xff52
100    #endif
101    #ifndef GDK_KEY_Down
102    # define GDK_KEY_Down 0xff54
103    #endif
104    
105    #include <glibmm/convert.h>
106    
107    #define GIG_STR_ENCODING "CP1252"
108    
109    static inline
110    Glib::ustring gig_to_utf8(const gig::String& gig_string) {
111        return Glib::convert_with_fallback(gig_string, "UTF-8", GIG_STR_ENCODING, "?");
112    }
113    
114    static inline
115    gig::String gig_from_utf8(const Glib::ustring& utf8_string) {
116        return Glib::convert_with_fallback(utf8_string, GIG_STR_ENCODING, "UTF-8", "?");
117    }
118    
119  template<class T> inline std::string ToString(T o) {  template<class T> inline std::string ToString(T o) {
120      std::stringstream ss;      std::stringstream ss;
# Line 115  public: Line 176  public:
176          }          }
177          return false;          return false;
178      }      }
179    
180        // prevent passing gig::dimension_none from creating a new pair
181        // (TODO: other invalid gig::dimension_t values should be filtered here as well)
182        int& operator[](const gig::dimension_t& k) {
183            static int unused = 0;
184            if (k == gig::dimension_none) {
185                unused = 0;
186                return unused;
187            }
188            return std::map<gig::dimension_t,int>::operator[](k);
189        }
190  };  };
191    
192    //TODO: this function and caseOfDimRegion() from dimregionchooser.h are duplicates, eliminate either one of them!
193  inline DimensionCase dimensionCaseOf(gig::DimensionRegion* dr) {  inline DimensionCase dimensionCaseOf(gig::DimensionRegion* dr) {
194      DimensionCase dimCase;      DimensionCase dimCase;
195      int idr = getDimensionRegionIndex(dr);      int idr = getDimensionRegionIndex(dr);
# Line 142  inline std::vector<gig::DimensionRegion* Line 215  inline std::vector<gig::DimensionRegion*
215      return v;      return v;
216  }  }
217    
218    inline gig::DimensionRegion* dimensionRegionMatching(const DimensionCase& dimCase, gig::Region* rgn) {
219        for (int idr = 0; idr < 256; ++idr) {
220            if (!rgn->pDimensionRegions[idr]) continue;
221            DimensionCase c = dimensionCaseOf(rgn->pDimensionRegions[idr]);
222            if (c == dimCase) return rgn->pDimensionRegions[idr];
223        }
224        return NULL;
225    }
226    
227  #endif // GIGEDIT_GLOBAL_H  #endif // GIGEDIT_GLOBAL_H
Legend:
Removed from v.3089  
changed lines
  Added in v.3157
  ViewVC Help
Powered by ViewVC