diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb.in | 2 | ||||
| -rw-r--r-- | ext/nkf/MANIFEST | 2 | ||||
| -rw-r--r-- | ext/nkf/nkf.c | 9 | ||||
| -rw-r--r-- | ext/readline/readline.c | 6 | ||||
| -rw-r--r-- | ext/socket/socket.c | 137 | ||||
| -rw-r--r-- | ext/tcltklib/tcltklib.c | 4 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 51 | ||||
| -rw-r--r-- | ext/tk/lib/tkfont.rb | 35 |
8 files changed, 109 insertions, 137 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index ceadc4dd77..d7f58d7b3b 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -561,7 +561,7 @@ if $extlist.size > 0 if PLATFORM =~ /m68k-human|beos/ $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs end - system format('make #{ruby} EXTOBJS="%s" EXTLIBS="%s"', $extobjs, $extlibs) + system format(%[make #{ruby} EXTOBJS="%s" EXTLIBS="%s"], $extobjs, $extlibs) else Dir.chdir ".." if older(ruby, miniruby) diff --git a/ext/nkf/MANIFEST b/ext/nkf/MANIFEST index 7e3345a6b7..5e01e6e237 100644 --- a/ext/nkf/MANIFEST +++ b/ext/nkf/MANIFEST @@ -3,5 +3,5 @@ depend extconf.rb lib/kconv.rb nkf.c -orig/nkf.c +1.7/nkf.c test.rb diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 6b5db0fe70..2442973f2f 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -43,7 +43,7 @@ printf("[[%c][%c][%d]]\n", c, output[output_ctr - 1], output_ctr); } #define PERL_XS 1 -#include "orig/nkf.c" +#include "1.7/nkf.c" static VALUE rb_nkf_kconv(obj, opt, src) @@ -61,12 +61,12 @@ rb_nkf_kconv(obj, opt, src) } arguments(opt_ptr); } - dst = rb_str_new(0, RSTRING(src)->len*3 + 10); /* large enough? */ incsize = INCSIZE; input_ctr = 0; input = str2cstr(src, &i_len); + dst = rb_str_new(0, i_len*3 + 10); /* large enough? */ output_ctr = 0; output = RSTRING(dst)->ptr; @@ -106,12 +106,13 @@ rb_nkf_guess(obj, src) { unsigned char *p; unsigned char *pend; + int plen; int sequence_counter = 0; Check_Type(src, T_STRING); - p = RSTRING(src)->ptr; - pend = p + RSTRING(src)->len; + p = str2cstr(src, &plen); + pend = p + plen; #define INCR do {\ p++;\ diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 9e471195e6..84b98f0d70 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -19,9 +19,7 @@ static int readline_event() { CHECK_INTS; -#ifdef USE_THREAD rb_thread_schedule(); -#endif } static VALUE @@ -135,14 +133,14 @@ readline_attempted_completion_function(char *text, int start, int end) static VALUE readline_s_vi_editing_mode(VALUE self) { - rl_vi_editing_mode(); + rl_vi_editing_mode(1,0); return Qnil; } static VALUE readline_s_emacs_editing_mode(VALUE self) { - rl_emacs_editing_mode(); + rl_emacs_editing_mode(1,0); return Qnil; } diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 66bf56a251..fcf8f18c1b 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -30,7 +30,7 @@ extern int rb_thread_select(int, fd_set*, fd_set*, fd_set*, struct timeval*); /* # include <GUSI.h> #endif -#if defined(USE_THREAD) && defined(HAVE_FCNTL) +#if defined(HAVE_FCNTL) #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif @@ -43,20 +43,20 @@ extern int rb_thread_select(int, fd_set*, fd_set*, fd_set*, struct timeval*); /* #endif VALUE rb_cBasicSocket; -VALUE rb_cIPsocket; -VALUE rb_cTCPsocket; -VALUE rb_cTCPserver; -VALUE rb_cUDPsocket; +VALUE rb_cIPSocket; +VALUE rb_cTCPSocket; +VALUE rb_cTCPServer; +VALUE rb_cUDPSocket; #ifdef AF_UNIX -VALUE rb_cUNIXsocket; -VALUE rb_cUNIXserver; +VALUE rb_cUNIXSocket; +VALUE rb_cUNIXServer; #endif VALUE rb_cSocket; static VALUE rb_eSocket; #ifdef SOCKS -VALUE rb_cSOCKSsocket; +VALUE rb_cSOCKSSocket; void SOCKSinit(); int Rconnect(); #endif @@ -146,9 +146,7 @@ bsock_close_read(sock) if (fptr->f2 == 0) { return rb_io_close(sock); } -#ifdef USE_THREAD rb_thread_fd_close(fileno(fptr->f)); -#endif fptr->mode &= ~FMODE_READABLE; #ifdef NT free(fptr->f); @@ -293,9 +291,7 @@ bsock_send(argc, argv, sock) f = GetWriteFile(fptr); fd = fileno(f); retry: -#ifdef USE_THREAD rb_thread_fd_writable(fd); -#endif m = rb_str2cstr(msg, &mlen); if (RTEST(to)) { t = rb_str2cstr(to, &tlen); @@ -312,9 +308,7 @@ bsock_send(argc, argv, sock) #if EAGAIN != EWOULDBLOCK case EAGAIN: #endif -#ifdef USE_THREAD rb_thread_schedule(); -#endif goto retry; } rb_sys_fail("send(2)"); @@ -329,9 +323,9 @@ static VALUE unixaddr _((struct sockaddr_un*)); enum sock_recv_type { RECV_RECV, /* BasicSocket#recv(no from) */ - RECV_TCP, /* TCPsocket#recvfrom */ - RECV_UDP, /* UDPsocket#recvfrom */ - RECV_UNIX, /* UNIXsocket#recvfrom */ + RECV_TCP, /* TCPSocket#recvfrom */ + RECV_UDP, /* UDPSocket#recvfrom */ + RECV_UNIX, /* UNIXSocket#recvfrom */ RECV_SOCKET, /* Socket#recvfrom */ }; @@ -358,9 +352,7 @@ s_recv(sock, argc, argv, from) GetOpenFile(sock, fptr); fd = fileno(fptr->f); -#ifdef USE_THREAD rb_thread_wait_fd(fd); -#endif TRAP_BEG; retry: RSTRING(str)->len = recvfrom(fd, RSTRING(str)->ptr, RSTRING(str)->len, flags, @@ -374,9 +366,7 @@ s_recv(sock, argc, argv, from) #if EAGAIN != EWOULDBLOCK case EAGAIN: #endif -#ifdef USE_THREAD rb_thread_schedule(); -#endif goto retry; } rb_sys_fail("recvfrom(2)"); @@ -504,7 +494,7 @@ setipaddr(name, addr) } } -#if defined(USE_THREAD) && defined(HAVE_FCNTL) +#if defined(HAVE_FCNTL) static int thread_connect(fd, sockaddr, len, type) int fd; @@ -661,7 +651,7 @@ open_inet(class, h, serv, type) syscall = "bind(2)"; } else { -#if defined(USE_THREAD) && defined(HAVE_FCNTL) +#if defined(HAVE_FCNTL) status = thread_connect(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr), type); #else @@ -742,7 +732,7 @@ tcp_s_gethostbyname(obj, host) for (pch = h->h_aliases; *pch; pch++) { rb_ary_push(names, rb_str_new2(*pch)); } - rb_ary_push(ary, NUM2INT(h->h_addrtype)); + rb_ary_push(ary, INT2NUM(h->h_addrtype)); #ifdef h_addr for (pch = h->h_addr_list; *pch; pch++) { memcpy((char *) &addr.sin_addr, *pch, h->h_length); @@ -780,9 +770,7 @@ s_accept(class, fd, sockaddr, len) int fd2; retry: -#ifdef USE_THREAD rb_thread_wait_fd(fd); -#endif TRAP_BEG; fd2 = accept(fd, sockaddr, len); TRAP_END; @@ -793,9 +781,7 @@ s_accept(class, fd, sockaddr, len) #if EAGAIN != EWOULDBLOCK case EAGAIN: #endif -#ifdef USE_THREAD rb_thread_schedule(); -#endif goto retry; } rb_sys_fail(0); @@ -813,7 +799,7 @@ tcp_accept(sock) GetOpenFile(sock, fptr); fromlen = sizeof(struct sockaddr_in); - return s_accept(rb_cTCPsocket, fileno(fptr->f), + return s_accept(rb_cTCPSocket, fileno(fptr->f), (struct sockaddr*)&from, &fromlen); } @@ -981,9 +967,7 @@ udp_connect(sock, host, port) #if EAGAIN != EWOULDBLOCK case EAGAIN: #endif -#ifdef USE_THREAD rb_thread_schedule(); -#endif goto retry; } rb_sys_fail("connect(2)"); @@ -1040,9 +1024,7 @@ udp_send(argc, argv, sock) #if EAGAIN != EWOULDBLOCK case EAGAIN: #endif -#ifdef USE_THREAD rb_thread_schedule(); -#endif goto retry; } rb_sys_fail("sendto(2)"); @@ -1110,7 +1092,7 @@ unix_accept(sock) GetOpenFile(sock, fptr); fromlen = sizeof(struct sockaddr_un); - return s_accept(rb_cUNIXsocket, fileno(fptr->f), + return s_accept(rb_cUNIXSocket, fileno(fptr->f), (struct sockaddr*)&from, &fromlen); } @@ -1293,9 +1275,7 @@ sock_connect(sock, addr) #if EAGAIN != EWOULDBLOCK case EAGAIN: #endif -#ifdef USE_THREAD rb_thread_schedule(); -#endif goto retry; } rb_sys_fail("connect(2)"); @@ -1416,7 +1396,7 @@ mkhostent(h) for (pch = h->h_aliases; *pch; pch++) { rb_ary_push(names, rb_str_new2(*pch)); } - rb_ary_push(ary, NUM2INT(h->h_addrtype)); + rb_ary_push(ary, INT2NUM(h->h_addrtype)); #ifdef h_addr for (pch = h->h_addr_list; *pch; pch++) { rb_ary_push(ary, rb_str_new(*pch, h->h_length)); @@ -1533,49 +1513,56 @@ Init_socket() rb_define_method(rb_cBasicSocket, "send", bsock_send, -1); rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1); - rb_cIPsocket = rb_define_class("IPsocket", rb_cBasicSocket); - rb_define_method(rb_cIPsocket, "addr", ip_addr, 0); - rb_define_method(rb_cIPsocket, "peeraddr", ip_peeraddr, 0); - rb_define_singleton_method(rb_cIPsocket, "getaddress", ip_s_getaddress, 1); + rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket); + rb_define_global_const("IPsocket", rb_cIPSocket); + rb_define_method(rb_cIPSocket, "addr", ip_addr, 0); + rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0); + rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1); - rb_cTCPsocket = rb_define_class("TCPsocket", rb_cIPsocket); - rb_define_singleton_method(rb_cTCPsocket, "open", tcp_s_open, 2); - rb_define_singleton_method(rb_cTCPsocket, "new", tcp_s_open, 2); - rb_define_singleton_method(rb_cTCPsocket, "gethostbyname", tcp_s_gethostbyname, 1); - rb_define_method(rb_cTCPsocket, "recvfrom", tcp_recvfrom, -1); + rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket); + rb_define_global_const("TCPsocket", rb_cTCPSocket); + rb_define_singleton_method(rb_cTCPSocket, "open", tcp_s_open, 2); + rb_define_singleton_method(rb_cTCPSocket, "new", tcp_s_open, 2); + rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1); + rb_define_method(rb_cTCPSocket, "recvfrom", tcp_recvfrom, -1); #ifdef SOCKS - rb_cSOCKSsocket = rb_define_class("SOCKSsocket", rb_cTCPsocket); - rb_define_singleton_method(rb_cSOCKSsocket, "open", socks_s_open, 2); - rb_define_singleton_method(rb_cSOCKSsocket, "new", socks_s_open, 2); -#endif - - rb_cTCPserver = rb_define_class("TCPserver", rb_cTCPsocket); - rb_define_singleton_method(rb_cTCPserver, "open", tcp_svr_s_open, -1); - rb_define_singleton_method(rb_cTCPserver, "new", tcp_svr_s_open, -1); - rb_define_method(rb_cTCPserver, "accept", tcp_accept, 0); - - rb_cUDPsocket = rb_define_class("UDPsocket", rb_cIPsocket); - rb_define_singleton_method(rb_cUDPsocket, "open", udp_s_open, 0); - rb_define_singleton_method(rb_cUDPsocket, "new", udp_s_open, 0); - rb_define_method(rb_cUDPsocket, "connect", udp_connect, 2); - rb_define_method(rb_cUDPsocket, "bind", udp_bind, 2); - rb_define_method(rb_cUDPsocket, "send", udp_send, -1); - rb_define_method(rb_cUDPsocket, "recvfrom", udp_recvfrom, -1); + rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket); + rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket); + rb_define_singleton_method(rb_cSOCKSSocket, "open", socks_s_open, 2); + rb_define_singleton_method(rb_cSOCKSSocket, "new", socks_s_open, 2); +#endif + + rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket); + rb_define_global_const("TCPserver", rb_cTCPServer); + rb_define_singleton_method(rb_cTCPServer, "open", tcp_svr_s_open, -1); + rb_define_singleton_method(rb_cTCPServer, "new", tcp_svr_s_open, -1); + rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0); + + rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket); + rb_define_global_const("UDPsocket", rb_cUDPSocket); + rb_define_singleton_method(rb_cUDPSocket, "open", udp_s_open, 0); + rb_define_singleton_method(rb_cUDPSocket, "new", udp_s_open, 0); + rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2); + rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2); + rb_define_method(rb_cUDPSocket, "send", udp_send, -1); + rb_define_method(rb_cUDPSocket, "recvfrom", udp_recvfrom, -1); #ifdef HAVE_SYS_UN_H - rb_cUNIXsocket = rb_define_class("UNIXsocket", rb_cBasicSocket); - rb_define_singleton_method(rb_cUNIXsocket, "open", unix_s_sock_open, 1); - rb_define_singleton_method(rb_cUNIXsocket, "new", unix_s_sock_open, 1); - rb_define_method(rb_cUNIXsocket, "path", unix_path, 0); - rb_define_method(rb_cUNIXsocket, "addr", unix_addr, 0); - rb_define_method(rb_cUNIXsocket, "peeraddr", unix_peeraddr, 0); - rb_define_method(rb_cUNIXsocket, "recvfrom", unix_recvfrom, -1); - - rb_cUNIXserver = rb_define_class("UNIXserver", rb_cUNIXsocket); - rb_define_singleton_method(rb_cUNIXserver, "open", unix_svr_s_open, 1); - rb_define_singleton_method(rb_cUNIXserver, "new", unix_svr_s_open, 1); - rb_define_method(rb_cUNIXserver, "accept", unix_accept, 0); + rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket); + rb_define_global_const("UNIXsocket", rb_cUNIXSocket); + rb_define_singleton_method(rb_cUNIXSocket, "open", unix_s_sock_open, 1); + rb_define_singleton_method(rb_cUNIXSocket, "new", unix_s_sock_open, 1); + rb_define_method(rb_cUNIXSocket, "path", unix_path, 0); + rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0); + rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0); + rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1); + + rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket); + rb_define_global_const("UNIXserver", rb_cUNIXServer); + rb_define_singleton_method(rb_cUNIXServer, "open", unix_svr_s_open, 1); + rb_define_singleton_method(rb_cUNIXServer, "new", unix_svr_s_open, 1); + rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0); #endif rb_cSocket = rb_define_class("Socket", rb_cBasicSocket); diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 11eb977861..a08391b7bb 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -55,9 +55,7 @@ void _timer_for_tcl (ClientData clientData) timer->flag = 0; CHECK_INTS; -#ifdef USE_THREAD if (!rb_thread_critical) rb_thread_schedule(); -#endif timer->token = Tk_CreateTimerHandler(200, _timer_for_tcl, (ClientData)timer); @@ -82,11 +80,9 @@ lib_mainloop(VALUE self) } DUMP1("stop Tk_Mainloop"); -#ifdef USE_THREAD if (timer->flag) { Tk_DeleteTimerHandler(timer->token); } -#endif return Qnil; } diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 8fc57f307e..2aa49879fd 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -228,7 +228,7 @@ module TkComm return '' if cmd == '' id = _next_cmd_id Tk_CMDTBL[id] = cmd - @cmdtbl = [] if not @cmdtbl + @cmdtbl = [] unless @cmdtbl @cmdtbl.push id return format("rb_out %s", id); end @@ -711,14 +711,14 @@ class TkVariable elsif val.kind_of?(Array) a = [] val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))} - s = '"' + a.join(" ").gsub(/[][$"]/, '\\\\\&') + '"' #' + s = '"' + a.join(" ").gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; array set %s %s', @id, @id, s)) elsif val.kind_of?(Hash) s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\ - .gsub(/[][$"]/, '\\\\\&') + '"' #' + .gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; array set %s %s', @id, @id, s)) else - s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' #' + s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; set %s %s', @id, @id, s)) end end @@ -738,16 +738,15 @@ class TkVariable if INTERP._eval(format('global %s; array exists %s', @id, @id)) != "1" raise else - Hash[*tk_split_simplelist(INTERP\ - ._eval(format('global %s; array get %s', - @id, @id)))] + Hash[*tk_split_simplelist(INTERP._eval(format('global %s; array get %s', + @id, @id)))] end end end def value=(val) begin - s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' #' + s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; set %s %s', @id, @id, s)) rescue if INTERP._eval(format('global %s; array exists %s', @id, @id)) != "1" @@ -760,12 +759,12 @@ class TkVariable elsif val.kind_of?(Array) a = [] val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))} - s = '"' + a.join(" ").gsub(/[][$"]/, '\\\\\&') + '"' #' + s = '"' + a.join(" ").gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; unset %s; array set %s %s', @id, @id, @id, s)) elsif val.kind_of?(Hash) s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\ - .gsub(/[][$"]/, '\\\\\&') + '"' #' + .gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; unset %s; array set %s %s', @id, @id, @id, s)) else @@ -972,7 +971,7 @@ class TkVarAccess<TkVariable def initialize(varname, val=nil) @id = varname if val - s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' #' + s = '"' + _get_eval_string(val).gsub(/[][$"]/, '\\\\\&') + '"' INTERP._eval(format('global %s; set %s %s', @id, @id, s)) end end @@ -1600,17 +1599,21 @@ class TkObject<TkKernel def configure(slot, value=None) if slot.kind_of? Hash - if ( slot['font'] || slot['kanjifont'] \ - || slot['latinfont'] || slot['asciifont'] ) + if (slot['font'] || slot['kanjifont'] || + slot['latinfont'] || slot['asciifont'] ) font_configure(slot.dup) else tk_call path, 'configure', *hash_kv(slot) end else - if ( slot == 'font' || slot == 'kanjifont' \ - || slot == 'latinfont' || slot == 'asciifont' ) - font_configure({slot=>value}) + if (slot == 'font' || slot == 'kanjifont' || + slot == 'latinfont' || slot == 'asciifont') + if value == None + fontobj + else + font_configure({slot=>value}) + end else tk_call path, 'configure', "-#{slot}", value end @@ -1624,13 +1627,11 @@ class TkObject<TkKernel def configinfo(slot = nil) if slot == 'font' || slot == 'kanjifont' fontobj - else if slot conf = tk_split_list(tk_send('configure', "-#{slot}") ) conf[0] = conf[0][1..-1] conf - else ret = tk_split_list(tk_send('configure') ).collect{|conf| conf[0] = conf[0][1..-1] @@ -2360,27 +2361,21 @@ class TkMenu<TkWindow def yposition(index) number(tk_send('yposition', index)) end - def entryconfigure(index, keys=nil) - tk_send 'entryconfigure', index, *hash_kv(keys) - end -# def entryconfigure(index, keys=nil) -# tk_send 'entryconfigure', index, *hash_kv(keys) -# end def entrycget(index, key) tk_tcl2ruby tk_send 'entrycget', index, "-#{key}" end def entryconfigure(index, key, val=None) if key.kind_of? Hash - if ( key['font'] || key['kanjifont'] \ - || key['latinfont'] || key['asciifont'] ) + if (key['font'] || key['kanjifont'] || + key['latinfont'] || key['asciifont']) tagfont_configure(index, key.dup) else tk_send 'entryconfigure', index, *hash_kv(key) end else - if ( key == 'font' || key == 'kanjifont' \ - || key == 'latinfont' || key == 'asciifont' ) + if (key == 'font' || key == 'kanjifont' || + key == 'latinfont' || key == 'asciifont' ) tagfont_configure({key=>val}) else tk_call 'entryconfigure', index, "-#{key}", val diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb index 421988aeca..1526f68d88 100644 --- a/ext/tk/lib/tkfont.rb +++ b/ext/tk/lib/tkfont.rb @@ -153,8 +153,8 @@ class TkFont charset = (info = font['charset'] .to_s)? info: '*' encoding = (info = font['encoding'].to_s)? info: '*' - Array([foundry, family, weight, slant, swidth, adstyle, - pixels, points, resx, resy, space, avgWidth, charset, encoding]) + [foundry, family, weight, slant, swidth, adstyle, + pixels, points, resx, resy, space, avgWidth, charset, encoding] end def create_latinfont_tk4x(font) @@ -238,13 +238,10 @@ class TkFont } @kanjifont = '-' + _get_font_info_from_hash(finfo).join('-') + '-' - elsif font.kind_of? TkFont @kanjifont = font.kanji_font - else @kanjifont = font - end end @@ -309,11 +306,9 @@ class TkFont elsif font.kind_of? TkFont tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font) - else tk_call('font', 'create', @kanjifont, '-copy', font, '-charset', 'jisx0208.1983') - end end @@ -397,9 +392,9 @@ class TkFont if option "" else - Array([ ['family',[]], ['size',[]], ['weight',[]], ['slant',[]], - ['underline',[]], ['overstrike',[]], ['charset',[]], - ['pointadjust',[]] ]) + [['family',[]], ['size',[]], ['weight',[]], ['slant',[]], + ['underline',[]], ['overstrike',[]], ['charset',[]], + ['pointadjust',[]]] end end @@ -440,9 +435,9 @@ class TkFont if option "" else - Array([ ['family',[]], ['size',[]], ['weight',[]], ['slant',[]], - ['underline',[]], ['overstrike',[]], ['charset',[]], - ['pointadjust',[]] ]) + [['family',[]], ['size',[]], ['weight',[]], ['slant',[]], + ['underline',[]], ['overstrike',[]], ['charset',[]], + ['pointadjust',[]]] end end @@ -583,15 +578,15 @@ class TkFont def kanji_replace_core_tk81(knj) if font.kind_of? Hash - tk_call('font', 'configure', @compoundfont, *hash_kv(font)) + tk_call('font', 'configure', @compoundfont, *hash_kv(knj)) else keys = {} - if font.kind_of? Array - actual_core(array2tk_list(font)).each{|key,val| keys[key] = val} - elsif font.kind_of? TkFont - actual_core(font.latin_font).each{|key,val| keys[key] = val} + if knj.kind_of? Array + actual_core(array2tk_list(knj)).each{|key,val| keys[key] = val} + elsif knj.kind_of? TkFont + actual_core(knj.latin_font).each{|key,val| keys[key] = val} else - actual_core(font).each{|key,val| keys[key] = val} + actual_core(knj).each{|key,val| keys[key] = val} end tk_call('font', 'configure', @compoundfont, *hash_kv(keys)) end @@ -616,7 +611,7 @@ class TkFont if option "" else - Array([ ['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]] ]) + [['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]]] end end |