Changeset f51359c in buchla-emu for emu/vid.c

Timestamp:

09/05/2017 09:49:45 AM (7 years ago)

Author:

Alexander Heinrich <alex.heinrich@…>

Branches:

master

Children:

c8a92ef

Parents:

5475ecf (diff), ca77925 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​ssh://bob.lopatic.de:11501/home/git/buchla-emu into lcda

File:

• emu/vid.c (modified) (4 diffs)

emu/vid.c

@@ -50 +50 @@
 #define OD0_CB 0x0800
 
+#define AT_UND 0x0100
 #define AT_CG 0x8000
 
@@ -80 +81 @@
 
 static SDL_Window *win;
+uint32_t vid_win;
+
 static SDL_Renderer *ren;
 static SDL_Texture *tex;
@@ -123 +126 @@
                                 int32_t fg = (at & 0x00f0) >> 4;
 
-                                uint16_t *cg = (at & AT_CG) != 0 ? cg0 : cg1;
-                                int32_t bits = cg[256 * line + ch];
+                                int32_t bits;
+
+                                if ((at & AT_UND) != 0 && line == 1) {
+                                        bits = 0xff;
+                                }
+                                else {
+                                        uint16_t *cg = (at & AT_CG) != 0 ? cg0 : cg1;
+                                        bits = cg[256 * line + ch];
+                                }
+
                                 int32_t mask = 0x01;
 
@@ -225 +236 @@
         if (win == NULL) {
                 fail("SDL_CreateWindow() failed: %s", SDL_GetError());
+        }
+
+        vid_win = SDL_GetWindowID(win);
+
+        if (vid_win == 0) {
+                fail("SDL_GetWindowID() failed: %s", SDL_GetError());
         }