rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2025-02-20 23:17:13 -05:00
Code Releases Activity

bind: code review and minor refactoring.

Browse Source 
basic: minor reformatting.
This commit is contained in:
Renaud 2021-08-09 15:24:33 +08:00
parent eaf516110f
commit 720603ac8e
3 changed files with 199 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
basic.c
View File

@ -320,6 +320,7 @@ boolean setmark( int f, int n) {
return TRUE ; return TRUE ;
} }
/* Swap the values of "." and "mark" in the current window. If no mark as /* Swap the values of "." and "mark" in the current window. If no mark as
been previously set, set it. Bound to C-X C-X exchange-point-and-mark. been previously set, set it. Bound to C-X C-X exchange-point-and-mark.
*/ */

113
bind.c
View File

@ -9,24 +9,22 @@
*/ */
#include <assert.h> #include <assert.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "estruct.h"
#include "bindable.h" #include "bindable.h"
#include "buffer.h" #include "buffer.h"
#include "display.h" #include "display.h" /* upmode(), ostring() */
#include "exec.h" #include "exec.h"
#include "file.h" #include "file.h"
#include "flook.h" #include "flook.h"
#include "input.h" #include "input.h"
#include "line.h" #include "line.h"
#include "mlout.h"
#include "names.h" #include "names.h"
#include "util.h" #include "util.h"
#include "window.h" #include "window.h"
static int buildlist( char *mstring) ; static int buildlist( char *mstring) ;
static char *cmdstr( unsigned c, char *seq) ; static char *cmdstr( unsigned c, char *seq) ;
static unsigned int getckey( int mflag) ; static unsigned int getckey( int mflag) ;
@ -34,14 +32,10 @@ static unsigned int stock( char *keyname) ;
static const char *getfname( unsigned keycode, const char *failmsg) ; static const char *getfname( unsigned keycode, const char *failmsg) ;
static boolean cmdfail( const char *msg) { /* give me some help!!!! bring up a fake buffer and read the help file into
mlwrite( "%s", msg) ; it with view mode
return FALSE ; */
}
BINDABLE( help) { BINDABLE( help) {
/* give me some help!!!!
bring up a fake buffer and read the help file into it with view mode */
char *fname = NULL; /* ptr to file returned by flook() */ char *fname = NULL; /* ptr to file returned by flook() */
/* first check if we are already here */ /* first check if we are already here */
@ -52,7 +46,7 @@ BINDABLE( help) {
if( bp == NULL) { if( bp == NULL) {
fname = flook( hlpfname, FALSE) ; fname = flook( hlpfname, FALSE) ;
if( fname == NULL) if( fname == NULL)
return cmdfail( "(Help file is not online)") ; return mloutfail( "(Help file is not online)") ;
} }
/* split the current window to make room for the help stuff */ /* split the current window to make room for the help stuff */
@ -74,17 +68,19 @@ BINDABLE( help) {
return TRUE ; return TRUE ;
} }
static boolean invalidkey( void) { static boolean invalidkey( void) {
return cmdfail( "(Invalid key sequence)") ; return mloutfail( "(Invalid key sequence)") ;
} }
/* describe the command for a certain key */ /* describe the command for a certain key */
BINDABLE( deskey) { BINDABLE( deskey) {
const char cmdname[] = "describe-key" ; const char cmdname[] = "describe-key" ;
char outseq[ NSTRING] ; /* output buffer for command sequence */ char outseq[ 8] ; /* output buffer for keystroke sequence */
/* prompt the user to type a key to describe */ /* prompt the user to type a key to describe */
mlwrite( "%s: ", cmdname) ; mloutfmt( "%s: ", cmdname) ;
/* get the command sequence to describe /* get the command sequence to describe
* change it to something we can print as well */ * change it to something we can print as well */
@ -93,23 +89,23 @@ BINDABLE( deskey) {
return invalidkey() ; return invalidkey() ;
/* output the command sequence */ /* output the command sequence */
mlwrite( "%s %s: 0x%x, %s", cmdname, cmdstr( keycode, outseq), keycode, mloutfmt( "%s %s: 0x%x, %s", cmdname, cmdstr( keycode, outseq), keycode,
getfname( keycode, "Not Bound")) ; getfname( keycode, "Not Bound")) ;
return TRUE ; return TRUE ;
} }
/*
* bindtokey: /* bindtokey:
* add a new key to the key binding table * add a new key to the key binding table
* *
* int f, n; command arguments [IGNORED] * int f, n; command arguments [IGNORED]
*/ */
BINDABLE( bindtokey) { BINDABLE( bindtokey) {
kbind_p ktp ; /* pointer into the command table */ kbind_p ktp ; /* pointer into the command table */
char outseq[ 80] ; /* output buffer for keystroke sequence */ char outseq[ 8] ; /* output buffer for keystroke sequence */
/* prompt the user to type in a key to bind */ /* prompt the user to type in a key to bind */
mlwrite("bind-to-key: "); mloutstr( "bind-to-key: ") ;
/* get the function name to bind it to */ /* get the function name to bind it to */
nbind_p nbp = getname() ; nbind_p nbp = getname() ;
@ -118,9 +114,9 @@ BINDABLE( bindtokey) {
fnp_t kfunc = nbp->n_func ; fnp_t kfunc = nbp->n_func ;
if( kfunc == NULL) if( kfunc == NULL)
return cmdfail( "(No such function)") ; return mloutfail( "(No such function)") ;
mlwrite( "bind-to-key %s: ", bind_name( nbp)) ; mloutfmt( "bind-to-key %s: ", bind_name( nbp)) ;
/* get the command sequence to bind */ /* get the command sequence to bind */
boolean prefix_f = (kfunc == metafn) || (kfunc == cex) || boolean prefix_f = (kfunc == metafn) || (kfunc == cex) ||
@ -139,9 +135,9 @@ BINDABLE( bindtokey) {
|| (c == ctlxc && kfunc == cex) || (c == ctlxc && kfunc == cex)
|| (c == reptc && kfunc == unarg) || (c == reptc && kfunc == unarg)
|| (c == abortc && kfunc == ctrlg)) || (c == abortc && kfunc == ctrlg))
return TRUE ; return TRUE ; /* be silent if keep current */
return cmdfail( "(Can't bind to active prefix)") ; return mloutfail( "(Can't bind to active prefix)") ;
} }
/* if the function is a prefix key */ /* if the function is a prefix key */
@ -166,22 +162,22 @@ BINDABLE( bindtokey) {
ktp = setkeybinding( c, nbp) ; ktp = setkeybinding( c, nbp) ;
if( ktp->k_code == 0) if( ktp->k_code == 0)
return cmdfail( "Binding table FULL!") ; return mloutfail( "Binding table FULL!") ;
return TRUE ; return TRUE ;
} }
/*
* unbindkey: /* unbindkey:
* delete a key from the key binding table * delete a key from the key binding table
* *
* int f, n; command arguments [IGNORED] * int f, n; command arguments [IGNORED]
*/ */
BINDABLE( unbindkey) { BINDABLE( unbindkey) {
char outseq[ 80] ; /* output buffer for keystroke sequence */ char outseq[ 8] ; /* output buffer for keystroke sequence */
/* prompt the user to type in a key to unbind */ /* prompt the user to type in a key to unbind */
mlwrite( "unbind-key: ") ; mloutstr( "unbind-key: ") ;
/* get the command sequence to unbind */ /* get the command sequence to unbind */
int c = getckey( FALSE) ; /* get a command sequence */ int c = getckey( FALSE) ; /* get a command sequence */
@ -194,19 +190,17 @@ BINDABLE( unbindkey) {
/* prefix key sequence can't be undound, just redefined */ /* prefix key sequence can't be undound, just redefined */
if( c == reptc || c == abortc) if( c == reptc || c == abortc)
return cmdfail( "(Can't unbind prefix)") ; return mloutfail( "(Can't unbind prefix)") ;
/* if it isn't bound, bitch */ /* if it isn't bound, bitch */
if( delkeybinding( c) == FALSE) { if( delkeybinding( c) == FALSE)
mlwrite( "(Key not bound)") ; return mloutfail( "(Key not bound)") ;
return FALSE ;
}
return TRUE ; return TRUE ;
} }
/*
* does source include sub? /* does source include sub?
* *
* char *source; string to search in * char *source; string to search in
* char *sub; substring to look for * char *sub; substring to look for
@ -232,6 +226,7 @@ static boolean strinc( const char *source, const char *sub) {
return FALSE ; return FALSE ;
} }
/* describe bindings /* describe bindings
* bring up a fake buffer and list the key bindings * bring up a fake buffer and list the key bindings
* into it with view mode * into it with view mode
@ -240,6 +235,7 @@ BINDABLE( desbind) {
return buildlist( "") ; return buildlist( "") ;
} }
/* Apropos (List functions that match a substring) */ /* Apropos (List functions that match a substring) */
BINDABLE( apro) { BINDABLE( apro) {
char *mstring ; /* string to match cmd names to */ char *mstring ; /* string to match cmd names to */
@ -254,17 +250,14 @@ BINDABLE( apro) {
return status ; return status ;
} }
/*
* build a binding list (limited or full) /* build a binding list (limited or full)
* *
* char *mstring; match string if a partial list, "" matches all * char *mstring; match string if a partial list, "" matches all
*/ */
static int buildlist( char *mstring) { static int buildlist( char *mstring) {
struct window *wp; /* scanning pointer to windows */ #define PADDING 28
kbind_p ktp; /* pointer into the command table */ char outseq[ PADDING + 8] ; /* output buffer for command + keystroke */
nbind_p nptr;/* pointer into the name binding table */
struct buffer *bp; /* buffer to put binding list into */
char outseq[80]; /* output buffer for keystroke sequence */
/* split the current window to make room for the binding list */ /* split the current window to make room for the binding list */
if( wheadp->w_wndp == NULL /* One window */ if( wheadp->w_wndp == NULL /* One window */
@ -272,12 +265,12 @@ static int buildlist( char *mstring) {
return FALSE ; return FALSE ;
/* and get a buffer for it */ /* and get a buffer for it */
bp = bfind("*Binding list*", TRUE, 0); buffer_p bp = bfind( "*Binding list*", TRUE, 0) ;
if( bp == NULL || bclear( bp) == FALSE) if( bp == NULL || bclear( bp) == FALSE)
return cmdfail( "Can't display binding list") ; return mloutfail( "Can't display binding list") ;
/* let us know this is in progress */ /* let us know this is in progress */
mlwrite("(Building binding list)"); mloutstr( "(Building binding list)") ;
/* disconnect the current buffer */ /* disconnect the current buffer */
if( --curbp->b_nwnd == 0) { /* Last use. */ if( --curbp->b_nwnd == 0) { /* Last use. */
@ -291,7 +284,7 @@ static int buildlist( char *mstring) {
curbp = bp ; /* make this buffer current in current window */ curbp = bp ; /* make this buffer current in current window */
bp->b_mode = 0 ; /* no modes active in binding list */ bp->b_mode = 0 ; /* no modes active in binding list */
bp->b_nwnd++ ; /* mark us as more in use */ bp->b_nwnd++ ; /* mark us as more in use */
wp = curwp; window_p wp = curwp ;
wp->w_bufp = bp ; wp->w_bufp = bp ;
wp->w_linep = bp->b_linep ; wp->w_linep = bp->b_linep ;
wp->w_flag = WFHARD | WFFORCE ; wp->w_flag = WFHARD | WFFORCE ;
@ -301,7 +294,7 @@ static int buildlist( char *mstring) {
wp->w_marko = 0 ; wp->w_marko = 0 ;
/* build the contents of this window, inserting it line by line */ /* build the contents of this window, inserting it line by line */
for( nptr = names ; nptr->n_func != NULL ; nptr++) { for( nbind_p nptr = names ; nptr->n_func != NULL ; nptr++) {
int cpos ; /* current position to use in outseq */ int cpos ; /* current position to use in outseq */
/* if we are executing an apropos command..... */ /* if we are executing an apropos command..... */
@ -314,10 +307,10 @@ static int buildlist( char *mstring) {
cpos = strlen( outseq) ; cpos = strlen( outseq) ;
/* search down any keys bound to this */ /* search down any keys bound to this */
for( ktp = keytab ; ktp->k_code != 0 ; ktp++) { for( kbind_p ktp = keytab ; ktp->k_code != 0 ; ktp++) {
if( ktp->k_nbp == nptr) { if( ktp->k_nbp == nptr) {
/* padd out some spaces */ /* padd out some spaces */
while (cpos < 28) while( cpos < PADDING)
outseq[ cpos++] = ' ' ; outseq[ cpos++] = ' ' ;
/* add in the command sequence */ /* add in the command sequence */
@ -346,12 +339,12 @@ static int buildlist( char *mstring) {
wp->w_dotp = lforw( bp->b_linep) ; /* back to the beginning */ wp->w_dotp = lforw( bp->b_linep) ; /* back to the beginning */
wp->w_doto = 0 ; wp->w_doto = 0 ;
upmode() ; /* and update ALL mode lines */ upmode() ; /* and update ALL mode lines */
mlwrite(""); /* clear the mode line */ mloutstr( "") ; /* clear the mode line */
return TRUE ; return TRUE ;
} }
/*
* get a command key sequence from the keyboard /* get a command key sequence from the keyboard
* *
* int mflag; going for a meta sequence? * int mflag; going for a meta sequence?
* returns ~0 on failure * returns ~0 on failure
@ -378,8 +371,8 @@ static unsigned int getckey( int mflag) {
return c ; return c ;
} }
/*
* execute the startup file /* execute the startup file
* *
* char *fname; name of startup file (null if default) * char *fname; name of startup file (null if default)
*/ */
@ -394,8 +387,8 @@ int startup( const char *fname) {
return dofile( fname) ; /* otherwise, execute the sucker */ return dofile( fname) ; /* otherwise, execute the sucker */
} }
/*
* change a key command to a string we can print out /* change a key command to a string we can print out
* *
* int c; sequence to translate * int c; sequence to translate
* char *seq; destination string for sequence * char *seq; destination string for sequence
@ -433,6 +426,7 @@ static char *cmdstr( unsigned c, char *seq) {
return seq ; return seq ;
} }
static const char *getfname( unsigned keycode, const char *failmsg) { static const char *getfname( unsigned keycode, const char *failmsg) {
/* takes a key code and gets the name of the function bound to it */ /* takes a key code and gets the name of the function bound to it */
kbind_p kbp = getkeybinding( keycode) ; kbind_p kbp = getkeybinding( keycode) ;
@ -444,6 +438,7 @@ static const char *getfname( unsigned keycode, const char *failmsg) {
return found ; return found ;
} }
/* stock: /* stock:
* String key name TO Command Key * String key name TO Command Key
* *
@ -494,8 +489,8 @@ static unsigned int stock( char *keyname) {
return c ; return c ;
} }
/*
* string key name to binding name.... /* string key name to binding name....
* *
* char *skey; name of key to get binding for * char *skey; name of key to get binding for
*/ */

4
bind.h
View File

@ -1,3 +1,5 @@
/* bind.h -- bindable functions dealing with name and key bindings */
#ifndef _BIND_H_ #ifndef _BIND_H_
#define _BIND_H_ #define _BIND_H_
@ -17,3 +19,5 @@ int startup( const char *fname) ;
const char *transbind( char *skey) ; /* by string representation of key */ const char *transbind( char *skey) ; /* by string representation of key */
#endif #endif
/* end of bind.h */