From 56e9dd1200ccd863216d68e75240dadb3a7fabb2 Mon Sep 17 00:00:00 2001
From: EvanR <evanrinehart@gmail.com>
Date: Sun, 28 Jun 2009 16:31:31 -0400
Subject: [PATCH] Added command line options and unicode. Changed audio init.

The unicode is untested and prehaps incomplete.
The audio is failing to play silence on intel HDA hardware.
---
 Makefile  |  4 +++-
 backend.c | 46 ++++++++++++++++++++++++++++++++++------------
 backend.h |  9 +++++++--
 util.c    | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 util.h    | 10 +++++++++-
 5 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index a915322..f76e9d2 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,13 @@ LIBS = -lSDL -lGL -lzzip
 $(PROJECT): $(OBJ)
 	$(CC) -o $(PROJECT) $(LIBS) $(OBJ)
 
+
+
 game.o: game.h intro.h
 title.o: game.h backend.h title.h
 intro.o: game.h backend.h intro.h title.h
 util.o: util.h
-main.o: game.h backend.h intro.h loader.h
+main.o: game.h backend.h intro.h loader.h util.h
 backend.o: game.h backend.h util.h loader.h sound.h
 loader.o: loader.h util.h
 sound.o: sound.h
diff --git a/backend.c b/backend.c
index 4bc08d3..650f989 100644
--- a/backend.c
+++ b/backend.c
@@ -23,9 +23,8 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_opengl.h>
 
-#include "game.h"
 #include "backend.h"
-#include "util.h"
+#include "game.h"
 #include "loader.h"
 #include "sound.h"
 
@@ -616,13 +615,11 @@ extern void process_audio(short lout[], short rout[], int len);
 void audio_callback(void *userdata, Uint8 *stream, int len){
   Sint16* out = (Sint16*)stream;
 
-  process_audio(lout, rout, BUFFER_SIZE/2);
+  process_audio(lout, rout, BUFFER_SIZE);
 
-  int j = 0;
-  for(int i=0; i<len/2; i+=2){
-    out[i  ] = lout[j];
-    out[i+1] = rout[j];
-    j++;
+  for(int i=0; i<BUFFER_SIZE; i++){
+    out[i*2    ] = lout[i];
+    out[i*2 + 1] = rout[i];
   }
 
 }
@@ -642,13 +639,38 @@ void backend_init(int argc, char* argv[]){
   /* options */
   int fullscreen = 0;
   for(int i=0; i<argc; i++){
-    if(strncmp(argv[i], "-gl",5)==0){
+    if(!strcmp(argv[i], "-gl")){
       gl_flag = 1;
       continue;
     }
-    if(strncmp(argv[i], "-f",5)==0){
+    if(!strcmp(argv[i], "-f")){
       fullscreen = 1;
     }
+    if(!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")){
+      printf("options:\n");
+      printf("  -gl   use opengl video mode\n");
+      printf("  -f    use fullscreen video mode\n");
+      printf("  -h    print this help\n");
+      printf("  -v    print version info\n");
+      exit(0);
+    }
+    if(!strcmp(argv[i], "-v")){
+      printf("cantaveria (v%d.%d)\n",VERSION_MAJOR,VERSION_MINOR);
+      printf("Copyright 2009 Evan Rinehart\n\n");
+
+      printf("This program is distributed under the terms of the GNU General\n"
+             "Public License (v2) and comes with ABSOLUTELY NO WARRANTY.\n\n");
+
+      printf("Send questions, comments, and bugs to evanrinehart@gmail.com\n\n");
+
+      printf("Send money to:\n");
+      printf("1850 Claiborne St\n");
+      printf("Mandeville, LA 70448\n");
+      printf("United States of America\n\n");
+
+      printf("Thanks! :)\n");
+      exit(0);
+    }
   }
 
 
@@ -773,7 +795,7 @@ void backend_init(int argc, char* argv[]){
   audio.freq = SAMPLE_RATE;
   audio.format = AUDIO_S16;
   audio.channels = 2;
-  audio.samples = BUFFER_SIZE/audio.channels;
+  audio.samples = BUFFER_SIZE;
   audio.callback = audio_callback;
 
   SDL_AudioSpec gotten;
@@ -822,4 +844,4 @@ else{
 }
 */
 
-}
\ No newline at end of file
+}
diff --git a/backend.h b/backend.h
index b4bc614..026cf97 100644
--- a/backend.h
+++ b/backend.h
@@ -20,6 +20,8 @@
    Boston, MA  02110-1301, USA
 */
 
+#include "util.h"
+
 enum {
 ESCAPE_KEY,
 PAUSE_KEY,
@@ -61,6 +63,9 @@ JOYRELEASE,
 FOOBAR
 };
 
+#define VERSION_MAJOR 0
+#define VERSION_MINOR 0
+
 #define JOY_MAX 32767
 #define JOY_MIN -32768
 
@@ -149,9 +154,9 @@ void unload_stage();
 
 /* text */
 sprite* small_text(char* str);
+void draw_small_text(char* str, int x, int y);
 void clear_message();
 void set_message(char* str);
+void append_message_character(utf32 u);
 void reposition_message(int x, int y);
 void resize_message(int w, int h);
-int message_width(char* str);
-int message_trim_index(char* str);
\ No newline at end of file
diff --git a/util.c b/util.c
index 0e7508a..ccbd30d 100644
--- a/util.c
+++ b/util.c
@@ -70,4 +70,56 @@ void strmcat(char* dst, const char* src, size_t n){
 void out_of_memory(const char* prefix){
   report_error("%s: out of memory", prefix);
   exit(-2);
-}
\ No newline at end of file
+}
+
+
+
+/*
+decodes utf8 encoded string str and places the
+next character in u.
+returns the number of bytes of str consumed.
+*/
+int unicode_getc(char* str, utf32* u){
+  unsigned char b[4] = {str[0], str[1], str[2], str[3]};
+  unsigned char a[4] = {0,0,0,0};
+  int N;
+
+  /* 1111 0xf
+     1110 0xe
+     1100 0xc
+     1000 0x8 */
+
+  if((b[0] & 0x80) == 0){/*one byte sequence*/
+    a[3] = b[0];
+    N = 1;
+  }
+  else if(((b[0]&0xe0)==0xc0) &&
+          ((b[1]&0xc0)==0x80) ){/*two byte sequence*/
+    a[3] = ((b[0]&0x03)<<6)|(b[1]&0x3f);
+    a[2] = (b[0]&0x1c)>>2;
+    N = 2;
+  }
+  else if(((b[0]&0xf0)==0xe0) &&
+          ((b[1]&0xc0)==0x80) &&
+          ((b[2]&0xc0)==0x80) ){/*three byte sequence*/
+    a[3] = ((b[1]&0x03)<<6)|(b[2]&0x3f);
+    a[2] = ((b[0]&0x0f)<<4)|((b[1]&0x3c)>>2);
+    N = 3;
+  }
+  else if(((b[0]&0xf8)==0xf0) &&
+          ((b[1]&0xc0)==0x80) &&
+          ((b[2]&0xc0)==0x80) &&
+          ((b[3]&0xc0)==0x80) ){/*four byte sequence*/
+    a[3] =((b[2]&0x03)<<6)|(b[3]&0x3f);
+    a[2] =((b[1]&0x0f)<<4)|((b[2]&0x3c)>>2);
+    a[1] =((b[0]&0x03)<<2)|((b[1]&0x30)>>4);
+    N = 4;
+  }
+  else {
+    a[3] = '?';
+    N = 4;/*FIXME find next valid byte*/
+  }
+  *u = (a[0]<<24) | (a[1]<<16) | (a[2]<<8) | a[3];
+  return N;
+}
+
diff --git a/util.h b/util.h
index c629955..4d437b9 100644
--- a/util.h
+++ b/util.h
@@ -25,4 +25,12 @@ void fatal_error(const char* format, ...);
 void* xmalloc(size_t size);
 char* strxcpy(const char* str);
 void strmcat(char* dst, const char* src, size_t n);
-void out_of_memory(const char*);
\ No newline at end of file
+void out_of_memory(const char*);
+
+//typedef struct {
+//  unsigned char b[4];
+ // unsigned long n;
+//} utf32;
+typedef unsigned long utf32;
+
+int unicode_getc(char* str, utf32* u);
-- 
2.11.4.GIT