Commit e203fb4c authored by Ercan Ersoy's avatar Ercan Ersoy

Some fixes

Update FDOSTUI for some reasons. Fix "Show Archive Items"
checkbox and fix "Show Hidden Items" checkbox.
parent 27760d77
This is a Bazaar control directory.
Do not change any files in this directory.
See http://bazaar.canonical.com/ for more information about Bazaar.
Bazaar-NG meta directory, format 1
parent_location = bzr://bzr.savannah.nongnu.org/fdostui/v1/
Bazaar Branch Format 7 (needs bzr 1.6)
33 markjolesen@gmail.com-20181002222954-s0ie09yj4kz2hs5m
Bazaar Working Tree Format 6 (bzr 1.14)
Bazaar repository format 2a (needs bzr 1.16 or later)
B+Tree Graph Index 2
node_ref_lists=0
key_elements=1
len=0
row_lengths=
......@@ -126,19 +126,30 @@ enum scancodes
#endif /* #if defined(__DOS__) && !defined(__CURSES__) */
#if defined(__NT__) && !defined(__CURSES__)
#include <windows.h>
enum scancodes
{
SCAN_NONE =0x00,
SCAN_HOME =0x47,
SCAN_UP =0x48,
SCAN_PGUP =0x49,
SCAN_LEFT =0x4b,
SCAN_RIGHT =0x4d,
SCAN_END =0x4f,
SCAN_DOWN =0x50,
SCAN_PGDN =0x51,
SCAN_INS =0x52,
SCAN_DEL =0x53,
SCAN_F1 =VK_F1,
SCAN_F2 =VK_F2,
SCAN_F3 =VK_F3,
SCAN_F4 =VK_F4,
SCAN_F5 =VK_F5,
SCAN_F6 =VK_F6,
SCAN_F7 =VK_F7,
SCAN_F8 =VK_F8,
SCAN_F9 =VK_F9,
SCAN_F10 =VK_F10,
SCAN_HOME =VK_HOME,
SCAN_UP =VK_UP,
SCAN_PGUP =VK_PRIOR,
SCAN_LEFT =VK_LEFT,
SCAN_RIGHT =VK_RIGHT,
SCAN_END =VK_END,
SCAN_DOWN =VK_DOWN,
SCAN_PGDN =VK_NEXT,
SCAN_INS =VK_INSERT,
SCAN_DEL =VK_DELETE,
SCAN_SHIFT_TAB =0xf,
SCAN_ALT_MASK =1000,
SCAN_ALT_1 =('1' | SCAN_ALT_MASK),
......@@ -187,6 +198,16 @@ enum scancodes
enum scancodes
{
SCAN_NONE =0x00,
SCAN_F1 =KEY_F(1),
SCAN_F2 =KEY_F(2),
SCAN_F3 =KEY_F(3),
SCAN_F4 =KEY_F(4),
SCAN_F5 =KEY_F(5),
SCAN_F6 =KEY_F(6),
SCAN_F7 =KEY_F(7),
SCAN_F8 =KEY_F(8),
SCAN_F9 =KEY_F(9),
SCAN_F10 =KEY_F(10),
SCAN_HOME =KEY_HOME,
SCAN_UP =KEY_UP,
SCAN_PGUP =KEY_NPAGE,
......@@ -245,6 +266,16 @@ enum scancodes
enum scancodes
{
SCAN_NONE =0x00,
SCAN_F1 =(KEY_F0 + 1),
SCAN_F2 =(KEY_F0 + 2),
SCAN_F3 =(KEY_F0 + 3),
SCAN_F4 =(KEY_F0 + 4),
SCAN_F5 =(KEY_F0 + 5),
SCAN_F6 =(KEY_F0 + 6),
SCAN_F7 =(KEY_F0 + 7),
SCAN_F8 =(KEY_F0 + 8),
SCAN_F9 =(KEY_F0 + 9),
SCAN_F10 =(KEY_F0 + 10),
SCAN_HOME =KEY_HOME,
SCAN_UP =KEY_UP,
SCAN_PGUP =KEY_NPAGE,
......
{
INFO.PAS this file was extracted from
https::/gitub.com/shidel/DustyTP7/blob/master/INFO/INFO.PAS
https:/github.com/shidel/DustyTP7/blob/master/INFO/INFO.PAS
This file was used to adapt VIDEO.ASM.
}
......
File mode changed from 100755 to 100644
......@@ -14,15 +14,14 @@
#include <string.h>
#include <stdlib.h>
#if defined(__DOS__) || defined(__NT__) && !defined(__NTCRUSTY__)
#include <sys\types.h>
#include <sys\stat.h>
#include <direct.h>
#else
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <limits.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
#if !defined(PATH_MAX)
# define PATH_MAX 4096
......@@ -41,6 +40,12 @@ strtobcolor(
do
{
if (isdigit(*i_color))
{
l_color= (enum background)atoi(i_color);
break;
}
l_rc= strcmp(i_color, "black");
if (0 == l_rc)
{
......@@ -108,6 +113,12 @@ strtofcolor(
do
{
if (isdigit(*i_color))
{
l_color= (enum background)atoi(i_color);
break;
}
l_rc= strcmp(i_color, "black");
if (0 == l_rc)
{
......
......@@ -50,7 +50,7 @@ extern void
cursor_block()
{
curs_set(1);
curs_set(2);
return;
}
......@@ -7,8 +7,8 @@
and related or neighboring rights to FDOSTUI Library. This work is published
from: United States.
*/
#include "cursor.h"
#include <windows.h>
#include "cursor.h"
extern HANDLE _screen_active;
enum cursor_mode _cursor_mode= CURSOR_OVERWRITE;
......
......@@ -7,15 +7,15 @@
and related or neighboring rights to FDOSTUI Library. This work is published
from: United States.
*/
#include "filedlg.hpp"
#include "strings.h"
#include "hw.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <stdlib.h>
#include <ctype.h>
#include <limits.h>
#include <errno.h>
#include "filedlg.hpp"
#include "strings.h"
#include "hw.h"
#ifndef PATH_MAX
#define PATH_MAX 4096
......
......@@ -7,9 +7,9 @@
and related or neighboring rights to FDOSTUI Library. This work is published
from: United States.
*/
#include "hw.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include "hw.h"
unsigned char _hw_drives[HW_DRIVE_MAX]; /* drives 'A'-'Z' 0=not available 1=available */
......
......@@ -7,11 +7,11 @@
and related or neighboring rights to FDOSTUI Library. This work is published
from: United States.
*/
#include "poll.h"
#include "mouse.h"
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <string.h>
#include "poll.h"
#include "mouse.h"
extern HANDLE _screen_stdin;
......@@ -83,7 +83,7 @@ poll_block(
else
{
(*o_event).m_record.m_key.m_ascii= (*l_key).uChar.AsciiChar;
(*o_event).m_record.m_key.m_scan= (*l_key).wVirtualScanCode;
(*o_event).m_record.m_key.m_scan= (*l_key).wVirtualKeyCode;
}
l_exit= 1;
break;
......
......@@ -44,6 +44,7 @@ static window* _wm_grab;
static window* _wm_focused;
static struct array _wm_array;
static enum wm_error _wm_quit_flag;
bool _wm_esc_flag= true;
#if (__WATCOMC__)
static unsigned int _saved_drive;
#endif
......@@ -298,6 +299,53 @@ wm_register_window(
return;
}
static void
wm_window_next()
{
unsigned l_slot;
window* l_window;
l_window= 0;
do
{
if (0 == _wm_focused)
{
l_window= (window*)_wm_array.m_base[0];
break;
}
for (l_slot= 0; _wm_array.m_taken > l_slot; l_slot++)
{
l_window= (window*)_wm_array.m_base[l_slot];
if (_wm_focused == l_window)
{
if (_wm_array.m_taken > (l_slot+1))
{
l_window= (window*)_wm_array.m_base[(l_slot+1)];
}
else
{
l_window= (window*)_wm_array.m_base[0];
}
break;
}
}
}while(0);
if (l_window && _wm_focused != l_window)
{
(*_wm_focused).focus_leave();
_wm_focused= l_window;
wm_draw(_wm_focused);
(*_wm_focused).focus_enter();
}
return;
}
static enum event_response
wm_event_keyboard(
struct event_key const& i_key)
......@@ -326,6 +374,13 @@ wm_event_keyboard(
break;
}
if (SCAN_F6 == i_key.m_scan)
{
wm_window_next();
l_response= RESPONSE_HANDLED;
break;
}
l_response= (*_wm_focused).event_key(i_key);
if (RESPONSE_NONE != l_response)
......@@ -500,7 +555,7 @@ wm_run()
if (EVENT_KEY == l_event.m_type)
{
if (ASCII_ESC == l_event.m_record.m_key.m_ascii)
if (_wm_esc_flag && ASCII_ESC == l_event.m_record.m_key.m_ascii)
{
break;
}
......
No preview for this file type
......@@ -201,8 +201,8 @@ struct menuitem edit_menu[] =
struct menuitem view_menu[] =
{
{reinterpret_cast<unsigned char const*>(kittengets(7, 1, "Refresh")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_SEPERATOR, directory_view, 0}, // Refresh
{reinterpret_cast<unsigned char const*>(kittengets(7, 2, "Show Archive Items")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_CHECKBOX, show_archive_items, 0}, // Show archive files
{reinterpret_cast<unsigned char const*>(kittengets(7, 3, "Show Hidden Items")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_CHECKBOX, show_hidden_items, 0}, // Show hidden files
{reinterpret_cast<unsigned char const*>(kittengets(7, 2, "Show Archive Items")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_CHECKBOX | MENUITEM_VALUE, show_archive_items, 0}, // Show archive files
{reinterpret_cast<unsigned char const*>(kittengets(7, 3, "Show Hidden Items")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_CHECKBOX | MENUITEM_VALUE, show_hidden_items, 0}, // Show hidden files
{reinterpret_cast<unsigned char const*>(kittengets(7, 4, "Show Readonly Items")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_CHECKBOX, show_read_only_items, 0}, // Show read only files
{reinterpret_cast<unsigned char const*>(kittengets(7, 5, "Show System Items")), MENUITEM_MNEMONIC_NONE, 0, SCAN_NONE, MENUITEM_CHECKBOX, show_system_items, 0}, // Show system files
{0}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment