Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for 'TEXT' atom

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@67142 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%netscape.com 2000-04-26 00:50:37 +00:00
parent 8ddbd3a621
commit e04f0e3062
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/widget/src/gtk/nsClipboard.cpp
View File

@ -822,7 +822,8 @@ void nsClipboard::SelectionGetCB(GtkWidget *widget,
if (type.Equals("STRING") ||
type.Equals("UTF8_STRING") ||
type.Equals("COMPOUND_TEXT"))
type.Equals("COMPOUND_TEXT") ||
type.Equals("TEXT"))
{
dataFlavor = kUnicodeMime;
} else {
@ -869,7 +870,11 @@ void nsClipboard::SelectionGetCB(GtkWidget *widget,
clipboardData = utf8String;
dataLength = strlen(utf8String);
}
} else if (type.Equals("COMPOUND_TEXT")) {
} else if (type.Equals("COMPOUND_TEXT") || type.Equals("TEXT")) {
if (type.Equals("TEXT")) {
// if we get a request for TEXT, return COMPOUND_TEXT
aInfo = gdk_atom_intern("COMPOUND_TEXT", FALSE);
}
char *platformText;
PRInt32 platformLen;
// Get the appropriate unicode encoder. We're guaranteed that this won't change
@ -904,7 +909,7 @@ void nsClipboard::SelectionGetCB(GtkWidget *widget,
rv = encoder->Convert(castedData, &len, platformText, &platformLen);
(platformText)[platformLen] = '\0'; // null terminate. Convert() doesn't do it for us
}
} // if valid length
} // if valid length
if (platformLen > 0) {
int status = 0;
@ -1074,6 +1079,8 @@ void nsClipboard::RegisterFormat(const char *aMimeStr, GdkAtom aSelectionAtom)
// for Text and Unicode we want to add some extra types to the X clipboard
if (mimeStr.Equals(kUnicodeMime)) {
// we will do the conversions to and from unicode internally
// anyone asking for TEXT will get COMPOUND_TEXT
AddTarget(gdk_atom_intern("TEXT", FALSE), aSelectionAtom);
AddTarget(gdk_atom_intern("COMPOUND_TEXT", FALSE), aSelectionAtom);
AddTarget(gdk_atom_intern("UTF8_STRING", FALSE), aSelectionAtom);
AddTarget(GDK_SELECTION_TYPE_STRING, aSelectionAtom);