procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing Motif atoms

Browse source 
* src/xselect.c (symbol_to_x_atom):
(x_atom_to_symbol):
(syms_of_xselect): Optimize for XmTRANSFER_SUCCESS and
XmTRANSFER_FAILURE as well.
This commit is contained in:
Po Lu 2022-04-18 18:38:35 +08:00
parent 2b6a1c98df
commit 89a5aa4ca7
1 changed files with 50 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/xselect.c
View file

@ -208,24 +208,49 @@ static Atom
symbol_to_x_atom (struct x_display_info *dpyinfo, Lisp_Object sym)
{
Atom val;
if (NILP (sym)) return 0;
if (EQ (sym, QPRIMARY)) return XA_PRIMARY;
if (EQ (sym, QSECONDARY)) return XA_SECONDARY;
if (EQ (sym, QSTRING)) return XA_STRING;
if (EQ (sym, QINTEGER)) return XA_INTEGER;
if (EQ (sym, QATOM)) return XA_ATOM;
if (EQ (sym, QCLIPBOARD)) return dpyinfo->Xatom_CLIPBOARD;
if (EQ (sym, QTIMESTAMP)) return dpyinfo->Xatom_TIMESTAMP;
if (EQ (sym, QTEXT)) return dpyinfo->Xatom_TEXT;
if (EQ (sym, QCOMPOUND_TEXT)) return dpyinfo->Xatom_COMPOUND_TEXT;
if (EQ (sym, QUTF8_STRING)) return dpyinfo->Xatom_UTF8_STRING;
if (EQ (sym, QDELETE)) return dpyinfo->Xatom_DELETE;
if (EQ (sym, QMULTIPLE)) return dpyinfo->Xatom_MULTIPLE;
if (EQ (sym, QINCR)) return dpyinfo->Xatom_INCR;
if (EQ (sym, Q_EMACS_TMP_)) return dpyinfo->Xatom_EMACS_TMP;
if (EQ (sym, QTARGETS)) return dpyinfo->Xatom_TARGETS;
if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL;
if (!SYMBOLP (sym)) emacs_abort ();
if (NILP (sym))
return 0;
if (EQ (sym, QPRIMARY))
return XA_PRIMARY;
if (EQ (sym, QSECONDARY))
return XA_SECONDARY;
if (EQ (sym, QSTRING))
return XA_STRING;
if (EQ (sym, QINTEGER))
return XA_INTEGER;
if (EQ (sym, QATOM))
return XA_ATOM;
if (EQ (sym, QCLIPBOARD))
return dpyinfo->Xatom_CLIPBOARD;
if (EQ (sym, QTIMESTAMP))
return dpyinfo->Xatom_TIMESTAMP;
if (EQ (sym, QTEXT))
return dpyinfo->Xatom_TEXT;
if (EQ (sym, QCOMPOUND_TEXT))
return dpyinfo->Xatom_COMPOUND_TEXT;
if (EQ (sym, QUTF8_STRING))
return dpyinfo->Xatom_UTF8_STRING;
if (EQ (sym, QDELETE))
return dpyinfo->Xatom_DELETE;
if (EQ (sym, QMULTIPLE))
return dpyinfo->Xatom_MULTIPLE;
if (EQ (sym, QINCR))
return dpyinfo->Xatom_INCR;
if (EQ (sym, Q_EMACS_TMP_))
return dpyinfo->Xatom_EMACS_TMP;
if (EQ (sym, QTARGETS))
return dpyinfo->Xatom_TARGETS;
if (EQ (sym, QNULL))
return dpyinfo->Xatom_NULL;
if (EQ (sym, QXdndSelection))
return dpyinfo->Xatom_XdndSelection;
if (EQ (sym, QXmTRANSFER_SUCCESS))
return dpyinfo->Xatom_XmTRANSFER_SUCCESS;
if (EQ (sym, QXmTRANSFER_FAILURE))
return dpyinfo->Xatom_XmTRANSFER_FAILURE;
if (!SYMBOLP (sym))
emacs_abort ();
TRACE1 (" XInternAtom %s", SSDATA (SYMBOL_NAME (sym)));
block_input ();
@ -287,6 +312,10 @@ x_atom_to_symbol (struct x_display_info *dpyinfo, Atom atom)
return QNULL;
if (atom == dpyinfo->Xatom_XdndSelection)
return QXdndSelection;
if (atom == dpyinfo->Xatom_XmTRANSFER_SUCCESS)
return QXmTRANSFER_SUCCESS;
if (atom == dpyinfo->Xatom_XmTRANSFER_FAILURE)
return QXmTRANSFER_FAILURE;
block_input ();
x_catch_errors (dpyinfo->display);
@ -2793,6 +2822,9 @@ A value of 0 means wait as long as necessary. This is initialized from the
DEFSYM (Qx_lost_selection_functions, "x-lost-selection-functions");
DEFSYM (Qx_sent_selection_functions, "x-sent-selection-functions");
DEFSYM (QXmTRANSFER_SUCCESS, "XmTRANSFER_SUCCESS");
DEFSYM (QXmTRANSFER_FAILURE, "XmTRANSFER_FAILURE");
pdumper_do_now_and_after_load (syms_of_xselect_for_pdumper);
}