Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sebastian Mayr
wine
Commits
71a71b30
Commit
71a71b30
authored
21 years ago
by
Eric Pouech
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
- win32 console's window cannot be larger than curses' stdscr
- correctly manage backspace - various cleanup
parent
e76cf04a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
programs/wineconsole/curses.c
+21
-11
21 additions, 11 deletions
programs/wineconsole/curses.c
with
21 additions
and
11 deletions
programs/wineconsole/curses.c
+
21
−
11
View file @
71a71b30
...
...
@@ -112,11 +112,6 @@ MAKE_FUNCPTR(wgetch)
/**********************************************************************/
typedef
struct
{
LPVOID
lpCallback
;
LPVOID
lpContext
;
}
DirectDrawEnumerateProcData
;
static
BOOL
WCCURSES_bind_libcurses
(
void
)
{
#ifdef HAVE_NCURSES_H
...
...
@@ -240,8 +235,6 @@ static void WCCURSES_PosCursor(const struct inner_data* data)
int
scr_width
;
int
scr_height
;
getmaxyx
(
stdscr
,
scr_height
,
scr_width
);
if
(
data
->
curcfg
.
cursor_visible
&&
data
->
cursor
.
Y
>=
data
->
curcfg
.
win_pos
.
Y
&&
data
->
cursor
.
Y
<
data
->
curcfg
.
win_pos
.
Y
+
data
->
curcfg
.
win_height
&&
...
...
@@ -255,10 +248,12 @@ static void WCCURSES_PosCursor(const struct inner_data* data)
{
curs_set
(
0
);
}
getmaxyx
(
stdscr
,
scr_height
,
scr_width
);
prefresh
(
PRIVATE
(
data
)
->
pad
,
data
->
curcfg
.
win_pos
.
Y
,
data
->
curcfg
.
win_pos
.
X
,
0
,
0
,
scr_height
,
scr_width
);
0
,
0
,
min
(
scr_height
,
data
->
curcfg
.
win_height
)
-
1
,
min
(
scr_width
,
data
->
curcfg
.
win_width
)
-
1
);
}
/******************************************************************
...
...
@@ -281,6 +276,21 @@ void WCCURSES_ShapeCursor(struct inner_data* data, int size, int vis, BOOL force
*/
void
WCCURSES_ComputePositions
(
struct
inner_data
*
data
)
{
int
x
,
y
;
getmaxyx
(
stdscr
,
y
,
x
);
if
((
data
->
curcfg
.
win_height
&&
y
<
data
->
curcfg
.
win_height
)
||
(
data
->
curcfg
.
win_width
&&
x
<
data
->
curcfg
.
win_width
))
{
SMALL_RECT
pos
;
WINE_WARN
(
"Window too large (%dx%d), adjusting to curses' size (%dx%d)
\n
"
,
data
->
curcfg
.
win_width
,
data
->
curcfg
.
win_height
,
x
,
y
);
pos
.
Left
=
pos
.
Top
=
0
;
pos
.
Right
=
x
-
1
;
pos
.
Bottom
=
y
-
1
;
SetConsoleWindowInfo
(
data
->
hConOut
,
FALSE
,
&
pos
);
return
;
/* we'll get called again upon event for new window size */
}
if
(
PRIVATE
(
data
)
->
pad
)
WCCURSES_PosCursor
(
data
);
}
...
...
@@ -611,7 +621,7 @@ static unsigned WCCURSES_FillCode(struct inner_data* data, INPUT_RECORD* ir, int
numEvent
=
WCCURSES_FillComplexChar
(
ir
,
0x47
,
0x24
,
0
);
break
;
case
KEY_BACKSPACE
:
numEvent
=
WCCURSES_FillSimpleChar
(
ir
,
'\b'
);
numEvent
=
WCCURSES_FillSimpleChar
(
ir
,
127
);
break
;
case
KEY_F0
:
/* up to F63 */
...
...
@@ -898,7 +908,7 @@ enum init_return WCCURSES_InitBackend(struct inner_data* data)
* For the time being, setting this to 1 will allow scrolling up/down
* on buffer with F11/F12.
*/
/* data->allow_scroll = 1; */
/*
PRIVATE(
data
)
->allow_scroll = 1; */
initscr
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment