Mercurial > hg > xemacs-beta
view lisp/mule/kinsoku.el @ 5043:d0c14ea98592
various frame-geometry fixes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-15 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameResize):
* console-msw-impl.h:
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT):
* device-tty.c:
* device-tty.c (tty_asynch_device_change):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* faces.c (Fface_list):
* faces.h:
* frame-gtk.c:
* frame-gtk.c (gtk_set_initial_frame_size):
* frame-gtk.c (gtk_set_frame_size):
* frame-msw.c:
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_frame_size):
* frame-msw.c (mswindows_size_frame_internal):
* frame-msw.c (msprinter_init_frame_3):
* frame.c:
* frame.c (enum):
* frame.c (Fmake_frame):
* frame.c (adjust_frame_size):
* frame.c (store_minibuf_frame_prop):
* frame.c (Fframe_property):
* frame.c (Fframe_properties):
* frame.c (Fframe_displayable_pixel_height):
* frame.c (Fframe_displayable_pixel_width):
* frame.c (internal_set_frame_size):
* frame.c (Fset_frame_height):
* frame.c (Fset_frame_pixel_height):
* frame.c (Fset_frame_displayable_pixel_height):
* frame.c (Fset_frame_width):
* frame.c (Fset_frame_pixel_width):
* frame.c (Fset_frame_displayable_pixel_width):
* frame.c (Fset_frame_size):
* frame.c (Fset_frame_pixel_size):
* frame.c (Fset_frame_displayable_pixel_size):
* frame.c (frame_conversion_internal_1):
* frame.c (get_frame_displayable_pixel_size):
* frame.c (change_frame_size_1):
* frame.c (change_frame_size):
* frame.c (generate_title_string):
* frame.h:
* gtk-xemacs.c:
* gtk-xemacs.c (gtk_xemacs_size_request):
* gtk-xemacs.c (gtk_xemacs_size_allocate):
* gtk-xemacs.c (gtk_xemacs_paint):
* gutter.c:
* gutter.c (update_gutter_geometry):
* redisplay.c (end_hold_frame_size_changes):
* redisplay.c (redisplay_frame):
* toolbar.c:
* toolbar.c (update_frame_toolbars_geometry):
* window.c:
* window.c (frame_pixsize_valid_p):
* window.c (check_frame_size):
Various fixes to frame geometry to make it a bit easier to understand
and fix some bugs.
1. IMPORTANT: Some renamings. Will need to be applied carefully to
the carbon repository, in the following order:
-- pixel_to_char_size -> pixel_to_frame_unit_size
-- char_to_pixel_size -> frame_unit_to_pixel_size
-- pixel_to_real_char_size -> pixel_to_char_size
-- char_to_real_pixel_size -> char_to_pixel_size
-- Reverse second and third arguments of change_frame_size() and
change_frame_size_1() to try to make functions consistent in
putting width before height.
-- Eliminate old round_size_to_char, because it didn't really
do anything differently from round_size_to_real_char()
-- round_size_to_real_char -> round_size_to_char; any places that
called the old round_size_to_char should just call the new one.
2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed
sizes in "frame units", like all other frame-sizing functions,
rather than some hacked-up combination of char-cell units and
total pixel size. This only affects window systems that use
"pixelated geometry", and I'm not sure if Carbon is one of them.
MS Windows is pixelated, X and GTK are not. For pixelated-geometry
systems, the size in set_frame_size() is in displayable pixels
rather than total pixels and needs to be converted appropriately;
take a look at the changes made to mswindows_set_frame_size()
method if necessary.
3. Add a big long comment in frame.c describing how frame geometry
works.
4. Remove MS Windows-specific character height and width fields,
duplicative and unused.
5. frame-displayable-pixel-* and set-frame-displayable-pixel-*
didn't use to work on MS Windows, but they do now.
6. In general, clean up the handling of "pixelated geometry" so
that fewer functions have to worry about this. This is really
an abomination that should be removed entirely but that will
have to happen later. Fix some buggy code in
frame_conversion_internal() that happened to "work" because it
was countered by oppositely buggy code in change_frame_size().
7. Clean up some frame-size code in toolbar.c and use functions
already provided in frame.c instead of rolling its own.
8. Fix check_frame_size() in window.c, which formerly didn't take
pixelated geometry into account.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 15 Feb 2010 22:14:11 -0600 |
parents | aa5bf79c0076 |
children | cd167465bf69 91b3aa59f49b |
line wrap: on
line source
;; kinsoku.el -- Kinsoku (line wrap) processing for XEmacs/Mule -*- coding: iso-2022-7bit; -*- ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; This file is part of Mule (MULtilingual Enhancement of XEmacs). ;; This file contains Japanese and Chinese characters. ;; XEmacs 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, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; Written by Jareth Hein (jhod@po.iijnet.or.jp) based off of ;; code by S.Tomura, Electrotechnical Lab. (tomura@etl.go.jp) from ;; Mule-2.3 ;;; Special characters for JIS code ;;; "$B!!!"!#!$!%!&!'!'!(!)!*!+!,!-!.!/(B" ;;; "$B!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?(B" ;;; "$B!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O(B" ;;; "$B!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_(B" ;;; "$B!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o(B" ;;; "$B!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~(B" ;;; "$B"!"""#"$"%"&"'"(")"*"+","-".(B " ;;; "$B&!&"&#&$&%&&&'&(&)&*&+&,&-&.&/(B" ;;; "$B&0&1&2&3&4&5&6&7&8(B" ;;; "$B&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O(B" ;;; "$B&P&Q&R&S&T&U&V&W&X(B" ;;; "$B'!'"'#'$'%'&'''(')'*'+','-'.'/(B" ;;; "$B'0'1'2'3'4'5'6'7'8'9':';'<'='>'?(B" ;;; "$B'@'A(B" ;;; "$B'Q'R'S'T'U'V'W'X'Y'Z'['\']'^'_!I(B ;;; "$B'`'a'b'c'd'e'f'g'h'i'j'k'l'm'n'o(B" ;;; "$B'p'q(B" ;;; $B#0#1#2#3#4#5#6#7#8#9#A#B#C#D#E#F(B ;;; "$B$!$#$%$'$)$C$c$e$g$n(B" ;;; "$B%!%#%%%'%)%C%c%e%g%n%u%v(B" ;;; Special characters for GB ;;; ;;; $A!!!"!#!$!%!&!'!(!)!*!+!,!-!.!/(B ;;;$A!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?(B ;;;$A!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O(B ;;;$A!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_(B ;;;$A!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o(B ;;;$A!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~(B ;;; $A"1"2"3"4"5"6"7"8"9":";"<"=">"?(B ;;;$A"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O(B ;;;$A"P"Q"R"S"T"U"V"W"X"Y"Z"["\"]"^"_(B ;;;$A"`"a"b"c"d"e"f"g"h"i"j"k"l"m"n"o(B ;;;$A"p"q"r"s"t"u"v"w"x"y"z"{"|"}"~(B ;;; $A#!#"###$#%#&#'#(#)#*#+#,#-#.#/(B ;;;$A#0#1#2#3#4#5#6#7#8#9#:#;#<#=#>#?(B ;;;$A#@#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O(B ;;;$A#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#^#_(B ;;;$A#`#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o(B ;;;$A#p#q#r#s#t#u#v#w#x#y#z#{#|#}#~(B ;;; $A$!$"$#$$$%$&$'$($)$*$+$,$-$.$/(B ;;;$A$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?(B ;;;$A$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B ;;;$A$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_(B ;;;$A$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o(B ;;;$A$p$q$r$s$t$u$v$w$x$y$z${$|$}$~(B ;;; $A%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/(B ;;;$A%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?(B ;;;$A%@%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O(B ;;;$A%P%Q%R%S%T%U%V%W%X%Y%Z%[%\%]%^%_(B ;;;$A%`%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o(B ;;;$A%p%q%r%s%t%u%v%w%x%y%z%{%|%}%~(B ;;; $A&!&"&#&$&%&&&'&(&)&*&+&,&-&.&/(B ;;;$A&0&1&2&3&4&5&6&7&8&9&:&;&<&=&>&?(B ;;;$A&@&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O(B ;;;$A&P&Q&R&S&T&U&V&W&X&Y&Z&[&\&]&^&_(B ;;;$A&`&a&b&c&d&e&f&g&h&i&j&k&l&m&n&o(B ;;;$A&p&q&r&s&t&u&v&w&x&y&z&{&|&}&~(B ;;; $A'!'"'#'$'%'&'''(')'*'+','-'.'/(B ;;;$A'0'1'2'3'4'5'6'7'8'9':';'<'='>'?(B ;;;$A'@'A'B'C'D'E'F'G'H'I'J'K'L'M'N'O(B ;;;$A'P'Q'R'S'T'U'V'W'X'Y'Z'['\']'^'_(B ;;;$A'`'a'b'c'd'e'f'g'h'i'j'k'l'm'n'o(B ;;;$A'p'q'r's't'u'v'w'x'y'z'{'|'}'~(B ;;; $A(!("(#($(%(&('((()(*(+(,(-(.(/(B ;;;$A(0(1(2(3(4(5(6(7(8(9(:(;(<(=(>(?(B ;;;$A(@(A(B(C(D(E(F(G(H(I(J(K(L(M(N(O(B ;;;$A(P(Q(R(S(T(U(V(W(X(Y(Z([(\(](^(_(B ;;;$A(`(a(b(c(d(e(f(g(h(i(j(k(l(m(n(o(B ;;; Special characters for BIG5 ;;; ;;; $(0!!!"!#!$!%!&!'!(!)!*!+!,!-!.!/(B ;;;$(0!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>!?(B ;;;$(0!@!A!B!C!D!E!F!G!H!I!J!K!L!M!N!O(B ;;;$(0!P!Q!R!S!T!U!V!W!X!Y!Z![!\!]!^!_(B ;;;$(0!`!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o(B ;;;$(0!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~(B ;;; $(0"!"""#"$"%"&"'"(")"*"+","-"."/(B ;;;$(0"0"1"2"3"4"5"6"7"8"9":";"<"=">"?(B ;;;$(0"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O(B ;;;$(0"P"Q"R"S"T"U"V"W"X"Y"Z"["\"]"^"_(B ;;;$(0"`"a"b"c"d"e"f"g"h"i"j"k"l"m"n"o(B ;;;$(0"p"q"r"s"t"u"v"w"x"y"z"{"|"}"~(B ;;; $(0#!#"###$#%#&#'#(#)#*#+#,#-#.#/(B ;;;$(0#0#1#2#3#4#5#6#7#8#9#:#;#<#=#>#?(B ;;;$(0#@#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O(B ;;;$(0#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#^#_(B ;;;$(0#`#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o(B ;;;$(0#p#q#r#s#t#u#v#w#x#y#z#{#|#}#~(B ;;; $(0$!$"$#$$$%$&$'$($)$*$+$,$-$.$/(B ;;;$(0$0$1$2$3$4$5$6$7$8$9$:$;$<$=$>$?(B ;;;$(0$@$A$B$C$D$E$F$G$H$I$J$K$L$M$N$O(B ;;;$(0$P$Q$R$S$T$U$V$W$X$Y$Z$[$\$]$^$_(B ;;;$(0$`$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o(B ;;;$(0$p$q$r$s$t$u$v$w$x$y$z${$|$}$~(B ;;; $(0%!%"%#%$%%%&%'%(%)%*%+%,%-%.%/(B ;;;$(0%0%1%2%3%4%5%6%7%8%9%:%;%<%=%>%?(B (defvar kinsoku-ascii nil "Do kinsoku-processing for ASCII.") (make-variable-buffer-local 'kinsoku-ascii) (set-default 'kinsoku-ascii nil) (defvar kinsoku-jis t "Do kinsoku-processing for JISX0208.") (make-variable-buffer-local 'kinsoku-jis) (set-default 'kinsoku-jis t) (defvar kinsoku-gb t "Do kinsoku-processing for GB2312.") (make-variable-buffer-local 'kinsoku-gb) (set-default 'kinsoku-gb t) (defvar kinsoku-big5 t "Do kinsoku-processing for Big5..") (make-variable-buffer-local 'kinsoku-big5) (set-default 'kinsoku-big5 t) (defvar kinsoku-ascii-bol "!)-_~}]:;',.?" "BOL kinsoku for ASCII.") (defvar kinsoku-ascii-eol "({[" "EOL kinsoku for ASCII.") (defvar kinsoku-jis-bol (concat "$B!"!#!$!%!&!'!(!)!*!+!,!-!.!/!0!1!2!3!4!5!6!7!8!9!:!;!<!=!>(B" "$B!?!@!A!B!C!D!E!G!I!K!M!O!Q!S!U!W!Y![!k!l!m!n(B" "$B$!$#$%$'$)$C$c$e$g$n%!%#%%%'%)%C%c%e%g%n%u%v(B") "BOL kinsoku for JISX0208.") (defvar kinsoku-jis-eol "$B!F!H!J!L!N!P!R!T!V!X!Z!k!l!m!n!w!x(B" "EOL kinsoku for JISX0208.") (defvar kinsoku-gb-bol (concat "$A!"!##.#,!$!%!&!'!(!)!*!+!,!-!/!1#)!3!5!7!9!;!=(B" "$A!?#;#:#?#!!@!A!B!C!c!d!e!f#/#\#"#_#~#|(e(B") "BOL kinsoku for GB2312.") (defvar kinsoku-gb-eol (concat "$A!.!0#"#(!2!4!6!8!:!<!>!c!d!e#@!f!l(B" "$A(E(F(G(H(I(J(K(L(M(N(O(P(Q(R(S(T(U(V(W(X(Y(h(B") "EOL kinsoku for GB2312.") (defvar kinsoku-big5-bol (concat "$(0!"!#!$!%!&!'!(!)!*!+!,!-!.!/!0!1!2(B" "$(0!3!4!5!6!7!8!9!:!;!<!=!?!A!C!E!G!I!K(B" "$(0!M!O!Q(B $(0!S!U!W!Y![!]!_!a!c!e!g!i!k!q(B" "$(0"#"$"%"&"'"(")"*"+","2"3"4"j"k"l"x%7(B") "BOL kinsoku for BIG5.") (defvar kinsoku-big5-eol (concat "$(0!>!@!B!D!F!H!J!L!N!P!R!T!V!X!Z!\!^!`!b(B" "$(0!d!f!h!j!k!q!p"i"j"k"n"x$u$v$w$x$y$z${(B" "$(0$|$}$~%!%"%#%$%%%&%'%(%)%*%+%:(B") "EOL kinsoku for BIG5.") (define-category ?s "Kinsoku forbidden start of line characters") (define-category ?e "Kinsoku forbidden end of line characters") ;; kinsoku ascii (loop for char in (string-to-list kinsoku-ascii-bol) do (modify-category-entry char ?s)) (loop for char in (string-to-list kinsoku-ascii-eol) do (modify-category-entry char ?e)) ;; kinsoku-jis (loop for char in (string-to-list kinsoku-jis-bol) do (modify-category-entry char ?s)) (loop for char in (string-to-list kinsoku-jis-eol) do (modify-category-entry char ?e)) ;; kinsoku-gb (loop for char in (string-to-list kinsoku-gb-bol) do (modify-category-entry char ?s)) (loop for char in (string-to-list kinsoku-gb-eol) do (modify-category-entry char ?e)) ;; kinsoku-big5 (loop for char in (string-to-list kinsoku-big5-bol) do (modify-category-entry char ?s)) (loop for char in (string-to-list kinsoku-big5-eol) do (modify-category-entry char ?e)) (defun kinsoku-bol-p () "Check if point would break forbidden beginning-of-line rules Uses category \'s\' to check. point$B$G2~9T$9$k$H9TF,6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B $B9TF,6XB'J8;z$O(B\'s\'$B$N(Bcategory$B$G;XDj$9$k!#(B" (let ((before (char-before)) (after (char-after))) (if (and after (or (and kinsoku-ascii (char-in-category-p after ?a)) (and kinsoku-jis (or (char-in-category-p after ?j) (and before (char-in-category-p before ?j)))) (and kinsoku-gb (or (char-in-category-p after ?c) (and before (char-in-category-p before ?c)))) (and kinsoku-big5 (or (char-in-category-p after ?t) (and before (char-in-category-p before ?t)))))) (char-in-category-p after ?s) nil))) (defun kinsoku-eol-p () "Check if point would break forbidden end-of-line rules Uses category \'e\' to check. point$B$G2~9T$9$k$H9TKv6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B $B9TKv6XB'J8;z$O(B\'s\'$B$N(Bcategory$B$G;XDj$9$k!#(B" (let ((before (char-before)) (after (char-after))) (if (and before (or (and kinsoku-ascii (char-in-category-p before ?a)) (and kinsoku-jis (or (char-in-category-p before ?j) (and after (char-in-category-p after ?j)))) (and kinsoku-gb (or (char-in-category-p before ?c) (and after (char-in-category-p after ?c)))) (and kinsoku-big5 (or (char-in-category-p before ?t) (and after (char-in-category-p after ?t)))))) (char-in-category-p before ?e) nil))) (defvar kinsoku-extend-limit nil "Defines how many characters kinsoku will search forward before giving up. A value of nil equates to infinity. $B6XB'=hM}$G9T$r?-$P$7$FNI$$H>3QJ8;z?t$r;XDj$9$k!#(B $BHsIi@0?t0J30$N>l9g$OL58BBg$r0UL#$9$k!#(B") (defun kinsoku-process () "Move to a point that will not break forbidden line break rules. $B6XB'$K?($l$J$$E@$X0\F0$9$k!#(B point$B$,9TF,6XB'$K?($l$k>l9g$O9T$r?-$P$7$F!"6XB'$K?($l$J$$E@$rC5$9!#(B point$B$,9TKv6XB'$K?($l$k>l9g$O9T$r=L$a$F!"6XB'$K?($l$J$$E@$rC5$9!#(B $B$?$@$7!"9T?-$P$7H>3QJ8;z?t$,(Bkinsoku-extend-limit$B$r1[$($k$H!"(B $B9T$r=L$a$F6XB'$K?($l$J$$E@$rC5$9!#(B" (let ((bol-kin nil) (eol-kin nil)) (if (and (not (bolp)) (not (eolp)) (or (setq bol-kin (kinsoku-bol-p)) (setq eol-kin (kinsoku-eol-p)))) (cond(bol-kin (kinsoku-process-extend)) (eol-kin (kinsoku-process-shrink)))))) (defun kinsoku-process-extend () "Move point forward to a permissable for line-breaking. $B9T$r?-$P$7$F6XB'$K?($l$J$$E@$X0\F0$9$k!#(B" (let ((max-column (+ fill-column (if (and (numberp kinsoku-extend-limit) (>= kinsoku-extend-limit 0)) kinsoku-extend-limit 10000))) ;;; 10000 is deliberatly unreasonably large ch1 ch2) (while (and (setq ch1 (char-after)) (<= (+ (current-column) (char-width ch1 )) max-column) (not (bolp)) (not (eolp)) (or (kinsoku-eol-p) (kinsoku-bol-p) ;;; don't break in the middle of an English word (and (char-in-category-p ch1 ?a) (setq ch2 (char-before)) (char-in-category-p ch2 ?a) (= ?w (char-syntax ch2)) (= ?w (char-syntax ch1))))) (forward-char)) (if (or (kinsoku-eol-p) (kinsoku-bol-p)) (kinsoku-process-shrink)))) (defun kinsoku-process-shrink () "Move point backward to a point permissable for line-breaking. $B9T$r=L$a$F6XB'$K?($l$J$$E@$X0\F0$9$k!#(B" (let (ch1 ch2) (while (and (not (bolp)) (not (eolp)) (or (kinsoku-bol-p) (kinsoku-eol-p) ;;; don't break in the middle of an English word (and (char-in-category-p (setq ch1 (following-char)) ?a) (char-in-category-p (setq ch2 (preceding-char)) ?a) (= ?w (char-syntax ch2)) (= ?w (char-syntax ch1))))) (backward-char))))