diff --git a/WindowServer/WSFrameBuffer.cpp b/WindowServer/WSFrameBuffer.cpp index 54ca0dc633..1d39ee0d78 100644 --- a/WindowServer/WSFrameBuffer.cpp +++ b/WindowServer/WSFrameBuffer.cpp @@ -15,13 +15,6 @@ WSFrameBuffer& WSFrameBuffer::the() return *s_the; } -WSFrameBuffer::WSFrameBuffer(unsigned width, unsigned height) - : WSScreen(width, height) -{ - ASSERT(!s_the); - s_the = this; -} - WSFrameBuffer::WSFrameBuffer(RGBA32* data, unsigned width, unsigned height) : WSScreen(width, height) , m_data(data) @@ -35,10 +28,6 @@ WSFrameBuffer::~WSFrameBuffer() { } -void WSFrameBuffer::show() -{ -} - RGBA32* WSFrameBuffer::scanline(int y) { unsigned pitch = sizeof(RGBA32) * width(); diff --git a/WindowServer/WSFrameBuffer.h b/WindowServer/WSFrameBuffer.h index a24bc82f10..06e90bc4d3 100644 --- a/WindowServer/WSFrameBuffer.h +++ b/WindowServer/WSFrameBuffer.h @@ -7,12 +7,9 @@ class GraphicsBitmap; class WSFrameBuffer final : public WSScreen { public: - WSFrameBuffer(unsigned width, unsigned height); WSFrameBuffer(RGBA32*, unsigned width, unsigned height); ~WSFrameBuffer(); - void show(); - static WSFrameBuffer& the(); RGBA32* scanline(int y); diff --git a/WindowServer/WSWindow.cpp b/WindowServer/WSWindow.cpp index d18d273d9c..005821de8f 100644 --- a/WindowServer/WSWindow.cpp +++ b/WindowServer/WSWindow.cpp @@ -8,12 +8,12 @@ WSWindow::WSWindow(Process& process, int window_id) : m_process(process) , m_window_id(window_id) { - WSWindowManager::the().addWindow(*this); + WSWindowManager::the().add_window(*this); } WSWindow::~WSWindow() { - WSWindowManager::the().removeWindow(*this); + WSWindowManager::the().remove_window(*this); } void WSWindow::set_title(String&& title) @@ -22,7 +22,7 @@ void WSWindow::set_title(String&& title) return; m_title = move(title); - WSWindowManager::the().notifyTitleChanged(*this); + WSWindowManager::the().notify_title_changed(*this); } void WSWindow::set_rect(const Rect& rect) @@ -32,7 +32,7 @@ void WSWindow::set_rect(const Rect& rect) auto oldRect = m_rect; m_rect = rect; m_backing = GraphicsBitmap::create(m_process, m_rect.size()); - WSWindowManager::the().notifyRectChanged(*this, oldRect, m_rect); + WSWindowManager::the().notify_rect_changed(*this, oldRect, m_rect); } // FIXME: Just use the same types. diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp index 6303dd6a3a..735650bfdf 100644 --- a/WindowServer/WSWindowManager.cpp +++ b/WindowServer/WSWindowManager.cpp @@ -122,11 +122,11 @@ WSWindowManager::WSWindowManager() m_front_painter = make(*m_front_bitmap); m_back_painter = make(*m_back_bitmap); - m_activeWindowBorderColor = Color(0, 64, 192); - m_activeWindowTitleColor = Color::White; + m_active_window_border_color = Color(0, 64, 192); + m_active_window_title_color = Color::White; - m_inactiveWindowBorderColor = Color(64, 64, 64); - m_inactiveWindowTitleColor = Color::White; + m_inactive_window_border_color = Color(64, 64, 64); + m_inactive_window_title_color = Color::White; m_cursor_bitmap_inner = CharacterBitmap::create_from_ascii(cursor_bitmap_inner_ascii, 12, 17); m_cursor_bitmap_outer = CharacterBitmap::create_from_ascii(cursor_bitmap_outer_ascii, 12, 17); @@ -139,7 +139,7 @@ WSWindowManager::~WSWindowManager() { } -void WSWindowManager::paintWindowFrame(WSWindow& window) +void WSWindowManager::paint_window_frame(WSWindow& window) { LOCKER(m_lock); //printf("[WM] paintWindowFrame {%p}, rect: %d,%d %dx%d\n", &window, window.rect().x(), window.rect().y(), window.rect().width(), window.rect().height()); @@ -156,8 +156,8 @@ void WSWindowManager::paintWindowFrame(WSWindow& window) window.height() + 2 }; - auto titleColor = &window == activeWindow() ? m_activeWindowTitleColor : m_inactiveWindowTitleColor; - auto borderColor = &window == activeWindow() ? m_activeWindowBorderColor : m_inactiveWindowBorderColor; + auto titleColor = &window == activeWindow() ? m_active_window_title_color : m_inactive_window_title_color; + auto borderColor = &window == activeWindow() ? m_active_window_border_color : m_inactive_window_border_color; m_back_painter->fill_rect(titleBarRect, borderColor); m_back_painter->draw_rect(borderRect, Color::MidGray); @@ -166,7 +166,7 @@ void WSWindowManager::paintWindowFrame(WSWindow& window) m_back_painter->draw_text(titleBarTitleRect, window.title(), Painter::TextAlignment::CenterLeft, titleColor); } -void WSWindowManager::addWindow(WSWindow& window) +void WSWindowManager::add_window(WSWindow& window) { LOCKER(m_lock); m_windows.set(&window); @@ -182,7 +182,7 @@ void WSWindowManager::move_to_front(WSWindow& window) m_windows_in_order.append(&window); } -void WSWindowManager::removeWindow(WSWindow& window) +void WSWindowManager::remove_window(WSWindow& window) { LOCKER(m_lock); if (!m_windows.contains(&window)) @@ -195,12 +195,12 @@ void WSWindowManager::removeWindow(WSWindow& window) set_active_window(*m_windows.begin()); } -void WSWindowManager::notifyTitleChanged(WSWindow& window) +void WSWindowManager::notify_title_changed(WSWindow& window) { printf("[WM] WSWindow{%p} title set to '%s'\n", &window, window.title().characters()); } -void WSWindowManager::notifyRectChanged(WSWindow& window, const Rect& old_rect, const Rect& new_rect) +void WSWindowManager::notify_rect_changed(WSWindow& window, const Rect& old_rect, const Rect& new_rect) { printf("[WM] WSWindow %p rect changed (%d,%d %dx%d) -> (%d,%d %dx%d)\n", &window, old_rect.x(), old_rect.y(), old_rect.width(), old_rect.height(), new_rect.x(), new_rect.y(), new_rect.width(), new_rect.height()); ASSERT_INTERRUPTS_ENABLED(); @@ -209,32 +209,32 @@ void WSWindowManager::notifyRectChanged(WSWindow& window, const Rect& old_rect, invalidate(outerRectForWindow(new_rect)); } -void WSWindowManager::handleTitleBarMouseEvent(WSWindow& window, MouseEvent& event) +void WSWindowManager::handle_titlebar_mouse_event(WSWindow& window, MouseEvent& event) { if (event.type() == WSEvent::MouseDown && event.button() == MouseButton::Left) { #ifdef DRAG_DEBUG printf("[WM] Begin dragging WSWindow{%p}\n", &window); #endif m_dragWindow = window.makeWeakPtr();; - m_dragOrigin = event.position(); - m_dragWindowOrigin = window.position(); - m_dragStartRect = outerRectForWindow(window.rect()); + m_drag_origin = event.position(); + m_drag_window_origin = window.position(); + m_drag_start_rect = outerRectForWindow(window.rect()); window.set_is_being_dragged(true); return; } } -void WSWindowManager::processMouseEvent(MouseEvent& event) +void WSWindowManager::process_mouse_event(MouseEvent& event) { if (event.type() == WSEvent::MouseUp && event.button() == MouseButton::Left) { if (m_dragWindow) { #ifdef DRAG_DEBUG printf("[WM] Finish dragging WSWindow{%p}\n", m_dragWindow.ptr()); #endif - invalidate(m_dragStartRect); + invalidate(m_drag_start_rect); invalidate(*m_dragWindow); m_dragWindow->set_is_being_dragged(false); - m_dragEndRect = outerRectForWindow(m_dragWindow->rect()); + m_drag_end_rect = outerRectForWindow(m_dragWindow->rect()); m_dragWindow = nullptr; return; } @@ -243,11 +243,11 @@ void WSWindowManager::processMouseEvent(MouseEvent& event) if (event.type() == WSEvent::MouseMove) { if (m_dragWindow) { auto old_window_rect = m_dragWindow->rect(); - Point pos = m_dragWindowOrigin; + Point pos = m_drag_window_origin; #ifdef DRAG_DEBUG dbgprintf("[WM] Dragging [origin: %d,%d] now: %d,%d\n", m_dragOrigin.x(), m_dragOrigin.y(), event.x(), event.y()); #endif - pos.move_by(event.x() - m_dragOrigin.x(), event.y() - m_dragOrigin.y()); + pos.move_by(event.x() - m_drag_origin.x(), event.y() - m_drag_origin.y()); m_dragWindow->set_position_without_repaint(pos); invalidate(outerRectForWindow(old_window_rect)); invalidate(outerRectForWindow(m_dragWindow->rect())); @@ -261,7 +261,7 @@ void WSWindowManager::processMouseEvent(MouseEvent& event) move_to_front(*window); set_active_window(window); } - handleTitleBarMouseEvent(*window, event); + handle_titlebar_mouse_event(*window, event); return; } @@ -315,7 +315,7 @@ void WSWindowManager::compose() continue; if (!any_dirty_rect_intersects_window(*window)) continue; - paintWindowFrame(*window); + paint_window_frame(*window); m_back_painter->blit(window->position(), *window->backing()); } for (auto& r : invalidated_rects) @@ -344,7 +344,7 @@ void WSWindowManager::event(WSEvent& event) ASSERT_INTERRUPTS_ENABLED(); LOCKER(m_lock); if (event.isMouseEvent()) - return processMouseEvent(static_cast(event)); + return process_mouse_event(static_cast(event)); if (event.isKeyEvent()) { // FIXME: This is a good place to hook key events globally. :) diff --git a/WindowServer/WSWindowManager.h b/WindowServer/WSWindowManager.h index 180a44abe0..d9a7ef18cc 100644 --- a/WindowServer/WSWindowManager.h +++ b/WindowServer/WSWindowManager.h @@ -19,11 +19,11 @@ class GraphicsBitmap; class WSWindowManager : public WSEventReceiver { public: static WSWindowManager& the(); - void addWindow(WSWindow&); - void removeWindow(WSWindow&); + void add_window(WSWindow&); + void remove_window(WSWindow&); - void notifyTitleChanged(WSWindow&); - void notifyRectChanged(WSWindow&, const Rect& oldRect, const Rect& newRect); + void notify_title_changed(WSWindow&); + void notify_rect_changed(WSWindow&, const Rect& oldRect, const Rect& newRect); WSWindow* activeWindow() { return m_active_window.ptr(); } @@ -43,24 +43,24 @@ private: WSWindowManager(); virtual ~WSWindowManager() override; - void processMouseEvent(MouseEvent&); - void handleTitleBarMouseEvent(WSWindow&, MouseEvent&); + void process_mouse_event(MouseEvent&); + void handle_titlebar_mouse_event(WSWindow&, MouseEvent&); void set_active_window(WSWindow*); virtual void event(WSEvent&) override; void compose(); - void paintWindowFrame(WSWindow&); + void paint_window_frame(WSWindow&); WSFrameBuffer& m_framebuffer; Rect m_screen_rect; - Color m_activeWindowBorderColor; - Color m_activeWindowTitleColor; + Color m_active_window_border_color; + Color m_active_window_title_color; - Color m_inactiveWindowBorderColor; - Color m_inactiveWindowTitleColor; + Color m_inactive_window_border_color; + Color m_inactive_window_title_color; HashTable m_windows; InlineLinkedList m_windows_in_order; @@ -69,11 +69,11 @@ private: WeakPtr m_dragWindow; - Point m_dragOrigin; - Point m_dragWindowOrigin; - Rect m_lastDragRect; - Rect m_dragStartRect; - Rect m_dragEndRect; + Point m_drag_origin; + Point m_drag_window_origin; + Rect m_last_drag_rect; + Rect m_drag_start_rect; + Rect m_drag_end_rect; Rect m_last_cursor_rect;