From 992e025f3779a5448304d1e93b1633c82d3de9f1 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Mon, 21 Nov 2016 21:29:27 +0000
Subject: [PATCH] fixes for new cmdcongl API

FossilOrigin-Name: 2763c197ffe44706da7f3d8e9b20834da8f74871c51cab0ea11bedf311a43632
---
 xreader.d | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xreader.d b/xreader.d
index ebd17f7..ed92d3c 100644
--- a/xreader.d
+++ b/xreader.d
@@ -29,7 +29,7 @@ import iv.nanovg.perf;
 
 import iv.strex;
 
-import iv.glcmdcon;
+import iv.cmdcongl;
 
 import iv.vfs;
 import iv.vfs.io;
@@ -690,7 +690,7 @@ void run (string bookFileName) {
   sdwindow.redrawOpenGlScene = delegate () {
     if (isQuitRequested) return;
 
-    oglResizeConsole(GWidth/oglConScale, GHeight/oglConScale, oglConScale);
+    glconResize(GWidth/oglConScale, GHeight/oglConScale, oglConScale);
     /*{
       __gshared int cnt;
       conwriteln("cnt=", cnt++);
@@ -878,7 +878,7 @@ void run (string bookFileName) {
       //vg.endFrame();
     }
     vg.endFrame();
-    oglDrawConsole();
+    glconDraw();
   };
 
   void processThreads () {
@@ -1052,7 +1052,7 @@ void run (string bookFileName) {
     },
     delegate (KeyEvent event) {
       if (sdwindow.closed) return;
-      if (conKeyEvent(event)) return;
+      if (glconKeyEvent(event)) return;
       if (event.key == Key.PadEnter) event.key = Key.Enter;
       if ((event.modifierState&ModifierState.numLock) == 0) {
         switch (event.key) {
@@ -1146,8 +1146,8 @@ void run (string bookFileName) {
     },
     delegate (dchar ch) {
       if (sdwindow.closed) return;
-      if (conCharEvent(ch)) return;
-      if (ch == '`') { concmd("r_console tan"); return; }
+      if (glconCharEvent(ch)) return;
+      //if (ch == '`') { concmd("r_console tan"); return; }
     },
   );
   closeWindow();
-- 
2.11.4.GIT