[chocolate-doom] 75/79: Remove unneeded text GUI code from stable branch.
Jonathan Dowland
jmtd at moszumanska.debian.org
Mon Jan 30 15:07:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
jmtd pushed a commit to annotated tag chocolate-doom-0.1.3
in repository chocolate-doom.
commit 05c90f6f9f57f1120bdcfa71e9cd48be57d3a120
Author: Simon Howard <fraggle at gmail.com>
Date: Fri Jan 20 17:46:46 2006 +0000
Remove unneeded text GUI code from stable branch.
Subversion-branch: /branches/CHOCOLATE_DOOM_0_1/chocolate-doom
Subversion-revision: 303
---
textscreen/Makefile.am | 2 -
textscreen/txt_gui.c | 188 -----------------------------------
textscreen/txt_gui.h | 50 ----------
textscreen/txt_io.c | 263 -------------------------------------------------
textscreen/txt_io.h | 55 -----------
5 files changed, 558 deletions(-)
diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
index 8894f0f..7ccded5 100644
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -4,8 +4,6 @@ AM_CFLAGS = @SDL_CFLAGS@
noinst_LIBRARIES=libtextscreen.a
libtextscreen_a_SOURCES = \
- txt_gui.c txt_gui.h \
- txt_io.c txt_io.h \
txt_main.c txt_main.h \
txt_font.h
diff --git a/textscreen/txt_gui.c b/textscreen/txt_gui.c
deleted file mode 100644
index ee581fe..0000000
--- a/textscreen/txt_gui.c
+++ /dev/null
@@ -1,188 +0,0 @@
-// Emacs style mode select -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// $Id: txt_gui.c 291 2006-01-13 23:56:00Z fraggle $
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005 Simon Howard
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-//
-// $Log$
-// Revision 1.1 2006/01/13 23:56:00 fraggle
-// Add text-mode I/O functions.
-// Use text-mode screen for the waiting screen.
-//
-//
-
-#include <string.h>
-
-#include "txt_io.h"
-#include "txt_main.h"
-
-// Array of border characters for drawing windows. The array looks like this:
-//
-// +-++
-// | ||
-// +-++
-// +-++
-
-static int borders[4][4] =
-{
- {0xda, 0xc4, 0xc2, 0xbf},
- {0xb3, ' ', 0xb3, 0xb3},
- {0xc3, 0xc4, 0xc5, 0xb4},
- {0xc0, 0xc4, 0xc1, 0xd9},
-};
-
-void TXT_DrawDesktop(char *title)
-{
- int i;
- unsigned char *screendata;
- unsigned char *p;
-
- screendata = TXT_GetScreenData();
-
- // Fill the screen with gradient characters
-
- p = screendata;
-
- for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
- {
- *p++ = 0xb1;
- *p++ = TXT_COLOR_GREY | (TXT_COLOR_BLUE << 4);
- }
-
- // Draw the top and bottom banners
-
- p = screendata;
-
- for (i=0; i<TXT_SCREEN_W; ++i)
- {
- *p++ = ' ';
- *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
- }
-
- p = screendata + (TXT_SCREEN_H - 1) * TXT_SCREEN_W * 2;
-
- for (i=0; i<TXT_SCREEN_W; ++i)
- {
- *p++ = ' ';
- *p++ = TXT_COLOR_BLACK | (TXT_COLOR_GREY << 4);
- }
-
- // Print the title
-
- TXT_GotoXY(0, 0);
- TXT_FGColor(TXT_COLOR_BLACK);
- TXT_BGColor(TXT_COLOR_GREY, 0);
-
- TXT_PutChar(' ');
- TXT_Puts(title);
-}
-
-void TXT_DrawShadow(int x, int y, int w, int h)
-{
- unsigned char *screendata;
- unsigned char *p;
- int x1, y1;
-
- screendata = TXT_GetScreenData();
-
- for (y1=y; y1<y+h; ++y1)
- {
- p = screendata + y1 * TXT_SCREEN_W * 2 + x * 2;
-
- for (x1=0; x1<w; ++x1)
- {
- p[1] = TXT_COLOR_DARK_GREY;
- p += 2;
- }
- }
-}
-
-void TXT_DrawWindow(char *title, int x, int y, int w, int h)
-{
- int x1, y1;
- int bx, by;
-
- TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
- TXT_BGColor(TXT_COLOR_BLUE, 0);
-
- for (y1=y; y1<y+h; ++y1)
- {
- TXT_GotoXY(x, y1);
-
- // Select the appropriate row and column in the borders
- // array to pick the appropriate character to draw at
- // this location.
- //
- // Draw a horizontal line on the third line down, so we
- // draw a box around the title.
-
- by = y1 == y ? 0 :
- y1 == y + 2 ? 2 :
- y1 == y + h - 1 ? 3 : 1;
-
- for (x1=x; x1<x+w; ++x1)
- {
- bx = x1 == x ? 0 :
- x1 == x + w - 1 ? 3 : 1;
-
- TXT_PutChar(borders[by][bx]);
- }
- }
-
- // Draw the title
-
- TXT_GotoXY(x + 1, y + 1);
- TXT_BGColor(TXT_COLOR_GREY, 0);
- TXT_FGColor(TXT_COLOR_BLUE);
-
- for (x1=0; x1<w-2; ++x1)
- {
- TXT_PutChar(' ');
- }
-
- TXT_GotoXY(x + (w - strlen(title)) / 2, y + 1);
- TXT_Puts(title);
-
- // Draw the window's shadow.
-
- TXT_DrawShadow(x + 2, y + h, w, 1);
- TXT_DrawShadow(x + w, y + 1, 2, h);
-}
-
-void TXT_DrawSeparator(int x, int y, int w)
-{
- int x1;
- int c;
-
- TXT_FGColor(TXT_COLOR_BRIGHT_CYAN);
- TXT_BGColor(TXT_COLOR_BLUE, 0);
-
- for (x1=x; x1<x+w; ++x1)
- {
- TXT_GotoXY(x1, y);
-
- c = x1 == x ? borders[2][0] :
- x1 == x + w - 1 ? borders[2][3] :
- borders[2][1];
-
- TXT_PutChar(c);
- }
-}
-
diff --git a/textscreen/txt_gui.h b/textscreen/txt_gui.h
deleted file mode 100644
index 84d3334..0000000
--- a/textscreen/txt_gui.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Emacs style mode select -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// $Id: txt_gui.h 291 2006-01-13 23:56:00Z fraggle $
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005 Simon Howard
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-//
-// $Log$
-// Revision 1.1 2006/01/13 23:56:00 fraggle
-// Add text-mode I/O functions.
-// Use text-mode screen for the waiting screen.
-//
-// Revision 1.2 2006/01/13 18:23:28 fraggle
-// Textscreen getchar() function; remove SDL code from I_Endoom.
-//
-// Revision 1.1 2005/10/02 03:16:03 fraggle
-// Text mode emulation code
-//
-//
-//-----------------------------------------------------------------------------
-//
-// Text mode emulation in SDL
-//
-//-----------------------------------------------------------------------------
-
-#ifndef TXT_GUI_H
-#define TXT_GUI_H
-
-void TXT_DrawDesktop(char *title);
-void TXT_DrawWindow(char *title, int x, int y, int w, int h);
-void TXT_DrawSeparator(int x, int y, int w);
-
-#endif /* #ifndef TXT_GUI_H */
-
diff --git a/textscreen/txt_io.c b/textscreen/txt_io.c
deleted file mode 100644
index e0fdae4..0000000
--- a/textscreen/txt_io.c
+++ /dev/null
@@ -1,263 +0,0 @@
-// Emacs style mode select -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// $Id: txt_io.c 292 2006-01-14 00:10:54Z fraggle $
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005 Simon Howard
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-//
-// $Log$
-// Revision 1.2 2006/01/14 00:10:53 fraggle
-// Change the format of color commands. Reorganise the waiting dialog.
-//
-// Revision 1.1 2006/01/13 23:56:00 fraggle
-// Add text-mode I/O functions.
-// Use text-mode screen for the waiting screen.
-//
-//
-//-----------------------------------------------------------------------------
-//
-// Text mode I/O functions, similar to C stdio
-//
-//-----------------------------------------------------------------------------
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "txt_io.h"
-#include "txt_main.h"
-
-static struct
-{
- txt_color_t color;
- char *name;
-} colors[] = {
- {TXT_COLOR_BLACK, "black"},
- {TXT_COLOR_BLUE, "blue"},
- {TXT_COLOR_GREEN, "green"},
- {TXT_COLOR_CYAN, "cyan"},
- {TXT_COLOR_RED, "red"},
- {TXT_COLOR_MAGENTA, "magenta"},
- {TXT_COLOR_BROWN, "brown"},
- {TXT_COLOR_GREY, "grey"},
- {TXT_COLOR_DARK_GREY, "darkgrey"},
- {TXT_COLOR_BRIGHT_BLUE, "brightblue"},
- {TXT_COLOR_BRIGHT_GREEN, "brightgreen"},
- {TXT_COLOR_BRIGHT_CYAN, "brightcyan"},
- {TXT_COLOR_BRIGHT_RED, "brightred"},
- {TXT_COLOR_BRIGHT_MAGENTA, "brightmagenta"},
- {TXT_COLOR_YELLOW, "yellow"},
- {TXT_COLOR_BRIGHT_WHITE, "brightwhite"},
-};
-
-static int cur_x = 0, cur_y = 0;
-static txt_color_t fgcolor = TXT_COLOR_GREY;
-static txt_color_t bgcolor = TXT_COLOR_BLACK;
-
-static int GetColorForName(char *s)
-{
- int i;
-
- for (i=0; i<sizeof(colors) / sizeof(*colors); ++i)
- {
- if (!strcmp(s, colors[i].name))
- {
- return colors[i].color;
- }
- }
-
- return -1;
-}
-
-static void NewLine(unsigned char *screendata)
-{
- int i;
- unsigned char *p;
-
- cur_x = 0;
- ++cur_y;
-
- if (cur_y >= TXT_SCREEN_H)
- {
- // Scroll the screen up
-
- cur_y = TXT_SCREEN_H - 1;
-
- memcpy(screendata, screendata + TXT_SCREEN_W * 2,
- TXT_SCREEN_W * 2 * (TXT_SCREEN_H -1));
-
- // Clear the bottom line
-
- p = screendata + (TXT_SCREEN_H - 1) * 2 * TXT_SCREEN_W;
-
- for (i=0; i<TXT_SCREEN_W; ++i)
- {
- *p++ = ' ';
- *p++ = fgcolor | (bgcolor << 4);
- }
- }
-}
-
-static void PutChar(unsigned char *screendata, int c)
-{
- unsigned char *p;
-
- p = screendata + cur_y * TXT_SCREEN_W * 2 + cur_x * 2;
-
- switch (c)
- {
- case '\n':
- NewLine(screendata);
- break;
-
- case '\b':
- // backspace
- --cur_x;
- if (cur_x < 0)
- cur_x = 0;
- break;
-
- default:
-
- // Add a new character to the buffer
-
- p[0] = c;
- p[1] = fgcolor | (bgcolor << 4);
-
- ++cur_x;
-
- if (cur_x >= TXT_SCREEN_W)
- {
- NewLine(screendata);
- }
-
- break;
- }
-}
-
-void TXT_PutChar(int c)
-{
- unsigned char *screen;
-
- screen = TXT_GetScreenData();
-
- PutChar(screen, c);
-}
-
-void TXT_Puts(char *s)
-{
- int previous_color = TXT_COLOR_BLACK;
- unsigned char *screen;
- char *p;
- char colorname_buf[20];
- char *ending;
- int col;
-
- screen = TXT_GetScreenData();
-
- for (p=s; *p != '\0'; ++p)
- {
- if (*p == '<')
- {
- ++p;
-
- if (*p == '<')
- {
- PutChar(screen, '<');
- }
- else
- {
- ending = strchr(p, '>');
-
- if (ending == NULL)
- {
- return;
- }
-
- strncpy(colorname_buf, p, 19);
- colorname_buf[ending-p] = '\0';
-
- if (!strcmp(colorname_buf, "/"))
- {
- // End of color block
-
- col = previous_color;
- }
- else
- {
- col = GetColorForName(colorname_buf);
-
- if (col < 0)
- {
- return;
- }
-
- // Save the color for the ending marker
-
- previous_color = fgcolor;
- }
-
- TXT_FGColor(col);
-
- p = ending;
- }
- }
- else
- {
- PutChar(screen, *p);
- }
- }
-
- PutChar(screen, '\n');
-}
-
-void TXT_GotoXY(int x, int y)
-{
- cur_x = x;
- cur_y = y;
-}
-
-void TXT_FGColor(txt_color_t color)
-{
- fgcolor = color;
-}
-
-void TXT_BGColor(int color, int blinking)
-{
- bgcolor = color;
- if (blinking)
- bgcolor |= TXT_COLOR_BLINKING;
-}
-
-void TXT_ClearScreen(void)
-{
- unsigned char *screen;
- int i;
-
- screen = TXT_GetScreenData();
-
- for (i=0; i<TXT_SCREEN_W * TXT_SCREEN_H; ++i)
- {
- screen[i * 2] = ' ';
- screen[i * 2 + 1] = (bgcolor << 4) | fgcolor;
- }
-
- cur_x = 0;
- cur_y = 0;
-}
-
diff --git a/textscreen/txt_io.h b/textscreen/txt_io.h
deleted file mode 100644
index 7ea3170..0000000
--- a/textscreen/txt_io.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Emacs style mode select -*- C++ -*-
-//-----------------------------------------------------------------------------
-//
-// $Id: txt_io.h 291 2006-01-13 23:56:00Z fraggle $
-//
-// Copyright(C) 1993-1996 Id Software, Inc.
-// Copyright(C) 2005 Simon Howard
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-//
-// $Log$
-// Revision 1.1 2006/01/13 23:56:00 fraggle
-// Add text-mode I/O functions.
-// Use text-mode screen for the waiting screen.
-//
-// Revision 1.2 2006/01/13 18:23:28 fraggle
-// Textscreen getchar() function; remove SDL code from I_Endoom.
-//
-// Revision 1.1 2005/10/02 03:16:03 fraggle
-// Text mode emulation code
-//
-//
-//-----------------------------------------------------------------------------
-//
-// Text mode emulation in SDL
-//
-//-----------------------------------------------------------------------------
-
-#ifndef TXT_IO_H
-#define TXT_IO_H
-
-#include "txt_main.h"
-
-void TXT_PutChar(int c);
-void TXT_Puts(char *s);
-void TXT_GotoXY(int x, int y);
-void TXT_FGColor(txt_color_t color);
-void TXT_BGColor(int color, int blinking);
-void TXT_ClearScreen(void);
-
-#endif /* #ifndef TXT_IO_H */
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/chocolate-doom.git
More information about the Pkg-games-commits
mailing list