Mercurial > hg > xemacs-beta

comparison src/dialog-msw.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 2b6fa2618f76
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
254 button_width (Lisp_Object text) 254 button_width (Lisp_Object text)
255 { 255 {
256 /* !!#### do Japanese chars count as two? */ 256 /* !!#### do Japanese chars count as two? */
257 int width = 257 int width =
258 X_DLU_PER_CHAR * 258 X_DLU_PER_CHAR *
259 intbyte_string_displayed_columns (XSTRING_DATA (text), 259 ibyte_string_displayed_columns (XSTRING_DATA (text),
260 XSTRING_LENGTH (text)); 260 XSTRING_LENGTH (text));
261 return max (X_MIN_BUTTON, width); 261 return max (X_MIN_BUTTON, width);
262 } 262 }
263 263
264 /* Unwind protection routine frees a dynarr opaqued into arg */ 264 /* Unwind protection routine frees a dynarr opaqued into arg */
586 if (NILP (question)) 586 if (NILP (question))
587 sferror ("Dialog descriptor provides no question", keys); 587 sferror ("Dialog descriptor provides no question", keys);
588 588
589 /* Determine the final width layout */ 589 /* Determine the final width layout */
590 { 590 {
591 Intbyte *p = XSTRING_DATA (question); 591 Ibyte *p = XSTRING_DATA (question);
592 Charcount string_max = 0, this_length = 0; 592 Charcount string_max = 0, this_length = 0;
593 while (1) 593 while (1)
594 { 594 {
595 Emchar ch = charptr_emchar (p); 595 Ichar ch = itext_ichar (p);
596 INC_CHARPTR (p); 596 INC_IBYTEPTR (p);
597 597
598 if (ch == (Emchar)'\n' || ch == (Emchar)'\0') 598 if (ch == (Ichar)'\n' || ch == (Ichar)'\0')
599 { 599 {
600 string_max = max (this_length, string_max); 600 string_max = max (this_length, string_max);
601 this_length = 0; 601 this_length = 0;
602 } 602 }
603 else 603 else
604 ++this_length; 604 ++this_length;
605 605
606 if (ch == (Emchar)'\0') 606 if (ch == (Ichar)'\0')
607 break; 607 break;
608 } 608 }
609 609
610 if (string_max * X_DLU_PER_CHAR > max (X_MAX_TEXT, button_row_width)) 610 if (string_max * X_DLU_PER_CHAR > max (X_MAX_TEXT, button_row_width))
611 text_width = X_AVE_TEXT; 611 text_width = X_AVE_TEXT;
616 text_width = max (text_width, button_row_width); 616 text_width = max (text_width, button_row_width);
617 } 617 }
618 618
619 /* Now calculate the height for the text control */ 619 /* Now calculate the height for the text control */
620 { 620 {
621 Intbyte *p = XSTRING_DATA (question); 621 Ibyte *p = XSTRING_DATA (question);
622 Charcount break_at = text_width / X_DLU_PER_CHAR; 622 Charcount break_at = text_width / X_DLU_PER_CHAR;
623 Charcount char_pos = 0; 623 Charcount char_pos = 0;
624 int num_lines = 1; 624 int num_lines = 1;
625 Emchar ch; 625 Ichar ch;
626 626
627 while ((ch = charptr_emchar (p)) != (Emchar) '\0') 627 while ((ch = itext_ichar (p)) != (Ichar) '\0')
628 { 628 {
629 INC_CHARPTR (p); 629 INC_IBYTEPTR (p);
630 char_pos += ch != (Emchar) '\n'; 630 char_pos += ch != (Ichar) '\n';
631 if (ch == (Emchar) '\n' || char_pos == break_at) 631 if (ch == (Ichar) '\n' || char_pos == break_at)
632 { 632 {
633 ++num_lines; 633 ++num_lines;
634 char_pos = 0; 634 char_pos = 0;
635 } 635 }
636 } 636 }
719 Dynarr_add_many (template_, &button_class_id, 719 Dynarr_add_many (template_, &button_class_id,
720 sizeof (button_class_id)); 720 sizeof (button_class_id));
721 721
722 /* Next thing to add is control text, as Unicode string */ 722 /* Next thing to add is control text, as Unicode string */
723 { 723 {
724 Emchar accel_unused; 724 Ichar accel_unused;
725 725
726 push_lisp_string_as_unicode 726 push_lisp_string_as_unicode
727 (template_, 727 (template_,
728 mswindows_translate_menu_or_dialog_item 728 mswindows_translate_menu_or_dialog_item
729 (pgui_item->name, &accel_unused)); 729 (pgui_item->name, &accel_unused));