Mercurial > hg > xemacs-beta
view netinstall/geturl.cc @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | 42a8626b741e |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to act as a pretty interface to netio.cc. We add a progress dialog and some convenience functions (like collect to string or file */ #include "win32.h" #include "commctrl.h" #include <stdio.h> #include <stdlib.h> #include <errno.h> #include "dialog.h" #include "geturl.h" #include "resource.h" #include "netio.h" #include "msg.h" #include "log.h" static int is_showing = 0; static HWND gw_dialog = 0; static HWND gw_url = 0; static HWND gw_rate = 0; static HWND gw_progress = 0; static HANDLE init_event; static int max_bytes = 0; static BOOL dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDCANCEL: exit_setup (0); } return FALSE; } static BOOL CALLBACK dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: gw_dialog = h; gw_url = GetDlgItem (h, IDC_DLS_URL); gw_rate = GetDlgItem (h, IDC_DLS_RATE); gw_progress = GetDlgItem (h, IDC_DLS_PROGRESS); SetEvent (init_event); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); } return FALSE; } static DWORD WINAPI dialog (void *) { MSG m; HWND lgw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS), 0, dialog_proc); ShowWindow (lgw_dialog, SW_SHOWNORMAL); UpdateWindow (lgw_dialog); while (GetMessage (&m, 0, 0, 0) > 0) { TranslateMessage (&m); DispatchMessage (&m); } return FALSE; } static DWORD start_tics; static void init_dialog (char *url, int length) { if (gw_dialog == 0) { DWORD tid; HANDLE thread; init_event = CreateEvent (0, 0, 0, 0); thread = CreateThread (0, 0, dialog, 0, 0, &tid); WaitForSingleObject (init_event, 1000); CloseHandle (init_event); SendMessage (gw_progress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); is_showing = 0; } char *sl=url, *cp; for (cp=url; *cp; cp++) if (*cp == '/' || *cp == '\\' || *cp == ':') sl = cp+1; max_bytes = length; SetWindowText (gw_url, sl); SetWindowText (gw_rate, "Connecting..."); SendMessage (gw_progress, PBM_SETPOS, (WPARAM) 0, 0); ShowWindow (gw_progress, (length > 0) ? SW_SHOW : SW_HIDE); ShowWindow (gw_dialog, SW_SHOWNORMAL); if (!is_showing) { SetForegroundWindow (gw_dialog); is_showing = 1; } start_tics = GetTickCount (); } static void progress (int bytes) { static char buf[100]; int kbps; static DWORD last_tics = 0; DWORD tics = GetTickCount (); if (tics == start_tics) // to prevent division by zero return; if (tics < last_tics + 200) // to prevent flickering updates return; last_tics = tics; kbps = bytes / (tics - start_tics); ShowWindow (gw_progress, (max_bytes > 0) ? SW_SHOW : SW_HIDE); if (max_bytes > 100) { int perc = bytes / (max_bytes / 100); SendMessage (gw_progress, PBM_SETPOS, (WPARAM) perc, 0); sprintf (buf, "%3d %% (%dk/%dk) %d kb/s\n", perc, bytes/1000, max_bytes/1000, kbps); } else sprintf (buf, "%d %d kb/s\n", bytes, kbps); SetWindowText (gw_rate, buf); } struct GUBuf { GUBuf *next; int count; char buf[2000]; }; char * get_url_to_string (char *_url) { log (LOG_BABBLE, "get_url_to_string %s", _url); init_dialog (_url, 0); NetIO *n = NetIO::open (_url); if (!n || !n->ok ()) { delete n; log (LOG_BABBLE, "get_url_to_string failed!"); return 0; } if (n->file_size) max_bytes = n->file_size; GUBuf *bufs = 0; GUBuf **nextp = &bufs; int total_bytes = 1; /* for the NUL */ progress (0); while (1) { GUBuf *b = new GUBuf; *nextp = b; b->next = 0; nextp = &(b->next); b->count = n->read (b->buf, sizeof (b->buf)); if (b->count <= 0) break; total_bytes += b->count; progress (total_bytes); } char *rv = (char *) malloc (total_bytes); char *rvp = rv; while (bufs && bufs->count > 0) { GUBuf *tmp = bufs->next; memcpy (rvp, bufs->buf, bufs->count); rvp += bufs->count; delete bufs; bufs = tmp; } *rvp = 0; if (n) delete n; return rv; } int get_url_to_file (char *_url, char *_filename, int expected_length) { log (LOG_BABBLE, "get_url_to_file %s %s", _url, _filename); init_dialog (_url, expected_length); remove (_filename); /* but ignore errors */ NetIO *n = NetIO::open (_url); if (!n || !n->ok ()) { delete n; log (LOG_BABBLE, "get_url_to_file failed!"); return 1; } FILE *f = fopen (_filename, "wb"); if (!f) { char *err = strerror (errno); if (!err) err = "(unknown error)"; fatal (IDS_ERR_OPEN_WRITE, _filename, err); } if (n->file_size) max_bytes = n->file_size; int total_bytes = 0; progress (0); while (1) { char buf[8192]; int count; count = n->read (buf, sizeof (buf)); if (count <= 0) break; fwrite (buf, 1, count, f); total_bytes += count; progress (total_bytes); } fclose (f); if (n) delete n; return 0; } void dismiss_url_status_dialog () { ShowWindow (gw_dialog, SW_HIDE); is_showing = 0; }