Mercurial > hg > xemacs-beta

comparison src/frame-x.c @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents 49a24b4fd526
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
711 711
712 if (STRINGP (prop)) 712 if (STRINGP (prop))
713 { 713 {
714 CONST char *extprop; 714 CONST char *extprop;
715 715
716 if (string_length (XSTRING (prop)) == 0) 716 if (XSTRING_LENGTH (prop) == 0)
717 continue; 717 continue;
718 718
719 GET_C_STRING_CTEXT_DATA_ALLOCA (prop, extprop); 719 GET_C_STRING_CTEXT_DATA_ALLOCA (prop, extprop);
720 if (STRINGP (val)) 720 if (STRINGP (val))
721 { 721 {
761 } 761 }
762 CHECK_STRING (str); 762 CHECK_STRING (str);
763 763
764 /* Kludge the width/height so that we interpret them in characters 764 /* Kludge the width/height so that we interpret them in characters
765 instead of pixels. Yuck yuck yuck. */ 765 instead of pixels. Yuck yuck yuck. */
766 if (!strcmp ((char *) string_data (XSTRING (str)), "width")) 766 if (!strcmp ((char *) XSTRING_DATA (str), "width"))
767 { 767 {
768 CHECK_INT (val); 768 CHECK_INT (val);
769 width = XINT (val); 769 width = XINT (val);
770 width_specified_p = True; 770 width_specified_p = True;
771 continue; 771 continue;
772 } 772 }
773 if (!strcmp ((char *) string_data (XSTRING (str)), "height")) 773 if (!strcmp ((char *) XSTRING_DATA (str), "height"))
774 { 774 {
775 CHECK_INT (val); 775 CHECK_INT (val);
776 height = XINT (val); 776 height = XINT (val);
777 height_specified_p = True; 777 height_specified_p = True;
778 continue; 778 continue;
779 } 779 }
780 /* Further kludge the x/y. */ 780 /* Further kludge the x/y. */
781 if (!strcmp ((char *) string_data (XSTRING (str)), "x")) 781 if (!strcmp ((char *) XSTRING_DATA (str), "x"))
782 { 782 {
783 CHECK_INT (val); 783 CHECK_INT (val);
784 x = XINT (val); 784 x = XINT (val);
785 x_position_specified_p = True; 785 x_position_specified_p = True;
786 continue; 786 continue;
787 } 787 }
788 if (!strcmp ((char *) string_data (XSTRING (str)), "y")) 788 if (!strcmp ((char *) XSTRING_DATA (str), "y"))
789 { 789 {
790 CHECK_INT (val); 790 CHECK_INT (val);
791 y = XINT (val); 791 y = XINT (val);
792 y_position_specified_p = True; 792 y_position_specified_p = True;
793 continue; 793 continue;
794 } 794 }
795 /* Have you figured out by now that this entire function is 795 /* Have you figured out by now that this entire function is
796 one gigantic kludge? */ 796 one gigantic kludge? */
797 if (!strcmp ((char *) string_data (XSTRING (str)), 797 if (!strcmp ((char *) XSTRING_DATA (str),
798 "internalBorderWidth")) 798 "internalBorderWidth"))
799 { 799 {
800 internal_border_width_specified = True; 800 internal_border_width_specified = True;
801 } 801 }
802 802
803 if (int_p) 803 if (int_p)
804 { 804 {
805 CHECK_INT (val); 805 CHECK_INT (val);
806 XtVaSetValues (w, (char *) string_data (XSTRING (str)), 806 XtVaSetValues (w, (char *) XSTRING_DATA (str),
807 XINT (val), 0); 807 XINT (val), 0);
808 } 808 }
809 else if (EQ (val, Qt)) 809 else if (EQ (val, Qt))
810 XtVaSetValues (w, 810 XtVaSetValues (w,
811 /* XtN... */ 811 /* XtN... */
812 (char *) string_data (XSTRING (str)), 812 (char *) XSTRING_DATA (str),
813 True, 813 True,
814 0); 814 0);
815 else if (EQ (val, Qnil)) 815 else if (EQ (val, Qnil))
816 XtVaSetValues (w, 816 XtVaSetValues (w,
817 /* XtN... */ 817 /* XtN... */
818 (char *) string_data (XSTRING (str)), 818 (char *) XSTRING_DATA (str),
819 False, 819 False,
820 0); 820 0);
821 else 821 else
822 { 822 {
823 CHECK_STRING (val); 823 CHECK_STRING (val);
824 XtVaSetValues (w, XtVaTypedArg, 824 XtVaSetValues (w, XtVaTypedArg,
825 /* XtN... */ 825 /* XtN... */
826 (char *) string_data (XSTRING (str)), 826 (char *) XSTRING_DATA (str),
827 XtRString, 827 XtRString,
828 string_data (XSTRING (val)), 828 XSTRING_DATA (val),
829 string_length (XSTRING (val)) + 1, 829 XSTRING_LENGTH (val) + 1,
830 0); 830 0);
831 } 831 }
832 832
833 #ifdef HAVE_SCROLLBARS 833 #ifdef HAVE_SCROLLBARS
834 if (!strcmp ((char *) string_data (XSTRING (str)), "scrollBarWidth") 834 if (!strcmp ((char *) XSTRING_DATA (str), "scrollBarWidth")
835 || !strcmp ((char *) string_data (XSTRING (str)), 835 || !strcmp ((char *) XSTRING_DATA (str),
836 "scrollBarHeight")) 836 "scrollBarHeight"))
837 { 837 {
838 x_update_frame_scrollbars (f); 838 x_update_frame_scrollbars (f);
839 } 839 }
840 #endif 840 #endif
1489 if (!NILP (lisp_window_id)) 1489 if (!NILP (lisp_window_id))
1490 { 1490 {
1491 char *string; 1491 char *string;
1492 1492
1493 CHECK_STRING (lisp_window_id); 1493 CHECK_STRING (lisp_window_id);
1494 string = (char *) (string_data (XSTRING (lisp_window_id))); 1494 string = (char *) XSTRING_DATA (lisp_window_id);
1495 if (string[0] == '0' && (string[1] == 'x' || string[1] == 'X')) 1495 if (string[0] == '0' && (string[1] == 'x' || string[1] == 'X'))
1496 sscanf (string+2, "%lxu", &window_id); 1496 sscanf (string+2, "%lxu", &window_id);
1497 #if 0 1497 #if 0
1498 else if (string[0] == 'w') 1498 else if (string[0] == 'w')
1499 { 1499 {