[Midnightbsd-cvs] src [10732] trunk/usr.sbin/kbdmap/kbdmap.h: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 18:01:27 EDT 2018
Revision: 10732
http://svnweb.midnightbsd.org/src/?rev=10732
Author: laffer1
Date: 2018-06-09 18:01:26 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.sbin/kbdmap/Makefile
trunk/usr.sbin/kbdmap/TODO
trunk/usr.sbin/kbdmap/kbdmap.1
trunk/usr.sbin/kbdmap/kbdmap.c
trunk/usr.sbin/kbdmap/kbdmap.h
Property Changed:
----------------
trunk/usr.sbin/kbdmap/Languages.phrases
trunk/usr.sbin/kbdmap/TODO
trunk/usr.sbin/kbdmap/kbdmap.1
Index: trunk/usr.sbin/kbdmap/Languages.phrases
===================================================================
--- trunk/usr.sbin/kbdmap/Languages.phrases 2018-06-09 22:00:25 UTC (rev 10731)
+++ trunk/usr.sbin/kbdmap/Languages.phrases 2018-06-09 22:01:26 UTC (rev 10732)
Property changes on: trunk/usr.sbin/kbdmap/Languages.phrases
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/kbdmap/Makefile
===================================================================
--- trunk/usr.sbin/kbdmap/Makefile 2018-06-09 22:00:25 UTC (rev 10731)
+++ trunk/usr.sbin/kbdmap/Makefile 2018-06-09 22:01:26 UTC (rev 10732)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/kbdmap/Makefile,v 1.14 2005/01/28 16:08:10 ru Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/kbdmap/Makefile 140941 2005-01-28 16:08:11Z ru $
PROG= kbdmap
LINKS= ${BINDIR}/kbdmap ${BINDIR}/vidfont
Modified: trunk/usr.sbin/kbdmap/TODO
===================================================================
--- trunk/usr.sbin/kbdmap/TODO 2018-06-09 22:00:25 UTC (rev 10731)
+++ trunk/usr.sbin/kbdmap/TODO 2018-06-09 22:01:26 UTC (rev 10732)
@@ -1,4 +1,5 @@
-$FreeBSD: src/usr.sbin/kbdmap/TODO,v 1.2 2000/09/13 09:16:57 dwmalone Exp $
+$MidnightBSD$
+$FreeBSD: stable/10/usr.sbin/kbdmap/TODO 65807 2000-09-13 09:16:57Z dwmalone $
o remember some hackers to translate Languages.phrases into
Norwegian, Russian, Danish, Swedish
Property changes on: trunk/usr.sbin/kbdmap/TODO
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/kbdmap/kbdmap.1
===================================================================
--- trunk/usr.sbin/kbdmap/kbdmap.1 2018-06-09 22:00:25 UTC (rev 10731)
+++ trunk/usr.sbin/kbdmap/kbdmap.1 2018-06-09 22:01:26 UTC (rev 10732)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) March 1995 Wolfram Schneider <wosch at FreeBSD.org>. Berlin.
.\" All rights reserved.
.\"
@@ -22,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/kbdmap/kbdmap.1,v 1.34 2006/12/25 18:36:53 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/kbdmap/kbdmap.1 271095 2014-09-04 13:45:16Z se $
.Dd July 3, 2002
.Dt KBDMAP 1
.Os
@@ -29,7 +30,7 @@
.Sh NAME
.Nm kbdmap ,
.Nm vidfont
-.Nd front end for syscons
+.Nd front end for syscons and vt
.Sh SYNOPSIS
.Nm
.Op Fl K
@@ -106,12 +107,14 @@
.Sh FILES
.Bl -tag -width ".Pa /usr/share/syscons/keymaps/INDEX.keymaps" -compact
.It Pa /usr/share/syscons/keymaps/INDEX.keymaps
+.It Pa /usr/share/vt/keymaps/INDEX.keymaps
database for keymaps
.It Pa /usr/share/syscons/fonts/INDEX.fonts
+.It Pa /usr/share/vt/fonts/INDEX.fonts
database for fonts
.It Pa /etc/rc.conf
default font
-.It Pa /usr/X11/lib/X11/locale/locale.alias
+.It Pa /usr/local/share/locale/locale.alias
describe common
.Ev LANG
values
@@ -120,6 +123,8 @@
.Xr dialog 1 ,
.Xr kbdcontrol 1 ,
.Xr vidcontrol 1 ,
+.Xr syscons 4 ,
+.Xr vt 4 ,
.Xr kbdmap 5 ,
.Xr rc.conf 5
.Sh HISTORY
Property changes on: trunk/usr.sbin/kbdmap/kbdmap.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/kbdmap/kbdmap.c
===================================================================
--- trunk/usr.sbin/kbdmap/kbdmap.c 2018-06-09 22:00:25 UTC (rev 10731)
+++ trunk/usr.sbin/kbdmap/kbdmap.c 2018-06-09 22:01:26 UTC (rev 10732)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Jonathan Belson <jon at witchspace.com>
* All rights reserved.
@@ -25,10 +26,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.6 2007/08/27 21:56:42 murray Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/kbdmap/kbdmap.c 293335 2016-01-07 17:03:26Z emaste $");
#include <sys/types.h>
#include <sys/queue.h>
+#include <sys/sysctl.h>
#include <assert.h>
#include <ctype.h>
@@ -47,15 +49,16 @@
static const char *font;
static const char *lang;
static const char *program;
-static const char *keymapdir = DEFAULT_KEYMAP_DIR;
-static const char *fontdir = DEFAULT_FONT_DIR;
+static const char *keymapdir = DEFAULT_VT_KEYMAP_DIR;
+static const char *fontdir = DEFAULT_VT_FONT_DIR;
+static const char *font_default = DEFAULT_VT_FONT;
static const char *sysconfig = DEFAULT_SYSCONFIG;
-static const char *font_default = DEFAULT_FONT;
static const char *font_current;
static const char *dir;
static const char *menu = "";
static int x11;
+static int using_vt;
static int show;
static int verbose;
static int print;
@@ -146,6 +149,22 @@
}
/*
+ * Return 0 if syscons is in use (to select legacy defaults).
+ */
+static int
+check_vt(void)
+{
+ size_t len;
+ char term[3];
+
+ len = 3;
+ if (sysctlbyname("kern.vty", &term, &len, NULL, 0) != 0 ||
+ strcmp(term, "vt") != 0)
+ return 0;
+ return 1;
+}
+
+/*
* Figure out the default language to use.
*/
static const char *
@@ -226,6 +245,7 @@
}
}
}
+ fclose(fp);
} else
fprintf(stderr, "Could not open %s for reading\n", sysconfig);
@@ -238,7 +258,7 @@
static void
vidcontrol(const char *fnt)
{
- char *tmp, *p, *q;
+ char *tmp, *p, *q, *cmd;
char ch;
int i;
@@ -246,6 +266,13 @@
if (x11)
return;
+ if (using_vt) {
+ asprintf(&cmd, "vidcontrol -f %s", fnt);
+ system(cmd);
+ free(cmd);
+ return;
+ }
+
tmp = strdup(fnt);
/* Extract font size */
@@ -263,7 +290,6 @@
if (sscanf(p, "%dx%d%c", &i, &i, &ch) != 2)
fprintf(stderr, "Which font size? %s\n", fnt);
else {
- char *cmd;
asprintf(&cmd, "vidcontrol -f %s %s", p, fnt);
if (verbose)
fprintf(stderr, "%s\n", cmd);
@@ -288,7 +314,7 @@
if (!x11)
system(kbd_cmd);
- fprintf(stderr, "keymap=%s\n", km->keym);
+ fprintf(stderr, "keymap=\"%s\"\n", km->keym);
free(kbd_cmd);
}
@@ -326,7 +352,6 @@
FILE *fp;
char *cmd, *dialog;
char tmp_name[] = "/tmp/_kbd_lang.XXXX";
- const char *ext;
int fd, i, size;
fd = mkstemp(tmp_name);
@@ -336,10 +361,8 @@
exit(1);
}
asprintf(&dialog, "/usr/bin/dialog --clear --title \"Keyboard Menu\" "
- "--menu \"%s\" -1 -1 10", menu);
+ "--menu \"%s\" 0 0 0", menu);
- ext = extract_name(dir);
-
/* start right font, assume that current font is equal
* to default font in /etc/rc.conf
*
@@ -546,7 +569,7 @@
}
/*
- * Read options from the relevent configuration file, then
+ * Read options from the relevant configuration file, then
* present to user.
*/
static void
@@ -556,7 +579,7 @@
char *p;
int mark, num_keymaps, items, i;
char buffer[256], filename[PATH_MAX];
- char keym[64], lng[64], desc[64];
+ char keym[64], lng[64], desc[256];
char dialect[64], lang_abk[64];
struct keymap *km;
struct keymap **km_sorted;
@@ -601,7 +624,7 @@
continue;
/* Parse input, removing newline */
- matches = sscanf(p, "%64[^:]:%64[^:]:%64[^:\n]",
+ matches = sscanf(p, "%64[^:]:%64[^:]:%256[^:\n]",
keym, lng, desc);
if (matches == 3) {
if (strcmp(keym, "FONT")
@@ -817,6 +840,13 @@
sleep(2);
}
+ using_vt = check_vt();
+ if (using_vt == 0) {
+ keymapdir = DEFAULT_SC_KEYMAP_DIR;
+ fontdir = DEFAULT_SC_FONT_DIR;
+ font_default = DEFAULT_SC_FONT;
+ }
+
SLIST_INIT(&head);
lang = get_locale();
Modified: trunk/usr.sbin/kbdmap/kbdmap.h
===================================================================
--- trunk/usr.sbin/kbdmap/kbdmap.h 2018-06-09 22:00:25 UTC (rev 10731)
+++ trunk/usr.sbin/kbdmap/kbdmap.h 2018-06-09 22:01:26 UTC (rev 10732)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Jonathan Belson <jon at witchspace.com>
* All rights reserved.
@@ -23,12 +24,17 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/kbdmap/kbdmap.h,v 1.1 2002/07/03 14:56:08 markm Exp $
+ * $FreeBSD: stable/10/usr.sbin/kbdmap/kbdmap.h 270309 2014-08-21 21:57:18Z se $
*/
#define DEFAULT_LANG "en"
-#define DEFAULT_KEYMAP_DIR "/usr/share/syscons/keymaps"
-#define DEFAULT_FONT_DIR "/usr/share/syscons/fonts"
#define DEFAULT_SYSCONFIG "/etc/rc.conf"
-#define DEFAULT_FONT "cp437-8x16.fnt"
+
+#define DEFAULT_SC_KEYMAP_DIR "/usr/share/syscons/keymaps"
+#define DEFAULT_SC_FONT_DIR "/usr/share/syscons/fonts"
+#define DEFAULT_SC_FONT "cp437-8x16.fnt"
+
+#define DEFAULT_VT_KEYMAP_DIR "/usr/share/vt/keymaps"
+#define DEFAULT_VT_FONT_DIR "/usr/share/vt/fonts"
+#define DEFAULT_VT_FONT "vgarom-thin-8x16.fnt"
More information about the Midnightbsd-cvs
mailing list