Update libalx; Fix style

12 files changed, 58 insertions, 256 deletions

diff --git a/modules/about/src/about.c b/modules/about/src/about.c
index e101242..e36828b 100644
--- a/modules/about/src/about.c
+++ b/modules/about/src/about.c
@@ -13,7 +13,7 @@
 	#include <stdlib.h>
 /* libalx --------------------------------------------------------------------*/
 		/* alx_snprint_file() */
-	#include "libalx/alx_file.h"
+	#include "libalx/io/alx_file.h"
 /* Module --------------------------------------------------------------------*/
 	#include "about.h"
 
diff --git a/modules/about/tmp/Makefile b/modules/about/tmp/Makefile
index dee3dc3..21afd1b 100644
--- a/modules/about/tmp/Makefile
+++ b/modules/about/tmp/Makefile
@@ -14,7 +14,7 @@ SRC_DIR = $(ABOUT_DIR)/src/
 _ALL	= about.o
 ALL	= $(_ALL) about_mod.o
 
-ABOU_INC_LIBALX	= libalx/alx_file.h
+ABOU_INC_LIBALX	= libalx/io/alx_file.h
 ABOU_INC	= about.h
 ABOU_DEPS	= $(SRC_DIR)/about.c \
 			$(patsubst %,$(LIBALX_INC_DIR)/%,$(ABOU_INC_LIBALX)) \
diff --git a/modules/menu/src/menu_clui.c b/modules/menu/src/menu_clui.c
index d335b6e..964d176 100644
--- a/modules/menu/src/menu_clui.c
+++ b/modules/menu/src/menu_clui.c
@@ -7,7 +7,7 @@
 /******************************************************************************
  ******* headers **************************************************************
  ******************************************************************************/
-	#include "libalx/alx_input.h"
+	#include "libalx/io/alx_input.h"
 
 	#include "about.h"
 //	#include "save.h"
@@ -41,12 +41,10 @@ void	menu_clui	(void)
 
 	c	= 'n';
 	printf("Read 'Disclaimer of warranty'? (yes/NO): ");
-	if (!fgets(buff, BUFF_SIZE, stdin)) {
+	if (!fgets(buff, BUFF_SIZE, stdin))
 		return;
-	}
-	if (sscanf(buff, " %c", &c)  !=  1) {
+	if (sscanf(buff, " %c", &c)  !=  1)
 		return;
-	}
 	if (c == 'y' || c == 'Y') {
 		printf(" >yes\n");
 		print_share_file(SHARE_DISCLAIMER);
@@ -56,12 +54,10 @@ void	menu_clui	(void)
 
 	c	= 'n';
 	printf("Read 'License'? (yes/NO): ");
-	if (!fgets(buff, BUFF_SIZE, stdin)) {
+	if (!fgets(buff, BUFF_SIZE, stdin))
 		return;
-	}
-	if (sscanf(buff, " %c", &c)  !=  1) {
+	if (sscanf(buff, " %c", &c)  !=  1)
 		return;
-	}
 	if (c == 'y' || c == 'Y') {
 		printf(" >yes\n");
 		print_share_file(SHARE_LICENSE);
@@ -70,12 +66,10 @@ void	menu_clui	(void)
 	}
 #if 0
 	printf("Game interface? (NCURSES/text): ");
-	if (!fgets(buff, BUFF_SIZE, stdin)) {
+	if (!fgets(buff, BUFF_SIZE, stdin))
 		return;
-	}
-	if (sscanf(buff, " %c", &c)  !=  1) {
+	if (sscanf(buff, " %c", &c)  !=  1)
 		return;
-	}
 	if (c == 't' || c == 'T') {
 		printf(" >text\n");
 		// FIXME
@@ -110,12 +104,10 @@ static	void	menu_clui_start		(void)
 
 	c	= 'm';
 	printf("Load again? (MENU/load/exit): ");
-	if (!fgets(buff, BUFF_SIZE, stdin)) {
+	if (!fgets(buff, BUFF_SIZE, stdin))
 		return;
-	}
-	if (sscanf(buff, " %c", &c)  !=  1) {
+	if (sscanf(buff, " %c", &c)  !=  1)
 		return;
-	}
 	if (c == 'p' || c == 'P') {
 		printf(" >load\n");
 		menu_clui_start();
diff --git a/modules/menu/src/menu_tui.c b/modules/menu/src/menu_tui.c
index 3d5a484..8a6cb0b 100644
--- a/modules/menu/src/menu_tui.c
+++ b/modules/menu/src/menu_tui.c
@@ -12,7 +12,7 @@
 	#include <stdbool.h>
 	#include <stddef.h>
 /* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_ncur.h"
+	#include "libalx/curses/alx_ncur.h"
 /* Project -------------------------------------------------------------------*/
 	#include "about.h"
 	#include "proc_iface.h"
diff --git a/modules/menu/tmp/Makefile b/modules/menu/tmp/Makefile
index f83b79d..cd39b92 100644
--- a/modules/menu/tmp/Makefile
+++ b/modules/menu/tmp/Makefile
@@ -39,7 +39,7 @@ MENUI_DEPS	= $(SRC_DIR)/menu_iface.c \
 			$(patsubst %,$(INC_DIR)/%,$(MENUI_INC))
 MENUI_INC_DIRS	= -I $(INC_DIR)
 
-MENUCLUI_INC_LIBALX	= libalx/alx_input.h
+MENUCLUI_INC_LIBALX	= libalx/io/alx_input.h
 MENUCLUI_INC_ABOUT	= about.h
 MENUCLUI_INC_CTRL	= start.h
 MENUCLUI_INC_SAVE	= save.h
@@ -56,7 +56,7 @@ MENUCLUI_INC_DIRS	= -I $(INC_DIR) \
 			-I $(CTRL_INC_DIR) \
 			-I $(SAVE_INC_DIR)
 
-MENUTUI_INC_LIBALX	= libalx/alx_ncur.h
+MENUTUI_INC_LIBALX	= libalx/curses/alx_ncur.h
 MENUTUI_INC_ABOUT	= about.h
 MENUTUI_INC_CTRL	= start.h
 MENUTUI_INC_PROC	= proc_iface.h
diff --git a/modules/proc/src/proc_iface.c b/modules/proc/src/proc_iface.c
index 9111fc5..f14ba1d 100644
--- a/modules/proc/src/proc_iface.c
+++ b/modules/proc/src/proc_iface.c
@@ -14,7 +14,7 @@
 	#include <stdlib.h>
 	#include <time.h>
 /* libalx -------------------------------------------------------------------*/
-	#include "libalx/alx_input.h"
+	#include "libalx/io/alx_input.h"
 /* Project -------------------------------------------------------------------*/
 	#include "img_iface.h"
 	#include "user_iface.h"
@@ -107,7 +107,6 @@ void	proc_iface_series	(void)
 	char	file_basename [FILENAME_MAX];
 	char	file_ext [FILENAME_MAX];
 	char	file_name [FILENAME_MAX];
-	bool	proc_error;
 	char	save_error_as [FILENAME_MAX];
 	bool	wh;
 		/* if i starts being 0, the camera needs calibration */
@@ -177,39 +176,36 @@ void	proc_iface_series	(void)
 			errno	= 0;
 			img_iface_load(proc_path, file_name);
 
-			if (!errno) {
-				/* Process */
-				proc_error	= proc_iface_single(proc_mode);
-
-				if (proc_error) {
-					/* Save failed image into file */
-					proc_show_img();
-					if (snprintf(save_error_as, FILENAME_MAX,
-							"%s%0*i_err%s",
-							file_basename,
-							num_len, i,
-							file_ext)  >=  FILENAME_MAX) {
-						goto err_path;
-					}
-					save_image_file(proc_fail_path,
-								save_error_as);
-				}
-
-				/* Show log */
-				snprintf(txt_tmp, FILENAME_MAX, "%04i", i);
-				user_iface_show_log(txt_tmp, "Item");
+			if (errno) {
+				printf("errno:%i\n", errno);
+				goto err_load;
+			}
 
-				if (proc_debug >= PROC_DBG_STOP_ITEM) {
-					getchar();
+			/* Process */
+			if (proc_iface_single(proc_mode)) {
+				/* Save failed image into file */
+				proc_show_img();
+				if (snprintf(save_error_as, FILENAME_MAX,
+						"%s%0*i_err%s",
+						file_basename,
+						num_len, i,
+						file_ext)  >=  FILENAME_MAX) {
+					goto err_path;
 				}
-			} else {
-				printf("errno:%i\n", errno);
+				save_image_file(proc_fail_path,
+							save_error_as);
 			}
-		}
 
-		if (!i) {
-			proc_mode--;
+			/* Show log */
+			snprintf(txt_tmp, FILENAME_MAX, "%04i", i);
+			user_iface_show_log(txt_tmp, "Item");
+
+			if (proc_debug >= PROC_DBG_STOP_ITEM)
+				getchar();
 		}
+err_load:
+		if (!i)
+			proc_mode--;
 	}
 
 	return;
diff --git a/modules/proc/tmp/Makefile b/modules/proc/tmp/Makefile
index 0bdc990..531b63e 100644
--- a/modules/proc/tmp/Makefile
+++ b/modules/proc/tmp/Makefile
@@ -95,7 +95,7 @@ PROC_CMN_INC_DIRS	= -I $(INC_DIR) \
 				-I $(IMG_INC_DIR) \
 				-I $(USR_INC_DIR)
 
-PROC_IFACE_INC_LIBALX	= libalx/alx_input.h
+PROC_IFACE_INC_LIBALX	= libalx/io/alx_input.h
 PROC_IFACE_INC_IMG	= img_iface.h
 PROC_IFACE_INC_SAVE	= save.h
 PROC_IFACE_INC_USR	= user_iface.h
diff --git a/modules/user/src/user_clui.c b/modules/user/src/user_clui.c
index c48fb82..bcd44c8 100644
--- a/modules/user/src/user_clui.c
+++ b/modules/user/src/user_clui.c
@@ -7,13 +7,11 @@
 /******************************************************************************
  ******* headers **************************************************************
  ******************************************************************************/
-/* Standard C ----------------------------------------------------------------*/
 	#include <stdio.h>
-/* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_input.h"
-/* Project -------------------------------------------------------------------*/
+
+	#include "libalx/io/alx_input.h"
+
 	#include "img_iface.h"
-/* Module --------------------------------------------------------------------*/
 	#include "user_iface.h"
 
 	#include "user_clui.h"
@@ -75,12 +73,10 @@ void	user_clui_fname		(const char *filepath, char *filename)
 void	user_clui_show_log	(const char *title, const char *subtitle)
 {
 
-	printf("________________________________________"
-		"________________________________________\n");
+	printf("________________________________________________________________________________\n");
 	log_loop();
 	printf("%s	-	%s\n", subtitle, title);
-	printf("----------------------------------------"
-		"----------------------------------------\n");
+	printf("--------------------------------------------------------------------------------\n");
 
 }
 
@@ -96,9 +92,8 @@ static	void	log_loop	(void)
 	putchar('\n');
 	for (; log_pos < user_iface_log.len; log_pos++) {
 		if (user_iface_log.lvl[log_pos] <= user_iface_log.visible) {
-			for (lvl = 0; lvl < user_iface_log.lvl[log_pos]; lvl++) {
+			for (lvl = 0; lvl < user_iface_log.lvl[log_pos]; lvl++)
 				printf("\t");
-			}
 			printf("%s\n", user_iface_log.line[log_pos]);
 		}
 	}
@@ -113,18 +108,15 @@ static	int	usr_input	(void)
 	char	ch [10];
 	int	i;
 
-	for (i = 0; i < 10; i++) {
+	for (i = 0; i < 10; i++)
 		ch[i]	= '\0';
-	}
 	buff[0]	= '\0';
 	action	= USER_IFACE_ACT_FOO;
 
-	if (!fgets(buff, BUFF_SIZE, stdin)) {
+	if (!fgets(buff, BUFF_SIZE, stdin))
 		goto err_fgets;
-	}
-	if (!sscanf(buff, " %c%c%c%c%c", &ch[0], &ch[1], &ch[2], &ch[3], &ch[4])) {
+	if (sscanf(buff, " %5c", ch) <= 0)
 		goto err_sscanf;
-	}
 
 	switch (ch[0]) {
 	case '+':
@@ -144,9 +136,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_LABEL_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '2':
@@ -158,9 +147,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_OBJECTS_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '3':
@@ -169,9 +155,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_COINS_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '4':
@@ -180,9 +163,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_RESISTOR_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '5':
@@ -191,14 +171,8 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_LIGHTERS_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
-		default:
-			action	= USER_IFACE_ACT_FOO;
-			break;
 		}
 		break;
 
@@ -217,9 +191,6 @@ static	int	usr_input	(void)
 				case '1':
 					action	= USER_IFACE_ACT_SKELETON;
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
 			case '1':
@@ -231,9 +202,6 @@ static	int	usr_input	(void)
 				case '1':
 					action	= USER_IFACE_ACT_LINES_VERTICAL;
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
 			case '2':
@@ -251,14 +219,8 @@ static	int	usr_input	(void)
 				case '3':
 					action	= USER_IFACE_ACT_MEDIAN_VERTICAL;
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '1':
@@ -276,9 +238,6 @@ static	int	usr_input	(void)
 					case '1':
 						action	= USER_IFACE_ACT_PIXEL_SET;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '1':
@@ -290,9 +249,6 @@ static	int	usr_input	(void)
 					case '1':
 						action	= USER_IFACE_ACT_SET_ROI_2RECT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '2':
@@ -310,14 +266,8 @@ static	int	usr_input	(void)
 					case '3':
 						action	= USER_IFACE_ACT_COMPONENT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
 			case '1':
@@ -347,9 +297,6 @@ static	int	usr_input	(void)
 					case '6':
 						action	= USER_IFACE_ACT_BORDER;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '1':
@@ -367,9 +314,6 @@ static	int	usr_input	(void)
 					case '3':
 						action	= USER_IFACE_ACT_ROTATE_2RECT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '2':
@@ -387,9 +331,6 @@ static	int	usr_input	(void)
 					case '3':
 						action	= USER_IFACE_ACT_THRESHOLD;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '3':
@@ -401,9 +342,6 @@ static	int	usr_input	(void)
 					case '1':
 						action	= USER_IFACE_ACT_HISTOGRAM_C3;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '4':
@@ -424,9 +362,6 @@ static	int	usr_input	(void)
 					case '4':
 						action	= USER_IFACE_ACT_MIN_AREA_RECT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '5':
@@ -435,19 +370,10 @@ static	int	usr_input	(void)
 					case '0':
 						action	= USER_IFACE_ACT_HOUGH_CIRCLES;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '2':
@@ -456,9 +382,6 @@ static	int	usr_input	(void)
 			case '0':
 				action	= USER_IFACE_ACT_ALIGN;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '3':
@@ -470,9 +393,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_UNDISTORT;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '4':
@@ -481,9 +401,6 @@ static	int	usr_input	(void)
 			case '0':
 				action	= USER_IFACE_ACT_DECODE;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '5':
@@ -492,14 +409,8 @@ static	int	usr_input	(void)
 			case '0':
 				action	= USER_IFACE_ACT_READ;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
-		default:
-			action	= USER_IFACE_ACT_FOO;
-			break;
 		}
 		break;
 
@@ -529,9 +440,6 @@ static	int	usr_input	(void)
 		case '1':
 			action	= USER_IFACE_ACT_SHOW_OCR;
 			break;
-		default:
-			action	= USER_IFACE_ACT_FOO;
-			break;
 		}
 		break;
 
@@ -547,10 +455,6 @@ static	int	usr_input	(void)
 			}
 		}
 		break;
-
-	default:
-		action	= USER_IFACE_ACT_FOO;
-		break;
 	}
 
 err_fgets:
diff --git a/modules/user/src/user_tui.c b/modules/user/src/user_tui.c
index 90b457e..9b0285b 100644
--- a/modules/user/src/user_tui.c
+++ b/modules/user/src/user_tui.c
@@ -7,14 +7,12 @@
 /******************************************************************************
  ******* headers **************************************************************
  ******************************************************************************/
-/* Standard C ----------------------------------------------------------------*/
 	#include <inttypes.h>
 	#include <ncurses.h>
-/* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_ncur.h"
-/* Project -------------------------------------------------------------------*/
+
+	#include "libalx/curses/alx_ncur.h"
+
 	#include "img_iface.h"
-/* Module --------------------------------------------------------------------*/
 	#include "user_iface.h"
 
 	#include "user_tui.h"
@@ -212,7 +210,7 @@ static	int	usr_input	(void)
 	int	action;
 	wchar_t	ch;
 
-	/* Interpret input */
+	action	= USER_IFACE_ACT_FOO;
 	ch = wgetch(win_log);
 	switch (ch) {
 	case ' ':
@@ -238,9 +236,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_LABEL_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '2':
@@ -254,9 +249,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_OBJECTS_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '3':
@@ -267,9 +259,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_COINS_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '4':
@@ -280,9 +269,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_RESISTOR_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '5':
@@ -293,14 +279,8 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_PROC_LIGHTERS_SERIES;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
-		default:
-			action	= USER_IFACE_ACT_FOO;
-			break;
 		}
 		break;
 
@@ -325,9 +305,6 @@ static	int	usr_input	(void)
 				case '1':
 					action	= USER_IFACE_ACT_SKELETON;
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
 			case '1':
@@ -341,9 +318,6 @@ static	int	usr_input	(void)
 				case '1':
 					action	= USER_IFACE_ACT_LINES_VERTICAL;
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
 			case '2':
@@ -363,14 +337,8 @@ static	int	usr_input	(void)
 				case '3':
 					action	= USER_IFACE_ACT_MEDIAN_VERTICAL;
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '1':
@@ -394,9 +362,6 @@ static	int	usr_input	(void)
 					case '1':
 						action	= USER_IFACE_ACT_PIXEL_SET;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '1':
@@ -410,9 +375,6 @@ static	int	usr_input	(void)
 					case '1':
 						action	= USER_IFACE_ACT_SET_ROI_2RECT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '2':
@@ -432,14 +394,8 @@ static	int	usr_input	(void)
 					case '3':
 						action	= USER_IFACE_ACT_COMPONENT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
 			case '1':
@@ -473,9 +429,6 @@ static	int	usr_input	(void)
 					case '6':
 						action	= USER_IFACE_ACT_BORDER;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '1':
@@ -495,9 +448,6 @@ static	int	usr_input	(void)
 					case '3':
 						action	= USER_IFACE_ACT_ROTATE_2RECT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '2':
@@ -517,9 +467,6 @@ static	int	usr_input	(void)
 					case '3':
 						action	= USER_IFACE_ACT_THRESHOLD;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '3':
@@ -533,9 +480,6 @@ static	int	usr_input	(void)
 					case '1':
 						action	= USER_IFACE_ACT_HISTOGRAM_C3;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '4':
@@ -558,9 +502,6 @@ static	int	usr_input	(void)
 					case '4':
 						action	= USER_IFACE_ACT_MIN_AREA_RECT;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
 				case '5':
@@ -571,19 +512,10 @@ static	int	usr_input	(void)
 					case '0':
 						action	= USER_IFACE_ACT_HOUGH_CIRCLES;
 						break;
-					default:
-						action	= USER_IFACE_ACT_FOO;
-						break;
 					}
 					break;
-				default:
-					action	= USER_IFACE_ACT_FOO;
-					break;
 				}
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '2':
@@ -594,9 +526,6 @@ static	int	usr_input	(void)
 			case '0':
 				action	= USER_IFACE_ACT_ALIGN;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '3':
@@ -610,9 +539,6 @@ static	int	usr_input	(void)
 			case '1':
 				action	= USER_IFACE_ACT_UNDISTORT;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '4':
@@ -623,9 +549,6 @@ static	int	usr_input	(void)
 			case '0':
 				action	= USER_IFACE_ACT_DECODE;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
 		case '5':
@@ -636,14 +559,8 @@ static	int	usr_input	(void)
 			case '0':
 				action	= USER_IFACE_ACT_READ;
 				break;
-			default:
-				action	= USER_IFACE_ACT_FOO;
-				break;
 			}
 			break;
-		default:
-			action	= USER_IFACE_ACT_FOO;
-			break;
 		}
 		break;
 
@@ -675,9 +592,6 @@ static	int	usr_input	(void)
 		case '1':
 			action	= USER_IFACE_ACT_SHOW_OCR;
 			break;
-		default:
-			action	= USER_IFACE_ACT_FOO;
-			break;
 		}
 		break;
 
@@ -701,10 +615,6 @@ static	int	usr_input	(void)
 			}
 		}
 		break;
-
-	default:
-		action	= USER_IFACE_ACT_FOO;
-		break;
 	}
 
 	return	action;
diff --git a/modules/user/tmp/Makefile b/modules/user/tmp/Makefile
index 9ad6a8b..bc4f607 100644
--- a/modules/user/tmp/Makefile
+++ b/modules/user/tmp/Makefile
@@ -30,7 +30,7 @@ UI_INC_DIRS		= -I $(INC_DIR) \
 				-I $(IMG_INC_DIR) \
 				-I $(PROC_INC_DIR)
 
-UCLUI_INC_LIBALX	= libalx/alx_ncur.h
+UCLUI_INC_LIBALX	= libalx/curses/alx_ncur.h
 UCLUI_INC_IMG		= img_iface.h
 UCLUI_INC		= user_clui.h	user_iface.h
 UCLUI_DEPS		= $(SRC_DIR)/user_clui.c \
@@ -41,7 +41,7 @@ UCLUI_INC_DIRS		= -I $(INC_DIR) \
 				-I $(LIBALX_INC_DIR) \
 				-I $(IMG_INC_DIR)
 
-UTUI_INC_LIBALX		= libalx/alx_ncur.h
+UTUI_INC_LIBALX		= libalx/curses/alx_ncur.h
 UTUI_INC_IMG		= img_iface.h
 UTUI_INC		= user_tui.h	user_iface.h
 UTUI_DEPS		= $(SRC_DIR)/user_tui.c \
diff --git a/src/main.cpp b/src/main.cpp
index 2e05304..b1bc046 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,7 +10,7 @@
 /* Standard C ----------------------------------------------------------------*/
 	#include <cstdio>
 /* libalx --------------------------------------------------------------------*/
-	#include "libalx/alx_ncur.hpp"
+	#include "libalx/curses/alx_ncur.hpp"
 /* Project -------------------------------------------------------------------*/
 	#include "about.hpp"
 	#include "img_iface.hpp"
diff --git a/tmp/Makefile b/tmp/Makefile
index 0d44af3..a49f078 100644
--- a/tmp/Makefile
+++ b/tmp/Makefile
@@ -30,7 +30,7 @@ SRC_DIR		= $(MAIN_DIR)/src/
 
 ALL	= main.o
 
-MAIN_INC_LIBALX	= libalx/alx_ncur.hpp
+MAIN_INC_LIBALX	= libalx/curses/alx_ncur.hpp
 MAIN_INC_ABOUT	= about.hpp
 MAIN_INC_IMG	= img_iface.hpp
 MAIN_INC_MENU	= parser.hpp menu_iface.hpp