The NetBSD Project

CVS log for src/lib/libcurses/slk.c

[BACK] Up to [cvs.NetBSD.org] / src / lib / libcurses

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.20.2.1 / (download) - annotate - [select for diffs], Wed Dec 21 09:38:38 2022 UTC (6 weeks, 6 days ago) by martin
Branch: netbsd-10
Changes since 1.20: +6 -3 lines
Diff to previous 1.20 (colored) next main 1.21 (colored)

Pull up following revision(s) (requested by blymn in ticket #15):

	lib/libcurses/slk.c: revision 1.21
	lib/libcurses/addbytes.c: revision 1.68

Backout change to addnstr that broke other applications as n should be
the number of bytes to add - for multibyte characters n will be > 1.

Fix __slk_draw to pass in the actual length of the label instead of
the default label length because wide characters may make the
actual string length longer than the slk display length.

Revision 1.21 / (download) - annotate - [select for diffs], Tue Dec 20 04:57:01 2022 UTC (7 weeks, 1 day ago) by blymn
Branch: MAIN
CVS Tags: HEAD
Changes since 1.20: +6 -3 lines
Diff to previous 1.20 (colored)

Backout change to addnstr that broke other applications as n should be
the number of bytes to add - for multibyte characters n will be > 1.

Fix __slk_draw to pass in the actual length of the label instead of
the default label length because wide characters may make the
actual string length longer than the slk display length.

Revision 1.20 / (download) - annotate - [select for diffs], Tue Apr 12 07:03:04 2022 UTC (9 months, 4 weeks ago) by blymn
Branch: MAIN
CVS Tags: netbsd-10-base
Branch point for: netbsd-10
Changes since 1.19: +3 -2 lines
Diff to previous 1.19 (colored)

Make the default colour pair be pair 0 which appears to match other
curses implementations.

Revision 1.19 / (download) - annotate - [select for diffs], Tue Jan 25 03:05:06 2022 UTC (12 months, 2 weeks ago) by blymn
Branch: MAIN
Changes since 1.18: +3 -2 lines
Diff to previous 1.18 (colored)

Correct (hopefully) the handling of wide characters.

* Remove the WCOL family of macros, these were "stealing" the upper bits
  of a character attribute to store the column width of a character.  No
  warning was given about this in curses.h which meant it was easy to
  accidentally reuse the bits in use by the WCOL macros (we already did).
  Add couple of 16bit ints to the character structure iff HAVE_WCHAR is
  true to hold the display width and wide char related flags (just
  continuation at the moment)
* Convert all instances of WCOL macros to just reference the column width
  in the char structure so it is not obfuscated.
* Fix cursor positioning so placing a cursor in the middle of a wide char
  actually does just that.
* Fix plod so it understands that if the cursor is going to be positioned
  in the middle of a wide char it cannot just reprint the char to get there.
* Fix plodput so it correctly counts the number of output characters for
  wide characters.
* Fix slk routines to properly size the wctomb() buffer.

Revision 1.18 / (download) - annotate - [select for diffs], Thu Jan 6 20:50:18 2022 UTC (13 months ago) by blymn
Branch: MAIN
Changes since 1.17: +3 -3 lines
Diff to previous 1.17 (colored)

Revert change for array definition, it was incorrect, thanks Uwe.

Revision 1.17 / (download) - annotate - [select for diffs], Thu Jan 6 06:18:13 2022 UTC (13 months ago) by blymn
Branch: MAIN
Changes since 1.16: +3 -3 lines
Diff to previous 1.16 (colored)

Properly size and array to hold the larget return from wctomb.

Revision 1.16 / (download) - annotate - [select for diffs], Mon Sep 6 07:45:48 2021 UTC (17 months ago) by rin
Branch: MAIN
Changes since 1.15: +8 -6 lines
Diff to previous 1.15 (colored)

Style fixes most for __CTRACE().

Revision 1.15 / (download) - annotate - [select for diffs], Mon Sep 6 07:03:50 2021 UTC (17 months ago) by rin
Branch: MAIN
Changes since 1.14: +2 -12 lines
Diff to previous 1.14 (colored)

Expand __CTRACE() to __nothing #ifndef DEBUG.

Remove most of #ifdef DEBUG around __CTRACE() calls.

No binary changes, except for line numbers for assert().

Revision 1.14 / (download) - annotate - [select for diffs], Sun Aug 15 12:39:39 2021 UTC (17 months, 3 weeks ago) by christos
Branch: MAIN
Changes since 1.13: +2 -3 lines
Diff to previous 1.13 (colored)

This is a mess; always define MB_LEN_MAX so both the regular and libhack
version of curses compiles. Really we should not be defining MB_LEN_MAX here,
and include <limits.h> in curses_private.h to get it.

Revision 1.13 / (download) - annotate - [select for diffs], Sun Aug 15 11:54:12 2021 UTC (17 months, 3 weeks ago) by christos
Branch: MAIN
Changes since 1.12: +3 -2 lines
Diff to previous 1.12 (colored)

need limits.h

Revision 1.12 / (download) - annotate - [select for diffs], Sun Aug 15 11:44:39 2021 UTC (17 months, 3 weeks ago) by christos
Branch: MAIN
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

Use MBL_LEN_MAX (constant) so that SSP works

Revision 1.11 / (download) - annotate - [select for diffs], Thu Jun 24 15:41:25 2021 UTC (19 months, 2 weeks ago) by martin
Branch: MAIN
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 (colored)

Fix printf format for size_t

Revision 1.10 / (download) - annotate - [select for diffs], Thu Jun 24 05:53:05 2021 UTC (19 months, 2 weeks ago) by blymn
Branch: MAIN
Changes since 1.9: +17 -3 lines
Diff to previous 1.9 (colored)

Make sure we don't use wide char routines when DISABLE_WCHAR is in
effect.

Revision 1.9 / (download) - annotate - [select for diffs], Tue Jun 22 07:26:45 2021 UTC (19 months, 2 weeks ago) by blymn
Branch: MAIN
Changes since 1.8: +73 -7 lines
Diff to previous 1.8 (colored)

Fix how the slk are drawn by making sure we use ins_wchar in the
bottom left of the screen to avoid a scroll because this may cause
an ERR if scrollok is false.

Revision 1.2.16.2 / (download) - annotate - [select for diffs], Mon Apr 13 08:03:12 2020 UTC (2 years, 9 months ago) by martin
Branch: phil-wifi
Changes since 1.2.16.1: +57 -26 lines
Diff to previous 1.2.16.1 (colored) to branchpoint 1.2 (colored) next main 1.3 (colored)

Mostly merge changes from HEAD upto 20200411

Revision 1.8 / (download) - annotate - [select for diffs], Sun Jul 28 00:51:59 2019 UTC (3 years, 6 months ago) by uwe
Branch: MAIN
CVS Tags: phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, netbsd-9-base, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9, is-mlppp-base, is-mlppp, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x
Changes since 1.7: +23 -13 lines
Diff to previous 1.7 (colored)

__slk_set_finalise - fix length vs. width confusion

Revision 1.7 / (download) - annotate - [select for diffs], Sun Jul 28 00:15:38 2019 UTC (3 years, 6 months ago) by uwe
Branch: MAIN
Changes since 1.6: +7 -7 lines
Diff to previous 1.6 (colored)

__slk_set - fix calculating "len" for HAVE_WCHAR

Revision 1.6 / (download) - annotate - [select for diffs], Sat Jul 27 00:58:34 2019 UTC (3 years, 6 months ago) by uwe
Branch: MAIN
Changes since 1.5: +10 -7 lines
Diff to previous 1.5 (colored)

Put slk_color() undef #ifdef HAVE_WCHAR too.

Revision 1.5 / (download) - annotate - [select for diffs], Sat Jul 27 00:46:43 2019 UTC (3 years, 6 months ago) by uwe
Branch: MAIN
Changes since 1.4: +27 -9 lines
Diff to previous 1.4 (colored)

Put wide character functions under #ifdef HAVE_WCHAR

Revision 1.2.16.1 / (download) - annotate - [select for diffs], Mon Jun 10 22:05:22 2019 UTC (3 years, 8 months ago) by christos
Branch: phil-wifi
Changes since 1.2: +7 -3 lines
Diff to previous 1.2 (colored)

Sync with HEAD

Revision 1.2.14.1 / (download) - annotate - [select for diffs], Sat Oct 20 06:58:22 2018 UTC (4 years, 3 months ago) by pgoyette
Branch: pgoyette-compat
CVS Tags: pgoyette-compat-merge-20190127
Changes since 1.2: +7 -3 lines
Diff to previous 1.2 (colored) next main 1.3 (colored)

Sync with head

Revision 1.2.8.1 / (download) - annotate - [select for diffs], Mon Oct 8 19:06:52 2018 UTC (4 years, 4 months ago) by martin
Branch: netbsd-8
CVS Tags: netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1
Changes since 1.2: +7 -3 lines
Diff to previous 1.2 (colored) next main 1.3 (colored)

Pull up following revision(s) (requested by roy in ticket #1048):

	lib/libcurses/curses_private.h: revision 1.66
	lib/libcurses/slk.c: revision 1.3
	lib/libcurses/slk.c: revision 1.4

curses: declare SLK format as invalid until slk_init(3) called

If we don't, then when __slk_init with a valid format of 0 it sets
up labels to be drawn without a window.

 -

curses: once __slk_init is called, reset slk_fmt

This allows soft label keys to be used on more than one terminal.

Revision 1.4 / (download) - annotate - [select for diffs], Thu Oct 4 19:11:09 2018 UTC (4 years, 4 months ago) by roy
Branch: MAIN
CVS Tags: phil-wifi-20190609, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020
Changes since 1.3: +5 -3 lines
Diff to previous 1.3 (colored)

curses: once __slk_init is called, reset slk_fmt

This allows soft label keys to be used on more than one terminal.

Revision 1.3 / (download) - annotate - [select for diffs], Thu Oct 4 18:40:41 2018 UTC (4 years, 4 months ago) by roy
Branch: MAIN
Changes since 1.2: +5 -3 lines
Diff to previous 1.2 (colored)

curses: declare SLK format as invalid until slk_init(3) called

If we don't, then when __slk_init with a valid format of 0 it sets
up labels to be drawn without a window.

Revision 1.2.4.2 / (download) - annotate - [select for diffs], Fri Apr 21 16:53:10 2017 UTC (5 years, 9 months ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.2.4.1: +799 -0 lines
Diff to previous 1.2.4.1 (colored) to branchpoint 1.2 (colored) next main 1.3 (colored)

Sync with HEAD

Revision 1.2.2.2 / (download) - annotate - [select for diffs], Mon Mar 20 06:56:59 2017 UTC (5 years, 10 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.2.2.1: +799 -0 lines
Diff to previous 1.2.2.1 (colored) to branchpoint 1.2 (colored) next main 1.3 (colored)

Sync with HEAD

Revision 1.2.4.1, Mon Jan 30 17:15:52 2017 UTC (6 years ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.2: +0 -799 lines
FILE REMOVED

file slk.c was added on branch bouyer-socketcan on 2017-04-21 16:53:10 +0000

Revision 1.2.2.1, Mon Jan 30 17:15:52 2017 UTC (6 years ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.2: +0 -799 lines
FILE REMOVED

file slk.c was added on branch pgoyette-localcount on 2017-03-20 06:56:59 +0000

Revision 1.2 / (download) - annotate - [select for diffs], Mon Jan 30 17:15:52 2017 UTC (6 years ago) by roy
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, phil-wifi-base, pgoyette-localcount-20170426, pgoyette-localcount-20170320, pgoyette-compat-base, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, perseant-stdc-iso10646-base, perseant-stdc-iso10646, netbsd-8-base, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, matt-nb8-mediatek-base, matt-nb8-mediatek, bouyer-socketcan-base1
Branch point for: phil-wifi, pgoyette-localcount, pgoyette-compat, netbsd-8, bouyer-socketcan
Changes since 1.1: +21 -30 lines
Diff to previous 1.1 (colored)

Just return ERR instead of asserting if someone calls the slk routines
to affect the ripped off window before the window is actually ripped off.

Revision 1.1 / (download) - annotate - [select for diffs], Tue Jan 24 17:27:30 2017 UTC (6 years ago) by roy
Branch: MAIN

Implement POSIX Curses Soft Label Key functions.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>