CVS update by viteno MODIFIED: xemacs-builds/viteno ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/09 21:53:23
Modified: xemacs-builds/viteno package-index setup-packages.ini
Log:
Package database backup:
- mail-lib-1.72
- re-builder-1.01
Revision Changes Path
1.200 +28 -6 XEmacs/xemacs-builds/viteno/package-index
Index: package-index
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/package-index,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- package-index 2005/03/05 19:24:30 1.199
+++ package-index 2005/03/09 20:53:22 1.200
＠＠ -1,6 +1,28 ＠＠
;; Package Index file -- Do not edit manually.
;;;＠＠＠
(package-get-update-base-entry (quote
+(re-builder
+ (standards-version 1.1
+ version "1.01"
+ author-version "1.20"
+ date "2005-03-09"
+ build-date "2005-03-09"
+ maintainer "Aidan Kehoe <aidan(a)xemacs.org>"
+ distribution xemacs
+ priority medium
+ category "standard"
+ dump nil
+ description "Interactive development tool for regular expressions."
+ filename "re-builder-1.01-pkg.tar.gz"
+ md5sum "5f54b344bc3a87cdcc2392fc6ef2816a"
+ size 16802
+ provides (re-builder)
+ requires (fsf-compat)
+ type regular
+))
+))
+;;;＠＠＠
+(package-get-update-base-entry (quote
(latin-euro-standards
(standards-version 1.1
version "1.03"
＠＠ -778,19 +800,19 ＠＠
(package-get-update-base-entry (quote
(mail-lib
(standards-version 1.1
- version "1.71"
+ version "1.72"
author-version "No-Upstream-Ver"
- date "2005-02-28"
- build-date "2005-02-28"
+ date "2005-03-09"
+ build-date "2005-03-09"
maintainer "Simon Josefsson <simon(a)josefsson.org>"
distribution xemacs
priority medium
category "standard"
dump nil
description "Fundamental lisp files for providing email support."
- filename "mail-lib-1.71-pkg.tar.gz"
- md5sum "3f60b444abbc63dfbe7e74d34cee12f2"
- size 204321
+ filename "mail-lib-1.72-pkg.tar.gz"
+ md5sum "1b832c99d65a2b28e4cb49aa3282d98f"
+ size 210347
provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls tls)
requires (eterm xemacs-base fsf-compat sh-script ecrypto)
type regular
1.192 +6 -2 XEmacs/xemacs-builds/viteno/setup-packages.ini
Index: setup-packages.ini
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/setup-packages.ini,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- setup-packages.ini 2005/03/05 19:24:30 1.191
+++ setup-packages.ini 2005/03/09 20:53:22 1.192
＠＠ -332,8 +332,8 ＠＠
install: packages/jde-1.46-pkg.tar.gz 2403395
＠ mail-lib
-version: 1.71
-install: packages/mail-lib-1.71-pkg.tar.gz 204321
+version: 1.72
+install: packages/mail-lib-1.72-pkg.tar.gz 210347
＠ pcl-cvs
version: 1.66
＠＠ -454,5 +454,9 ＠＠
＠ xwem
version: 1.19
install: packages/xwem-1.19-pkg.tar.gz 615167
+
+＠ re-builder
+version: 1.01
+install: packages/re-builder-1.01-pkg.tar.gz 16802
# setup-packages.ini file ends here
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages/re-builder ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/09 21:23:20
Modified: packages/xemacs-packages/re-builder ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.2 +4 -0 XEmacs/packages/xemacs-packages/re-builder/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/re-builder/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 2005/03/04 20:29:56 1.1
+++ ChangeLog 2005/03/09 20:23:20 1.2
＠＠ -1,3 +1,7 ＠＠
+2005-03-09 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.01 released.
+
2005-02-27 Aidan Kehoe <kehoea(a)parhasard.net>
* Makefile: Created.
1.2 +1 -1 XEmacs/packages/xemacs-packages/re-builder/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/re-builder/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 2005/03/04 20:29:56 1.1
+++ Makefile 2005/03/09 20:23:20 1.2
＠＠ -20,7 +20,7 ＠＠
# The GNU Emacs CVS version of re-builder.el is canonical--we're
# distributing this to make it more convenient for XEmacs users.
-VERSION = 1.0
+VERSION = 1.01
AUTHOR_VERSION = 1.20
MAINTAINER = Aidan Kehoe <aidan(a)xemacs.org>
PACKAGE = re-builder
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages/mail-lib ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/09 21:23:01
Modified: packages/xemacs-packages/mail-lib ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.157 +4 -0 XEmacs/packages/xemacs-packages/mail-lib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog 2005/03/09 11:14:56 1.156
+++ ChangeLog 2005/03/09 20:23:00 1.157
＠＠ -1,3 +1,7 ＠＠
+2005-03-09 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.72 released.
+
2005-03-09 Steve Youngs <steve(a)sxemacs.org>
Support Firefox in browse-url.
1.86 +1 -1 XEmacs/packages/xemacs-packages/mail-lib/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/Makefile,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- Makefile 2005/02/28 21:33:11 1.85
+++ Makefile 2005/03/09 20:23:01 1.86
＠＠ -19,7 +19,7 ＠＠
# This XEmacs package contains independent single file lisp packages
-VERSION = 1.71
+VERSION = 1.72
AUTHOR_VERSION =
MAINTAINER = Simon Josefsson <simon(a)josefsson.org>
PACKAGE = mail-lib
- 1 participants
- 0 comments
Notice of CVSROOT-commit by viteno in CVSROOT
19 years, 9 months
CVS Monitor
CVS Monitor
Commit done by viteno
Wed Mar 9 21:22:10 CET 2005
Update of /pack/xemacscvs/CVSROOT
In directory sunsite.dk:/tmp/cvs-serv11417
Modified Files:
ChangeLog avail
Log Message:
Explicitly denote package maintenance.
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/03/09 21:19:26
Modified: packages/xemacs-packages Makefile
Log:
Add new package re-builder to the build.
Revision Changes Path
1.510 +5 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- ChangeLog 2005/03/07 21:49:16 1.509
+++ ChangeLog 2005/03/09 20:19:22 1.510
＠＠ -1,3 +1,8 ＠＠
+2005-03-09 Norbert Koch <viteno(a)xemacs.org>
+
+ * package-compile.el:
+ * xemacs-packages/Makefile (PACKAGES): New package re-builder.
+
2005-03-07 Norbert Koch <viteno(a)xemacs.org>
* Sumo packages released.
1.67 +1 -0 XEmacs/packages/package-compile.el
Index: package-compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-compile.el,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- package-compile.el 2005/02/15 21:53:52 1.66
+++ package-compile.el 2005/03/09 20:19:23 1.67
＠＠ -162,6 +162,7 ＠＠
("psgml" . "xemacs-packages")
("psgml-dtds" . "xemacs-packages")
("python-modes" . "xemacs-packages")
+ ("re-builder" . "xemacs-packages")
("reftex" . "xemacs-packages")
("riece" . "xemacs-packages")
("rmail" . "xemacs-packages")
1.37 +3 -3 XEmacs/packages/xemacs-packages/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile 2004/12/08 01:31:54 1.36
+++ Makefile 2005/03/09 20:19:26 1.37
＠＠ -50,9 +50,9 ＠＠
hm--html-menus hyperbole ibuffer idlwave igrep ilisp \
jde liece mailcrypt mew mh-e mine misc-games mmm-mode \
ocaml oo-browser pc pcl-cvs pcomplete perl-modes pgg \
- prog-modes ps-print psgml psgml-dtds python-modes reftex \
- riece rmail ruby-modes sasl scheme semantic sgml sieve \
- slider sml-mode sounds-au sounds-wav speedbar strokes \
+ prog-modes ps-print psgml psgml-dtds python-modes re-builder \
+ reftex riece rmail ruby-modes sasl scheme semantic sgml \
+ sieve slider sml-mode sounds-au sounds-wav speedbar strokes \
supercite textools time tm tooltalk tpu tramp \
vc vc-cc vhdl view-process viper vm w3 x-symbol \
xslide xslt-process xwem zenirc
- 1 participants
- 0 comments
CVS update by crestani (Fix bug in KKCC marking of unions.) MODIFIED: xemacs/src ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: crestani
Date: 05/03/09 20:47:43
Modified: xemacs/src ChangeLog redisplay.h
Log:
Subject: Fix bug in KKCC marking of unions.
2005-03-02 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de>
* redisplay.h (struct rune): make type field an int, to fix
KKCC marking of unions.
Revision Changes Path
1.803 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -r1.802 -r1.803
--- ChangeLog 2005/03/09 04:59:25 1.802
+++ ChangeLog 2005/03/09 19:47:40 1.803
＠＠ -1,3 +1,8 ＠＠
+2005-03-02 Marcus Crestani <crestani(a)informatik.uni-tuebingen.de>
+
+ * redisplay.h (struct rune): make type field an int, to fix
+ KKCC marking of unions.
+
2005-01-13 Stephen J. Turnbull <stephen(a)xemacs.org>
* regex.c (re_match_2_internal):
1.23 +1 -1 XEmacs/xemacs/src/redisplay.h
Index: redisplay.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- redisplay.h 2005/01/26 10:33:42 1.22
+++ redisplay.h 2005/03/09 19:47:41 1.23
＠＠ -144,7 +144,7 ＠＠
unsigned char cursor_type; /* is this rune covered by the cursor? */
- unsigned char type; /* type of rune object */
+ unsigned int type; /* type of rune object */
/* We used to do bitfields here, but if I
(JV) count correctly that doesn't matter
for the size of the structure. All the bit
- 1 participants
- 0 comments
CVS update by simon MODIFIED: packages/xemacs-packages/mail-lib, browse-url-xemacs.el ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: simon
Date: 05/03/09 12:15:00
Modified: packages/xemacs-packages/mail-lib browse-url.el
browse-url-xemacs.el ChangeLog
Log:
2005-03-09 Steve Youngs <steve(a)sxemacs.org>
Support Firefox in browse-url.
* browse-url.el (browse-url-browser-function): Add firefox.
(browse-url-firefox-program): New.
(browse-url-firefox-arguments): New.
(browse-url-firefox-startup-arguments): New.
(browse-url-firefox-new-window-is-tab): New.
(browse-url-default-browser): Add firefox.
(browse-url-firefox): New.
(browse-url-firefox-sentinel): New.
* browse-url-xemacs.el: Add menu item for Firefox.
Revision Changes Path
1.36 +94 -3 XEmacs/packages/xemacs-packages/mail-lib/browse-url.el
Index: browse-url.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/browse-url.el,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- browse-url.el 2005/02/26 19:09:55 1.35
+++ browse-url.el 2005/03/09 11:14:56 1.36
＠＠ -40,6 +40,7 ＠＠
;; Function Browser Earliest version
;; browse-url-mozilla Mozilla Don't know
+;; browse-url-firefox Firefox Don't know (1st tried with 1.0.1)
;; browse-url-galeon Galeon Don't know
;; browse-url-epiphany Epiphany Don't know
;; browse-url-netscape Netscape 1.1b1
＠＠ -266,6 +267,7 ＠＠
(function-item :tag "W3M in another Emacs via `gnudoit'"
:value browse-url-w3-gnudoit)
(function-item :tag "Mozilla" :value browse-url-mozilla)
+ (function-item :tag "Firefox" :value browse-url-firefox)
(function-item :tag "Galeon" :value browse-url-galeon)
(function-item :tag "Epiphany" :value browse-url-epiphany)
(function-item :tag "Netscape" :value browse-url-netscape)
＠＠ -348,6 +350,24 ＠＠
:group 'browse-url)
;;;###autoload
+(defcustom browse-url-firefox-program "firefox"
+ "*The name by which to invoke Firefox."
+ :type 'string
+ :group 'browse-url)
+
+(defcustom browse-url-firefox-arguments nil
+ "*A list of strings to pass to Firefox as arguments."
+ :type '(repeat (string :tag "Argument"))
+ :group 'browse-url)
+
+(defcustom browse-url-firefox-startup-arguments browse-url-firefox-arguments
+ "*A list of strings to pass to Firefox when it starts up.
+Defaults to the value of `browse-url-firefox-arguments' at the time
+`browse-url' is loaded."
+ :type '(repeat (string :tag "Argument"))
+ :group 'browse-url)
+
+;;;###autoload
(defcustom browse-url-galeon-program "galeon"
"*The name by which to invoke Galeon."
:type 'string
＠＠ -389,6 +409,13 ＠＠
:type 'boolean
:group 'browse-url)
+(defcustom browse-url-firefox-new-window-is-tab nil
+ "*Whether to open up new windows in a tab or a new window.
+If non-nil, then open the URL in a new tab rather than a new window if
+`browse-url-firefox' is asked to open it in a new window."
+ :type 'boolean
+ :group 'browse-url)
+
(defcustom browse-url-galeon-new-window-is-tab nil
"*Whether to open up new windows in a tab or a new window.
If non-nil, then open the URL in a new tab rather than a new window if
＠＠ -840,13 +867,14 ＠＠
When called non-interactively, optional second argument NEW-WINDOW is
used instead of `browse-url-new-window-flag'.
-The order attempted is emacs-w3m, gnome-moz-remote, Mozilla, Galeon,
-Konqueror, Netscape, Opera, Mosaic, IXI Mosaic, Lynx in an xterm, MMM,
-and then W3."
+The order attempted is emacs-w3m, gnome-moz-remote, Mozilla, Firefox,
+Galeon, Konqueror, Netscape, Opera, Mosaic, IXI Mosaic, Lynx in an
+xterm, MMM, and then W3."
(apply
(cond
((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
+ ((executable-find browse-url-firefox-program) 'browse-url-firefox)
((executable-find browse-url-galeon-program) 'browse-url-galeon)
((executable-find browse-url-kde-program) 'browse-url-kde)
((executable-find browse-url-netscape-program) 'browse-url-netscape)
＠＠ -995,6 +1023,69 ＠＠
(apply 'start-process (concat "mozilla " url) nil
browse-url-mozilla-program
(append browse-url-mozilla-startup-arguments (list url))))))
+
+;;;###autoload
+(defun browse-url-firefox (url &optional new-window)
+ "Ask the Firefox WWW browser to load URL.
+Default to the URL around or before point. The strings in variable
+`browse-url-firefox-arguments' are also passed to Firefox.
+
+When called interactively, if variable `browse-url-new-window-flag' is
+non-nil, load the document in a new Firefox window, otherwise use a
+random existing one. A non-nil interactive prefix argument reverses
+the effect of `browse-url-new-window-flag'.
+
+If `browse-url-firefox-new-window-is-tab' is non-nil, then whenever a
+document would otherwise be loaded in a new window, it is loaded in a
+new tab in an existing window instead.
+
+When called non-interactively, optional second argument NEW-WINDOW is
+used instead of `browse-url-new-window-flag'.
+
+On MS-Windows systems the optional `new-window' parameter is ignored.
+Firefox for Windows does not support the \"-remote\" command line
+parameter. Therefore the `browse-url-new-window-flag',
+`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab'
+are ignored as well. Firefox on Windows will always open the
+requested URL in a new window."
+ (interactive (browse-url-interactive-arg "URL: "))
+ ;; URL encode any `confusing' characters in the URL. This needs to
+ ;; include at least commas; presumably also close parens.
+ (while (string-match "[,)]" url)
+ (setq url (replace-match
+ (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
+ (let* ((process-environment (browse-url-process-environment))
+ (process
+ (apply 'start-process
+ (concat "firefox " url) nil
+ browse-url-firefox-program
+ (append
+ browse-url-firefox-arguments
+ (if (or (featurep 'dos-w32)
+ (string-match "win32" system-configuration))
+ (list url)
+ (list "-remote"
+ (concat "openURL("
+ url
+ (if (browse-url-maybe-new-window
+ new-window)
+ (if browse-url-firefox-new-window-is-tab
+ ",new-tab"
+ ",new-window"))
+ ")")))))))
+ (set-process-sentinel process
+ `(lambda (process change)
+ (browse-url-firefox-sentinel process ,url)))))
+
+(defun browse-url-firefox-sentinel (process url)
+ "Handle a change to the process communicating with Firefox."
+ (or (eq (process-exit-status process) 0)
+ (let* ((process-environment (browse-url-process-environment)))
+ ;; Firefox is not running - start it
+ (message "Starting Firefox...")
+ (apply 'start-process (concat "firefox " url) nil
+ browse-url-firefox-program
+ (append browse-url-firefox-startup-arguments (list url))))))
;;;###autoload
(defun browse-url-galeon (url &optional new-window)
1.5 +7 -0 XEmacs/packages/xemacs-packages/mail-lib/browse-url-xemacs.el
Index: browse-url-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/browse-url-xemacs.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- browse-url-xemacs.el 2003/01/05 20:58:58 1.4
+++ browse-url-xemacs.el 2005/03/09 11:14:56 1.5
＠＠ -108,6 +108,13 ＠＠
:selected (eq browse-url-browser-function 'browse-url-mozilla)
:active (and (fboundp 'browse-url-mozilla)
(executable-find browse-url-mozilla-program))]
+ ["%_Firefox"
+ (customize-set-variable 'browse-url-browser-function
+ 'browse-url-firefox)
+ :style radio
+ :selected (eq browse-url-browser-function 'browse-url-firefox)
+ :active (and (fboundp 'browse-url-firefox)
+ (executable-find browse-url-firefox-program))]
["G%_aleon"
(customize-set-variable 'browse-url-browser-function
'browse-url-galeon)
1.156 +15 -0 XEmacs/packages/xemacs-packages/mail-lib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 2005/02/28 21:33:11 1.155
+++ ChangeLog 2005/03/09 11:14:56 1.156
＠＠ -1,3 +1,18 ＠＠
+2005-03-09 Steve Youngs <steve(a)sxemacs.org>
+
+ Support Firefox in browse-url.
+
+ * browse-url.el (browse-url-browser-function): Add firefox.
+ (browse-url-firefox-program): New.
+ (browse-url-firefox-arguments): New.
+ (browse-url-firefox-startup-arguments): New.
+ (browse-url-firefox-new-window-is-tab): New.
+ (browse-url-default-browser): Add firefox.
+ (browse-url-firefox): New.
+ (browse-url-firefox-sentinel): New.
+
+ * browse-url-xemacs.el: Add menu item for Firefox.
+
2005-02-28 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.71 released.
- 1 participants
- 0 comments
CVS update by stephent MODIFIED: xemacs/src ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/03/09 11:53:47
Modified: xemacs/src Tag: sjt-xft ChangeLog objects-x.c
Log:
one more quick fix
Revision Changes Path
No revision
No revision
1.758.2.19 +2 -1 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.18
retrieving revision 1.758.2.19
diff -u -r1.758.2.18 -r1.758.2.19
--- ChangeLog 2005/03/09 09:30:36 1.758.2.18
+++ ChangeLog 2005/03/09 10:53:20 1.758.2.19
＠＠ -1,7 +1,8 ＠＠
2005-03-09 Stephen J. Turnbull <stephen(a)xemacs.org>
* objects-x.c (x_font_instance_truename): Try to fix XListFonts
- crash by not hand random Xft results to core Xlib functions.
+ crash by not handing random Xft results to core Xlib functions.
+ Replace bizarre gymnastics with simple FcNameUnparse.
2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
1.26.2.13 +21 -2 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.26.2.12
retrieving revision 1.26.2.13
diff -u -r1.26.2.12 -r1.26.2.13
--- objects-x.c 2005/03/09 09:30:49 1.26.2.12
+++ objects-x.c 2005/03/09 10:53:31 1.26.2.13
＠＠ -718,7 +718,7 ＠＠
Display *dpy = DEVICE_X_DISPLAY (d);
Extbyte *nameext;
char* xlfd;
-#ifdef USE_XFT
+#if defined(USE_XFT) && defined(DO_FORMER_BIZARRE_GYMNASTICS)
FcChar8* fcfont;
#endif
＠＠ -726,6 +726,24 ＠＠
/* First, try an Xft font. */
if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_XFTFONT (f))
{
+#ifndef DO_FORMER_BIZARRE_GYMNASTICS
+ /* The font is already open, we should just unparse. */
+ FcChar8 *res = FcNameUnparse (FONT_INSTANCE_X_XFTFONT (f)->pattern);
+ if (res)
+ {
+ FONT_INSTANCE_TRUENAME (f) = make_string (res, strlen (res));
+ free (res);
+ return FONT_INSTANCE_TRUENAME (f);
+ }
+ else
+ {
+ maybe_signal_error (Qgui_error,
+ "Couldn't unparse Xft font to truename",
+ Qnil, Qfont, errb);
+ /* used to return Qnil here */
+ }
+#else
+ /* FORMER BIZARRE GYMNASTICS */
int core;
FcPattern *pat = FONT_INSTANCE_X_XFTFONT (f)->pattern;
FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &fcfont);
＠＠ -781,8 +799,9 ＠＠
Qnil, Qfont, errb);
/* used to return Qnil here */
}
+#endif /* DO_FORMER_BIZARRE_GYMNASTICS */
}
-#endif
+#endif /* USE_XFT */
/* OK, fall back to core font. */
if (NILP (FONT_INSTANCE_TRUENAME (f))
- 1 participants
- 0 comments
CVS update by stephent MODIFIED: xemacs/src ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/03/09 10:31:05
Modified: xemacs/src Tag: sjt-xft ChangeLog objects-x.c
Log:
Try to fix truename_via_XListFonts crash again
<87fyz5yxpj.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
No revision
No revision
1.64.2.8 +4 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.64.2.7
retrieving revision 1.64.2.8
diff -u -r1.64.2.7 -r1.64.2.8
--- ChangeLog 2005/03/09 06:31:09 1.64.2.7
+++ ChangeLog 2005/03/09 09:30:26 1.64.2.8
＠＠ -1,3 +1,7 ＠＠
+2005-03-09 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * xlwtabs.c (TabsGeometryManager): Fix "fat fingers" mistake.
+
2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
* lwlib-Xlw.c (build_tabs_in_widget): Correctly disable geometry
1.4.2.10 +1 -1 XEmacs/xemacs/lwlib/xlwtabs.c
Index: xlwtabs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -u -r1.4.2.9 -r1.4.2.10
--- xlwtabs.c 2005/03/09 06:31:10 1.4.2.9
+++ xlwtabs.c 2005/03/09 09:30:26 1.4.2.10
＠＠ -1143,7 +1143,7 ＠＠
~((reply->border_width == tab->core.border_width
? CWBorderWidth : 0)
|(reply->width == tab->core.width ? CWWidth : 0)
- |(reply->height == tab->core.height ? CWHeight : 0))
+ |(reply->height == tab->core.height ? CWHeight : 0));
return XtGeometryAlmost ;
}
No revision
No revision
1.758.2.18 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.17
retrieving revision 1.758.2.18
diff -u -r1.758.2.17 -r1.758.2.18
--- ChangeLog 2005/03/09 06:31:22 1.758.2.17
+++ ChangeLog 2005/03/09 09:30:36 1.758.2.18
＠＠ -1,3 +1,8 ＠＠
+2005-03-09 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x.c (x_font_instance_truename): Try to fix XListFonts
+ crash by not hand random Xft results to core Xlib functions.
+
2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
* objects-x-impl.h: Include lwlib-fonts.h
1.26.2.12 +25 -8 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.26.2.11
retrieving revision 1.26.2.12
diff -u -r1.26.2.11 -r1.26.2.12
--- objects-x.c 2005/03/09 06:31:42 1.26.2.11
+++ objects-x.c 2005/03/09 09:30:49 1.26.2.12
＠＠ -711,7 +711,6 ＠＠
return Qnil;
}
-/* #### The logic in this function seems fxxked. */
static Lisp_Object
x_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior errb)
{
＠＠ -725,14 +724,17 ＠＠
#ifdef USE_XFT
/* First, try an Xft font. */
- if (NILP (FONT_INSTANCE_TRUENAME (f)))
+ if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_XFTFONT (f))
{
int core;
FcPattern *pat = FONT_INSTANCE_X_XFTFONT (f)->pattern;
FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &fcfont);
FcResult res_core = FcPatternGetBool (pat, XFT_CORE, 0, &core);
- if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch)
+ /* #### boy this is broken!! FIXME!!
+ Probably only makes sense in Xft v1. */
+ if (res_xlfd == FcResultNoMatch || res_core == FcResultNoMatch || !core)
+ /* #### should we test fcfont for something here? if so, what? */
{
/* we've got an Xft font! */
FcChar8 *res = FcNameUnparse (pat);
＠＠ -749,20 +751,35 ＠＠
return FONT_INSTANCE_TRUENAME (f);
}
else
- { /* Now we're f.... */
+ {
maybe_signal_error (Qgui_error,
- "Couldn't determine font truename",
+ "Couldn't unparse Xft font to truename",
Qnil, Qfont, errb);
- return Qnil;
+ /* used to return Qnil here */
}
}
- else
+ else if (res_xlfd == FcResultMatch && res_core == FcResultMatch)
{
- /* #### Why isn't this appropriate for core fonts, too? */
FONT_INSTANCE_TRUENAME (f) =
build_ext_string (truename_via_XListFonts (dpy,
(Extbyte *) &fcfont[0]),
Qx_font_name_encoding);
+ return FONT_INSTANCE_TRUENAME (f);
+ }
+ else if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch)
+ { /* Now we're f.... */
+ maybe_signal_error (Qgui_error,
+ "Xft TypeMismatch while determining font truename",
+ Qnil, Qfont, errb);
+ /* used to return Qnil here */
+ }
+ /* we shouldn't have to worry about FcResultNoId */
+ else
+ { /* Now we're f.... */
+ maybe_signal_error (Qgui_error,
+ "Xft bogus status while determining font truename",
+ Qnil, Qfont, errb);
+ /* used to return Qnil here */
}
}
#endif
- 1 participants
- 0 comments
CVS update by stephent MODIFIED: xemacs/src, objects-x-impl.h ...
19 years, 9 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/03/09 07:32:05
Modified: xemacs/src Tag: sjt-xft ChangeLog frame-x.c glyphs-x.c
objects-x-impl.h objects-x.c redisplay-x.c
Log:
tab geometry and uninited FONT_INSTANCE_X_FONT fixes
<87r7ipe3lb.fsf(a)tleepslib.sk.tsukuba.ac.jp>
Revision Changes Path
No revision
No revision
1.64.2.7 +4 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.64.2.6
retrieving revision 1.64.2.7
diff -u -r1.64.2.6 -r1.64.2.7
--- ChangeLog 2005/03/07 02:25:54 1.64.2.6
+++ ChangeLog 2005/03/09 06:31:09 1.64.2.7
＠＠ -1,5 +1,9 ＠＠
2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
+ * lwlib-Xlw.c (build_tabs_in_widget): Correctly disable geometry
+ negotiation for tab children.
+ (xlw_create_tab_control): Don't set nonexistent resizable resource.
+
* lwlib-Xaw.c (debug_gauge): Fix and suppress gauge debug message.
* xlwtabs.c (TabsGeometryManager): Suppress "kludging" message, too.
1.13.2.1 +22 -8 XEmacs/xemacs/lwlib/lwlib-Xlw.c
Index: lwlib-Xlw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xlw.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- lwlib-Xlw.c 2004/09/20 19:19:16 1.13
+++ lwlib-Xlw.c 2005/03/09 06:31:10 1.13.2.1
＠＠ -319,13 +319,21 ＠＠
#ifdef LWLIB_TABS_LUCID
/* tab control
- lwlib is such an incredible hairy crock. I just cannot believe
+ [[ lwlib is such an incredible hairy crock. I just cannot believe
it! There are random dependencies between functions, there is a
total lack of genericity, even though it initially appears to be
generic. It should all be junked and begun again. Building tabs are
an example - in theory we should be able to reuse a lot of the
general stuff because we want to put labels of whatever toolkit we
- are using in the tab. Instead we have to hack it by hand. */
+ are using in the tab. Instead we have to hack it by hand. ]]
+ While lwlib is a hairy crock, whoever wrote that seems to misunderstand
+ Falk's tab control widget. The tab control widget has *two* kinds of
+ children: *widgets*, which all occupy a *single* pane below the row of
+ tabs---this is where the labels created in build_tabs_in_widget go, and
+ *gadgets*, the tabs themselves, which do *not* draw themselves, but
+ rather are drawn by the control. In fact, in XEmacs the true widget
+ children are *never* visible! So this case is not a problem in the
+ design of lwlib, but rather of Falk's widget. -- sjt */
static void
xlw_tab_control_callback (Widget w, XtPointer client_data, XtPointer call_data)
{
＠＠ -375,9 +383,8 ＠＠
widget_value* val = instance->info->val;
XtSetArg (al [ac], XtNsensitive, val->enabled); ac++;
- XtSetArg (al [ac], XtNmappedWhenManaged, FALSE); ac++;
+ XtSetArg (al [ac], XtNmappedWhenManaged, False); ac++;
XtSetArg (al [ac], XtNorientation, XtorientHorizontal); ac++;
- XtSetArg (al [ac], XtNresizable, False); ac++;
/* add any args the user supplied for creation time */
lw_add_value_args_to_args (val, al, &ac);
＠＠ -396,15 +403,22 ＠＠
Widget widget, widget_value* val)
{
widget_value* cur = val;
+ Arg al[1];
+
+ /* Children are always invisible, don't permit resizing. */
+ XtSetArg (al[0], XtNresizable, False);
+
for (cur = val; cur; cur = cur->next)
{
if (cur->value)
{
+ Widget w;
#ifdef LWLIB_WIDGETS_MOTIF
- xm_create_label (widget, cur);
+ w = xm_create_label (widget, cur);
#else
- xaw_create_label (widget, cur);
+ w = xaw_create_label (widget, cur);
#endif
+ XtSetValues (w, al, 1);
}
cur->change = NO_CHANGE;
}
＠＠ -465,8 +479,8 ＠＠
Widget clip = 0;
widget_value* val = instance->info->val;
- XtSetArg (al [ac], XtNmappedWhenManaged, FALSE); ac++;
- XtSetArg (al [ac], XtNsensitive, TRUE); ac++;
+ XtSetArg (al [ac], XtNmappedWhenManaged, False); ac++;
+ XtSetArg (al [ac], XtNsensitive, True); ac++;
/* add any args the user supplied for creation time */
lw_add_value_args_to_args (val, al, &ac);
1.4.2.9 +13 -3 XEmacs/xemacs/lwlib/xlwtabs.c
Index: xlwtabs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -r1.4.2.8 -r1.4.2.9
--- xlwtabs.c 2005/03/07 02:25:54 1.4.2.8
+++ xlwtabs.c 2005/03/09 06:31:10 1.4.2.9
＠＠ -909,10 +909,12 ＠＠
static int debug_mask = 1;
/* Position request cannot be satisfied, so if tabs are not resizable,
- no request can be satisfied: return XGeometryNo. */
+ no nontrivial request can be satisfied: return XGeometryNo. */
if (!constraint->tabs.resizable)
return XtGeometryNo;
+ fprintf (stderr, "Urk! label is resizable!\n");
+
/* Assume we will refuse these; toggle iff we accept them.
Reply won't specify any fields not in the request. */
reply->request_mode = request->request_mode;
＠＠ -943,7 +945,10 ＠＠
reply->width == tab->core.width &&
reply->height == tab->core.height &&
reply->border_width == tab->core.border_width)
- return best_offer;
+ {
+ reply->request_mode &= ~(CWWidth | CWHeight | CWBorderWidth);
+ return best_offer;
+ }
#ifndef DONT_DEBUG_REQUESTS
#define DBG_REQUEST_PRINT(name,field,size) \
＠＠ -1131,9 +1136,14 ＠＠
/* Cannot grant child's request. Describe what we *can* do
* and return counter-offer.
*/
+ control->tabs.needs_layout = False;
reply->width = aw - 2 * request->border_width ;
reply->height = ah - 2 * request->border_width ;
- control->tabs.needs_layout = False;
+ reply->request_mode &=
+ ~((reply->border_width == tab->core.border_width
+ ? CWBorderWidth : 0)
+ |(reply->width == tab->core.width ? CWWidth : 0)
+ |(reply->height == tab->core.height ? CWHeight : 0))
return XtGeometryAlmost ;
}
No revision
No revision
1.758.2.17 +13 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.758.2.16
retrieving revision 1.758.2.17
diff -u -r1.758.2.16 -r1.758.2.17
--- ChangeLog 2005/03/05 18:09:25 1.758.2.16
+++ ChangeLog 2005/03/09 06:31:22 1.758.2.17
＠＠ -1,3 +1,16 ＠＠
+2005-03-07 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * objects-x-impl.h: Include lwlib-fonts.h
+
+ * objects-x.c (x_font_instance_truename):
+ * glyphs-x.c (update_widget_face):
+ * frame-x.c (x_update_frame_external_traits):
+ Use the correct variant of FONT_INSTANCE_{X,XFT}_FONT.
+ Protect against access of uninitialized objects.
+
+ * redisplay-x.c (x_get_gc): Fix typo.
+ * (x_output_string): Add comments, clarify logic slightly.
+
2005-03-05 Stephen J. Turnbull <stephen(a)xemacs.org>
Refactor language/charset checking in Xft.
1.68.2.4 +20 -7 XEmacs/xemacs/src/frame-x.c
Index: frame-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v
retrieving revision 1.68.2.3
retrieving revision 1.68.2.4
diff -u -r1.68.2.3 -r1.68.2.4
--- frame-x.c 2005/03/05 18:09:28 1.68.2.3
+++ frame-x.c 2005/03/09 06:31:39 1.68.2.4
＠＠ -2674,17 +2674,30 ＠＠
}
else if (EQ (name, Qfont))
{
- /* #### what to do about Xft? It looks like the font is used to
- compute cell size for computing frame pixel dimensions (see call
- to EmacsFrameRecomputeCellSize() below); maybe we should make
- those directly members of the frame, not the font itself. -- sjt */
Lisp_Object font = FACE_FONT (Vdefault_face, frame, Vcharset_ascii);
+ /* #### what to do about Xft? I don't think the font is actually used
+ to compute cell size for computing frame pixel dimensions (see call
+ to EmacsFrameRecomputeCellSize() below); where is it used? -- sjt
+ What does XtSetValues() do if that resource isn't present? */
if (!EQ (font, Vthe_null_font_instance))
{
- XtSetArg (al[ac], XtNfont,
- (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)));
- ac++;
+ if (0)
+ ;
+#ifdef USE_XFT
+ else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)))
+ {
+ XtSetArg (al[ac], XtNxftFont,
+ (void *) FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)));
+ ac++;
+ }
+#endif
+ else if (FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)))
+ {
+ XtSetArg (al[ac], XtNfont,
+ (void *) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)));
+ ac++;
+ }
}
}
else
1.80.2.5 +24 -12 XEmacs/xemacs/src/glyphs-x.c
Index: glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.80.2.4
retrieving revision 1.80.2.5
diff -u -r1.80.2.4 -r1.80.2.5
--- glyphs-x.c 2005/02/01 15:46:55 1.80.2.4
+++ glyphs-x.c 2005/03/09 06:31:40 1.80.2.5
＠＠ -2326,21 +2326,33 ＠＠
lw_add_widget_value_arg (wv, XtNbackground, bcolor.pixel);
{
- /* #### What to do about Xft? */
Lisp_Object face = IMAGE_INSTANCE_WIDGET_FACE (ii);
- XFontStruct *fs =
- FONT_INSTANCE_X_FONT (XFONT_INSTANCE (query_string_font
- (IMAGE_INSTANCE_WIDGET_TEXT (ii),
- face,
- domain)));
-#ifdef LWLIB_WIDGETS_MOTIF
- fontList = XmFontListCreate (fs, XmSTRING_DEFAULT_CHARSET);
- lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal)fontList);
+ Lisp_Font_Instance *fi =
+ XFONT_INSTANCE (query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (ii),
+ face,
+ domain));
+ XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
+#ifdef USE_XFT
+ XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi);
+
+ if (rf)
+ {
+ /* #### What to do about Motif? */
+ lw_add_widget_value_arg (wv, XtNxftFont, (XtArgVal) rf);
+ }
#endif
- /* #### This is an unacceptable hack. */
+
if (fs)
- lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
- else
+ {
+#ifdef LWLIB_WIDGETS_MOTIF
+ fontList = XmFontListCreate (fs, XmSTRING_DEFAULT_CHARSET);
+ lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal) fontList);
+#endif
+ lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
+ }
+
+ /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
+ if (!rf && !fs)
warn_when_safe_lispobj
(intern ("xft"), Qdebug,
Fcons (build_string ("missing font in update_widget_face"),
1.1.6.2 +4 -0 XEmacs/xemacs/src/objects-x-impl.h
Index: objects-x-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x-impl.h,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -r1.1.6.1 -r1.1.6.2
--- objects-x-impl.h 2004/11/25 12:44:15 1.1.6.1
+++ objects-x-impl.h 2005/03/09 06:31:41 1.1.6.2
＠＠ -29,6 +29,10 ＠＠
#include "objects-impl.h"
#include "objects-x.h"
+#ifdef USE_XFT
+/* for resource name definitions, etc */
+#include "../lwlib/lwlib-fonts.h"
+#endif
#ifdef HAVE_X_WINDOWS
1.26.2.11 +7 -7 XEmacs/xemacs/src/objects-x.c
Index: objects-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.11
diff -u -r1.26.2.10 -r1.26.2.11
--- objects-x.c 2005/03/05 18:09:29 1.26.2.10
+++ objects-x.c 2005/03/09 06:31:42 1.26.2.11
＠＠ -237,12 +237,11 ＠＠
{
/* yes, this has been known to happen. */
XFreeFont (dpy, fs);
+ fs = NULL;
maybe_signal_error (Qgui_error, "X font is too small", f->name, Qfont,
errb);
if (!rf)
return 0;
- else
- fs = NULL;
}
/* Now that we're sure that we will succeed, we can allocate data without
＠＠ -274,17 +273,17 ＠＠
XftTextExtents8 (dpy, rf, test_string8, len, &glyphinfo);
/* #### maybe should be glyphinfo.xOff - glyphinfo.x? */
- f->width = glyphinfo.width/len + 1;
+ f->width = (2*glyphinfo.width + len)/(2*len);
}
f->height = rf->height;
- /* #### Is this right? See comment on proportional_p below. */
- f->proportional_p = 1; /* we can't recognize monospaced fonts! */
+ f->proportional_p = 1; /* we can't recognize monospaced fonts! */
if (debug_xft > 0)
stderr_out ("initialized metrics ascent %d descent %d width %d height %d\n",
f->ascent, f->descent, f->width, f->height);
if (debug_xft > 2) /* we also output on initialization of any font below */
stderr_out ("initialized Xft font %s\n", extname);
+ fs = NULL; /* we don' need no steenkin' X font */
}
else
{
＠＠ -294,7 +293,7 ＠＠
#endif
FONT_INSTANCE_X_FONT (f) = fs;
- if (fs && !rf) /* fs && rf is unlikely, but play it safe */
+ if (fs)
/* Have to use a core font, initialize font info from it. */
{
f->ascent = fs->ascent;
＠＠ -769,7 +768,8 ＠＠
#endif
/* OK, fall back to core font. */
- if (NILP (FONT_INSTANCE_TRUENAME (f)))
+ if (NILP (FONT_INSTANCE_TRUENAME (f))
+ && FONT_INSTANCE_X_FONT (f))
{
nameext = &xlfd[0];
LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding);
1.39.2.4 +16 -16 XEmacs/xemacs/src/redisplay-x.c
Index: redisplay-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v
retrieving revision 1.39.2.3
retrieving revision 1.39.2.4
diff -u -r1.39.2.3 -r1.39.2.4
--- redisplay-x.c 2005/02/01 15:46:57 1.39.2.3
+++ redisplay-x.c 2005/03/09 06:31:42 1.39.2.4
＠＠ -800,7 +800,7 ＠＠
/* evil kludge! */
if (!NILP (fg) && !COLOR_INSTANCEP (fg) && !INTP (fg))
{
- /* #### I fixed once case where this was getting it. It was a
+ /* #### I fixed one case where this was getting hit. It was a
bad macro expansion (compiler bug). */
stderr_out ("Help! x_get_gc got a bogus fg value! fg = ");
debug_print (fg);
＠＠ -931,7 +931,8 ＠＠
int i;
struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
- int use_x_font = 1;
+ int use_x_font = 1; /* #### bogus!!
+ The logic of this function needs review! */
#ifdef USE_XFT
Colormap cmap = DEVICE_X_COLORMAP (d);
Visual *visual = DEVICE_X_VISUAL (d);
＠＠ -1214,19 +1215,18 ＠＠
{
int upos, uthick;
unsigned long upos_ext, uthick_ext;
- XFontStruct *xfont = FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font));
+ XFontStruct *fs =
+ use_x_font ? FONT_INSTANCE_X_FONT (XFONT_INSTANCE (font)) : 0;
/* #### the logic of the next two may be suboptimal: we may want
to use the POSITION and/or THICKNESS information with Xft */
- if (!use_x_font
- || !XGetFontProperty (xfont, XA_UNDERLINE_POSITION, &upos_ext))
- upos = dl->descent / 2;
- else
+ if (fs && XGetFontProperty (fs, XA_UNDERLINE_POSITION, &upos_ext))
upos = (int) upos_ext;
- if (!use_x_font
- || !XGetFontProperty (xfont, XA_UNDERLINE_THICKNESS, &uthick_ext))
- uthick = 1;
else
+ upos = dl->descent / 2;
+ if (fs && XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext))
uthick = (int) uthick_ext;
+ else
+ uthick = 1;
if (dl->ypos + upos < dl->ypos + dl->descent - dl->clip)
{
if (dl->ypos + upos + uthick > dl->ypos + dl->descent - dl->clip)
＠＠ -1249,7 +1249,7 ＠＠
{
int ascent, descent, upos, uthick;
unsigned long ascent_ext, descent_ext, uthick_ext;
- XFontStruct *xf = FONT_INSTANCE_X_FONT (fi);
+ XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
if (!use_x_font)
{
＠＠ -1259,15 +1259,15 ＠＠
}
else
{
- if (!XGetFontProperty (xf, XA_STRIKEOUT_ASCENT, &ascent_ext))
- ascent = xf->ascent;
+ if (!XGetFontProperty (fs, XA_STRIKEOUT_ASCENT, &ascent_ext))
+ ascent = fs->ascent;
else
ascent = (int) ascent_ext;
- if (!XGetFontProperty (xf, XA_STRIKEOUT_DESCENT, &descent_ext))
- descent = xf->descent;
+ if (!XGetFontProperty (fs, XA_STRIKEOUT_DESCENT, &descent_ext))
+ descent = fs->descent;
else
descent = (int) descent_ext;
- if (!XGetFontProperty (xf, XA_UNDERLINE_THICKNESS, &uthick_ext))
+ if (!XGetFontProperty (fs, XA_UNDERLINE_THICKNESS, &uthick_ext))
uthick = 1;
else
uthick = (int) uthick_ext;
- 1 participants
- 0 comments