Commit Graph

158 Commits (b3a549b8b5e01809b2dd2006d6bf92a7a4d6baf7)

Author SHA1 Message Date
Liny ac5d466639 Fix FIRE-14282/BUG-6875 with the solution provided in LL's jira. 2014-09-21 16:53:31 -07:00
Cinder Biscuits 60795c508e OPEN-215: Replace deprecated call to kCGLRPTextureMemory with kCGLRPTextureMemoryMegabytes 2014-04-14 23:08:50 +00:00
Ansariel 60006e25b9 Fix some bad refcount code and squash some potential leakiness on Mac; by Cinder Roxley 2014-08-26 21:36:25 +02:00
Mnikolenko ProductEngine 1108a34d1d MAINT-3907 FIXED Handle pressing of Alt/Shift/Control keys without any other key being pressed simultaneously. 2014-04-08 12:37:41 +03:00
Nicky 22e028c9ae Merge with lgpl tip. 2014-06-14 17:58:37 +02:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Cinder 03e396af4b Transplant cmd key fix to Mac64 branch
--HG--
branch : Mac64
2014-06-04 07:20:08 -06:00
Nicky fcc517f8e1 More OSX cocoa fixes. Call function with correct types instead of hacking around the type system to make the compiler happy. 2014-05-29 19:07:03 +02:00
Whirly ec8da7c32f FIRE-11882: Going fullscreen in OS X fails while inworld - patch from Cinder Roxley
--HG--
branch : Firestorm_4.6.5
2014-05-04 15:47:53 +01:00
Whirly 9066357849 FIRE-11882: Going fullscreen in OS X fails while inworld - patch from Cinder Roxley 2014-05-04 15:47:53 +01:00
simon cb2045fcd5 Merge downstream code with viewer-release 2014-02-10 16:11:50 -08:00
Nicky fd55bc6ded Make sure to grab current modifiers on keypress/mouse so they don't get stuck until pressed again. 2014-04-07 18:00:36 +02:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Aura Linden ddd6b8f91b Mac Fullscreen fix for MAINT-3288 and MAINT-3135 2013-12-17 00:12:26 -08:00
Tonya Souther 07b5e702e6 BUG-3968: do not wear an object when renaming in inventory 2013-10-29 13:59:21 -04:00
Cinders 49bb37e11d WIP mac keyboard cleanup. Possibly fix sticky control. 2013-12-02 19:17:26 -07:00
Graham Madarasz (Graham Linden) 9b99ece5ab MAINT-3135 WIP partial fix, addresses graphics corruption on resize, but not mouse mapping issues 2013-09-12 13:17:43 -07:00
Geenz dea416fd83 Rework the command+click functionality a bit to ensure we're not mistakenly simulating a right click where we shouldn't. 2013-07-11 22:07:17 -04:00
Geenz a787e272c3 Alert box support! 2013-07-11 21:31:17 -04:00
Geenz 72bb473c9e Ensure that the correct method is called when we're simulating a right click. 2013-07-11 18:59:28 -04:00
Geenz 6fbafaf056 Restore control + right click functionality. 2013-07-11 18:41:16 -04:00
Geenz 623077e6a4 Added license headers. 2013-06-27 15:06:03 -04:00
Geenz 860b86e3d1 Fix for down key presses not opening up the IME character selection window, and inadvertently being handled while marked text is selected. 2013-06-27 13:48:44 -04:00
Geenz 90e511bbdf Handle VRAM in megabytes. This was previously being reported as bytes. 2013-06-20 11:28:05 -04:00
Geenz 2837ca7a47 This seems to be on par with viewer-release at this point. 2013-06-17 17:08:48 -04:00
Geenz 84f287b34e Moved detecting if we're using a roman-script language to it's own function in the application delegate. Also consider the delete and backspace characters to be special cases. 2013-06-17 12:31:25 -04:00
Geenz 2253d22eb8 Have showInputWindow hand off input events to the bottom line input window. 2013-06-17 10:28:32 -04:00
Geenz 440a1ee3ba Move logic involving the input window to keyDown. Pass input events to the input window from there. 2013-06-17 09:26:11 -04:00
Geenz 93531f3ba8 Insert text into the input window when we attempt to insert text without a pre-editor. Also handle backspace as a special case when determining if the input window needs to be displayed. 2013-06-17 08:59:01 -04:00
Geenz f8abfb63c3 This brings us to feature parity with CHUI for IME support. 2013-06-17 07:52:19 -04:00
Geenz 7decac40e6 Override NSPanel's close method to hide the window instead of actually removing the window. 2013-05-23 09:39:49 -04:00
Geenz cda10266ae Only show the input window when we attempt to add marked text, *and* we can't submit marked text directly to the viewer. 2013-05-23 08:50:05 -04:00
Geenz aa0cb35db5 Support the committing of the current pre edit string when language input is interrupted per the viewer's original pre edit functionality. 2013-04-07 11:33:39 -04:00
Geenz 2656b1f405 First pass at adding a viable replacement for TSM's old UseInputWindow method (which is now deprecated with seemingly no Cocoa replacement). 2013-04-01 08:15:12 -04:00
Geenz 80a79e5d7b IME support is pretty much finished at this point. 2013-03-27 08:49:45 -04:00
Geenz 258b77b647 Additional IME support. LLPreeditor is largely good to go at this point, but there's still some work to do in getSegments. 2013-03-25 05:26:55 -04:00
Geenz 6c200a94f7 Fix for command key presses + a letter not triggering keyUp. Fix by Katharine Berry. 2013-03-23 01:05:21 -04:00
Geenz 64c0455db5 More LLPreeditor work. 2013-03-19 23:02:47 -04:00
Geenz ebe320e7c3 Refactored LLNSWindow and LLOpenGLView significantly. All input goes through LLOpenGLView now. 2013-03-19 06:32:56 -04:00
Geenz ad26f3c390 IME support (and revamped text input support) semi-working. 2013-03-19 05:50:50 -04:00
Geenz 3c60fb24ca Merge 2013-03-11 10:26:52 -04:00
Graham Madarasz (Graham Linden) d046e60657 Fix max VRAM detection on some cards and issues with sequencing of application of mem multiplier 2013-02-27 14:39:26 -08:00
Graham Madarasz (Graham Linden) f5516e0fc0 For MAINT-2404 Fixes detection of VRAM on OSX removed along with other AGL code. Code Review: callum 2013-02-27 06:46:53 -08:00
Geenz 21aa4b9c24 Setup the quit handler for when the user attempts to close the window. This restores the previous functionality of asking the user if they want to quit. 2013-02-26 16:18:42 -05:00
Geenz e19db56688 Fix for antialiasing and VSync not being enabled properly. 2013-02-25 15:35:21 -05:00
Geenz 4a935b6815 Fix inconsistent handling of Control, Alt, and Shift keys through a new modifier update callback. 2013-02-22 16:41:49 -05:00
Cinders 4ff26225e7 Fix sporadic texture reloading on OSX 2013-10-22 11:34:10 -06:00
Cinders 3d9f82f929 Use kCGLRPTextureMemoryMetabytes in place of deprecated kCGLRPTextureMemory 2013-10-12 20:59:48 -06:00
Tonya Souther b8e8cd021d FIRE-11828: Don't process Return or keypad Enter twice on OS X. 2013-10-06 18:12:10 -05:00
Geenz c52e6f9c59 Refactor the key input handling to make it easier to filter out keys we don't need unicode characters for (such as the arrow keys). 2013-01-23 09:29:32 -05:00
Geenz 461ab912a5 Initial Cocoa drag and drop support. 2013-01-22 19:59:49 -05:00
Geenz 29e747c4f1 And thus, the demonic mouse position conversions from view space to screen space were tamed. 2013-01-22 15:37:01 -05:00
Geenz da90fe3528 This *should* put an end to our modifier key woes. 2013-01-15 05:46:31 -05:00
Geenz 09b07e3619 Big change set:
- LLAppDelegate header relocated to LLWindow.  Definition is still present in secondlife-bin (for compatibility reasons when loading a nib).
- Return key handling fixed.
- Command key now acts the same as the control key by issuing control character codes when the command key is pressed.
- We now retrieve the window pointer directly from the app delegate in LLWindow.
2013-01-08 16:22:54 -05:00
Geenz 9ce3ab1a52 Fixed the enter and return keys not being sent appropriately as unicode characters. 2013-01-02 18:53:44 -05:00
Geenz ddb48d51d9 More things in this commit:
- Removed the callback system in favor of simply defining functions in a header to later be implemented in whichever file is most convenient for what we want to do (i.e., calling LLWindow callbacks within LLWindowMacOSX, setting cursors in llwindowmacosx-objc.mm, etc.)
- Viewer shutdown now works appropriately
- Added a bit of debugging code to test if a key has been handled by the UI or not (useful for tracking down the mystery of the enter key not being handled)
- Setup a cocoa quit handler within the application delegate that intercepts any termination requests
2013-01-01 11:32:53 -05:00
Geenz bd152c1fb7 Huge amount of refactoring to use Cocoa here:
- Updated to .xib format.  To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory.
- xib file now defines the viewer's window.  VIews are still being pragmatically added to the main window.  This may change in the future.
- LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X.  This probably needs a bit more work.
- Event handling still needs more work to work within a timer based event loop.  It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse.
- Carbon has been purged from the viewer's startup, and from LLWindow entirely.  There's likely still a few odds and ends fragmented throughout the viewer and its dependencies.  Need to track these down.
- LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate.
- Fullscreen support has been implemented for OS X 10.7+
This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete.  From here, it's mostly just bug hunting and fixing.
2012-12-29 06:59:43 -05:00
Geenz c8aa1fb7c8 LLWindow: Move to using Cocoa for window and view creation along with setting up callbacks for event handling as such. 2012-12-17 18:00:30 -05:00