Merge pull request #1 from Wyatts/patch-1

Fix examples

Author: msoucy

deimos/ncurses/ncurses.d

@@ -32,3 +32,4 @@
 module deimos.ncurses.ncurses;
 
 public import deimos.ncurses.curses;
+alias deimos.ncurses.curses.clear nclear;

examples/menu_scroll.d

@@ -55,9 +55,9 @@ int main()
     /* Print a border around the main window and print a title */
         box(my_menu_win, 0, 0);
     print_in_middle(my_menu_win, 1, 0, 40, "My Menu", COLOR_PAIR(1));
-    mvwaddch(my_menu_win, 2, 0, acs_map[ACS.LTEE]);
-    mvwhline(my_menu_win, 2, 1, acs_map[ACS.HLINE], 38);
-    mvwaddch(my_menu_win, 2, 39, acs_map[ACS.RTEE]);
+    mvwaddch(my_menu_win, 2, 0, ACS_LTEE);
+    mvwhline(my_menu_win, 2, 1, ACS_HLINE, 38);
+    mvwaddch(my_menu_win, 2, 39, ACS_RTEE);
 
     /* Post the menu */
     post_menu(my_menu);
@@ -99,7 +99,7 @@ int main()
 }
 
 void print_in_middle(WINDOW *win, int starty, int startx, int width, string strtemp, chtype color)
-{   int length, x, y;
+{   int x, y;
     float temp;
 
     if(win == null)
@@ -112,7 +112,7 @@ void print_in_middle(WINDOW *win, int starty, int startx, int width, string strt
     if(width == 0)
         width = 80;
 
-    length = strtemp.length;
+    auto length = strtemp.length;
     temp = (width - length)/ 2;
     x = startx + cast(int)temp;
     wattron(win, color);

examples/mouse_menu.d

@@ -1,4 +1,3 @@
-
 import std.string: toStringz;
 import deimos.ncurses.ncurses;
 
@@ -18,7 +17,7 @@ void main()
     MEVENT event;
 
     initscr();                      //hopefully you've seen all of this before.
-    clear();
+    nclear();
     noecho();
     cbreak();
     keypad(stdscr, true);
@@ -83,7 +82,7 @@ void print_menu(WINDOW* menu_win, int highlight)
 
     box(menu_win, 0, 0);
 
-    foreach(i, choice; choices)
+    foreach(int i, choice; choices)
     {
         if(highlight == i + 1)
             wattron(menu_win, A_REVERSE);
@@ -100,7 +99,7 @@ int report_choice(int mouse_x, int mouse_y)
     int i = startx + 2;
     int j = starty + 3;
     int report = 0;
-    foreach(choice, str; choices)
+    foreach(int choice, str; choices)
     {
         if((mouse_y == j + choice) && (mouse_x >= i) && (mouse_x <= i+str.length))
         {

examples/printw_example.d

@@ -1,5 +1,6 @@
 //Modified by: 1100110
 
+import std.conv;
 import std.string;
 import deimos.ncurses.ncurses;				/* ncurses.h includes stdio.h */  
 
@@ -11,7 +12,7 @@ void main()
 	initscr();								//start the curses mode 
 	getmaxyx(stdscr, row, col);				//get the number of rows and columns
 	//print the message at the center of the screen 
-	mvprintw(row/2, (col-(mesg.length - 1))/2, "%s", toStringz(mesg));
+	mvprintw(row/2, to!uint((col-(mesg.length - 1))/2), "%s", toStringz(mesg));
 	//Did you notice? there is a '%s' not toStringified.
 	//In one of those great weird blips, D2 will pass small characters
 	//like that, and yet will choke on larger strings.

examples/simple_key.d

@@ -17,7 +17,7 @@ int main()
     int c;
 
     initscr();
-    clear();
+    nclear();
     noecho();
     cbreak();   /* Line buffering disabled. pass on everything */
     scope(exit) endwin();

examples/with_chgat.d

@@ -7,7 +7,7 @@ void main()
 
     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, null);
+    mvchgat(0, 0, -1, cast(attr_t)A_BLINK, cast(short)1, cast(void*)null);
     /*
      * First two parameters specify the position at which to start
      * Third parameter number of characters to update. -1 means till