comparison src/nsterm.m @ 96749:e18e64789955

(lisp_to_mod): Use parse_solitary_modifier instead. (ns_lisp_to_color): Don't mess with internal Lisp data fields. (ns_term_init, ns_term_shutdown, initFrameFromEmacs, ns_list_fonts): Use SDATA.

96748:92f7bbffcb45

Lisp_Object Vx_toolkit_scroll_bars;
static Lisp_Object Qmodifier_value;
/*PENDING: unsure why these defined in term files, anyway we need in keymap.c */
Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
extern Lisp_Object Qcursor_color, Qcursor_type, Qns;
extern int lisp_to_mod (Lisp_Object lmod);


EmacsPrefsController *prefsController;

/* Defaults managed through the OpenStep defaults system.  These pertain to

#define NS_FUNCTION_KEY_MASK 0x800000
#define EV_MODIFIERS(e)                               \
    ((([e modifierFlags] & NSHelpKeyMask) ?           \
           hyper_modifier : 0)                        \
     | (([e modifierFlags] & NSAlternateKeyMask) ?    \
           lisp_to_mod (ns_alternate_modifier) : 0)   \
     | (([e modifierFlags] & NSShiftKeyMask) ?        \
           shift_modifier : 0)                        \
     | (([e modifierFlags] & NSControlKeyMask) ?      \
           lisp_to_mod (ns_control_modifier) : 0)     \
     | (([e modifierFlags] & NS_FUNCTION_KEY_MASK) ?  \
           lisp_to_mod (ns_function_modifier) : 0)    \
     | (([e modifierFlags] & NSCommandKeyMask) ?      \
           lisp_to_mod (ns_command_modifier):0))

#define EV_UDMODIFIERS(e)                                      \
    ((([e type] == NSLeftMouseDown) ? down_modifier : 0)       \
     | (([e type] == NSRightMouseDown) ? down_modifier : 0)    \
     | (([e type] == NSLeftMouseDragged) ? down_modifier : 0)  \

/* --------------------------------------------------------------------------
     Convert a Lisp string object to a NS color
   -------------------------------------------------------------------------- */
{
  NSTRACE (ns_lisp_to_color);
  if (XTYPE (color) == Lisp_String)
    return ns_get_color (XSTRING (color)->data, col);
  else if (XTYPE (color) == Lisp_Symbol)
    return ns_get_color (XSTRING (XSYMBOL (color)->xname)->data, col);
  return 1;
}


Lisp_Object

              }
          }

        cl = [[NSColorList alloc]
               initWithName: @"Emacs"
                   fromFile: [NSString stringWithCString: XSTRING (tem)->data]];
        if (cl ==nil)
          fatal ("Could not find %s.\n", XSTRING (tem1)->data);
        [cl writeToFile: nil];
      }
  }

  {

void
ns_term_shutdown (int sig)
{
  /* code not reached in emacs.c after this is called by shut_down_emacs: */
  if (STRINGP (Vauto_save_list_file_name))
    unlink (XSTRING (Vauto_save_list_file_name)->data);

  ns_shutdown_properly = YES;
  [NSApp terminate: NSApp];
}

      if (flags & NSShiftKeyMask)
        emacs_event->modifiers |= shift_modifier;

      if (flags & NSCommandKeyMask)
        {
          emacs_event->modifiers |= lisp_to_mod (ns_command_modifier);
          /* if super (default), take input manager's word so things like
             dvorak / qwerty layout work */
          if (EQ (ns_command_modifier, Qsuper)
              && !fnKeysym
              && [[theEvent characters] length] != 0)

#endif
            }
        }

      if (flags & NSControlKeyMask)
          emacs_event->modifiers |= lisp_to_mod (ns_control_modifier);

      if (flags & NS_FUNCTION_KEY_MASK && !fnKeysym)
          emacs_event->modifiers |= lisp_to_mod (ns_function_modifier);

      if (flags & NSAlternateKeyMask) /* default = meta */
        {
          if (EQ (ns_alternate_modifier, Qnone) && !fnKeysym)
            {   /* accept pre-interp alt comb */

              /*HACK: clear lone shift modifier to stop next if from firing */
              if (emacs_event->modifiers == shift_modifier)
                emacs_event->modifiers = 0;
            }
          else
              emacs_event->modifiers |= lisp_to_mod (ns_alternate_modifier);
        }

/*fprintf (stderr,"code =%x\tfnKey =%x\tflags = %x\tmods = %x\n",code,fnKeysym,flags,emacs_event->modifiers); */

      /* if it was a function key or had modifiers, pass it directly to emacs */

  if (ns_drag_types)
    [self registerForDraggedTypes: ns_drag_types];

  tem = f->name;
  name = [NSString stringWithUTF8String:
                   NILP (tem) ? (unsigned char *)"Emacs" : XSTRING (tem)->data];
  [win setTitle: name];

  /* toolbar support */
  toolbar = [[EmacsToolbar alloc] initForView: self withIdentifier:
                         [NSString stringWithFormat: @"Emacs Frame %d",

  FRAME_NS_TOOLBAR_HEIGHT (f) = 0;

  tem = f->icon_name;
  if (!NILP (tem))
    [win setMiniwindowTitle:
           [NSString stringWithUTF8String: XSTRING (tem)->data]];

  {
    NSScreen *screen = [win screen];

    if (screen != 0)

  [expandSpaceSlider setFloatValue: prevExpandSpace];
  [cursorBlinkSlider setFloatValue: prevBlinkRate];
  [cursorTypeMatrix selectCellWithTag: (cursorType == filled_box ? 1 :
                                        (cursorType == bar ? 2 :
                                         (cursorType == underscore ? 3 : 4)))];
  selectItemWithTag (alternateModMenu, lisp_to_mod (ns_alternate_modifier));
  selectItemWithTag (commandModMenu, lisp_to_mod (ns_command_modifier));
#ifdef NS_IMPL_COCOA
  selectItemWithTag (controlModMenu, lisp_to_mod (ns_control_modifier));
  selectItemWithTag (functionModMenu, lisp_to_mod (ns_function_modifier));
  [smoothFontsCheck setState: ns_antialias_text ? YES : NO];
  [useQuickdrawCheck setState: ns_use_qd_smoothing ? YES : NO];
  [useSysHiliteCheck setState: prevUseHighlightColor ? YES : NO];
#endif
}

  NSString *famName;

  NSTRACE (ns_list_fonts);

  CHECK_STRING (pattern);
  patt = XSTRING (pattern)->data;

#if 0
/* temporary: for font_backend, we use fontsets, and when these are defined,
   the old XLFD-based system is used; eventually this will be replaced by
   backend code, but for now we allow specs that are just family names */

96749:e18e64789955

Lisp_Object Vx_toolkit_scroll_bars;
static Lisp_Object Qmodifier_value;
/*PENDING: unsure why these defined in term files, anyway we need in keymap.c */
Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qsuper;
extern Lisp_Object Qcursor_color, Qcursor_type, Qns;


EmacsPrefsController *prefsController;

/* Defaults managed through the OpenStep defaults system.  These pertain to

#define NS_FUNCTION_KEY_MASK 0x800000
#define EV_MODIFIERS(e)                               \
    ((([e modifierFlags] & NSHelpKeyMask) ?           \
           hyper_modifier : 0)                        \
     | (([e modifierFlags] & NSAlternateKeyMask) ?    \
           parse_solitary_modifier (ns_alternate_modifier) : 0)   \
     | (([e modifierFlags] & NSShiftKeyMask) ?        \
           shift_modifier : 0)                        \
     | (([e modifierFlags] & NSControlKeyMask) ?      \
           parse_solitary_modifier (ns_control_modifier) : 0)     \
     | (([e modifierFlags] & NS_FUNCTION_KEY_MASK) ?  \
           parse_solitary_modifier (ns_function_modifier) : 0)    \
     | (([e modifierFlags] & NSCommandKeyMask) ?      \
           parse_solitary_modifier (ns_command_modifier):0))

#define EV_UDMODIFIERS(e)                                      \
    ((([e type] == NSLeftMouseDown) ? down_modifier : 0)       \
     | (([e type] == NSRightMouseDown) ? down_modifier : 0)    \
     | (([e type] == NSLeftMouseDragged) ? down_modifier : 0)  \

/* --------------------------------------------------------------------------
     Convert a Lisp string object to a NS color
   -------------------------------------------------------------------------- */
{
  NSTRACE (ns_lisp_to_color);
  if (STRINGP (color))
    return ns_get_color (SDATA (color), col);
  else if (SYMBOLP (color))
    return ns_get_color (SDATA (SYMBOL_NAME (color)), col);
  return 1;
}


Lisp_Object

              }
          }

        cl = [[NSColorList alloc]
               initWithName: @"Emacs"
                   fromFile: [NSString stringWithCString: SDATA (tem)]];
        if (cl ==nil)
          fatal ("Could not find %s.\n", SDATA (tem1));
        [cl writeToFile: nil];
      }
  }

  {

void
ns_term_shutdown (int sig)
{
  /* code not reached in emacs.c after this is called by shut_down_emacs: */
  if (STRINGP (Vauto_save_list_file_name))
    unlink (SDATA (Vauto_save_list_file_name));

  ns_shutdown_properly = YES;
  [NSApp terminate: NSApp];
}

      if (flags & NSShiftKeyMask)
        emacs_event->modifiers |= shift_modifier;

      if (flags & NSCommandKeyMask)
        {
          emacs_event->modifiers |= parse_solitary_modifier (ns_command_modifier);
          /* if super (default), take input manager's word so things like
             dvorak / qwerty layout work */
          if (EQ (ns_command_modifier, Qsuper)
              && !fnKeysym
              && [[theEvent characters] length] != 0)

#endif
            }
        }

      if (flags & NSControlKeyMask)
          emacs_event->modifiers |= parse_solitary_modifier (ns_control_modifier);

      if (flags & NS_FUNCTION_KEY_MASK && !fnKeysym)
          emacs_event->modifiers |= parse_solitary_modifier (ns_function_modifier);

      if (flags & NSAlternateKeyMask) /* default = meta */
        {
          if (EQ (ns_alternate_modifier, Qnone) && !fnKeysym)
            {   /* accept pre-interp alt comb */

              /*HACK: clear lone shift modifier to stop next if from firing */
              if (emacs_event->modifiers == shift_modifier)
                emacs_event->modifiers = 0;
            }
          else
              emacs_event->modifiers |= parse_solitary_modifier (ns_alternate_modifier);
        }

/*fprintf (stderr,"code =%x\tfnKey =%x\tflags = %x\tmods = %x\n",code,fnKeysym,flags,emacs_event->modifiers); */

      /* if it was a function key or had modifiers, pass it directly to emacs */

  if (ns_drag_types)
    [self registerForDraggedTypes: ns_drag_types];

  tem = f->name;
  name = [NSString stringWithUTF8String:
                   NILP (tem) ? (unsigned char *)"Emacs" : SDATA (tem)];
  [win setTitle: name];

  /* toolbar support */
  toolbar = [[EmacsToolbar alloc] initForView: self withIdentifier:
                         [NSString stringWithFormat: @"Emacs Frame %d",

  FRAME_NS_TOOLBAR_HEIGHT (f) = 0;

  tem = f->icon_name;
  if (!NILP (tem))
    [win setMiniwindowTitle:
           [NSString stringWithUTF8String: SDATA (tem)]];

  {
    NSScreen *screen = [win screen];

    if (screen != 0)

  [expandSpaceSlider setFloatValue: prevExpandSpace];
  [cursorBlinkSlider setFloatValue: prevBlinkRate];
  [cursorTypeMatrix selectCellWithTag: (cursorType == filled_box ? 1 :
                                        (cursorType == bar ? 2 :
                                         (cursorType == underscore ? 3 : 4)))];
  selectItemWithTag (alternateModMenu,
		     parse_solitary_modifier (ns_alternate_modifier));
  selectItemWithTag (commandModMenu,
		     parse_solitary_modifier (ns_command_modifier));
#ifdef NS_IMPL_COCOA
  selectItemWithTag (controlModMenu,
		     parse_solitary_modifier (ns_control_modifier));
  selectItemWithTag (functionModMenu,
		     parse_solitary_modifier (ns_function_modifier));
  [smoothFontsCheck setState: ns_antialias_text ? YES : NO];
  [useQuickdrawCheck setState: ns_use_qd_smoothing ? YES : NO];
  [useSysHiliteCheck setState: prevUseHighlightColor ? YES : NO];
#endif
}

  NSString *famName;

  NSTRACE (ns_list_fonts);

  CHECK_STRING (pattern);
  patt = SDATA (pattern);

#if 0
/* temporary: for font_backend, we use fontsets, and when these are defined,
   the old XLFD-based system is used; eventually this will be replaced by
   backend code, but for now we allow specs that are just family names */