emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/macfns.c [lexbind]


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/src/macfns.c [lexbind]
Date: Sat, 04 Sep 2004 05:39:53 -0400

Index: emacs/src/macfns.c
diff -c emacs/src/macfns.c:1.3.2.11 emacs/src/macfns.c:1.3.2.12
*** emacs/src/macfns.c:1.3.2.11 Sat Sep  4 09:26:25 2004
--- emacs/src/macfns.c  Sat Sep  4 09:28:15 2004
***************
*** 324,342 ****
    Point pt;
    GrafPtr oldport;
  
! #ifdef TARGET_API_MAC_CARBON
    {
      Rect r;
  
!     GetWindowPortBounds (f->output_data.mac->mWP, &r);
      SetPt (&pt, r.left, r.top);
    }
  #else /* not TARGET_API_MAC_CARBON */
    SetPt (&pt,
!        f->output_data.mac->mWP->portRect.left,
!        f->output_data.mac->mWP->portRect.top);
  #endif /* not TARGET_API_MAC_CARBON */
-   GetPort (&oldport);
    LocalToGlobal (&pt);
    SetPort (oldport);
  
--- 324,344 ----
    Point pt;
    GrafPtr oldport;
  
!   GetPort (&oldport);
!   SetPortWindowPort (FRAME_MAC_WINDOW (f));
! 
! #if TARGET_API_MAC_CARBON
    {
      Rect r;
  
!     GetWindowPortBounds (FRAME_MAC_WINDOW (f), &r);
      SetPt (&pt, r.left, r.top);
    }
  #else /* not TARGET_API_MAC_CARBON */
    SetPt (&pt,
!        FRAME_MAC_WINDOW (f)->portRect.left,
!        FRAME_MAC_WINDOW (f)->portRect.top);
  #endif /* not TARGET_API_MAC_CARBON */
    LocalToGlobal (&pt);
    SetPort (oldport);
  
***************
*** 1934,1941 ****
    if (FRAME_MAC_WINDOW (f))
      {
        if (STRING_MULTIBYTE (name))
! #if 0 /* MAC_TODO: encoding title string */
!       name = ENCODE_SYSTEM (name);
  #else
          return;
  #endif
--- 1936,1943 ----
    if (FRAME_MAC_WINDOW (f))
      {
        if (STRING_MULTIBYTE (name))
! #if TARGET_API_MAC_CARBON
!       name = ENCODE_UTF_8 (name);
  #else
          return;
  #endif
***************
*** 1943,1948 ****
--- 1945,1958 ----
        BLOCK_INPUT;
  
        {
+ #if TARGET_API_MAC_CARBON
+       CFStringRef windowTitle =
+         CFStringCreateWithCString (NULL, SDATA (name),
+                                    kCFStringEncodingUTF8);
+ 
+       SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
+       CFRelease (windowTitle);
+ #else
        Str255 windowTitle;
        if (strlen (SDATA (name)) < 255)
          {
***************
*** 1950,1955 ****
--- 1960,1966 ----
            c2pstr (windowTitle);
            SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
          }
+ #endif
        }
  
        UNBLOCK_INPUT;
***************
*** 2008,2015 ****
    if (FRAME_MAC_WINDOW (f))
      {
        if (STRING_MULTIBYTE (name))
! #if 0 /* MAC_TODO: encoding title string */
!       name = ENCODE_SYSTEM (name);
  #else
          return;
  #endif
--- 2019,2026 ----
    if (FRAME_MAC_WINDOW (f))
      {
        if (STRING_MULTIBYTE (name))
! #if TARGET_API_MAC_CARBON
!       name = ENCODE_UTF_8 (name);
  #else
          return;
  #endif
***************
*** 2017,2022 ****
--- 2028,2041 ----
        BLOCK_INPUT;
  
        {
+ #if TARGET_API_MAC_CARBON
+       CFStringRef windowTitle =
+         CFStringCreateWithCString (NULL, SDATA (name),
+                                    kCFStringEncodingUTF8);
+ 
+       SetWindowTitleWithCFString (FRAME_MAC_WINDOW (f), windowTitle);
+       CFRelease (windowTitle);
+ #else
        Str255 windowTitle;
        if (strlen (SDATA (name)) < 255)
          {
***************
*** 2024,2029 ****
--- 2043,2049 ----
            c2pstr (windowTitle);
            SetWTitle (FRAME_MAC_WINDOW (f), windowTitle);
          }
+ #endif
        }
  
        UNBLOCK_INPUT;
***************
*** 2981,2997 ****
    (display)
       Lisp_Object display;
  {
!   int mac_major_version, mac_minor_version;
    SInt32 response;
  
    if (Gestalt (gestaltSystemVersion, &response) != noErr)
      error ("Cannot get Mac OS version");
  
!   mac_major_version = (response >> 8) & 0xf;
!   mac_minor_version = (response >> 4) & 0xf;
  
    return Fcons (make_number (mac_major_version),
!               Fcons (make_number (mac_minor_version), Qnil));
  }
  
  DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0,
--- 3001,3020 ----
    (display)
       Lisp_Object display;
  {
!   int mac_major_version;
    SInt32 response;
  
    if (Gestalt (gestaltSystemVersion, &response) != noErr)
      error ("Cannot get Mac OS version");
  
!   mac_major_version = (response >> 8) & 0xff;
!   /* convert BCD to int */
!   mac_major_version -= (mac_major_version >> 4) * 6;
  
    return Fcons (make_number (mac_major_version),
!               Fcons (make_number ((response >> 4) & 0xf),
!                      Fcons (make_number (response & 0xf),
!                             Qnil)));
  }
  
  DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]