Contents of /trunk/mozilla-thunderbird/patches/mozilla-firefox-1.5.0-embed-typeaheadfind.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 41361 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 41361 byte(s)
-import
1 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/Makefile.in mozilla/extensions/typeaheadfind/Makefile.in |
2 | --- mozilla.orig/extensions/typeaheadfind/Makefile.in 2005-03-26 00:12:02.000000000 -0500 |
3 | +++ mozilla/extensions/typeaheadfind/Makefile.in 2005-03-26 11:39:29.000000000 -0500 |
4 | @@ -31,7 +31,7 @@ |
5 | |
6 | include $(DEPTH)/config/autoconf.mk |
7 | |
8 | -MODULE = typeaheadfind |
9 | +MODULE = typeaheadfindsea |
10 | DIRS = public src resources |
11 | |
12 | include $(topsrcdir)/config/rules.mk |
13 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/public/Makefile.in mozilla/extensions/typeaheadfind/public/Makefile.in |
14 | --- mozilla.orig/extensions/typeaheadfind/public/Makefile.in 2005-03-26 00:12:02.000000000 -0500 |
15 | +++ mozilla/extensions/typeaheadfind/public/Makefile.in 2005-03-26 11:39:29.000000000 -0500 |
16 | @@ -31,11 +31,11 @@ |
17 | |
18 | include $(DEPTH)/config/autoconf.mk |
19 | |
20 | -MODULE=typeaheadfind |
21 | -XPIDL_MODULE=typeaheadfind |
22 | +MODULE=typeaheadfindsea |
23 | +XPIDL_MODULE=typeaheadfindsea |
24 | GRE_MODULE = 1 |
25 | |
26 | -XPIDLSRCS= ./nsITypeAheadFind.idl \ |
27 | +XPIDLSRCS= ./nsITypeAheadFindSea.idl \ |
28 | $(NULL) |
29 | |
30 | |
31 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl |
32 | --- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFind.idl 2005-03-26 00:12:02.000000000 -0500 |
33 | +++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFind.idl 1969-12-31 19:00:00.000000000 -0500 |
34 | @@ -1,88 +0,0 @@ |
35 | -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
36 | -/* ***** BEGIN LICENSE BLOCK ***** |
37 | - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
38 | - * |
39 | - * The contents of this file are subject to the Mozilla Public License Version |
40 | - * 1.1 (the "License"); you may not use this file except in compliance with |
41 | - * the License. You may obtain a copy of the License at |
42 | - * http://www.mozilla.org/MPL/ |
43 | - * |
44 | - * Software distributed under the License is distributed on an "AS IS" basis, |
45 | - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
46 | - * for the specific language governing rights and limitations under the |
47 | - * License. |
48 | - * |
49 | - * The Original Code is mozilla.org code. |
50 | - * |
51 | - * The Initial Developer of the Original Code is |
52 | - * Netscape Communications Corporation. |
53 | - * Portions created by the Initial Developer are Copyright (C) 1998 |
54 | - * the Initial Developer. All Rights Reserved. |
55 | - * |
56 | - * Contributor(s): |
57 | - * Original Author: Aaron Leventhal (aaronl@netscape.com) |
58 | - * |
59 | - * Alternatively, the contents of this file may be used under the terms of |
60 | - * either the GNU General Public License Version 2 or later (the "GPL"), or |
61 | - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
62 | - * in which case the provisions of the GPL or the LGPL are applicable instead |
63 | - * of those above. If you wish to allow use of your version of this file only |
64 | - * under the terms of either the GPL or the LGPL, and not to allow others to |
65 | - * use your version of this file under the terms of the MPL, indicate your |
66 | - * decision by deleting the provisions above and replace them with the notice |
67 | - * and other provisions required by the GPL or the LGPL. If you do not delete |
68 | - * the provisions above, a recipient may use your version of this file under |
69 | - * the terms of any one of the MPL, the GPL or the LGPL. |
70 | - * |
71 | - * ***** END LICENSE BLOCK ***** */ |
72 | - |
73 | -#include "nsISupports.idl" |
74 | -#include "domstubs.idl" |
75 | -#include "nsISupportsPrimitives.idl" |
76 | - |
77 | -%{ C++ |
78 | - #include "nsIDOMEvent.h" |
79 | - |
80 | - #define NS_TYPEAHEADFIND_CID \ |
81 | - {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}} |
82 | - |
83 | - #define NS_TYPEAHEADFIND_CONTRACTID "@mozilla.org/typeaheadfind;1" |
84 | -%} |
85 | - |
86 | -interface nsIDOMEvent; |
87 | - |
88 | -[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)] |
89 | -interface nsITypeAheadFind : nsISupports |
90 | -{ |
91 | - /** Is type ahead find mode currently on? */ |
92 | - readonly attribute boolean isActive; |
93 | - |
94 | - /** Manually start type ahead find mode */ |
95 | - void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly); |
96 | - |
97 | - /** Manually cancel type ahead find mode */ |
98 | - void cancelFind(); |
99 | - |
100 | - /** |
101 | - * Will find as you type start automatically if the user |
102 | - * types with the focus on page content other than a textfield or select? |
103 | - * If autostart is off, the startNewFind() method can be used to enact |
104 | - * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText. |
105 | - */ |
106 | - void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn); |
107 | - boolean getAutoStart(in nsIDOMWindow aWindow); |
108 | - |
109 | - /** |
110 | - * Find next recurrence if typeaheadfind was the last used find, |
111 | - * as opposed to regular find. Returns false in nsISupportsPRBool if we |
112 | - * don't handle the request. |
113 | - */ |
114 | - void findNext(in boolean aReverse, in nsISupportsInterfacePointer aCallerWindowSupports); |
115 | - |
116 | - /* |
117 | - * Go back and remove one character from find string |
118 | - * Returns true if backspace used |
119 | - */ |
120 | - boolean backOneChar(); |
121 | -}; |
122 | - |
123 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl |
124 | --- mozilla.orig/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl 1969-12-31 19:00:00.000000000 -0500 |
125 | +++ mozilla/extensions/typeaheadfind/public/nsITypeAheadFindSea.idl 2005-03-26 11:39:29.000000000 -0500 |
126 | @@ -0,0 +1,88 @@ |
127 | +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
128 | +/* ***** BEGIN LICENSE BLOCK ***** |
129 | + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
130 | + * |
131 | + * The contents of this file are subject to the Mozilla Public License Version |
132 | + * 1.1 (the "License"); you may not use this file except in compliance with |
133 | + * the License. You may obtain a copy of the License at |
134 | + * http://www.mozilla.org/MPL/ |
135 | + * |
136 | + * Software distributed under the License is distributed on an "AS IS" basis, |
137 | + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
138 | + * for the specific language governing rights and limitations under the |
139 | + * License. |
140 | + * |
141 | + * The Original Code is mozilla.org code. |
142 | + * |
143 | + * The Initial Developer of the Original Code is |
144 | + * Netscape Communications Corporation. |
145 | + * Portions created by the Initial Developer are Copyright (C) 1998 |
146 | + * the Initial Developer. All Rights Reserved. |
147 | + * |
148 | + * Contributor(s): |
149 | + * Original Author: Aaron Leventhal (aaronl@netscape.com) |
150 | + * |
151 | + * Alternatively, the contents of this file may be used under the terms of |
152 | + * either the GNU General Public License Version 2 or later (the "GPL"), or |
153 | + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
154 | + * in which case the provisions of the GPL or the LGPL are applicable instead |
155 | + * of those above. If you wish to allow use of your version of this file only |
156 | + * under the terms of either the GPL or the LGPL, and not to allow others to |
157 | + * use your version of this file under the terms of the MPL, indicate your |
158 | + * decision by deleting the provisions above and replace them with the notice |
159 | + * and other provisions required by the GPL or the LGPL. If you do not delete |
160 | + * the provisions above, a recipient may use your version of this file under |
161 | + * the terms of any one of the MPL, the GPL or the LGPL. |
162 | + * |
163 | + * ***** END LICENSE BLOCK ***** */ |
164 | + |
165 | +#include "nsISupports.idl" |
166 | +#include "domstubs.idl" |
167 | +#include "nsISupportsPrimitives.idl" |
168 | + |
169 | +%{ C++ |
170 | + #include "nsIDOMEvent.h" |
171 | + |
172 | + #define NS_TYPEAHEADFINDSEA_CID \ |
173 | + {0x46590685, 0xbc00, 0x4aac, {0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4}} |
174 | + |
175 | + #define NS_TYPEAHEADFINDSEA_CONTRACTID "@mozilla.org/typeaheadfindsea;1" |
176 | +%} |
177 | + |
178 | +interface nsIDOMEvent; |
179 | + |
180 | +[scriptable, uuid(AD1C62CC-72F4-4c5b-BE78-503854F9E0D8)] |
181 | +interface nsITypeAheadFindSea : nsISupports |
182 | +{ |
183 | + /** Is type ahead find mode currently on? */ |
184 | + readonly attribute boolean isActive; |
185 | + |
186 | + /** Manually start type ahead find mode */ |
187 | + void startNewFind(in nsIDOMWindow aWindow, in boolean aLinksOnly); |
188 | + |
189 | + /** Manually cancel type ahead find mode */ |
190 | + void cancelFind(); |
191 | + |
192 | + /** |
193 | + * Will find as you type start automatically if the user |
194 | + * types with the focus on page content other than a textfield or select? |
195 | + * If autostart is off, the startNewFind() method can be used to enact |
196 | + * type ahead find, as well as cmd_findTypeLinks or cmd_findTypeText. |
197 | + */ |
198 | + void setAutoStart(in nsIDOMWindow aWindow, in boolean aIsAutoStartOn); |
199 | + boolean getAutoStart(in nsIDOMWindow aWindow); |
200 | + |
201 | + /** |
202 | + * Find next recurrence if typeaheadfindsea was the last used find, |
203 | + * as opposed to regular find. Returns false in nsISupportsPRBool if we |
204 | + * don't handle the request. |
205 | + */ |
206 | + void findNext(in boolean aReverse, in nsISupportsInterfacePointer aCallerWindowSupports); |
207 | + |
208 | + /* |
209 | + * Go back and remove one character from find string |
210 | + * Returns true if backspace used |
211 | + */ |
212 | + boolean backOneChar(); |
213 | +}; |
214 | + |
215 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js |
216 | --- mozilla.orig/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js 2005-03-26 00:12:02.000000000 -0500 |
217 | +++ mozilla/extensions/typeaheadfind/resources/content/prefs/typeaheadfind.js 2005-03-26 11:39:29.000000000 -0500 |
218 | @@ -36,7 +36,7 @@ |
219 | * |
220 | * ***** END LICENSE BLOCK ***** */ |
221 | |
222 | -pref("accessibility.typeaheadfind", true); |
223 | -pref("accessibility.typeaheadfind.linksonly", true); |
224 | -pref("accessibility.typeaheadfind.startlinksonly", false); |
225 | -pref("accessibility.typeaheadfind.timeout", 5000); |
226 | +pref("accessibility.typeaheadfindsea", true); |
227 | +pref("accessibility.typeaheadfindsea.linksonly", true); |
228 | +pref("accessibility.typeaheadfindsea.startlinksonly", false); |
229 | +pref("accessibility.typeaheadfindsea.timeout", 5000); |
230 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/jar.mn mozilla/extensions/typeaheadfind/resources/jar.mn |
231 | --- mozilla.orig/extensions/typeaheadfind/resources/jar.mn 2005-03-26 00:12:02.000000000 -0500 |
232 | +++ mozilla/extensions/typeaheadfind/resources/jar.mn 2005-03-26 11:39:29.000000000 -0500 |
233 | @@ -1,5 +1,5 @@ |
234 | en-US.jar: |
235 | - locale/en-US/global/typeaheadfind.properties (locale/en-US/typeaheadfind.properties) |
236 | + locale/en-US/global/typeaheadfindsea.properties (locale/en-US/typeaheadfindsea.properties) |
237 | |
238 | toolkit.jar: |
239 | content/global/notfound.wav (content/notfound.wav) |
240 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties |
241 | --- mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties 2005-03-26 00:12:02.000000000 -0500 |
242 | +++ mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfind.properties 1969-12-31 19:00:00.000000000 -0500 |
243 | @@ -1,13 +0,0 @@ |
244 | -openparen = ( |
245 | -closeparen = ) |
246 | -textfound = Text found: " |
247 | -textnotfound = Text not found: " |
248 | -linkfound = Link found: " |
249 | -linknotfound = Link not found: " |
250 | -closequote = " |
251 | -stopfind = Find stopped. |
252 | -starttextfind = Starting -- find text as you type |
253 | -startlinkfind = Starting -- find links as you type |
254 | -repeated = repeated |
255 | -nextmatch = - next match |
256 | -prevmatch = - previous match |
257 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties |
258 | --- mozilla.orig/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties 1969-12-31 19:00:00.000000000 -0500 |
259 | +++ mozilla/extensions/typeaheadfind/resources/locale/en-US/typeaheadfindsea.properties 2005-03-26 11:39:29.000000000 -0500 |
260 | @@ -0,0 +1,13 @@ |
261 | +openparen = ( |
262 | +closeparen = ) |
263 | +textfound = Text found: " |
264 | +textnotfound = Text not found: " |
265 | +linkfound = Link found: " |
266 | +linknotfound = Link not found: " |
267 | +closequote = " |
268 | +stopfind = Find stopped. |
269 | +starttextfind = Starting -- find text as you type |
270 | +startlinkfind = Starting -- find links as you type |
271 | +repeated = repeated |
272 | +nextmatch = - next match |
273 | +prevmatch = - previous match |
274 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/Makefile.in mozilla/extensions/typeaheadfind/src/Makefile.in |
275 | --- mozilla.orig/extensions/typeaheadfind/src/Makefile.in 2005-03-26 00:12:02.000000000 -0500 |
276 | +++ mozilla/extensions/typeaheadfind/src/Makefile.in 2005-03-26 11:39:29.000000000 -0500 |
277 | @@ -31,15 +31,15 @@ |
278 | |
279 | include $(DEPTH)/config/autoconf.mk |
280 | |
281 | -MODULE = typeaheadfind |
282 | -LIBRARY_NAME = typeaheadfind |
283 | +MODULE = typeaheadfindsea |
284 | +LIBRARY_NAME = typeaheadfindsea |
285 | ifneq ($(OS_ARCH),WINNT) |
286 | -SHORT_LIBNAME = typahead |
287 | +SHORT_LIBNAME = typaheadsea |
288 | endif |
289 | GRE_MODULE = 1 |
290 | MOZILLA_INTERNAL_API = 1 |
291 | |
292 | -PACKAGE_FILE = typeaheadfind.pkg |
293 | +PACKAGE_FILE = typeaheadfindsea.pkg |
294 | |
295 | REQUIRES = appcomps \ |
296 | embedcomponents \ |
297 | @@ -66,7 +66,7 @@ |
298 | |
299 | EXPORT_LIBRARY = 1 |
300 | IS_COMPONENT = 1 |
301 | -MODULE_NAME = nsTypeAheadFind |
302 | +MODULE_NAME = nsTypeAheadFindSea |
303 | |
304 | CPPSRCS = \ |
305 | nsTypeAheadFind.cpp \ |
306 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.cpp mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp |
307 | --- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.cpp 2005-03-26 00:12:02.000000000 -0500 |
308 | +++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp 2005-03-26 11:39:29.000000000 -0500 |
309 | @@ -114,8 +114,8 @@ |
310 | //////////////////////////////////////////////////////////////////////// |
311 | |
312 | |
313 | -NS_INTERFACE_MAP_BEGIN(nsTypeAheadFind) |
314 | - NS_INTERFACE_MAP_ENTRY(nsITypeAheadFind) |
315 | +NS_INTERFACE_MAP_BEGIN(nsTypeAheadFindSea) |
316 | + NS_INTERFACE_MAP_ENTRY(nsITypeAheadFindSea) |
317 | NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) |
318 | NS_INTERFACE_MAP_ENTRY(nsITimerCallback) |
319 | NS_INTERFACE_MAP_ENTRY(nsIScrollPositionListener) |
320 | @@ -128,8 +128,8 @@ |
321 | NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsIDOMEventListener, nsIDOMKeyListener) |
322 | NS_INTERFACE_MAP_END |
323 | |
324 | -NS_IMPL_ADDREF(nsTypeAheadFind) |
325 | -NS_IMPL_RELEASE(nsTypeAheadFind) |
326 | +NS_IMPL_ADDREF(nsTypeAheadFindSea) |
327 | +NS_IMPL_RELEASE(nsTypeAheadFindSea) |
328 | |
329 | static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID); |
330 | static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); |
331 | @@ -138,11 +138,11 @@ |
332 | |
333 | #define NS_FIND_CONTRACTID "@mozilla.org/embedcomp/rangefind;1" |
334 | |
335 | -nsTypeAheadFind* nsTypeAheadFind::sInstance = nsnull; |
336 | -PRInt32 nsTypeAheadFind::sAccelKey = -1; // magic value of -1 when unitialized |
337 | +nsTypeAheadFindSea* nsTypeAheadFindSea::sInstance = nsnull; |
338 | +PRInt32 nsTypeAheadFindSea::sAccelKey = -1; // magic value of -1 when unitialized |
339 | |
340 | |
341 | -nsTypeAheadFind::nsTypeAheadFind(): |
342 | +nsTypeAheadFindSea::nsTypeAheadFindSea(): |
343 | mIsFindAllowedInWindow(PR_FALSE), mAutoStartPref(PR_FALSE), |
344 | mLinksOnlyPref(PR_FALSE), mStartLinksOnlyPref(PR_FALSE), |
345 | mLinksOnly(PR_FALSE), mIsTypeAheadOn(PR_FALSE), mCaretBrowsingOn(PR_FALSE), |
346 | @@ -161,25 +161,25 @@ |
347 | static PRInt32 gInstanceCount; |
348 | ++gInstanceCount; |
349 | NS_ASSERTION(gInstanceCount == 1, |
350 | - "There should be only 1 instance of nsTypeAheadFind!"); |
351 | + "There should be only 1 instance of nsTypeAheadFindSea!"); |
352 | #endif |
353 | } |
354 | |
355 | |
356 | -nsTypeAheadFind::~nsTypeAheadFind() |
357 | +nsTypeAheadFindSea::~nsTypeAheadFindSea() |
358 | { |
359 | RemoveDocListeners(); |
360 | mTimer = nsnull; |
361 | |
362 | nsCOMPtr<nsIPrefBranch2> prefInternal(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
363 | if (prefInternal) { |
364 | - prefInternal->RemoveObserver("accessibility.typeaheadfind", this); |
365 | + prefInternal->RemoveObserver("accessibility.typeaheadfindsea", this); |
366 | prefInternal->RemoveObserver("accessibility.browsewithcaret", this); |
367 | } |
368 | } |
369 | |
370 | nsresult |
371 | -nsTypeAheadFind::Init() |
372 | +nsTypeAheadFindSea::Init() |
373 | { |
374 | nsresult rv = NS_NewISupportsArray(getter_AddRefs(mManualFindWindows)); |
375 | NS_ENSURE_SUCCESS(rv, rv); |
376 | @@ -196,7 +196,7 @@ |
377 | } |
378 | |
379 | // ----------- Listen to prefs ------------------ |
380 | - rv = prefInternal->AddObserver("accessibility.typeaheadfind", this, PR_FALSE); |
381 | + rv = prefInternal->AddObserver("accessibility.typeaheadfindsea", this, PR_FALSE); |
382 | NS_ENSURE_SUCCESS(rv, rv); |
383 | |
384 | rv = prefInternal->AddObserver("accessibility.browsewithcaret", this, PR_FALSE); |
385 | @@ -217,11 +217,11 @@ |
386 | return rv; |
387 | } |
388 | |
389 | -nsTypeAheadFind * |
390 | -nsTypeAheadFind::GetInstance() |
391 | +nsTypeAheadFindSea * |
392 | +nsTypeAheadFindSea::GetInstance() |
393 | { |
394 | if (!sInstance) { |
395 | - sInstance = new nsTypeAheadFind(); |
396 | + sInstance = new nsTypeAheadFindSea(); |
397 | if (!sInstance) |
398 | return nsnull; |
399 | |
400 | @@ -241,14 +241,14 @@ |
401 | |
402 | |
403 | void |
404 | -nsTypeAheadFind::ReleaseInstance() |
405 | +nsTypeAheadFindSea::ReleaseInstance() |
406 | { |
407 | NS_IF_RELEASE(sInstance); |
408 | } |
409 | |
410 | |
411 | void |
412 | -nsTypeAheadFind::Shutdown() |
413 | +nsTypeAheadFindSea::Shutdown() |
414 | { |
415 | // Application shutdown |
416 | mTimer = nsnull; |
417 | @@ -264,14 +264,14 @@ |
418 | // ------- Pref Callbacks (2) --------------- |
419 | |
420 | nsresult |
421 | -nsTypeAheadFind::PrefsReset() |
422 | +nsTypeAheadFindSea::PrefsReset() |
423 | { |
424 | nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID)); |
425 | NS_ENSURE_TRUE(prefBranch, NS_ERROR_FAILURE); |
426 | |
427 | PRBool wasTypeAheadOn = mIsTypeAheadOn; |
428 | |
429 | - prefBranch->GetBoolPref("accessibility.typeaheadfind", &mIsTypeAheadOn); |
430 | + prefBranch->GetBoolPref("accessibility.typeaheadfindsea", &mIsTypeAheadOn); |
431 | |
432 | if (mIsTypeAheadOn != wasTypeAheadOn) { |
433 | if (!mIsTypeAheadOn) { |
434 | @@ -291,7 +291,7 @@ |
435 | do_GetService(kStringBundleServiceCID); |
436 | |
437 | if (stringBundleService) |
438 | - stringBundleService->CreateBundle(TYPEAHEADFIND_BUNDLE_URL, |
439 | + stringBundleService->CreateBundle(TYPEAHEADFINDSEA_BUNDLE_URL, |
440 | getter_AddRefs(mStringBundle)); |
441 | |
442 | // Observe find again commands. We'll handle them if we were the last find |
443 | @@ -306,34 +306,34 @@ |
444 | } |
445 | |
446 | PRBool oldAutoStartPref = mAutoStartPref; |
447 | - prefBranch->GetBoolPref("accessibility.typeaheadfind.autostart", |
448 | + prefBranch->GetBoolPref("accessibility.typeaheadfindsea.autostart", |
449 | &mAutoStartPref); |
450 | if (mAutoStartPref != oldAutoStartPref) { |
451 | ResetGlobalAutoStart(mAutoStartPref); |
452 | } |
453 | |
454 | - prefBranch->GetBoolPref("accessibility.typeaheadfind.linksonly", |
455 | + prefBranch->GetBoolPref("accessibility.typeaheadfindsea.linksonly", |
456 | &mLinksOnlyPref); |
457 | |
458 | - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", |
459 | + prefBranch->GetBoolPref("accessibility.typeaheadfindsea.startlinksonly", |
460 | &mStartLinksOnlyPref); |
461 | |
462 | PRBool isSoundEnabled = PR_TRUE; |
463 | - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", |
464 | + prefBranch->GetBoolPref("accessibility.typeaheadfindsea.enablesound", |
465 | &isSoundEnabled); |
466 | nsXPIDLCString soundStr; |
467 | if (isSoundEnabled) { |
468 | - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", |
469 | + prefBranch->GetCharPref("accessibility.typeaheadfindsea.soundURL", |
470 | getter_Copies(soundStr)); |
471 | } |
472 | mNotFoundSoundURL = soundStr; |
473 | |
474 | PRBool isTimeoutEnabled = PR_FALSE; |
475 | - prefBranch->GetBoolPref("accessibility.typeaheadfind.enabletimeout", |
476 | + prefBranch->GetBoolPref("accessibility.typeaheadfindsea.enabletimeout", |
477 | &isTimeoutEnabled); |
478 | PRInt32 timeoutLength = 0; |
479 | if (isTimeoutEnabled) { |
480 | - prefBranch->GetIntPref("accessibility.typeaheadfind.timeout", |
481 | + prefBranch->GetIntPref("accessibility.typeaheadfindsea.timeout", |
482 | &timeoutLength); |
483 | } |
484 | mTimeoutLength = timeoutLength; |
485 | @@ -349,7 +349,7 @@ |
486 | // ------- nsITimer Methods (1) --------------- |
487 | |
488 | NS_IMETHODIMP |
489 | -nsTypeAheadFind::Notify(nsITimer *timer) |
490 | +nsTypeAheadFindSea::Notify(nsITimer *timer) |
491 | { |
492 | CancelFind(); |
493 | return NS_OK; |
494 | @@ -358,7 +358,7 @@ |
495 | // ----------- nsIObserver Methods (1) ------------------- |
496 | |
497 | NS_IMETHODIMP |
498 | -nsTypeAheadFind::Observe(nsISupports *aSubject, const char *aTopic, |
499 | +nsTypeAheadFindSea::Observe(nsISupports *aSubject, const char *aTopic, |
500 | const PRUnichar *aData) |
501 | { |
502 | PRBool isOpening; |
503 | @@ -476,7 +476,7 @@ |
504 | |
505 | |
506 | nsresult |
507 | -nsTypeAheadFind::UseInWindow(nsIDOMWindow *aDOMWin) |
508 | +nsTypeAheadFindSea::UseInWindow(nsIDOMWindow *aDOMWin) |
509 | { |
510 | NS_ENSURE_ARG_POINTER(aDOMWin); |
511 | |
512 | @@ -529,7 +529,7 @@ |
513 | // ------- nsIDOMEventListener Methods (1) --------------- |
514 | |
515 | NS_IMETHODIMP |
516 | -nsTypeAheadFind::HandleEvent(nsIDOMEvent* aEvent) |
517 | +nsTypeAheadFindSea::HandleEvent(nsIDOMEvent* aEvent) |
518 | { |
519 | nsAutoString eventType; |
520 | aEvent->GetType(eventType); |
521 | @@ -589,21 +589,21 @@ |
522 | // ------- nsIDOMKeyListener Methods (3) --------------- |
523 | |
524 | NS_IMETHODIMP |
525 | -nsTypeAheadFind::KeyDown(nsIDOMEvent* aEvent) |
526 | +nsTypeAheadFindSea::KeyDown(nsIDOMEvent* aEvent) |
527 | { |
528 | return NS_OK; |
529 | } |
530 | |
531 | |
532 | NS_IMETHODIMP |
533 | -nsTypeAheadFind::KeyUp(nsIDOMEvent* aEvent) |
534 | +nsTypeAheadFindSea::KeyUp(nsIDOMEvent* aEvent) |
535 | { |
536 | return NS_OK; |
537 | } |
538 | |
539 | |
540 | NS_IMETHODIMP |
541 | -nsTypeAheadFind::KeyPress(nsIDOMEvent* aEvent) |
542 | +nsTypeAheadFindSea::KeyPress(nsIDOMEvent* aEvent) |
543 | { |
544 | if (!mIsTypeAheadOn || mIsMenuBarActive || mIsMenuPopupActive) { |
545 | return NS_OK; |
546 | @@ -733,7 +733,7 @@ |
547 | |
548 | |
549 | NS_IMETHODIMP |
550 | -nsTypeAheadFind::BackOneChar(PRBool *aIsBackspaceUsed) |
551 | +nsTypeAheadFindSea::BackOneChar(PRBool *aIsBackspaceUsed) |
552 | { |
553 | if (!mFocusedDocSelection) { |
554 | *aIsBackspaceUsed = PR_FALSE; |
555 | @@ -863,7 +863,7 @@ |
556 | |
557 | |
558 | nsresult |
559 | -nsTypeAheadFind::HandleChar(PRUnichar aChar) |
560 | +nsTypeAheadFindSea::HandleChar(PRUnichar aChar) |
561 | { |
562 | // Add a printable char to mTypeAheadBuffer, then search for buffer contents |
563 | |
564 | @@ -1039,7 +1039,7 @@ |
565 | |
566 | |
567 | void |
568 | -nsTypeAheadFind::SaveFind() |
569 | +nsTypeAheadFindSea::SaveFind() |
570 | { |
571 | // Store find string for find-next |
572 | mFindNextBuffer = mTypeAheadBuffer; |
573 | @@ -1060,14 +1060,14 @@ |
574 | mFindService->SetSearchString(mFindNextBuffer); |
575 | } |
576 | |
577 | - // --- If accessibility.typeaheadfind.timeout is set, |
578 | + // --- If accessibility.typeaheadfindsea.timeout is set, |
579 | // cancel find after specified # milliseconds --- |
580 | StartTimeout(); |
581 | } |
582 | |
583 | |
584 | void |
585 | -nsTypeAheadFind::PlayNotFoundSound() |
586 | +nsTypeAheadFindSea::PlayNotFoundSound() |
587 | { |
588 | if (mNotFoundSoundURL.IsEmpty()) // no sound |
589 | return; |
590 | @@ -1097,7 +1097,7 @@ |
591 | |
592 | |
593 | NS_IMETHODIMP |
594 | -nsTypeAheadFind::HandleText(nsIDOMEvent* aTextEvent) |
595 | +nsTypeAheadFindSea::HandleText(nsIDOMEvent* aTextEvent) |
596 | { |
597 | // This is called multiple times in the middle of an |
598 | // IME composition |
599 | @@ -1145,7 +1145,7 @@ |
600 | |
601 | |
602 | NS_IMETHODIMP |
603 | -nsTypeAheadFind::HandleStartComposition(nsIDOMEvent* aCompositionEvent) |
604 | +nsTypeAheadFindSea::HandleStartComposition(nsIDOMEvent* aCompositionEvent) |
605 | { |
606 | // This is called once at the start of an IME composition |
607 | |
608 | @@ -1167,7 +1167,7 @@ |
609 | |
610 | |
611 | NS_IMETHODIMP |
612 | -nsTypeAheadFind::HandleEndComposition(nsIDOMEvent* aCompositionEvent) |
613 | +nsTypeAheadFindSea::HandleEndComposition(nsIDOMEvent* aCompositionEvent) |
614 | { |
615 | // This is called once at the end of an IME composition |
616 | |
617 | @@ -1198,28 +1198,28 @@ |
618 | |
619 | |
620 | NS_IMETHODIMP |
621 | -nsTypeAheadFind::HandleQueryComposition(nsIDOMEvent* aCompositionEvent) |
622 | +nsTypeAheadFindSea::HandleQueryComposition(nsIDOMEvent* aCompositionEvent) |
623 | { |
624 | return NS_OK; |
625 | } |
626 | |
627 | |
628 | NS_IMETHODIMP |
629 | -nsTypeAheadFind::HandleQueryReconversion(nsIDOMEvent* aCompositionEvent) |
630 | +nsTypeAheadFindSea::HandleQueryReconversion(nsIDOMEvent* aCompositionEvent) |
631 | { |
632 | return NS_OK; |
633 | } |
634 | |
635 | |
636 | NS_IMETHODIMP |
637 | -nsTypeAheadFind::HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent) |
638 | +nsTypeAheadFindSea::HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent) |
639 | { |
640 | return NS_OK; |
641 | } |
642 | |
643 | |
644 | nsresult |
645 | -nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, |
646 | +nsTypeAheadFindSea::FindItNow(nsIPresShell *aPresShell, |
647 | PRBool aIsRepeatingSameChar, PRBool aIsLinksOnly, |
648 | PRBool aIsFirstVisiblePreferred) |
649 | { |
650 | @@ -1241,7 +1241,7 @@ |
651 | |
652 | nsCOMPtr<nsISupports> startingContainer = presContext->GetContainer(); |
653 | nsCOMPtr<nsIDocShellTreeItem> treeItem(do_QueryInterface(startingContainer)); |
654 | - NS_ASSERTION(treeItem, "Bug 175321 Crashes with Type Ahead Find [@ nsTypeAheadFind::FindItNow]"); |
655 | + NS_ASSERTION(treeItem, "Bug 175321 Crashes with Type Ahead Find [@ nsTypeAheadFindSea::FindItNow]"); |
656 | if (!treeItem) { |
657 | return NS_ERROR_FAILURE; |
658 | } |
659 | @@ -1465,7 +1465,7 @@ |
660 | |
661 | |
662 | nsresult |
663 | -nsTypeAheadFind::GetSearchContainers(nsISupports *aContainer, |
664 | +nsTypeAheadFindSea::GetSearchContainers(nsISupports *aContainer, |
665 | PRBool aIsRepeatingSameChar, |
666 | PRBool aIsFirstVisiblePreferred, |
667 | PRBool aCanUseDocSelection, |
668 | @@ -1573,7 +1573,7 @@ |
669 | |
670 | |
671 | void |
672 | -nsTypeAheadFind::RangeStartsInsideLink(nsIDOMRange *aRange, |
673 | +nsTypeAheadFindSea::RangeStartsInsideLink(nsIDOMRange *aRange, |
674 | nsIPresShell *aPresShell, |
675 | PRBool *aIsInsideLink, |
676 | PRBool *aIsStartingLink) |
677 | @@ -1680,7 +1680,7 @@ |
678 | |
679 | |
680 | NS_IMETHODIMP |
681 | -nsTypeAheadFind::ScrollPositionWillChange(nsIScrollableView *aView, |
682 | +nsTypeAheadFindSea::ScrollPositionWillChange(nsIScrollableView *aView, |
683 | nscoord aX, nscoord aY) |
684 | { |
685 | return NS_OK; |
686 | @@ -1688,7 +1688,7 @@ |
687 | |
688 | |
689 | NS_IMETHODIMP |
690 | -nsTypeAheadFind::ScrollPositionDidChange(nsIScrollableView *aScrollableView, |
691 | +nsTypeAheadFindSea::ScrollPositionDidChange(nsIScrollableView *aScrollableView, |
692 | nscoord aX, nscoord aY) |
693 | { |
694 | if (!mIsFindingText) |
695 | @@ -1699,7 +1699,7 @@ |
696 | |
697 | |
698 | NS_IMETHODIMP |
699 | -nsTypeAheadFind::NotifySelectionChanged(nsIDOMDocument *aDoc, |
700 | +nsTypeAheadFindSea::NotifySelectionChanged(nsIDOMDocument *aDoc, |
701 | nsISelection *aSel, PRInt16 aReason) |
702 | { |
703 | if (!mIsFindingText) { |
704 | @@ -1716,10 +1716,10 @@ |
705 | } |
706 | |
707 | |
708 | -// ---------------- nsITypeAheadFind -------------------- |
709 | +// ---------------- nsITypeAheadFindSea -------------------- |
710 | |
711 | NS_IMETHODIMP |
712 | -nsTypeAheadFind::FindNext(PRBool aFindBackwards, nsISupportsInterfacePointer *aCallerWindowSupports) |
713 | +nsTypeAheadFindSea::FindNext(PRBool aFindBackwards, nsISupportsInterfacePointer *aCallerWindowSupports) |
714 | { |
715 | NS_ENSURE_TRUE(aCallerWindowSupports, NS_ERROR_FAILURE); |
716 | |
717 | @@ -1731,7 +1731,7 @@ |
718 | return NS_OK; |
719 | } |
720 | |
721 | - // Compare the top level content pres shell of typeaheadfind |
722 | + // Compare the top level content pres shell of typeaheadfindsea |
723 | // with the top level content pres shell window where find next is happening |
724 | // If they're different, exit so that webbrowswerfind can handle FindNext() |
725 | |
726 | @@ -1764,7 +1764,7 @@ |
727 | NS_ENSURE_TRUE(callerPresShell, NS_OK); |
728 | |
729 | if (callerPresShell != typeAheadPresShell) { |
730 | - // This means typeaheadfind is active in a different window or doc |
731 | + // This means typeaheadfindsea is active in a different window or doc |
732 | // So it's not appropriate to find next for the current window |
733 | mFindNextBuffer.Truncate(); |
734 | return NS_OK; |
735 | @@ -1782,7 +1782,7 @@ |
736 | webBrowserFind->GetSearchString(getter_Copies(webBrowserFindString)); |
737 | if (!webBrowserFindString.Equals(mFindNextBuffer)) { |
738 | // If they're not equal, then the find dialog was used last, |
739 | - // not typeaheadfind. Typeaheadfind applies to the last find, |
740 | + // not typeaheadfindsea. Typeaheadfind applies to the last find, |
741 | // so we should let nsIWebBrowserFind::FindNext() do it. |
742 | mFindNextBuffer.Truncate(); |
743 | return NS_OK; |
744 | @@ -1832,7 +1832,7 @@ |
745 | |
746 | |
747 | NS_IMETHODIMP |
748 | -nsTypeAheadFind::GetIsActive(PRBool *aIsActive) |
749 | +nsTypeAheadFindSea::GetIsActive(PRBool *aIsActive) |
750 | { |
751 | *aIsActive = mLinksOnlyManuallySet || !mTypeAheadBuffer.IsEmpty(); |
752 | |
753 | @@ -1845,7 +1845,7 @@ |
754 | */ |
755 | |
756 | NS_IMETHODIMP |
757 | -nsTypeAheadFind::StartNewFind(nsIDOMWindow *aWindow, PRBool aLinksOnly) |
758 | +nsTypeAheadFindSea::StartNewFind(nsIDOMWindow *aWindow, PRBool aLinksOnly) |
759 | { |
760 | if (!mFind || !mIsTypeAheadOn || !aWindow) |
761 | return NS_ERROR_FAILURE; // Type Ahead Find not correctly initialized |
762 | @@ -1878,7 +1878,7 @@ |
763 | } |
764 | |
765 | void |
766 | -nsTypeAheadFind::ResetGlobalAutoStart(PRBool aAutoStart) |
767 | +nsTypeAheadFindSea::ResetGlobalAutoStart(PRBool aAutoStart) |
768 | { |
769 | // Enumerate through the current top level windows |
770 | // and either attach or remove window listeners |
771 | @@ -1916,7 +1916,7 @@ |
772 | |
773 | |
774 | NS_IMETHODIMP |
775 | -nsTypeAheadFind::SetAutoStart(nsIDOMWindow *aDOMWin, PRBool aAutoStartOn) |
776 | +nsTypeAheadFindSea::SetAutoStart(nsIDOMWindow *aDOMWin, PRBool aAutoStartOn) |
777 | { |
778 | if (!aDOMWin) { |
779 | return NS_ERROR_FAILURE; |
780 | @@ -1946,7 +1946,7 @@ |
781 | |
782 | |
783 | NS_IMETHODIMP |
784 | -nsTypeAheadFind::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool *aIsAutoStartOn) |
785 | +nsTypeAheadFindSea::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool *aIsAutoStartOn) |
786 | { |
787 | *aIsAutoStartOn = PR_FALSE; |
788 | |
789 | @@ -2014,7 +2014,7 @@ |
790 | |
791 | |
792 | NS_IMETHODIMP |
793 | -nsTypeAheadFind::CancelFind() |
794 | +nsTypeAheadFindSea::CancelFind() |
795 | { |
796 | // Stop current find if: |
797 | // 1. Escape pressed |
798 | @@ -2070,7 +2070,7 @@ |
799 | // ------- Helper Methods --------------- |
800 | |
801 | void |
802 | -nsTypeAheadFind::GetTopContentPresShell(nsIDocShellTreeItem *aDocShellTreeItem, |
803 | +nsTypeAheadFindSea::GetTopContentPresShell(nsIDocShellTreeItem *aDocShellTreeItem, |
804 | nsIPresShell **aPresShell) |
805 | { |
806 | *aPresShell = nsnull; |
807 | @@ -2086,7 +2086,7 @@ |
808 | } |
809 | |
810 | void |
811 | -nsTypeAheadFind::GetStartWindow(nsIDOMWindow *aWindow, nsIDOMWindow **aStartWindow) |
812 | +nsTypeAheadFindSea::GetStartWindow(nsIDOMWindow *aWindow, nsIDOMWindow **aStartWindow) |
813 | { |
814 | // Return the root ancestor content window of aWindow |
815 | |
816 | @@ -2118,7 +2118,7 @@ |
817 | } |
818 | |
819 | nsresult |
820 | -nsTypeAheadFind::GetWebBrowserFind(nsIDOMWindow *aWin, |
821 | +nsTypeAheadFindSea::GetWebBrowserFind(nsIDOMWindow *aWin, |
822 | nsIWebBrowserFind **aWebBrowserFind) |
823 | { |
824 | NS_ENSURE_ARG_POINTER(aWin); |
825 | @@ -2143,7 +2143,7 @@ |
826 | |
827 | |
828 | void |
829 | -nsTypeAheadFind::StartTimeout() |
830 | +nsTypeAheadFindSea::StartTimeout() |
831 | { |
832 | if (mTimeoutLength) { |
833 | if (!mTimer) { |
834 | @@ -2159,7 +2159,7 @@ |
835 | } |
836 | |
837 | void |
838 | -nsTypeAheadFind::SetSelectionLook(nsIPresShell *aPresShell, |
839 | +nsTypeAheadFindSea::SetSelectionLook(nsIPresShell *aPresShell, |
840 | PRBool aChangeColor, |
841 | PRBool aEnabled) |
842 | { |
843 | @@ -2167,8 +2167,8 @@ |
844 | return; |
845 | |
846 | // Show caret when type ahead find is on |
847 | - // Also paint selection bright (typeaheadfind on) or normal |
848 | - // (typeaheadfind off) |
849 | + // Also paint selection bright (typeaheadfindsea on) or normal |
850 | + // (typeaheadfindsea off) |
851 | |
852 | if (aChangeColor) { |
853 | mFocusedDocSelCon->SetDisplaySelection(nsISelectionController::SELECTION_ATTENTION); |
854 | @@ -2211,7 +2211,7 @@ |
855 | |
856 | |
857 | void |
858 | -nsTypeAheadFind::RemoveDocListeners() |
859 | +nsTypeAheadFindSea::RemoveDocListeners() |
860 | { |
861 | nsCOMPtr<nsIPresShell> presShell(GetPresShell()); |
862 | nsIViewManager* vm = nsnull; |
863 | @@ -2245,7 +2245,7 @@ |
864 | |
865 | |
866 | void |
867 | -nsTypeAheadFind::AttachDocListeners(nsIPresShell *aPresShell) |
868 | +nsTypeAheadFindSea::AttachDocListeners(nsIPresShell *aPresShell) |
869 | { |
870 | if (!aPresShell) { |
871 | return; |
872 | @@ -2275,7 +2275,7 @@ |
873 | |
874 | |
875 | void |
876 | -nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin) |
877 | +nsTypeAheadFindSea::RemoveWindowListeners(nsIDOMWindow *aDOMWin) |
878 | { |
879 | nsCOMPtr<nsIDOMEventTarget> chromeEventHandler; |
880 | GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler)); |
881 | @@ -2332,7 +2332,7 @@ |
882 | |
883 | |
884 | void |
885 | -nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin) |
886 | +nsTypeAheadFindSea::AttachWindowListeners(nsIDOMWindow *aDOMWin) |
887 | { |
888 | nsCOMPtr<nsIDOMEventTarget> chromeEventHandler; |
889 | GetChromeEventHandler(aDOMWin, getter_AddRefs(chromeEventHandler)); |
890 | @@ -2385,7 +2385,7 @@ |
891 | |
892 | |
893 | void |
894 | -nsTypeAheadFind::GetChromeEventHandler(nsIDOMWindow *aDOMWin, |
895 | +nsTypeAheadFindSea::GetChromeEventHandler(nsIDOMWindow *aDOMWin, |
896 | nsIDOMEventTarget **aChromeTarget) |
897 | { |
898 | nsCOMPtr<nsPIDOMWindow> privateDOMWindow(do_QueryInterface(aDOMWin)); |
899 | @@ -2401,7 +2401,7 @@ |
900 | } |
901 | |
902 | PRBool |
903 | -nsTypeAheadFind::IsTargetContentOkay(nsIContent *aContent) |
904 | +nsTypeAheadFindSea::IsTargetContentOkay(nsIContent *aContent) |
905 | { |
906 | if (!aContent) { |
907 | return PR_FALSE; |
908 | @@ -2439,7 +2439,7 @@ |
909 | |
910 | |
911 | nsresult |
912 | -nsTypeAheadFind::GetTargetIfTypeAheadOkay(nsIDOMEvent *aEvent, |
913 | +nsTypeAheadFindSea::GetTargetIfTypeAheadOkay(nsIDOMEvent *aEvent, |
914 | nsIContent **aTargetContent, |
915 | nsIPresShell **aTargetPresShell) |
916 | { |
917 | @@ -2522,7 +2522,7 @@ |
918 | |
919 | |
920 | void |
921 | -nsTypeAheadFind::GetSelection(nsIPresShell *aPresShell, |
922 | +nsTypeAheadFindSea::GetSelection(nsIPresShell *aPresShell, |
923 | nsISelectionController **aSelCon, |
924 | nsISelection **aDOMSel) |
925 | { |
926 | @@ -2544,7 +2544,7 @@ |
927 | |
928 | |
929 | PRBool |
930 | -nsTypeAheadFind::IsRangeVisible(nsIPresShell *aPresShell, |
931 | +nsTypeAheadFindSea::IsRangeVisible(nsIPresShell *aPresShell, |
932 | nsPresContext *aPresContext, |
933 | nsIDOMRange *aRange, PRBool aMustBeInViewPort, |
934 | PRBool aGetTopVisibleLeaf, |
935 | @@ -2698,7 +2698,7 @@ |
936 | |
937 | |
938 | nsresult |
939 | -nsTypeAheadFind::GetTranslatedString(const nsAString& aKey, |
940 | +nsTypeAheadFindSea::GetTranslatedString(const nsAString& aKey, |
941 | nsAString& aStringOut) |
942 | { |
943 | nsXPIDLString xsValue; |
944 | @@ -2716,7 +2716,7 @@ |
945 | |
946 | |
947 | void |
948 | -nsTypeAheadFind::DisplayStatus(PRBool aSuccess, nsIContent *aFocusedContent, |
949 | +nsTypeAheadFindSea::DisplayStatus(PRBool aSuccess, nsIContent *aFocusedContent, |
950 | PRBool aClearStatus, const PRUnichar *aText) |
951 | { |
952 | // pres shell -> pres context -> container -> tree item -> |
953 | @@ -2863,7 +2863,7 @@ |
954 | // Make sure we're not focused on a text field, listbox |
955 | // or other form control that needs typeahead keystrokes |
956 | if (focusedContent) { |
957 | - *aResult = nsTypeAheadFind::IsTargetContentOkay(focusedContent); |
958 | + *aResult = nsTypeAheadFindSea::IsTargetContentOkay(focusedContent); |
959 | return NS_OK; |
960 | } |
961 | |
962 | @@ -2928,8 +2928,8 @@ |
963 | EnsureContentWindow(domWinInternal, getter_AddRefs(startContentWin)); |
964 | NS_ENSURE_TRUE(startContentWin, NS_ERROR_FAILURE); |
965 | |
966 | - nsCOMPtr<nsITypeAheadFind> typeAhead = |
967 | - do_GetService(NS_TYPEAHEADFIND_CONTRACTID); |
968 | + nsCOMPtr<nsITypeAheadFindSea> typeAhead = |
969 | + do_GetService(NS_TYPEAHEADFINDSEA_CONTRACTID); |
970 | NS_ENSURE_TRUE(typeAhead, NS_ERROR_FAILURE); |
971 | |
972 | return typeAhead->StartNewFind(startContentWin, isLinkSearch); |
973 | @@ -3013,7 +3013,7 @@ |
974 | } |
975 | |
976 | already_AddRefed<nsIPresShell> |
977 | -nsTypeAheadFind::GetPresShell() |
978 | +nsTypeAheadFindSea::GetPresShell() |
979 | { |
980 | if (!mFocusedWeakShell) |
981 | return nsnull; |
982 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.h mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h |
983 | --- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFind.h 2005-03-26 00:12:02.000000000 -0500 |
984 | +++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.h 2005-03-26 11:39:29.000000000 -0500 |
985 | @@ -62,13 +62,13 @@ |
986 | #include "nsIDOMRange.h" |
987 | #include "nsIDOMWindow.h" |
988 | #include "nsIDocShellTreeItem.h" |
989 | -#include "nsITypeAheadFind.h" |
990 | +#include "nsITypeAheadFindSea.h" |
991 | #include "nsIStringBundle.h" |
992 | #include "nsISupportsArray.h" |
993 | #include "nsISound.h" |
994 | |
995 | -#define TYPEAHEADFIND_BUNDLE_URL \ |
996 | - "chrome://global/locale/typeaheadfind.properties" |
997 | +#define TYPEAHEADFINDSEA_BUNDLE_URL \ |
998 | + "chrome://global/locale/typeaheadfindsea.properties" |
999 | #define TYPEAHEADFIND_NOTFOUND_WAV_URL \ |
1000 | "chrome://global/content/notfound.wav" |
1001 | |
1002 | @@ -82,7 +82,7 @@ |
1003 | |
1004 | const int kMaxBadCharsBeforeCancel = 3; |
1005 | |
1006 | -class nsTypeAheadFind : public nsITypeAheadFind, |
1007 | +class nsTypeAheadFindSea : public nsITypeAheadFindSea, |
1008 | public nsIDOMKeyListener, |
1009 | public nsIDOMTextListener, |
1010 | public nsIDOMCompositionListener, |
1011 | @@ -93,13 +93,13 @@ |
1012 | public nsSupportsWeakReference |
1013 | { |
1014 | public: |
1015 | - nsTypeAheadFind(); |
1016 | - virtual ~nsTypeAheadFind(); |
1017 | + nsTypeAheadFindSea(); |
1018 | + virtual ~nsTypeAheadFindSea(); |
1019 | |
1020 | - NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFIND_CID); |
1021 | + NS_DEFINE_STATIC_CID_ACCESSOR(NS_TYPEAHEADFINDSEA_CID); |
1022 | |
1023 | NS_DECL_ISUPPORTS |
1024 | - NS_DECL_NSITYPEAHEADFIND |
1025 | + NS_DECL_NSITYPEAHEADFINDSEA |
1026 | NS_DECL_NSIOBSERVER |
1027 | NS_DECL_NSIDOMEVENTLISTENER |
1028 | NS_DECL_NSISELECTIONLISTENER |
1029 | @@ -127,7 +127,7 @@ |
1030 | // ----- nsITimerCallback ----------------------------- |
1031 | NS_DECL_NSITIMERCALLBACK |
1032 | |
1033 | - static nsTypeAheadFind *GetInstance(); |
1034 | + static nsTypeAheadFindSea *GetInstance(); |
1035 | static void ReleaseInstance(void); |
1036 | static PRBool IsTargetContentOkay(nsIContent *aContent); |
1037 | |
1038 | @@ -185,7 +185,7 @@ |
1039 | nsresult GetTranslatedString(const nsAString& aKey, nsAString& aStringOut); |
1040 | |
1041 | // Used by GetInstance and ReleaseInstance |
1042 | - static nsTypeAheadFind *sInstance; |
1043 | + static nsTypeAheadFindSea *sInstance; |
1044 | |
1045 | // Current find state |
1046 | nsString mTypeAheadBuffer; |
1047 | @@ -196,7 +196,7 @@ |
1048 | |
1049 | // PRBool's are used instead of PRPackedBool's where the address of the |
1050 | // boolean variable is getting passed into a method. For example: |
1051 | - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); |
1052 | + // GetBoolPref("accessibility.typeaheadfindsea.linksonly", &mLinksOnlyPref); |
1053 | PRBool mIsFindAllowedInWindow; |
1054 | PRBool mAutoStartPref; |
1055 | PRBool mLinksOnlyPref; |
1056 | @@ -251,7 +251,7 @@ |
1057 | nsCOMPtr<nsIDOMWindow> mFocusedWindow; |
1058 | nsCOMPtr<nsIWeakReference> mFocusedWeakShell; |
1059 | |
1060 | - // Windows where typeaheadfind doesn't auto start as the user types |
1061 | + // Windows where typeaheadfindsea doesn't auto start as the user types |
1062 | nsCOMPtr<nsISupportsArray> mManualFindWindows; |
1063 | }; |
1064 | |
1065 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp mozilla/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp |
1066 | --- mozilla.orig/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp 2005-03-26 00:12:02.000000000 -0500 |
1067 | +++ mozilla/extensions/typeaheadfind/src/nsTypeAheadFindRegistration.cpp 2005-03-26 11:39:40.000000000 -0500 |
1068 | @@ -55,7 +55,7 @@ |
1069 | |
1070 | // This function is called at component registration time |
1071 | static NS_METHOD |
1072 | -nsTypeAheadFindRegistrationProc(nsIComponentManager *aCompMgr, nsIFile *aPath, |
1073 | +nsTypeAheadFindSeaRegistrationProc(nsIComponentManager *aCompMgr, nsIFile *aPath, |
1074 | const char *registryLocation, |
1075 | const char *componentType, |
1076 | const nsModuleComponentInfo *info) |
1077 | @@ -64,7 +64,7 @@ |
1078 | // an application component. This makes sure that we're |
1079 | // initialized on application startup. |
1080 | |
1081 | - // Register nsTypeAheadFind to be instantiated on startup. |
1082 | + // Register nsTypeAheadFindSea to be instantiated on startup. |
1083 | // XXX This is needed on linux, but for some reason not needed on win32. |
1084 | nsresult rv; |
1085 | nsCOMPtr<nsICategoryManager> categoryManager = |
1086 | @@ -74,7 +74,7 @@ |
1087 | rv = categoryManager->AddCategoryEntry(APPSTARTUP_CATEGORY, |
1088 | - "Type Ahead Find", |
1089 | + "Type Ahead Find Sea", |
1090 | "service," |
1091 | - NS_TYPEAHEADFIND_CONTRACTID, |
1092 | + NS_TYPEAHEADFINDSEA_CONTRACTID, |
1093 | PR_TRUE, PR_TRUE, nsnull); |
1094 | } |
1095 | |
1096 | @@ -82,22 +82,22 @@ |
1097 | } |
1098 | |
1099 | |
1100 | -NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsTypeAheadFind, |
1101 | - nsTypeAheadFind::GetInstance) |
1102 | +NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsTypeAheadFindSea, |
1103 | + nsTypeAheadFindSea::GetInstance) |
1104 | |
1105 | static void PR_CALLBACK |
1106 | -TypeAheadFindModuleDtor(nsIModule* self) |
1107 | +TypeAheadFindSeaModuleDtor(nsIModule* self) |
1108 | { |
1109 | - nsTypeAheadFind::ReleaseInstance(); |
1110 | + nsTypeAheadFindSea::ReleaseInstance(); |
1111 | } |
1112 | |
1113 | static const nsModuleComponentInfo components[] = |
1114 | { |
1115 | - { "TypeAheadFind Component", NS_TYPEAHEADFIND_CID, |
1116 | - NS_TYPEAHEADFIND_CONTRACTID, nsTypeAheadFindConstructor, |
1117 | - nsTypeAheadFindRegistrationProc, nsnull // Unregistration proc |
1118 | + { "TypeAheadFindSea Component", NS_TYPEAHEADFINDSEA_CID, |
1119 | + NS_TYPEAHEADFINDSEA_CONTRACTID, nsTypeAheadFindSeaConstructor, |
1120 | + nsTypeAheadFindSeaRegistrationProc, nsnull // Unregistration proc |
1121 | } |
1122 | }; |
1123 | |
1124 | -NS_IMPL_NSGETMODULE_WITH_DTOR(nsTypeAheadFind, components, |
1125 | - TypeAheadFindModuleDtor) |
1126 | +NS_IMPL_NSGETMODULE_WITH_DTOR(nsTypeAheadFindSea, components, |
1127 | + TypeAheadFindSeaModuleDtor) |
1128 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/typeaheadfind.pkg mozilla/extensions/typeaheadfind/src/typeaheadfind.pkg |
1129 | --- mozilla.orig/extensions/typeaheadfind/src/typeaheadfind.pkg 2005-03-26 00:12:02.000000000 -0500 |
1130 | +++ mozilla/extensions/typeaheadfind/src/typeaheadfind.pkg 1969-12-31 19:00:00.000000000 -0500 |
1131 | @@ -1,9 +0,0 @@ |
1132 | -# why not ship this with GRE/embedding, if we're building it? |
1133 | - |
1134 | -[xpfe-browser browser] |
1135 | -#if SHARED_LIBRARY |
1136 | -dist/bin/components/@SHARED_LIBRARY@ |
1137 | -#else |
1138 | -!staticcomp @LIBRARY@ @MODULE_NAME@ |
1139 | -#endif |
1140 | -!xpt dist/bin/components/typeaheadfind.xpt |
1141 | diff -urN --exclude=CVS mozilla.orig/extensions/typeaheadfind/src/typeaheadfindsea.pkg mozilla/extensions/typeaheadfind/src/typeaheadfindsea.pkg |
1142 | --- mozilla.orig/extensions/typeaheadfind/src/typeaheadfindsea.pkg 1969-12-31 19:00:00.000000000 -0500 |
1143 | +++ mozilla/extensions/typeaheadfind/src/typeaheadfindsea.pkg 2005-03-26 11:39:29.000000000 -0500 |
1144 | @@ -0,0 +1,9 @@ |
1145 | +# why not ship this with GRE/embedding, if we're building it? |
1146 | + |
1147 | +[xpfe-browser browser] |
1148 | +#if SHARED_LIBRARY |
1149 | +dist/bin/components/@SHARED_LIBRARY@ |
1150 | +#else |
1151 | +!staticcomp @LIBRARY@ @MODULE_NAME@ |
1152 | +#endif |
1153 | +!xpt dist/bin/components/typeaheadfindsea.xpt |