for #430 - fix some compiler warnings.

finish moving the monitors and windows console code to separate files.

Author: Cecil

shoes/app.c

@@ -16,6 +16,8 @@
 #include "shoes/types/native.h"
 #include "shoes/types/event.h"
 
+RUBY_EXTERN ID s_shift_key, s_control_key;
+
 // Global var:
 int shoes_app_serial_num = 0;
 
@@ -637,7 +639,6 @@ shoes_code shoes_app_motion(shoes_app *app, int x, int y, int mods) {
       shoes_canvas_send_motion(app->canvas, x, y, Qnil, modifiers);
     return SHOES_OK;
 }
-EXTERN ID s_shift_key, s_control_key;
 
 shoes_code shoes_app_click(shoes_app *app, int button, int x, int y, int mods) {
     app->mouseb = button;

shoes/console/gtk-terminal.c

@@ -4,12 +4,12 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include "tesi.h"
 #include <gdk/gdkkeysyms.h>
 #include "shoes/app.h"
 #include "shoes/ruby.h"
 #include "shoes/config.h"
 #include "shoes/world.h"
+#include "tesi.h"
 
 #include "shoes/native/gtk/gtkcss.h"
 extern char *colorstrings[];

shoes/console/tesi.h

@@ -1,8 +1,14 @@
 #ifndef TESI_H
 #define TESI_H
 
-// _XOPEN_SOURCE for posix_openpt() from stdlin and fcntl
+// _XOPEN_SOURCE for posix_openpt() for stdlin and fcntl
+#if defined(__linux__) || defined(__GLIBC__) || defined(__GNU__)
+#ifndef _GNU_SOURCE	
+#define _GNU_SOURCE			/* GNU glibc grantpt() prototypes */
+#endif
+#endif
 #define _XOPEN_SOURCE
+#define __USE_XOPEN_EXTENDED  
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>

shoes/native/gtk.c

@@ -1836,188 +1836,6 @@ VALUE shoes_native_to_s(VALUE text) {
     return text;
 }
 
-
-
-#ifdef SHOES_GTK_WIN32
-// hat tip: https://justcheckingonall.wordpress.com/2008/08/29/console-window-win32-app/
-#include <stdio.h>
-#include <io.h>
-#include <fcntl.h>
-
-
-// called from main.c(skel) on Windows - works fine
-static FILE* shoes_console_out = NULL;
-static FILE* shoes_console_in = NULL;
-
-int shoes_win32_console() {
-
-    if (AllocConsole() == 0) {
-        // cshoes.exe can get here
-        printf("Already have console\n");
-        return 0;
-    }
-
-    HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
-    int hCrt = _open_osfhandle((long) handle_out, _O_TEXT);
-    FILE* hf_out = _fdopen(hCrt, "w");
-    setvbuf(hf_out, NULL, _IONBF, 1);
-    *stdout = *hf_out;
-    HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
-    hCrt = _open_osfhandle((long) handle_in, _O_TEXT);
-    FILE* hf_in = _fdopen(hCrt, "r");
-    setvbuf(hf_in, NULL, _IONBF, 128);
-    *stdin = *hf_in;
-
-    //* stash handles
-    shoes_console_out = hf_out;
-    shoes_console_in = hf_in;
-    return 1;
-}
-
-// Called by Shoes after ruby/gtk/shoes is initialized and running
-int shoes_native_terminal() {
-    // has a console been setup by --console flag?
-    if (shoes_console_out == NULL) {
-        if (shoes_win32_console() == 0) { // cshoes.exe can do this
-            return 1;
-        }
-    }
-    // convert the (cached) FILE * for what ruby wants for fd[0], [1]...
-    if (dup2(_fileno(shoes_console_out), 1) == -1) {
-        printf("failed dup2 of stdout\n");
-    }
-    if (dup2(_fileno(shoes_console_out), 2) == -1) {
-        printf("failed dup2 of stderr\n");
-    }
-    if (dup2(_fileno(shoes_console_in), 0) == -1) {
-        printf("failed dup2 of stdin\n");
-    }
-    printf("created win32 console\n");
-    return 1;
-}
-
-// For bug #428 
-int shoes_win10_gtk3_22_check() {
-    if (gtk_get_minor_version() < 22)
-      return 0;
-    // borrowed from
-    // https://stackoverflow.com/questions/32115255/c-how-to-detect-windows-10
-    int ret = 0;
-    NTSTATUS(WINAPI *RtlGetVersion)(LPOSVERSIONINFOEXW);
-    OSVERSIONINFOEXW osInfo;
-
-    *(FARPROC*)&RtlGetVersion = GetProcAddress(GetModuleHandleA("ntdll"), "RtlGetVersion");
-
-    if (NULL != RtlGetVersion)
-    {
-        osInfo.dwOSVersionInfoSize = sizeof(osInfo);
-        RtlGetVersion(&osInfo);
-        ret = osInfo.dwMajorVersion;
-    }
-    //printf("windows version %i\n", ret); // win 7 returns '6' go figure
-    return ret == 10;
-}
-#else
-/*
-int shoes_native_console(char *app_path)
-{
-  //printf("init gtk console\n");
-  shoes_native_app_console(app_path);
-  printf("gtk\010k\t console \t\tcreated\n"); //test \b \t in string
-  return 1;
-}
-*/
-#endif
-
-/*
- *  ------- monitor handling --------
- *  As usual, gtk 3.22 'fixes' things with deprecations. 
- * 
- *  Currrently using pre 3.22 API.
- *    Screen width is the sum of all monitors. Height is the max of all 
- *    monitors. Do not address monitors just set x. 
-*/
-int shoes_native_monitor_default() {
-  GdkScreen *screen;
-  GdkDisplay *display;
-  display = gdk_display_get_default();
-  screen = gdk_display_get_default_screen(display);
-  int mon;
-  mon = gdk_screen_get_primary_monitor(screen);
-  return mon;
-}
-
-void shoes_native_monitor_geometry(int idx, shoes_monitor_t *geo) {
-
-  GdkScreen *screen;
-  screen = gdk_screen_get_default();
-  GdkRectangle r;
-  // workarea approximates visibleFrame on OSX
-  //gdk_screen_get_monitor_geometry(screen, idx,  &r);
-  gdk_screen_get_monitor_workarea(screen, idx, &r);
-  geo->x = r.x;
-  geo->y = r.y;
-  geo->width = r.width;
-  geo->height = r.height;
-}
-
-int shoes_native_monitor_count() {
-  GdkScreen *screen;
-  screen = gdk_screen_get_default();
-  int cnt = 0;
-  cnt = gdk_screen_get_n_monitors(screen);
-  return cnt;
-}
-
-// Sets/moves the window onto monitor 
-void shoes_native_monitor_set(shoes_app *app) {
-  GtkWindow *window = (GtkWindow *)app->os.window;
-  GdkDisplay *display;
-  GdkScreen *screen;
-  screen = gdk_screen_get_default();  
-  display = gdk_screen_get_display(screen);
-  // sanity checks
-  int cnt = 0;
-  cnt = gdk_screen_get_n_monitors(screen);
-  int realmon; 
-  if (app->monitor < cnt && app->monitor >= 0)
-    realmon = app->monitor;
-  else {
-    realmon = 0;
-  }
-  /*
-  fprintf(stderr, "Screen w: %d x h: %d\n", gdk_screen_get_width(screen),
-      gdk_screen_get_height(screen));
-  fprintf(stderr, "Switch to monitor %d of %d\n", realmon, cnt);
-  */ 
-  GdkRectangle r;
-  gdk_screen_get_monitor_geometry(screen, realmon,  &r);
-  gtk_window_move(window, app->x + r.x, app->y);
-  // TODO: do a better job of positioning. Worth the effort?
-}
-
-// returns the Shoes monitor number that the window is on
-int shoes_native_monitor_get(shoes_app *app) {
-  GtkWindow *window = (GtkWindow *)app->os.window;
-  GdkDisplay *display;
-  GdkScreen *screen;
-  screen = gtk_window_get_screen(window);
-  // determine which monitor that is. Remember: Gtk screen holds Gtk monitors
-  int x, y, cnt, i;
-  gtk_window_get_position (window, &x, &y);
-  cnt = gdk_screen_get_n_monitors(screen);
-  for (i = 0; i < cnt; i++) {
-    GdkRectangle r;
-    gdk_screen_get_monitor_geometry(screen, i,  &r);
-    if ((x >= r.x) && (x <= (r.x +r.width)) && (y >= r.y) && (y <= (r.y +r.height))) {
-        return i;
-    }
-  }
-  // should never get here, but if it does:
-  return gdk_screen_get_primary_monitor(screen);
-}
-
-
 /*  ------- have_menu == true and sizing ---------- */
 
 // hack for windows (gtk < 3.12) - the 65 below is the taskbar height. Hack!!
@@ -2186,8 +2004,8 @@ gboolean shoes_app_gtk_configure_menu(GtkWidget *widget, GdkEvent *evt, gpointer
       }
     } else {
 #ifdef SZBUG
-      printf(stderr, "shoes_app_gtk_configure_menu: dragged %d, %d, %d, %d\\n",
-	  evt->configure.x, evt->configure.y, evt->configure.width, evt->configure.height);
+      fprintf(stderr, "shoes_app_gtk_configure_menu: dragged %d, %d, %d, %d\\n",
+          evt->configure.x, evt->configure.y, evt->configure.width, evt->configure.height);
       GtkWidget *content = app->os.shoes_window;
 #endif
     }