Ticket #36: noX11.patch

io.c

@@ -24 +24 @@
 // Fonctions de lecture/ecriture file, gèrent les systèmes big-endian et
 // little-endian.
 
+#define _XOPEN_SOURCE 500
+
 #include <SDL_endian.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -51 +53 @@
 #include "io.h"
 #include "realpath.h"
 
+#include "text.h"
+
 // Lit un octet
 // Renvoie -1 si OK, 0 en cas d'erreur
 int Read_byte(FILE *file, byte *dest)
@@ -389 +393 @@
   closedir(current_directory);
 }
 
+void For_each_font_in_tree(const char * directory_name)
+{
+  // Pour scan de répertoire
+  DIR*  current_directory; //Répertoire courant
+  struct dirent* entry; // Structure de lecture des éléments
+  char full_filename[MAX_PATH_CHARACTERS];
+  int filename_position;
+  strcpy(full_filename, directory_name);
+  current_directory=opendir(directory_name);
+  if(current_directory == NULL) return;        // Répertoire invalide ...
+  filename_position = strlen(full_filename);
+#if defined(__AROS__)
+  if (filename_position==0 || (strcmp(full_filename+filename_position-1,PATH_SEPARATOR) && strcmp(full_filename+filename_position-1,":")))
+#else
+  if (filename_position==0 || strcmp(full_filename+filename_position-1,PATH_SEPARATOR))
+#endif
+  {
+    strcat(full_filename, PATH_SEPARATOR);
+    filename_position = strlen(full_filename);
+  }
+  while ((entry=readdir(current_directory)))
+  {
+    struct stat Infos_enreg;
+    strcpy(&full_filename[filename_position], entry->d_name);
+    stat(full_filename,&Infos_enreg);
+    if (S_ISREG(Infos_enreg.st_mode))
+    {
+      Add_font(full_filename);
+    }else if (S_ISDIR(Infos_enreg.st_mode))
+    {
+      if (strcmp(entry->d_name,".") != 0 && strcmp(entry->d_name,"..") != 0)
+        For_each_font_in_tree(full_filename);
+    }
+  }
+  closedir(current_directory);
+}
+
 /// Scans a directory, calls Callback for each file or directory in it,
 void For_each_directory_entry(const char * directory_name, void Callback(const char *, byte is_file, byte is_directory, byte is_hidden))
 {
@@ -453 +494 @@
 
 byte Create_lock_file(const char *file_directory)
 {
-  #if defined (__amigaos__)||(__AROS__)||(__ANDROID__)
+  #if defined (__amigaos__)||(__AROS__)
     #warning "Missing code for your platform, please check and correct!"
   #else
   char lock_filename[MAX_PATH_CHARACTERS];
   
-#ifdef GCWZERO
-  strcpy(lock_filename,"/media/home/.grafx2/");
-#else
   strcpy(lock_filename,file_directory);
-#endif
   strcat(lock_filename,"gfx2.lck");
   
   #ifdef __WIN32__

text.c

@@ -2 +2 @@
 */
 /*  Grafx2 - The Ultimate 256-color bitmap paint program
 
-    Copyright 2014 Sergii Pylypenko
     Copyright 2011 Pawel Góralski
     Copyright 2008 Yves Rizoud
     Copyright 2008 Franck Charlet
@@ -39 +38 @@
 #endif
 
 #if defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
-// No fontconfig
+// No X11
 #elif defined(__linux__)
-  #include <fontconfig/fontconfig.h>
+  #include <X11/Xlib.h>
 #endif
 #endif
 
@@ -327 +326 @@
     #endif
 
   #elif defined(__CAANOO__) || defined(__WIZ__) || defined(__GP2X__)
-  // No fontconfig : Only use fonts from Grafx2
+  // No X11 : Only use fonts from Grafx2
   #elif defined(__linux__)
     #ifndef NOTTF
-       #define USE_FC
+//       #define USE_XLIB
     
-       #ifdef USE_FC
+       #ifdef USE_XLIB
+/*
+        the following X calls lock Grafx2 into X Windows.
+        Grafx2 will not run in console mode outside X.
+        Also this does not find the newer "built-ins".
+*/
        {
-        FcStrList* dirs;
-        dirs = FcConfigGetFontDirs(NULL);
-        char* fdir = FcStrListNext(dirs);
-        while(fdir != NULL)
-        {
-            For_each_file(fdir,Add_font);
-            fdir = FcStrListNext(dirs);
-        }
+        int i,number;
+        Display* dpy = XOpenDisplay(NULL);
+        char** font_path_list = XGetFontPath(dpy,&number);
+        XCloseDisplay(dpy);
 
-        FcStrListDone(dirs);
+        for(i=0;i<number;i++)
+            For_each_file(*(font_path_list+i),Add_font);
+
+        XFreeFontPath(font_path_list);
        }
+       #else
+/*
+        on Linux SDL does NOT need X Windows to use TTF, 
+        but there are so many places usable fonts can be
+        we need to search by hand "one step up" of known
+        possibilities.
+*/
+       {
+        int i,number;
+        char *font_path_list[7] = {
+           "/usr/share/fonts",                  // mostly under here
+           "/usr/local/share/fonts",            // maybe here too
+           "/usr/local/share/lib/X11/fonts",    // we check the following on other/older systems
+           "/usr/openwin/lib/X11/fonts",
+           "/usr/dt/config/xfonts"
+        };
+        number = 7;
+
+        font_path_list[5] = getenv("HOME");
+        strcat(font_path_list[5], "/.fonts");     // traditionally, current users can also have fonts
+
+        font_path_list[6] = getenv("HOME");
+        strcat(font_path_list[6], "/.local/share/fonts"); // new systems are beginning to use this
+
+        for(i=0;i<number;i++)
+            For_each_font_in_tree(*(font_path_list+i));
+
+       }
+
        #endif
+
     #endif
   #elif defined(__amigaos4__) || defined(__amigaos__)
     #ifndef NOTTF
@@ -419 +452 @@
   bg_color.unused=fg_color.unused=255;
   
   // Text rendering: creates a 8bit surface with its dedicated palette
-  #ifdef __ANDROID__
   if (antialias)
-    text_surface=TTF_RenderUTF8_Shaded(font, str, fg_color, bg_color );
-  else
-    text_surface=TTF_RenderUTF8_Solid(font, str, fg_color);
-  #else
-  if (antialias)
     text_surface=TTF_RenderText_Shaded(font, str, fg_color, bg_color );
   else
     text_surface=TTF_RenderText_Solid(font, str, fg_color);
-  #endif
   if (!text_surface)
   {
     TTF_CloseFont(font);
@@ -534 +560 @@
   font_surface=IMG_Load(Font_name(font_number));
   if (!font_surface)
   {
-        char buffer[256];
-        strcpy(buffer, "Error loading font.\n");
-        strcat(buffer,IMG_GetError());
-    Verbose_message("Warning",buffer);
-        // TODO this leaves a non-erased cursor when the window closes.
+    Verbose_message("Warning","Error loading font.\nThe file may be corrupt.");
     return NULL;
   }
   // Font is 24bit: Perform a color reduction