X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=c91140f428b71ba9b0af9a616609eab5f1e0e375;hb=d21bba24b8b8b6ff574eed2ef8adbb213e9a9e65;hp=052f7ffd6139eb449f97e5a479d164e11126f21d;hpb=bdce9a4a15d59ade95a980050ec9a3a8de88caef;p=plomrogue

diff --git a/roguelike.c b/roguelike.c
index 052f7ff..c91140f 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -31,22 +31,20 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
 // Write text into window content space. Start on row start_y. Fill unused rows with whitespace.
   int x, y;
   char toggle;
-  int height_av = win->height - 1;
-  int width_av = win->width - 1;
   char fin = 0;
   int z = -1;
-  for (y = start_y; y < height_av; y++) {
+  for (y = start_y; y < win->height; y++) {
     if (0 == fin)
       toggle = 0;
-    for (x = 0; x < width_av; x++) {
+    for (x = 0; x < win->width; x++) {
        if (0 == toggle) {
          z++;
          if ('\n' == text[z]) {
-           mvwaddch(win->curses_win, y+1, x+win->border_left, ' ');
+           mvwaddch(win->curses_win, y, x, ' ');
            toggle = 1;
            continue; }
          else
-           mvwaddch(win->curses_win, y+1, x+win->border_left, text[z]);
+           mvwaddch(win->curses_win, y, x, text[z]);
          if ('\n' == text[z+1]) {
            z++;
            toggle = 1; }
@@ -54,18 +52,16 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
             toggle = 1;
             fin = 1; } }
        else
-         mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); } } }
+         mvwaddch(win->curses_win, y, x, ' '); } } }
 
 void draw_text_from_bottom (struct Win * win) {
 // Draw text in win->data from end/bottom to the top.
   char * text = (char *) win->data;
-  int width_av = win->width - 1;
-  int height_av = win->height - 1;
   char toggle = 0;
   int x, y, offset;
   int z = -1;
-  for (y = 0; 0 == toggle; y++)         // Determine number of lines text would have in a window of available
-    for (x = 0; x < width_av; x++) {    // width, but infinite height.
+  for (y = 0; 0 == toggle; y++)         // Determine number of lines text would have in a window of
+    for (x = 0; x < win->width; x++) {  // available width, but infinite height.
       z++;
       if ('\n' == text[z])              // Treat \n and \0 as control characters for incrementing y and
         break;                          // stopping the loop. Make sure they don't count as cell space
@@ -77,15 +73,15 @@ void draw_text_from_bottom (struct Win * win) {
         break; } }
   z = -1;
   int start_y = 0;
-  if (y < height_av) {             // Depending on what is bigger, determine start point in window or in text.
-    start_y = height_av - y;
+  if (y < win->height) {          // Depending on what is bigger, determine start point in window or in text.
+    start_y = win->height - y;
     for (y = 0; y < start_y; y++)
-      for (x = 0; x < width_av; x++)
-        mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); }
-  else if (y > height_av) {
-    offset = y - height_av;
+      for (x = 0; x < win->width; x++)
+        mvwaddch(win->curses_win, y, x, ' '); }
+  else if (y > win->height) {
+    offset = y - win->height;
     for (y = 0; y < offset; y++)
-      for (x = 0; x < width_av; x++) {
+      for (x = 0; x < win->width; x++) {
         z++;
         if ('\n' == text[z])
           break;
@@ -97,24 +93,22 @@ void draw_text_from_bottom (struct Win * win) {
 
 void draw_map (struct Win * win) {
 // Draw map determined by win->data Map struct into window. Respect offset.
-  int height_av = win->height - 1;
-  int width_av = win->width - 1;
   struct Map map = * (struct Map *) win->data;
   char * cells = map.cells;
   int width_map_av = map.width - map.offset_x;
   int height_map_av = map.height - map.offset_y;
   int x, y, z;
-  for (y = 0; y < height_av; y++) {
+  for (y = 0; y < win->height; y++) {
     z = map.offset_x + (map.offset_y + y) * (map.width);
-    for (x = 0; x < width_av; x++) {
+    for (x = 0; x < win->width; x++) {
       if (y < height_map_av && x < width_map_av) {
         if (z == (map.width * map.player_y) + map.player_x)
-          mvwaddch(win->curses_win, y+1, x+win->border_left, '@');
+          mvwaddch(win->curses_win, y, x, '@');
         else
-          mvwaddch(win->curses_win, y+1, x+win->border_left, cells[z]);
+          mvwaddch(win->curses_win, y, x, cells[z]);
         z++; }
       else
-        mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); } } }
+        mvwaddch(win->curses_win, y, x, ' '); } } }
 
 void draw_info (struct Win * win) {
 // Draw info window by appending win->data integer value to "Turn: " display.
@@ -220,21 +214,19 @@ void draw_keys_window (struct Win * win) {
   struct World * world = (struct World *) win->data;
   struct KeysWinData * keyswindata = (struct KeysWinData *) world->keyswindata;
   struct KeyBinding * keybindings = world->keybindings;
-  int height_av = win->height - 1;
-  int width_av = win->width - 1;
   int offset = 0;
-  if (keyswindata->max >= height_av) {
-    if (keyswindata->select > height_av / 2)
-      if (keyswindata->select < (keyswindata->max - (height_av / 2)))
-        offset = keyswindata->select - (height_av / 2);
+  if (keyswindata->max >= win->height) {
+    if (keyswindata->select > win->height / 2)
+      if (keyswindata->select < (keyswindata->max - (win->height / 2)))
+        offset = keyswindata->select - (win->height / 2);
       else
-        offset = keyswindata->max - height_av + 1; }
+        offset = keyswindata->max - win->height + 1; }
   int keydescwidth = 9; // max length assured by get_keyname()
   char * keydesc = malloc(keydescwidth + 1);
   attr_t attri;
   int y, x;
   char * keyname;
-  for (y = 0; 0 != keybindings[offset + y].name && y < height_av; y++) {
+  for (y = 0; 0 != keybindings[offset + y].name && y < win->height; y++) {
     attri = 0;
     if (y == keyswindata->select - offset) {
       attri = A_REVERSE;
@@ -243,18 +235,18 @@ void draw_keys_window (struct Win * win) {
     keyname = get_keyname(keybindings[y + offset].key);
     snprintf(keydesc, keydescwidth + 1, "%-9s", keyname);
     free(keyname);
-    for (x = 0; x < width_av; x++)
+    for (x = 0; x < win->width; x++)
       if (strlen(keydesc) > x)
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, keydesc[x] | attri);
+        mvwaddch(win->curses_win, y, x, keydesc[x] | attri);
       else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1)
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
+        mvwaddch(win->curses_win, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
       else
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, ' ' | attri); }
+        mvwaddch(win->curses_win, y, x, ' ' | attri); }
   free(keydesc);
-  if (y < height_av)
-    for (; y < height_av; y++)
-      for (x = 0; x < width_av; x++)
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, ' '); }
+  if (y < win->height)
+    for (; y < win->height; y++)
+      for (x = 0; x < win->width; x++)
+        mvwaddch(win->curses_win, y, x, ' '); }
 
 void init_keybindings(struct World * world) {
 // Initialize keybindings from file "keybindings".
@@ -340,7 +332,6 @@ int main () {
   curs_set(0);
   keypad(screen, TRUE);
   raw();
-
   struct WinMeta win_meta = init_win_meta(screen);
 
   struct Win win_keys = init_window(&win_meta, "Keys");
@@ -368,6 +359,10 @@ int main () {
     key = getch();
     if      (key == get_action_key(world.keybindings, "quit"))
       break;
+    else if (key == get_action_key(world.keybindings, "scroll pad right"))
+      win_meta.pad_offset++;
+    else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0)
+      win_meta.pad_offset--;
     else if (key == get_action_key(world.keybindings, "toggle keys window"))
       toggle_window(&win_meta, &win_keys);
     else if (key == get_action_key(world.keybindings, "toggle map window"))
@@ -394,9 +389,8 @@ int main () {
       resize_window(&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "save keys"))
       save_keybindings(&world);
-    else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0) {
+    else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0)
       world.keyswindata->select--;
-      draw_all_windows (&win_meta); }
     else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max)
       world.keyswindata->select++;
     else if (key == get_action_key(world.keybindings, "keys mod")) {