mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
fe3519e975
- Bug 1257611 - Fix wrong CondVar::Wait() and Monitor::Wait() usage in netwerk/cache2, r=honzab (54f1a79f43) - Bug 1239687 - Leak invalid/doomed file handles immediately after HTTP cache shutdown. r=michal (a20bcf662b) - Bug 996836 - Merge CLOSE and WRITE priority in cache2 I/O thread. r=michal (8b0af50593) - Bug 1265243 - Do not initialize CacheObserver in the child process, r=honzab (87f69529d2) - Bug 1247432 - Don't do any unnecessary I/O in cache2 after shutdown. r=michal (7c5a2b89ac) - Bug 1220272 - Fix signalling in HTTP cache test code suspender. r=michal (293a16731d) - Bug 1160368 - Part 2: Clean up some cruft in nsCookie.h from PRBool/bool conversions. r=jdm (aa873f2dcc) - Bug 1160368 - Part 5: Clean up some confusing browser_storage_listings.js checks. r=jdm (b27f5930a9) - Bug 866380 - Null check for amlogic libc implementation. r=valentin (c3a487af9c) - Bug 1257320 - Disable C4577 to unblock compilation on VS2015; r=mayhemer (2f800ca85c) - Bug 1229726 - fix the data copy from sockaddr to NetAddr on OSX/FreeBSD. r=mcmanus. (fde11e004e) - Bug 1241368 - provide JS implemented MDNS service as a fallback. r=nwgh,nalexander. (afe1445eb8) - Bug 571126: Remove NECKO_SEPARATE_STACKS support, r=jduell (fb5b87bb3a) - Bug 1057689 - Add xpcshell test checking correct notifications and app-offline state r=jduell (89946b44ba) - Bug 1259459 - h2 0 length options puts end-stream on headers r=hurley (618480a609) - Bug 1234251 - Remove HttpChannelChild::mSynthesizedResponseHead; r=jdm (20981affea) - Bug 904559 - Veto redirect when target channel doesn't implement nsIParentRedirectingChannel. r=jduell (b3da2fae91) - Bug 1261784 Make sure InterceptedChannel body streams are always closed. r=jdm (cd50b1a52b) - Bug 1224508 - Use URI path without reference as the callback key. r=valentin. (b8a953f23a) - Bug 1226760 - ViewSource doesn't work for packaged app resources r=mcmanus (ec9b0297de) - Bug 1254061 - Rewrite nsHttp::ParseInt64 using strtoll r=mcmanus (2125b8ae6f) - Bug 1241565 - nsIHttpChannelInternal should be a builtinclass, r=honzab.moz (d24da6a95a) - Bug 1252386 - Removed debugging printf,r=me (c5d89f353c) - bug 277813 - autogenerated expires needs max r=mayhemer (6aa7c255a5) - Bug 1225384 - Change how the default resource "host names" are handled. r=michal (868732baab) - Bug 719905: Fix resolution of resource: URLs containing : and / characters. r=valentin (f60f4baacf) - Bug 1195173 - Convert ExtensionProtocolHandler to use channel->Open2() (r=maglione) (063f5d5d10) - Bug 1226909 followup to fix bustage. Make sure that the channel returned by NS_NewChannel doesn't have a loadinfo that indicates that the channel has already been opened (42ebe0f44e) - Bug 241698 - Fixed init and use of nsDirIndex::mLastModified (-1LL) + built in nullptr checks where they were missing. r=dragana (e9c2277a3d) - Bug 1261318 - make sure brotli context is created in onstoprequest r=bagder (6646fed64d) - Bug 1212223 - Update |bufLen| as well when we probed the multipart preamble. r=valentin. (ec878c5b0f) - Bug 1259561: Increase CRAZY_COORD (threshold for debug build layout warnings) by an order of magnitude. r=mats (c05c16dd85) - Bug 1261698. Make ReparentFrameViewTo return void because it always returns NS_OK. r=mats (e806d6abcb) - Bug 1261698. Remove comment that is not relevant in nsContainerFrame.cpp. (f570189d15) - Bug 1261698. Don't descend into child frames looking for views in ReparentFrameViewTo if the frame doesn't have the NS_FRAME_HAS_CHILD_WITH_VIEW bit set. r=mats (0d42befd46) - Bug 1265154 - Fix compile error in MSVC 2013 caused by ArrayLength; r=heycam (1c962f2840) - Bug 1260351 - Image: Enable ConvolveVertically/Horizontally in LS3 MMI. r=tnikkel (576b6bbdb3) - Bug 1209780 (Part 1) - Mark DrawResult MOZ_MUST_USE. r=tn (e6c113bef2) - Bug 1253753 - Remove unnecessary switch fallthrough to avoid -Wimplicit-fallthrough warning. r=karlt (96bd93fc5c) - bug 1260178 null check pattern from -unico-border-gradient r=acomminos (f63c9c7ffb) - Bug 1247796. Use keyboardFocusIndicatorColor for ActiveBorder system color keyword. r=mstange (7ed133de97) - Bug 1248675 - Update the cached mBounds in nsChildView when its backing scale factor (display DPI) changes. r=mstange (8197274118) - Bug 1256576 - Make sure texture is (re)initialized if the size changed. r=snorp (2c56790ca9) - Bug 1242449 - Fix confusion among CSS, desktop and device pixel units in nsXULWindow position/size and window staggering so as to work consistently across mixed resolution displays. r=emk (f73d2fd41d) - Bug 1255645 - Ensure nsXULWindow constrains the window to the bounds of its screen after applying intrinsic sizing (if appropriate), by re-doing positioning after the window has been sized properly. r=emk (e87e0cea81) - Bug 1259492 - Ensure window position is constrained to the screen after it has been sized properly in nsXULWindow::OnChromeLoaded. r=emk (7cf599b39b) - Bug 1832708 - Disable std::__throw_* wrapping on libc++ >= 14.0. r=firefox-build-system-reviewers,andi (29e0cc9319)
375 lines
12 KiB
C++
375 lines
12 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/ArrayUtils.h"
|
|
#include "mozilla/MathAlgorithms.h"
|
|
#include "mozilla/TextEvents.h"
|
|
|
|
#include "NativeKeyBindings.h"
|
|
#include "nsString.h"
|
|
#include "nsMemory.h"
|
|
#include "nsGtkKeyUtils.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkkeysyms.h>
|
|
#include <gdk/gdk.h>
|
|
|
|
namespace mozilla {
|
|
namespace widget {
|
|
|
|
static nsIWidget::DoCommandCallback gCurrentCallback;
|
|
static void *gCurrentCallbackData;
|
|
static bool gHandled;
|
|
|
|
// Common GtkEntry and GtkTextView signals
|
|
static void
|
|
copy_clipboard_cb(GtkWidget *w, gpointer user_data)
|
|
{
|
|
gCurrentCallback(CommandCopy, gCurrentCallbackData);
|
|
g_signal_stop_emission_by_name(w, "copy_clipboard");
|
|
gHandled = true;
|
|
}
|
|
|
|
static void
|
|
cut_clipboard_cb(GtkWidget *w, gpointer user_data)
|
|
{
|
|
gCurrentCallback(CommandCut, gCurrentCallbackData);
|
|
g_signal_stop_emission_by_name(w, "cut_clipboard");
|
|
gHandled = true;
|
|
}
|
|
|
|
// GTK distinguishes between display lines (wrapped, as they appear on the
|
|
// screen) and paragraphs, which are runs of text terminated by a newline.
|
|
// We don't have this distinction, so we always use editor's notion of
|
|
// lines, which are newline-terminated.
|
|
|
|
static const Command sDeleteCommands[][2] = {
|
|
// backward, forward
|
|
{ CommandDeleteCharBackward, CommandDeleteCharForward }, // CHARS
|
|
{ CommandDeleteWordBackward, CommandDeleteWordForward }, // WORD_ENDS
|
|
{ CommandDeleteWordBackward, CommandDeleteWordForward }, // WORDS
|
|
{ CommandDeleteToBeginningOfLine, CommandDeleteToEndOfLine }, // LINES
|
|
{ CommandDeleteToBeginningOfLine, CommandDeleteToEndOfLine }, // LINE_ENDS
|
|
{ CommandDeleteToBeginningOfLine, CommandDeleteToEndOfLine }, // PARAGRAPH_ENDS
|
|
{ CommandDeleteToBeginningOfLine, CommandDeleteToEndOfLine }, // PARAGRAPHS
|
|
// This deletes from the end of the previous word to the beginning of the
|
|
// next word, but only if the caret is not in a word.
|
|
// XXX need to implement in editor
|
|
{ CommandDoNothing, CommandDoNothing } // WHITESPACE
|
|
};
|
|
|
|
static void
|
|
delete_from_cursor_cb(GtkWidget *w, GtkDeleteType del_type,
|
|
gint count, gpointer user_data)
|
|
{
|
|
g_signal_stop_emission_by_name(w, "delete_from_cursor");
|
|
bool forward = count > 0;
|
|
|
|
#if (MOZ_WIDGET_GTK == 3)
|
|
// Ignore GTK's Ctrl-K keybinding introduced in GTK 3.14 and removed in
|
|
// 3.18 if the user has custom bindings set. See bug 1176929.
|
|
if (del_type == GTK_DELETE_PARAGRAPH_ENDS && forward && GTK_IS_ENTRY(w) &&
|
|
!gtk_check_version(3, 14, 1) && gtk_check_version(3, 17, 9)) {
|
|
GtkStyleContext* context = gtk_widget_get_style_context(w);
|
|
GtkStateFlags flags = gtk_widget_get_state_flags(w);
|
|
|
|
GPtrArray* array;
|
|
gtk_style_context_get(context, flags, "gtk-key-bindings", &array, nullptr);
|
|
if (!array)
|
|
return;
|
|
g_ptr_array_unref(array);
|
|
}
|
|
#endif
|
|
|
|
gHandled = true;
|
|
if (uint32_t(del_type) >= ArrayLength(sDeleteCommands)) {
|
|
// unsupported deletion type
|
|
return;
|
|
}
|
|
|
|
if (del_type == GTK_DELETE_WORDS) {
|
|
// This works like word_ends, except we first move the caret to the
|
|
// beginning/end of the current word.
|
|
if (forward) {
|
|
gCurrentCallback(CommandWordNext, gCurrentCallbackData);
|
|
gCurrentCallback(CommandWordPrevious, gCurrentCallbackData);
|
|
} else {
|
|
gCurrentCallback(CommandWordPrevious, gCurrentCallbackData);
|
|
gCurrentCallback(CommandWordNext, gCurrentCallbackData);
|
|
}
|
|
} else if (del_type == GTK_DELETE_DISPLAY_LINES ||
|
|
del_type == GTK_DELETE_PARAGRAPHS) {
|
|
|
|
// This works like display_line_ends, except we first move the caret to the
|
|
// beginning/end of the current line.
|
|
if (forward) {
|
|
gCurrentCallback(CommandBeginLine, gCurrentCallbackData);
|
|
} else {
|
|
gCurrentCallback(CommandEndLine, gCurrentCallbackData);
|
|
}
|
|
}
|
|
|
|
Command command = sDeleteCommands[del_type][forward];
|
|
if (!command) {
|
|
return; // unsupported command
|
|
}
|
|
|
|
unsigned int absCount = Abs(count);
|
|
for (unsigned int i = 0; i < absCount; ++i) {
|
|
gCurrentCallback(command, gCurrentCallbackData);
|
|
}
|
|
}
|
|
|
|
static const Command sMoveCommands[][2][2] = {
|
|
// non-extend { backward, forward }, extend { backward, forward }
|
|
// GTK differentiates between logical position, which is prev/next,
|
|
// and visual position, which is always left/right.
|
|
// We should fix this to work the same way for RTL text input.
|
|
{ // LOGICAL_POSITIONS
|
|
{ CommandCharPrevious, CommandCharNext },
|
|
{ CommandSelectCharPrevious, CommandSelectCharNext }
|
|
},
|
|
{ // VISUAL_POSITIONS
|
|
{ CommandCharPrevious, CommandCharNext },
|
|
{ CommandSelectCharPrevious, CommandSelectCharNext }
|
|
},
|
|
{ // WORDS
|
|
{ CommandWordPrevious, CommandWordNext },
|
|
{ CommandSelectWordPrevious, CommandSelectWordNext }
|
|
},
|
|
{ // DISPLAY_LINES
|
|
{ CommandLinePrevious, CommandLineNext },
|
|
{ CommandSelectLinePrevious, CommandSelectLineNext }
|
|
},
|
|
{ // DISPLAY_LINE_ENDS
|
|
{ CommandBeginLine, CommandEndLine },
|
|
{ CommandSelectBeginLine, CommandSelectEndLine }
|
|
},
|
|
{ // PARAGRAPHS
|
|
{ CommandLinePrevious, CommandLineNext },
|
|
{ CommandSelectLinePrevious, CommandSelectLineNext }
|
|
},
|
|
{ // PARAGRAPH_ENDS
|
|
{ CommandBeginLine, CommandEndLine },
|
|
{ CommandSelectBeginLine, CommandSelectEndLine }
|
|
},
|
|
{ // PAGES
|
|
{ CommandMovePageUp, CommandMovePageDown },
|
|
{ CommandSelectPageUp, CommandSelectPageDown }
|
|
},
|
|
{ // BUFFER_ENDS
|
|
{ CommandMoveTop, CommandMoveBottom },
|
|
{ CommandSelectTop, CommandSelectBottom }
|
|
},
|
|
{ // HORIZONTAL_PAGES (unsupported)
|
|
{ CommandDoNothing, CommandDoNothing },
|
|
{ CommandDoNothing, CommandDoNothing }
|
|
}
|
|
};
|
|
|
|
static void
|
|
move_cursor_cb(GtkWidget *w, GtkMovementStep step, gint count,
|
|
gboolean extend_selection, gpointer user_data)
|
|
{
|
|
g_signal_stop_emission_by_name(w, "move_cursor");
|
|
gHandled = true;
|
|
bool forward = count > 0;
|
|
if (uint32_t(step) >= ArrayLength(sMoveCommands)) {
|
|
// unsupported movement type
|
|
return;
|
|
}
|
|
|
|
Command command = sMoveCommands[step][extend_selection][forward];
|
|
if (!command) {
|
|
return; // unsupported command
|
|
}
|
|
|
|
unsigned int absCount = Abs(count);
|
|
for (unsigned int i = 0; i < absCount; ++i) {
|
|
gCurrentCallback(command, gCurrentCallbackData);
|
|
}
|
|
}
|
|
|
|
static void
|
|
paste_clipboard_cb(GtkWidget *w, gpointer user_data)
|
|
{
|
|
gCurrentCallback(CommandPaste, gCurrentCallbackData);
|
|
g_signal_stop_emission_by_name(w, "paste_clipboard");
|
|
gHandled = true;
|
|
}
|
|
|
|
// GtkTextView-only signals
|
|
static void
|
|
select_all_cb(GtkWidget *w, gboolean select, gpointer user_data)
|
|
{
|
|
gCurrentCallback(CommandSelectAll, gCurrentCallbackData);
|
|
g_signal_stop_emission_by_name(w, "select_all");
|
|
gHandled = true;
|
|
}
|
|
|
|
NativeKeyBindings* NativeKeyBindings::sInstanceForSingleLineEditor = nullptr;
|
|
NativeKeyBindings* NativeKeyBindings::sInstanceForMultiLineEditor = nullptr;
|
|
|
|
// static
|
|
NativeKeyBindings*
|
|
NativeKeyBindings::GetInstance(NativeKeyBindingsType aType)
|
|
{
|
|
switch (aType) {
|
|
case nsIWidget::NativeKeyBindingsForSingleLineEditor:
|
|
if (!sInstanceForSingleLineEditor) {
|
|
sInstanceForSingleLineEditor = new NativeKeyBindings();
|
|
sInstanceForSingleLineEditor->Init(aType);
|
|
}
|
|
return sInstanceForSingleLineEditor;
|
|
|
|
default:
|
|
// fallback to multiline editor case in release build
|
|
MOZ_FALLTHROUGH_ASSERT("aType is invalid or not yet implemented");
|
|
case nsIWidget::NativeKeyBindingsForMultiLineEditor:
|
|
case nsIWidget::NativeKeyBindingsForRichTextEditor:
|
|
if (!sInstanceForMultiLineEditor) {
|
|
sInstanceForMultiLineEditor = new NativeKeyBindings();
|
|
sInstanceForMultiLineEditor->Init(aType);
|
|
}
|
|
return sInstanceForMultiLineEditor;
|
|
}
|
|
}
|
|
|
|
// static
|
|
void
|
|
NativeKeyBindings::Shutdown()
|
|
{
|
|
delete sInstanceForSingleLineEditor;
|
|
sInstanceForSingleLineEditor = nullptr;
|
|
delete sInstanceForMultiLineEditor;
|
|
sInstanceForMultiLineEditor = nullptr;
|
|
}
|
|
|
|
void
|
|
NativeKeyBindings::Init(NativeKeyBindingsType aType)
|
|
{
|
|
switch (aType) {
|
|
case nsIWidget::NativeKeyBindingsForSingleLineEditor:
|
|
mNativeTarget = gtk_entry_new();
|
|
break;
|
|
default:
|
|
mNativeTarget = gtk_text_view_new();
|
|
if (gtk_major_version > 2 ||
|
|
(gtk_major_version == 2 && (gtk_minor_version > 2 ||
|
|
(gtk_minor_version == 2 &&
|
|
gtk_micro_version >= 2)))) {
|
|
// select_all only exists in gtk >= 2.2.2. Prior to that,
|
|
// ctrl+a is bound to (move to beginning, select to end).
|
|
g_signal_connect(mNativeTarget, "select_all",
|
|
G_CALLBACK(select_all_cb), this);
|
|
}
|
|
break;
|
|
}
|
|
|
|
g_object_ref_sink(mNativeTarget);
|
|
|
|
g_signal_connect(mNativeTarget, "copy_clipboard",
|
|
G_CALLBACK(copy_clipboard_cb), this);
|
|
g_signal_connect(mNativeTarget, "cut_clipboard",
|
|
G_CALLBACK(cut_clipboard_cb), this);
|
|
g_signal_connect(mNativeTarget, "delete_from_cursor",
|
|
G_CALLBACK(delete_from_cursor_cb), this);
|
|
g_signal_connect(mNativeTarget, "move_cursor",
|
|
G_CALLBACK(move_cursor_cb), this);
|
|
g_signal_connect(mNativeTarget, "paste_clipboard",
|
|
G_CALLBACK(paste_clipboard_cb), this);
|
|
}
|
|
|
|
NativeKeyBindings::~NativeKeyBindings()
|
|
{
|
|
gtk_widget_destroy(mNativeTarget);
|
|
g_object_unref(mNativeTarget);
|
|
}
|
|
|
|
bool
|
|
NativeKeyBindings::Execute(const WidgetKeyboardEvent& aEvent,
|
|
DoCommandCallback aCallback,
|
|
void* aCallbackData)
|
|
{
|
|
// If the native key event is set, it must be synthesized for tests.
|
|
// We just ignore such events because this behavior depends on system
|
|
// settings.
|
|
if (!aEvent.mNativeKeyEvent) {
|
|
// It must be synthesized event or dispatched DOM event from chrome.
|
|
return false;
|
|
}
|
|
|
|
guint keyval;
|
|
|
|
if (aEvent.charCode) {
|
|
keyval = gdk_unicode_to_keyval(aEvent.charCode);
|
|
} else {
|
|
keyval =
|
|
static_cast<GdkEventKey*>(aEvent.mNativeKeyEvent)->keyval;
|
|
}
|
|
|
|
if (ExecuteInternal(aEvent, aCallback, aCallbackData, keyval)) {
|
|
return true;
|
|
}
|
|
|
|
for (uint32_t i = 0; i < aEvent.alternativeCharCodes.Length(); ++i) {
|
|
uint32_t ch = aEvent.IsShift() ?
|
|
aEvent.alternativeCharCodes[i].mShiftedCharCode :
|
|
aEvent.alternativeCharCodes[i].mUnshiftedCharCode;
|
|
if (ch && ch != aEvent.charCode) {
|
|
keyval = gdk_unicode_to_keyval(ch);
|
|
if (ExecuteInternal(aEvent, aCallback, aCallbackData, keyval)) {
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
gtk_bindings_activate_event is preferable, but it has unresolved bug:
|
|
http://bugzilla.gnome.org/show_bug.cgi?id=162726
|
|
The bug was already marked as FIXED. However, somebody reports that the
|
|
bug still exists.
|
|
Also gtk_bindings_activate may work with some non-shortcuts operations
|
|
(todo: check it). See bug 411005 and bug 406407.
|
|
|
|
Code, which should be used after fixing GNOME bug 162726:
|
|
|
|
gtk_bindings_activate_event(GTK_OBJECT(mNativeTarget),
|
|
static_cast<GdkEventKey*>(aEvent.mNativeKeyEvent));
|
|
*/
|
|
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
NativeKeyBindings::ExecuteInternal(const WidgetKeyboardEvent& aEvent,
|
|
DoCommandCallback aCallback,
|
|
void* aCallbackData,
|
|
guint aKeyval)
|
|
{
|
|
guint modifiers =
|
|
static_cast<GdkEventKey*>(aEvent.mNativeKeyEvent)->state;
|
|
|
|
gCurrentCallback = aCallback;
|
|
gCurrentCallbackData = aCallbackData;
|
|
|
|
gHandled = false;
|
|
#if (MOZ_WIDGET_GTK == 2)
|
|
gtk_bindings_activate(GTK_OBJECT(mNativeTarget),
|
|
aKeyval, GdkModifierType(modifiers));
|
|
#else
|
|
gtk_bindings_activate(G_OBJECT(mNativeTarget),
|
|
aKeyval, GdkModifierType(modifiers));
|
|
#endif
|
|
|
|
gCurrentCallback = nullptr;
|
|
gCurrentCallbackData = nullptr;
|
|
|
|
return gHandled;
|
|
}
|
|
|
|
} // namespace widget
|
|
} // namespace mozilla
|