Changeset 26502 in vbox
- Timestamp:
- Feb 14, 2010 8:29:01 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
-
.scm-settings (modified) (1 diff)
-
src/VBox/Frontends/VBoxBFE/HGCMObjects.h (modified) (1 diff)
-
src/VBox/Frontends/VBoxBFE/Makefile.kmk (modified) (1 diff)
-
src/VBox/Frontends/VBoxBFE/SDLConsole.cpp (modified) (1 diff)
-
src/VBox/Frontends/VBoxBFE/SDLConsole.h (modified) (1 diff)
-
src/VBox/Frontends/VBoxShell/vboxinfo.vbs (modified) (4 diffs)
-
src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/X11/VBoxX11Helper.cpp (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/X11/XKeyboard-new.cpp (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/X11/keyboard-tables.h (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/darwin/VBoxAquaStyle.cpp (modified) (4 diffs)
-
src/VBox/Frontends/VirtualBox/src/darwin/tstDarwinKeyboard.cpp (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/extensions/QIListView.h (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h (modified) (3 diffs)
-
src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/.scm-settings
r26501 r26502 43 43 --filter-out-dirs "*/src/libs/." 44 44 --filter-out-dirs "*/src/apps/." 45 --filter-out-dirs "*/src/VBox/Frontends/."46 45 --filter-out-dirs "*/src/VBox/Additions/x11/x11include/." 47 46 --filter-out-dirs "*/src/VBox/Additions/WINNT/Graphics/Wine/." -
trunk/src/VBox/Frontends/VBoxBFE/HGCMObjects.h
r8155 r26502 78 78 79 79 Log(("Dereference: refCnt = %d\n", refCnt)); 80 80 81 81 AssertRelease(refCnt >= 0); 82 82 -
trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk
r23452 r26502 172 172 include $(KBUILD_PATH)/subfooter.kmk 173 173 174 -
trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp
r20850 r26502 1632 1632 } 1633 1633 1634 -
trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.h
r8155 r26502 32 32 // damn SDL redefines main! 33 33 #undef main 34 #endif 34 #endif 35 35 36 36 #include "ConsoleImpl.h" -
trunk/src/VBox/Frontends/VBoxShell/vboxinfo.vbs
r21569 r26502 17 17 Sub Print(str) 18 18 Wscript.Echo str 19 End Sub 19 End Sub 20 20 21 21 Sub StartVm(vb, mach) 22 22 Dim session, progress 23 23 24 24 Set session = CreateObject("VirtualBox.Session") 25 25 Set progress = vb.openRemoteSession(session, mach.id, "gui", "") … … 31 31 Sub StopVm(vb, mach) 32 32 Dim session, progress 33 33 34 34 Set session = CreateObject("VirtualBox.Session") 35 35 vb.openExistingSession session, mach.id … … 41 41 Sub Main 42 42 Dim vb, mach 43 43 44 44 set vb = CreateObject("VirtualBox.VirtualBox") 45 45 Print "VirtualBox version " & vb.version 46 46 47 ' Safe arrays not fully functional from Visual Basic Script, as we 47 ' Safe arrays not fully functional from Visual Basic Script, as we 48 48 ' return real safe arrays, not ones wrapped to VARIANT and VBS engine 49 49 ' gets confused. Until then, explicitly find VM by name. 50 ' May wish to use hack like one described in 50 ' May wish to use hack like one described in 51 51 ' http://www.tech-archive.net/Archive/Excel/microsoft.public.excel.programming/2006-05/msg02796.html to handle safearrays 52 52 ' if desperate … … 54 54 Set mach = vb.findMachine("Win") 55 55 Print "Machine: " & mach.name & " ID: " & mach.id 56 56 57 57 StartVm vb, mach 58 58 End Sub -
trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h
r25583 r26502 1780 1780 1781 1781 int resetGl(); 1782 1782 1783 1783 void initGl(); 1784 1784 -
trunk/src/VBox/Frontends/VirtualBox/src/X11/VBoxX11Helper.cpp
r26469 r26502 102 102 Atom propNameAtom; 103 103 Window WMWindow = None; 104 104 105 105 propNameAtom = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", True); 106 106 if (XGetWindowProperty(display, QX11Info::appRootWindow(), propNameAtom, -
trunk/src/VBox/Frontends/VirtualBox/src/X11/XKeyboard-new.cpp
r21711 r26502 244 244 } 245 245 246 /** 246 /** 247 247 * Initialize X11 keyboard including the remapping specified in the 248 248 * global property GUI/RemapScancodes. This property is a string of … … 265 265 /* Do not advance on (ignore) identity mappings as this is 266 266 the stop signal to initXKeyboard and friends */ 267 if((*scancodesTail)[0] != (*scancodesTail)[1]) 267 if((*scancodesTail)[0] != (*scancodesTail)[1]) 268 268 scancodesTail++; 269 269 } 270 270 (*scancodesTail)[0] = (*scancodesTail)[1] = 0; 271 } 271 } 272 272 /* initialize the X keyboard subsystem */ 273 273 initXKeyboard (pDisplay ,scancodes); -
trunk/src/VBox/Frontends/VirtualBox/src/X11/keyboard-tables.h
r23040 r26502 83 83 /* Sun Menu, additional Japanese keys */ 84 84 #ifdef sun 85 0x15d, 0x79, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, /* FF20 */ 86 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, /* FF28 */ 85 0x15d, 0x79, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, /* FF20 */ 86 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, /* FF28 */ 87 87 #else 88 88 0x15d, 0x00, 0x7b, 0x79, 0x00, 0x00, 0x00, 0x70, /* FF20 */ -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/DarwinKeyboard.cpp
r24231 r26502 295 295 #ifdef USE_HID_FOR_MODIFIERS 296 296 static void darwinBruteForcePropertySearch(CFDictionaryRef DictRef, struct KeyboardCacheData *pKeyboardEntry); 297 #endif 297 #endif 298 298 299 299 -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/VBoxAquaStyle.cpp
r8155 r26502 52 52 53 53 /** 54 * The main purpose here is to make sure the global 54 * The main purpose here is to make sure the global 55 55 * instance doesn't die on us. 56 56 */ … … 155 155 } 156 156 157 void VBoxAquaStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, const QRect &r, const QColorGroup &cg, 157 void VBoxAquaStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, const QRect &r, const QColorGroup &cg, 158 158 SFlags flags/* = Style_Default*/, const QStyleOption &foo/* = QStyleOption::Default*/ ) const 159 159 { … … 195 195 } 196 196 197 int VBoxAquaStyle::styleHint( StyleHint stylehint, const QWidget *widget/* = 0*/, 197 int VBoxAquaStyle::styleHint( StyleHint stylehint, const QWidget *widget/* = 0*/, 198 198 const QStyleOption &foo/* = QStyleOption::Default*/, 199 199 QStyleHintReturn* returnData/* = 0*/) const … … 230 230 } 231 231 232 -
trunk/src/VBox/Frontends/VirtualBox/src/darwin/tstDarwinKeyboard.cpp
r8155 r26502 90 90 const uint64_t u64Elapsed = RTTimeNanoTS() - u64Start; 91 91 RTPrintf("\n" 92 "tstDarwinKeyboard: %u times in %RU64 ms - %RU64 ms per call\n", 92 "tstDarwinKeyboard: %u times in %RU64 ms - %RU64 ms per call\n", 93 93 i, u64Elapsed / 1000000, (u64Elapsed / i) / 1000000); 94 94 RTPrintf("tstDarwinKeyboard: DarwinGrabKeyboard: %RU64 ms total - %RU64 ms per call\n", -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.cpp
r25177 r26502 69 69 /* VBoxVMItemPainter class */ 70 70 71 void QIItemDelegate::drawBackground (QPainter *aPainter, const QStyleOptionViewItem &aOption, 71 void QIItemDelegate::drawBackground (QPainter *aPainter, const QStyleOptionViewItem &aOption, 72 72 const QModelIndex &aIndex) const 73 { 73 { 74 74 #if MAC_LEOPARD_STYLE 75 75 NOREF (aIndex); 76 76 /* Macify for Leopard */ 77 77 if (aOption.state & QStyle::State_Selected) 78 { 78 { 79 79 /* Standard color for selected items and focus on the widget */ 80 80 QColor topLineColor (69, 128, 200); -
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.h
r25177 r26502 37 37 protected slots: 38 38 void focusChanged (QWidget *aOld, QWidget *aNow); 39 }; 39 }; 40 40 41 41 class QIItemDelegate: public QItemDelegate … … 46 46 47 47 protected: 48 void drawBackground (QPainter *aPainter, const QStyleOptionViewItem &aOption, 48 void drawBackground (QPainter *aPainter, const QStyleOptionViewItem &aOption, 49 49 const QModelIndex &aIndex) const; 50 50 }; -
trunk/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h
r25177 r26502 49 49 break; 50 50 } 51 default: 51 default: 52 52 break; 53 53 } … … 63 63 64 64 QIWithRetranslateUI2 (QWidget *aParent = 0, Qt::WindowFlags aFlags = 0) : Base (aParent, aFlags) {} 65 65 66 66 protected: 67 67 … … 77 77 break; 78 78 } 79 default: 79 default: 80 80 break; 81 81 } -
trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsUSB.h
r25177 r26502 44 44 }; 45 45 46 enum RemoteMode 46 enum RemoteMode 47 47 { 48 48 ModeAny = 0,
Note:
See TracChangeset
for help on using the changeset viewer.

