Merge pull request #15 from 1100110/master

minor fixes for dub

Author: WalterBright

.gitignore

@@ -1,4 +1,6 @@
+examples/bin
+examples/bin/*
+
 *.o
 *.so
 *.a
-

.travis.yml

@@ -1,7 +1,9 @@
 before_install:
-    - sudo wget https://d-apt.googlecode.com/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
+    - sudo curl http://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -o /etc/apt/sources.list.d/d-apt.list
     - sudo apt-get update && sudo apt-get -y --allow-unauthenticated install d-apt-keyring && sudo apt-get update
-    - sudo apt-get install dmd libncursesw5
+    - sudo apt-get install dmd-bin libncursesw5 make
 
 script:
     dmd -lib -L-lncursesw -oflibncurses-d deimos/ncurses/curses.d deimos/ncurses/eti.d deimos/ncurses/form.d deimos/ncurses/menu.d deimos/ncurses/ncurses.d deimos/ncurses/panel.d deimos/ncurses/unctrl.d
+
+    cd examples/ && make

examples/Makefile

@@ -0,0 +1,65 @@
+DC=rdmd -g -w --build-only -ofbin/$@ -I../ -L-lncursesw $^
+
+all: 	init helloUnicode helloWorld simpleColor simpleKey simpleSpectrum keyCode chgat acsVars printw simplePanel winBorder.d simpleMenu.d otherBorder mouseMenu scrollMenu attribMenu printBold
+	
+init: 
+	@echo "building all examples..."
+
+helloWorld: 	helloWorld.d
+	$(DC)
+
+helloUnicode: 	helloUnicode.d
+	$(DC)
+
+simpleColor: 	simpleColor.d
+	$(DC)
+
+simplePanel: 	simplePanel.d
+	$(DC)
+
+# TODO fix
+simpleKey: 	simpleKey.d
+	$(DC)
+
+simpleSpectrum: simpleSpectrum.d
+	$(DC)
+
+simpleMenu: 	simpleMenu.d
+	$(DC)
+
+acsVars: 	acsVars.d
+	$(DC)
+
+chgat: 		chgat.d
+	$(DC)
+
+keyCode: 	keyCode.d
+	$(DC)
+
+tempLeave: 	tempLeave.d
+	$(DC)
+
+printw: 	printw.d
+	$(DC)
+
+printBold: 	printBold.d
+	$(DC)
+
+winBorder: 	winBorder.d
+	$(DC)
+
+otherBorder: 	otherBorder.d
+	$(DC)
+
+mouseMenu: 	mouseMenu.d
+	$(DC)
+
+scrollMenu: 	scrollMenu.d
+	$(DC)
+
+attribMenu: 	attribMenu.d
+	$(DC)
+
+clean: 
+	@rm bin/*
+	@echo "done."

examples/README

@@ -0,0 +1,31 @@
+# D Ncurses Examples
+
+Here are a few examples to get you started.
+
+The main site where these examples were originally found is here [tldp.org](http://tldp.org/HOWTO/NCURSES-Programming-HOWTO/)
+These examples need some work, but they should demonstrate that most everything is in working order.
+
+All of the files *should* be executable and set to link with ncursesw by default.
+If you have rdmd installed in /usr/bin/rdmd, then ./helloWorld.d should get you going!
+
+if not, then make [filename], and the programs will be in ./bin/
+
+### Requirements:
+    - [rdmd](http://github.com/D-Programming-Language/tools)
+    - ncursesw
+
+### Files
+    - helloWorld.d   - a simple hello world example.
+    - helloUnicode.d - a simple unicode example.
+    - keyCode.d      - returns the number code of the key you pressed.
+    - simpleColor.d  - a simple example that demonstrates color output.
+
+### TODO
+[ ] review, and fix anything that's broken.
+[ ] cosmetic alterations.
+[ ] add to travis.
+[ ] fix so that examples are compilable on Windows.
+
+Again, please file any bugs that you come across.
+Even if you don't know if it is actually a bug, we appreciate the time.  
+We understand that sometimes it is hard to figure out.

examples/README.md

@@ -1,16 +1,15 @@
-
+#!/usr/bin/rdmd -L-lncurses
 import std.string: toStringz;
 import deimos.ncurses.curses;
 
 void main()
 {
     initscr();
-
+    scope(exit)     endwin();
+    scope(failure)  endwin();
     //Please note: you might want to maximize your terminal before you try to
     //run this.  It does not check the size or enable scrolling.
     //In other word, if your terminal is <= 23 by 79, it will do weird things.
-    //That is left as an exersize for the reader.
-    //Plus I'm lazy and I still have to port the rest of the tutorials.. ;)
     //The spaces are for readability on the screen when you run the program.
 
     printw(toStringz("Upper left corner           "));
@@ -139,5 +138,4 @@ void main()
 
     refresh();
     getch();
-    endwin();
 }

examples/acs_vars.d renamed to examples/acsVars.d

@@ -1,5 +1,7 @@
+#!/usr/bin/rdmd -L-lmenu
 import deimos.ncurses.menu;
-
+import std.conv:    to;
+pragma(lib, "menu");
 const int CTRLD = 4;
 
 immutable char[][] choices = [  "Choice 1",
@@ -30,7 +32,7 @@ int main()
     init_pair(3, COLOR_MAGENTA, COLOR_BLACK);
 
     /* Initialize items */
-        n_choices = choices.length;
+        n_choices = choices.length.to!int;
         my_items.length = n_choices + 1;
         for(i = 0; i < n_choices; ++i)
                 my_items[i] = new_item((choices[i]~'\0').ptr, (choices[i]~'\0').ptr);

examples/menu_attrib.d renamed to examples/attribMenu.d

@@ -1,13 +1,20 @@
-import std.string: toStringz;
+#!/usr/bin/rdmd -L-lncurses
+import std.string:  toStringz;
+import std.conv:    to;
 import deimos.ncurses.ncurses;
 
 void main()
-{   initscr();          //Start curses mode
+{   
+    initscr();          //Start curses mode
+    scope(failure)  endwin();
+    scope(exit)     endwin();
+
     start_color();      //Start color functionality
 
     init_pair(1, COLOR_CYAN, COLOR_BLACK);
     printw(toStringz("A Big string which i didn't care to type fully... "));
-    mvchgat(0, 0, -1, cast(attr_t)A_BLINK, cast(short)1, cast(void*)null);
+                      //type attr_t    
+    mvchgat(0, 0, -1, A_BLINK.to!attr_t, 1.to!short, null.to!(void*));
     /*
      * First two parameters specify the position at which to start
      * Third parameter number of characters to update. -1 means till
@@ -20,5 +27,4 @@ void main()
      */
     refresh();
     getch();
-    endwin();           //End curses mode
 }

examples/with_chgat.d renamed to examples/chgat.d

@@ -1,6 +1,9 @@
+#!/usr/bin/rdmd
 import deimos.ncurses.form;
 import std.string;
-
+//TODO fix
+pragma(lib, "ncursesw");
+pragma(lib, "form");
 
 void main()
 {