From 2eedbb0079a38f02af5423e9a071cec6ee4b8c3e Mon Sep 17 00:00:00 2001 From: Ian C Date: Wed, 6 Apr 2016 20:55:47 +0000 Subject: Restored other lost changes + files --- cfile.c | 25 +++++------- dotrc/.bash_aliases | 42 ++++++++++++++++++++ dotrc/.bashrc | 5 +++ dotrc/.gvimrc | 22 +++++++++++ dotrc/.nethackrc | 8 ++++ dotrc/.vimrc | 98 ++++++++++++++++++++++++++++++++++++++++++++++ dotrc/_bash_aliases | 41 ------------------- dotrc/_bashrc | 5 --- dotrc/_gvimrc | 22 ----------- dotrc/_nethackrc | 8 ---- dotrc/_vimrc | 98 ---------------------------------------------- fonts/Crisp.ttf | Bin 0 -> 67688 bytes fonts/ProggyClean.ttf | Bin 0 -> 41208 bytes fonts/ProggyCleanCE.ttf | Bin 0 -> 45232 bytes fonts/ProggyCleanSZBP.ttf | Bin 0 -> 42144 bytes fonts/ProggySquare.ttf | Bin 0 -> 41588 bytes fonts/ProggySquareSZ.ttf | Bin 0 -> 41608 bytes fonts/ProggyTiny.ttf | Bin 0 -> 35656 bytes fonts/ProggyTinySZ.ttf | Bin 0 -> 35684 bytes 19 files changed, 184 insertions(+), 190 deletions(-) create mode 100644 dotrc/.bash_aliases create mode 100644 dotrc/.bashrc create mode 100644 dotrc/.gvimrc create mode 100644 dotrc/.nethackrc create mode 100644 dotrc/.vimrc delete mode 100644 dotrc/_bash_aliases delete mode 100644 dotrc/_bashrc delete mode 100644 dotrc/_gvimrc delete mode 100644 dotrc/_nethackrc delete mode 100644 dotrc/_vimrc create mode 100644 fonts/Crisp.ttf create mode 100644 fonts/ProggyClean.ttf create mode 100644 fonts/ProggyCleanCE.ttf create mode 100644 fonts/ProggyCleanSZBP.ttf create mode 100644 fonts/ProggySquare.ttf create mode 100644 fonts/ProggySquareSZ.ttf create mode 100644 fonts/ProggyTiny.ttf create mode 100644 fonts/ProggyTinySZ.ttf diff --git a/cfile.c b/cfile.c index c9a22f5..b06c1d8 100644 --- a/cfile.c +++ b/cfile.c @@ -5,19 +5,14 @@ #include #include -#define TYPE unsigned char -#define STR(x) #x -#define XSTR(x) STR(x) - int main(int argc, char *argv[]) { const char *name="bfile"; FILE *in,*out; - TYPE num; + unsigned long num; int col; int first; int len; - int fldsz; in=stdin; out=stdout; @@ -52,9 +47,7 @@ int main(int argc, char *argv[]) fprintf(out,"/* Auto-generated binary */\n\n"); } - fldsz = sizeof num * 2; - - fprintf(out,XSTR(TYPE) " %s[]=\n\t{",name); + fprintf(out,"unsigned long %s[]=\n\t\t\t{",name); col=0; num=0; @@ -63,33 +56,33 @@ int main(int argc, char *argv[]) while(!feof(in)) { - fread(&num,sizeof num,1,in); + fread(&num,sizeof(unsigned long),1,in); if (col==0) { if (first) { - fprintf(out,"\n\t\t"); + fprintf(out,"\n\t\t\t"); first=0; } else { - fprintf(out,",\n\t\t"); + fprintf(out,",\n\t\t\t"); } } else { - fprintf(out,", "); + fprintf(out,","); } - fprintf(out,"0x%.*x",fldsz, num); + fprintf(out,"0x%.8x",num); - col=(col+1) % (8 / sizeof num); + col=(col+1)%4; num=0; len++; } - fprintf(out,"\n\t};\n#define %s_LEN %d\n", name, len); + fprintf(out,"\n\t\t\t};\n#define %s_LEN %d\n", name, len); fclose(in); fclose(out); diff --git a/dotrc/.bash_aliases b/dotrc/.bash_aliases new file mode 100644 index 0000000..d499ae1 --- /dev/null +++ b/dotrc/.bash_aliases @@ -0,0 +1,42 @@ +export EDITOR=vim +export VISUAL=vim + +alias V="vi" + +alias ctags="ctags --langmap=c:.c.pc" + +alias lss="ls -Fx" +alias la="lss -a" +alias va="vi $HOME/.bash_aliases" +alias sa=". $HOME/.bash_aliases" +alias lsd="ls -Fx1 | egrep /" +alias pss="ps -ef" +alias psu="ps -f -u $LOGNAME" +alias h="history" +alias p="pwd" + +alias wenv="env | egrep " + +if [ -z "$XEDARG" ] ; then + export XEDARG="-i -r" +fi + +if [ -e $HOME/.bash_dirs ] ; then + . $HOME/.bash_dirs +fi + +# Directory setting +# +function dset +{ + if [ "$1" == "" ] ; then + echo usage: dset name + else + echo "export $1=\"`pwd`\" ; alias $1='cd \"\$$1\"'" >> $HOME/.bash_dirs + . $HOME/.bash_dirs + fi +} + +alias dsrc=". $HOME/.bash_dirs" +alias vd="vi $HOME/.bash_dirs" +alias dwot="alias | egrep cd" diff --git a/dotrc/.bashrc b/dotrc/.bashrc new file mode 100644 index 0000000..19429d1 --- /dev/null +++ b/dotrc/.bashrc @@ -0,0 +1,5 @@ +if [ "$PS1" != "" ] ; then + PS1="`hostname`$ " +fi + +test -s $HOME/.bash_aliases && . ~/.bash_aliases diff --git a/dotrc/.gvimrc b/dotrc/.gvimrc new file mode 100644 index 0000000..dace2c8 --- /dev/null +++ b/dotrc/.gvimrc @@ -0,0 +1,22 @@ +set ch=2 + +set guioptions-=T +set hlsearch +set mousehide + +set mouse= + +highlight Normal guibg=black guifg=white +highlight Search guibg=grey20 guifg=white +highlight Cursor guibg=white guifg=NONE +highlight NonText guibg=black +highlight Constant gui=NONE guibg=black +highlight Special gui=NONE guibg=black +set background=dark + +"set guifont=-adobe-courier-medium-r-normal-*-*-120-*-*-m-*-iso8859-9 +"set guifont=-adobe-courier-medium-r-normal-*-*-140-*-*-m-*-iso10646-1 +"set guifont="-windows-proggysquare-medium-r-normal--11-80-96-96-c-70-iso8859-1" +set guifont=fixed + +syntax on diff --git a/dotrc/.nethackrc b/dotrc/.nethackrc new file mode 100644 index 0000000..5caa573 --- /dev/null +++ b/dotrc/.nethackrc @@ -0,0 +1,8 @@ +# === OPTIONS === +# character +OPTIONS=hilite_pet +OPTIONS=showexp,showscore,time +OPTIONS=autodig,!autopickup +OPTIONS=catname:Smeghead,dogname:Dog +OPTIONS=number_pad +OPTIONS=menustyle:traditional diff --git a/dotrc/.vimrc b/dotrc/.vimrc new file mode 100644 index 0000000..06c3f5e --- /dev/null +++ b/dotrc/.vimrc @@ -0,0 +1,98 @@ +version 4.0 +set compatible +set cpo-=< +set sw=4 +" set expandtab +set ai +set report=2 +set more +set history=50 +set visualbell +set noshowmatch +set modeline + +:if &term =~ "linux" +: syntax on +:endif + +let Gtags_Auto_Map = 1 + +:if $BGLIGHT == "Y" +: set background=light +:else +: set background=dark +:endif + +:if $AMIGA == "Y" +: syntax off +: set background=light +:else +: syntax on +: let &colorcolumn=join(range(81, 999),",") +:endif + +set wildchar=^I +set wildmode=list,longest +set wildignore=*.o,core,*~,*.bak,*.a,*.obj +set wildmenu + +set fileformats=unix,dos,mac + +" For quickfix +" set mp=make\ \\\|&\ egrep\ ^cc:\ \\\|&\ egrep\ error +set mp=make\ \\\|&\ egrep\ ^cc: + +" +" This should work, but doesn't... +" set errorformat=cc:\ \"%f\"\,\ line\ %l:\ error\ %n:\ %m\. + +" Map error commands +map _a :cn +map _s :cp +map __ :cc + +" Map buffer cycling +map :bnext +map! :bnext + +" Spelling options +set spellfile=$HOME/.spell.en.add + +" Try and set color for xterm +" +" :if &term =~ "xterm" +" : if has("terminfo") +" : set t_Co=16 +" : set t_AB=[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm +" : set t_AF=[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm +" : else +" : set t_Co=16 +" : set t_Sf=[3%dm +" : set t_Sb=[4%dm +" : endif +" :endif + + +" Autocommands for skeletons and the such +" +:if !exists("autocommands_loaded") +: let autocommands_loaded = 1 +": autocmd BufNewFile *.c 0r /devel/proformas/proforma.c +": autocmd BufNewFile *.h 0r /devel/proformas/proforma.h +": autocmd BufNewFile *.htm,*.html 0r $HOME/.skeleton/skeleton.html +": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Bold `>a` +": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Italic `>a` +": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Header.1 `>a` +": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Header.2 `>a` +": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Header.3 `>a` +": autocmd BufNewFile,BufReadPost *.htm,*.html syntax on +": autocmd BufNewFile,BufReadPost *.css syntax on +": autocmd BufNewFile,BufReadPost *.h syntax on +": autocmd BufNewFile,BufReadPost *.c syntax on +": autocmd BufNewFile,BufReadPost *.cpp syntax on +": autocmd BufNewFile,BufReadPost *.sql syntax on +": autocmd BufNewFile,BufReadPost *.pc syntax on +": autocmd BufNewFile,BufReadPost *.pc set syntax=cpp +": autocmd BufNewFile,BufReadPost *.pkg syntax on +": autocmd BufNewFile,BufReadPost *.pkg set syntax=plsql +:endif diff --git a/dotrc/_bash_aliases b/dotrc/_bash_aliases deleted file mode 100644 index 36212eb..0000000 --- a/dotrc/_bash_aliases +++ /dev/null @@ -1,41 +0,0 @@ -export EDITOR=vim - -alias V="vi" - -alias ctags="ctags --langmap=c:.c.pc" - -alias lss="ls -Fx" -alias la="lss -a" -alias va="vi $HOME/.bash_aliases" -alias sa=". $HOME/.bash_aliases" -alias lsd="ls -Fx1 | egrep /" -alias pss="ps -ef" -alias psu="ps -f -u $LOGNAME" -alias h="history" -alias p="pwd" - -alias wenv="env | egrep " - -if [ -z "$XEDARG" ] ; then - export XEDARG="-i -r" -fi - -if [ -e $HOME/.bash_dirs ] ; then - . $HOME/.bash_dirs -fi - -# Directory setting -# -function dset -{ - if [ "$1" == "" ] ; then - echo usage: dset name - else - echo "export $1=\"`pwd`\" ; alias $1='cd \"\$$1\"'" >> $HOME/.bash_dirs - . $HOME/.bash_dirs - fi -} - -alias dsrc=". $HOME/.bash_dirs" -alias vd="vi $HOME/.bash_dirs" -alias dwot="alias | egrep cd" diff --git a/dotrc/_bashrc b/dotrc/_bashrc deleted file mode 100644 index 19429d1..0000000 --- a/dotrc/_bashrc +++ /dev/null @@ -1,5 +0,0 @@ -if [ "$PS1" != "" ] ; then - PS1="`hostname`$ " -fi - -test -s $HOME/.bash_aliases && . ~/.bash_aliases diff --git a/dotrc/_gvimrc b/dotrc/_gvimrc deleted file mode 100644 index dace2c8..0000000 --- a/dotrc/_gvimrc +++ /dev/null @@ -1,22 +0,0 @@ -set ch=2 - -set guioptions-=T -set hlsearch -set mousehide - -set mouse= - -highlight Normal guibg=black guifg=white -highlight Search guibg=grey20 guifg=white -highlight Cursor guibg=white guifg=NONE -highlight NonText guibg=black -highlight Constant gui=NONE guibg=black -highlight Special gui=NONE guibg=black -set background=dark - -"set guifont=-adobe-courier-medium-r-normal-*-*-120-*-*-m-*-iso8859-9 -"set guifont=-adobe-courier-medium-r-normal-*-*-140-*-*-m-*-iso10646-1 -"set guifont="-windows-proggysquare-medium-r-normal--11-80-96-96-c-70-iso8859-1" -set guifont=fixed - -syntax on diff --git a/dotrc/_nethackrc b/dotrc/_nethackrc deleted file mode 100644 index 5caa573..0000000 --- a/dotrc/_nethackrc +++ /dev/null @@ -1,8 +0,0 @@ -# === OPTIONS === -# character -OPTIONS=hilite_pet -OPTIONS=showexp,showscore,time -OPTIONS=autodig,!autopickup -OPTIONS=catname:Smeghead,dogname:Dog -OPTIONS=number_pad -OPTIONS=menustyle:traditional diff --git a/dotrc/_vimrc b/dotrc/_vimrc deleted file mode 100644 index 06c3f5e..0000000 --- a/dotrc/_vimrc +++ /dev/null @@ -1,98 +0,0 @@ -version 4.0 -set compatible -set cpo-=< -set sw=4 -" set expandtab -set ai -set report=2 -set more -set history=50 -set visualbell -set noshowmatch -set modeline - -:if &term =~ "linux" -: syntax on -:endif - -let Gtags_Auto_Map = 1 - -:if $BGLIGHT == "Y" -: set background=light -:else -: set background=dark -:endif - -:if $AMIGA == "Y" -: syntax off -: set background=light -:else -: syntax on -: let &colorcolumn=join(range(81, 999),",") -:endif - -set wildchar=^I -set wildmode=list,longest -set wildignore=*.o,core,*~,*.bak,*.a,*.obj -set wildmenu - -set fileformats=unix,dos,mac - -" For quickfix -" set mp=make\ \\\|&\ egrep\ ^cc:\ \\\|&\ egrep\ error -set mp=make\ \\\|&\ egrep\ ^cc: - -" -" This should work, but doesn't... -" set errorformat=cc:\ \"%f\"\,\ line\ %l:\ error\ %n:\ %m\. - -" Map error commands -map _a :cn -map _s :cp -map __ :cc - -" Map buffer cycling -map :bnext -map! :bnext - -" Spelling options -set spellfile=$HOME/.spell.en.add - -" Try and set color for xterm -" -" :if &term =~ "xterm" -" : if has("terminfo") -" : set t_Co=16 -" : set t_AB=[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm -" : set t_AF=[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm -" : else -" : set t_Co=16 -" : set t_Sf=[3%dm -" : set t_Sb=[4%dm -" : endif -" :endif - - -" Autocommands for skeletons and the such -" -:if !exists("autocommands_loaded") -: let autocommands_loaded = 1 -": autocmd BufNewFile *.c 0r /devel/proformas/proforma.c -": autocmd BufNewFile *.h 0r /devel/proformas/proforma.h -": autocmd BufNewFile *.htm,*.html 0r $HOME/.skeleton/skeleton.html -": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Bold `>a` -": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Italic `>a` -": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Header.1 `>a` -": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Header.2 `>a` -": autocmd BufNewFile,BufReadPost *.htm,*.html :vmenu HTML.Header.3 `>a` -": autocmd BufNewFile,BufReadPost *.htm,*.html syntax on -": autocmd BufNewFile,BufReadPost *.css syntax on -": autocmd BufNewFile,BufReadPost *.h syntax on -": autocmd BufNewFile,BufReadPost *.c syntax on -": autocmd BufNewFile,BufReadPost *.cpp syntax on -": autocmd BufNewFile,BufReadPost *.sql syntax on -": autocmd BufNewFile,BufReadPost *.pc syntax on -": autocmd BufNewFile,BufReadPost *.pc set syntax=cpp -": autocmd BufNewFile,BufReadPost *.pkg syntax on -": autocmd BufNewFile,BufReadPost *.pkg set syntax=plsql -:endif diff --git a/fonts/Crisp.ttf b/fonts/Crisp.ttf new file mode 100644 index 0000000..36f3a53 Binary files /dev/null and b/fonts/Crisp.ttf differ diff --git a/fonts/ProggyClean.ttf b/fonts/ProggyClean.ttf new file mode 100644 index 0000000..0270cdf Binary files /dev/null and b/fonts/ProggyClean.ttf differ diff --git a/fonts/ProggyCleanCE.ttf b/fonts/ProggyCleanCE.ttf new file mode 100644 index 0000000..28dd2f7 Binary files /dev/null and b/fonts/ProggyCleanCE.ttf differ diff --git a/fonts/ProggyCleanSZBP.ttf b/fonts/ProggyCleanSZBP.ttf new file mode 100644 index 0000000..884f741 Binary files /dev/null and b/fonts/ProggyCleanSZBP.ttf differ diff --git a/fonts/ProggySquare.ttf b/fonts/ProggySquare.ttf new file mode 100644 index 0000000..9118ece Binary files /dev/null and b/fonts/ProggySquare.ttf differ diff --git a/fonts/ProggySquareSZ.ttf b/fonts/ProggySquareSZ.ttf new file mode 100644 index 0000000..bfff77e Binary files /dev/null and b/fonts/ProggySquareSZ.ttf differ diff --git a/fonts/ProggyTiny.ttf b/fonts/ProggyTiny.ttf new file mode 100644 index 0000000..1c4312c Binary files /dev/null and b/fonts/ProggyTiny.ttf differ diff --git a/fonts/ProggyTinySZ.ttf b/fonts/ProggyTinySZ.ttf new file mode 100644 index 0000000..bc4a1ad Binary files /dev/null and b/fonts/ProggyTinySZ.ttf differ -- cgit v1.2.3