From f738860d69a382965488065dbc1386fa1f28957b Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Mon, 21 Oct 2019 20:17:56 +0200 Subject: Remove usage of import qualified as, which relies on the itask compiler --- src/Gtk/Signal.icl | 8 ++--- src/Gtk/State.icl | 15 +++++----- src/Gtk/Widgets.icl | 76 +++++++++++++++++++++++------------------------ src/Gtk/Widgets/Sheet.icl | 12 ++++---- 4 files changed, 55 insertions(+), 56 deletions(-) (limited to 'src') diff --git a/src/Gtk/Signal.icl b/src/Gtk/Signal.icl index 9ca4b22..5861e92 100644 --- a/src/Gtk/Signal.icl +++ b/src/Gtk/Signal.icl @@ -5,9 +5,9 @@ import StdEnv import Control.Monad import Control.Monad.Identity import Control.Monad.State -import qualified Data.Map as M +import qualified Data.Map -import qualified Gtk.Internal as I +import Gtk.Internal import Gtk.State import Gtk.Widgets @@ -15,12 +15,12 @@ installSignalHandler :: !GSignalHandler !w -> State GtkState w | gtkWidget w installSignalHandler handler widget = modify (\st -> { st - & signal_handlers = 'M'.put (st.signal_counter+1) handler_internal st.signal_handlers + & signal_handlers = 'Data.Map'.put (st.signal_counter+1) handler_internal st.signal_handlers , signal_counter = st.signal_counter+1 }) >>| gets (\st -> st.signal_counter) >>= \id -> (toState case handler_internal of - GSHI_Void _ -> 'I'.g_signal_connect_void (toPtr (gtkWidget widget)) signal_name id) >>| + GSHI_Void _ -> g_signal_connect_void (toPtr (gtkWidget widget)) signal_name id) >>| pure widget where (signal_name,handler_internal) = case handler of diff --git a/src/Gtk/State.icl b/src/Gtk/State.icl index 245ea7a..6adaf9c 100644 --- a/src/Gtk/State.icl +++ b/src/Gtk/State.icl @@ -5,19 +5,18 @@ import StdEnv import Control.Monad import Control.Monad.Identity import Control.Monad.State -import qualified Data.Map as M +import qualified Data.Map from Data.Map import :: Map import Data.Maybe -import qualified Gtk.Internal as I -from Gtk.Internal import :: GSignalArgs{..} +import Gtk.Internal import Gtk.Signal newGtkState :: GtkState newGtkState = { world = () , return = False - , signal_handlers = 'M'.newMap + , signal_handlers = 'Data.Map'.newMap , signal_counter = 0 } @@ -25,22 +24,22 @@ runGtk :: !(GtkM a) !*World -> (!a, !*World) runGtk f w = (evalState wrapped_f newGtkState, w) where wrapped_f = - toState 'I'.gtk_init >>| + toState gtk_init >>| f >>= \x -> main >>| pure x main = - toStateR 'I'.gtk_main_iteration >>| + toStateR gtk_main_iteration >>| handle_signals >>| gets (\st -> st.return) >>= \return | return -> pure () | otherwise -> main handle_signals = - toStateR 'I'.g_signal_pop >>= \sig_args -> case sig_args of + toStateR g_signal_pop >>= \sig_args -> case sig_args of Nothing -> pure () Just sig_args -> - gets (\st -> 'M'.get sig_args.sig_id st.signal_handlers) >>= \(Just handler) -> + gets (\st -> 'Data.Map'.get sig_args.sig_id st.signal_handlers) >>= \(Just handler) -> run handler >>| handle_signals with diff --git a/src/Gtk/Widgets.icl b/src/Gtk/Widgets.icl index 869293e..117fa49 100644 --- a/src/Gtk/Widgets.icl +++ b/src/Gtk/Widgets.icl @@ -11,7 +11,7 @@ import Data.Tuple import System.FilePath import System._Pointer -import qualified Gtk.Internal as I +import Gtk.Internal import Gtk.State import Gtk.Types @@ -26,26 +26,26 @@ where addCSSClass :: !GtkCSSClass !w -> GtkM w | gtkWidget w addCSSClass (Class cls) widget = - toStateR ('I'.gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> - toState ('I'.gtk_style_context_add_class context cls) >>| + toStateR (gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> + toState (gtk_style_context_add_class context cls) >>| pure widget removeCSSClass :: !GtkCSSClass !w -> GtkM () | gtkWidget w removeCSSClass (Class cls) widget = - toStateR ('I'.gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> - toState ('I'.gtk_style_context_remove_class context cls) + toStateR (gtk_widget_get_style_context (gtkWidget widget)) >>= \context -> + toState (gtk_style_context_remove_class context cls) setMargins :: !GtkMargins !w -> GtkM w | gtkWidget w setMargins {left,top,right,bottom} widget` = let widget = gtkWidget widget` in - toState ('I'.gtk_widget_set_margin_left widget left) >>| - toState ('I'.gtk_widget_set_margin_top widget top) >>| - toState ('I'.gtk_widget_set_margin_right widget right) >>| - toState ('I'.gtk_widget_set_margin_bottom widget bottom) >>| + toState (gtk_widget_set_margin_left widget left) >>| + toState (gtk_widget_set_margin_top widget top) >>| + toState (gtk_widget_set_margin_right widget right) >>| + toState (gtk_widget_set_margin_bottom widget bottom) >>| pure widget` show :: !w -> GtkM w | gtkWidget w -show widget = toState ('I'.gtk_widget_show (gtkWidget widget)) >>| pure widget +show widget = toState (gtk_widget_show (gtkWidget widget)) >>| pure widget :: GtkContainer :== Pointer @@ -59,7 +59,7 @@ where addToContainer :: !c !w -> GtkM w | gtkWidget w & gtkContainer c addToContainer container widget = - toState ('I'.gtk_container_add (gtkContainer container) (gtkWidget widget)) >>| + toState (gtk_container_add (gtkContainer container) (gtkWidget widget)) >>| pure widget :: GtkBox :== Pointer @@ -69,12 +69,12 @@ instance gtkContainer GtkBox where gtkContainer b = b newBox :: !GtkOrientation !Int -> GtkM GtkBox newBox orientation spacing = - toStateR ('I'.gtk_box_new orientation=:Vertical spacing) >>= + toStateR (gtk_box_new orientation=:Vertical spacing) >>= show packBox :: !GtkBox !GtkDirection !GtkExpand !w -> GtkM w | gtkWidget w packBox box direction expand widget = - toState (if direction=:StartToEnd 'I'.gtk_box_pack_start 'I'.gtk_box_pack_end + toState (if direction=:StartToEnd gtk_box_pack_start gtk_box_pack_end box (gtkWidget widget) expand=:Expand True 0) >>| pure widget @@ -85,9 +85,9 @@ instance gtkContainer GtkFrame where gtkContainer f = f newFrame :: !GtkLabel !w -> GtkM GtkFrame | gtkWidget w newFrame label widget = - toStateR ('I'.gtk_frame_new (case label of Label l -> Just l; _ -> Nothing)) >>= \frame -> + toStateR (gtk_frame_new (case label of Label l -> Just l; _ -> Nothing)) >>= \frame -> (case label of - Label _ -> toState ('I'.gtk_frame_set_label_align frame 0.02 0.5) + Label _ -> toState (gtk_frame_set_label_align frame 0.02 0.5) NoLabel -> pure ()) >>| addToContainer frame widget >>| show frame @@ -102,14 +102,14 @@ framed label widgetf = instance gtkWidget GtkMenu where gtkWidget m = m newMenu :: GtkM GtkMenu -newMenu = toStateR 'I'.gtk_menu_new >>= show +newMenu = toStateR gtk_menu_new >>= show :: GtkMenuBar :== Pointer instance gtkWidget GtkMenuBar where gtkWidget mb = mb newMenuBar :: GtkM GtkMenuBar -newMenuBar = toStateR 'I'.gtk_menu_bar_new >>= show +newMenuBar = toStateR gtk_menu_bar_new >>= show :: GtkMenuItem :== Pointer @@ -117,14 +117,14 @@ instance gtkWidget GtkMenuItem where gtkWidget mi = mi newMenuItem :: !String -> GtkM GtkMenuItem newMenuItem label = - toStateR 'I'.gtk_menu_item_new >>= \item -> - toState ('I'.gtk_menu_item_set_label item label) >>| - toState ('I'.gtk_menu_item_set_use_underline item True) >>| + toStateR gtk_menu_item_new >>= \item -> + toState (gtk_menu_item_set_label item label) >>| + toState (gtk_menu_item_set_use_underline item True) >>| show item setSubMenu :: !GtkMenuItem !GtkMenu -> GtkM GtkMenu setSubMenu item menu = - toState ('I'.gtk_menu_item_set_submenu item menu) >>| + toState (gtk_menu_item_set_submenu item menu) >>| pure menu :: GtkMenuShell :== Pointer @@ -137,7 +137,7 @@ instance gtkMenuShell GtkMenuShell where gtkMenuShell ms = ms appendToMenuShell :: !s !GtkMenuItem -> GtkM GtkMenuItem | gtkMenuShell s appendToMenuShell shell item = - toState ('I'.gtk_menu_shell_append (gtkMenuShell shell) item) >>| + toState (gtk_menu_shell_append (gtkMenuShell shell) item) >>| pure item :: GtkPaned :== Pointer @@ -147,18 +147,18 @@ instance gtkContainer GtkPaned where gtkContainer p = p newPaned :: !GtkOrientation !GtkPanedHandleWidth -> GtkM GtkPaned newPaned orientation handle_width = - toStateR ('I'.gtk_paned_new orientation=:Vertical) >>= \paned -> - toState ('I'.gtk_paned_set_wide_handle paned handle_width=:WideHandle) >>| + toStateR (gtk_paned_new orientation=:Vertical) >>= \paned -> + toState (gtk_paned_set_wide_handle paned handle_width=:WideHandle) >>| show paned packPane1 :: !GtkPaned !GtkResize !GtkShrink !w -> GtkM w | gtkWidget w packPane1 paned resize shrink widget = - toState ('I'.gtk_paned_pack1 paned (gtkWidget widget) resize=:Resize shrink=:Shrink) >>| + toState (gtk_paned_pack1 paned (gtkWidget widget) resize=:Resize shrink=:Shrink) >>| pure widget packPane2 :: !GtkPaned !GtkResize !GtkShrink !w -> GtkM w | gtkWidget w packPane2 paned resize shrink widget = - toState ('I'.gtk_paned_pack2 paned (gtkWidget widget) resize=:Resize shrink=:Shrink) >>| + toState (gtk_paned_pack2 paned (gtkWidget widget) resize=:Resize shrink=:Shrink) >>| pure widget :: GtkScrolledWindow :== Pointer @@ -167,12 +167,12 @@ instance gtkWidget GtkScrolledWindow where gtkWidget sw = sw instance gtkContainer GtkScrolledWindow where gtkContainer sw = sw newScrolledWindow :: GtkM GtkScrolledWindow -newScrolledWindow = toStateR ('I'.gtk_scrolled_window_new 0 0) >>= show +newScrolledWindow = toStateR (gtk_scrolled_window_new 0 0) >>= show :: GtkTextBuffer :== Pointer insertAtCursor :: !String !GtkTextBuffer -> GtkM () -insertAtCursor s buffer = toState ('I'.gtk_text_buffer_insert_at_cursor buffer s (size s)) +insertAtCursor s buffer = toState (gtk_text_buffer_insert_at_cursor buffer s (size s)) :: GtkTextView :== Pointer @@ -181,12 +181,12 @@ instance gtkContainer GtkTextView where gtkContainer tv = tv newTextView :: GtkM GtkTextView newTextView = - toStateR 'I'.gtk_text_view_new >>= \text_view -> - toState ('I'.gtk_text_view_set_editable text_view False) >>| + toStateR gtk_text_view_new >>= \text_view -> + toState (gtk_text_view_set_editable text_view False) >>| show text_view getTextBuffer :: !GtkTextView -> GtkTextBuffer -getTextBuffer text_view = 'I'.gtk_text_view_get_buffer text_view +getTextBuffer text_view = gtk_text_view_get_buffer text_view :: GtkWindow :== Pointer @@ -201,11 +201,11 @@ newWindow title size = new_window_or_popup False title size new_window_or_popup :: !Bool !String !(Maybe (Int,Int)) -> GtkM GtkWindow new_window_or_popup is_popup title size = - toStateR ('I'.gtk_window_new is_popup) >>= \window -> - toState ('I'.gtk_window_set_title window title) >>| + toStateR (gtk_window_new is_popup) >>= \window -> + toState (gtk_window_set_title window title) >>| (case size of Nothing -> pure () - Just (h,v) -> toState ('I'.gtk_widget_set_size_request window h v)) >>| + Just (h,v) -> toState (gtk_widget_set_size_request window h v)) >>| show window // NB: it is also possible to attach CSS to one widget in particular (excluding @@ -217,10 +217,10 @@ new_window_or_popup is_popup title size = // any GtkWidget. addCSSFromFile :: !GtkStylePriority !FilePath !GtkWindow -> GtkM Bool addCSSFromFile priority path window = - toStateR 'I'.gtk_css_provider_new >>= \provider -> - toStateR ('I'.gtk_css_provider_load_from_path provider path 0) >>= \ok + toStateR gtk_css_provider_new >>= \provider -> + toStateR (gtk_css_provider_load_from_path provider path 0) >>= \ok | not ok -> pure ok | otherwise -> - toStateR ('I'.gtk_widget_get_screen window) >>= \screen -> - toState ('I'.gtk_style_context_add_provider_for_screen screen provider (toInt priority)) >>| + toStateR (gtk_widget_get_screen window) >>= \screen -> + toState (gtk_style_context_add_provider_for_screen screen provider (toInt priority)) >>| pure True diff --git a/src/Gtk/Widgets/Sheet.icl b/src/Gtk/Widgets/Sheet.icl index fe3eb93..442f67d 100644 --- a/src/Gtk/Widgets/Sheet.icl +++ b/src/Gtk/Widgets/Sheet.icl @@ -12,7 +12,7 @@ import Control.Monad.State import System._Pointer import Gtk -import qualified Gtk.Widgets.Sheet.Internal as I +import Gtk.Widgets.Sheet.Internal :: GtkSheet :== Pointer @@ -21,28 +21,28 @@ instance gtkContainer GtkSheet where gtkContainer s = fromPtr s newSheet :: !Int !Int !String -> GtkM GtkSheet newSheet nrows ncols title = - toStateR ('I'.gtk_sheet_new nrows ncols title) >>= show + toStateR (gtk_sheet_new nrows ncols title) >>= show instance tune GtkSheet GtkSheetColumnResizability where tune setting sheet = - toState ('I'.gtk_sheet_columns_set_resizable sheet setting=:ColumnsResizable) >>| + toState (gtk_sheet_columns_set_resizable sheet setting=:ColumnsResizable) >>| pure sheet instance tune GtkSheet GtkSheetColumnSensitity where tune setting sheet = - toState ('I'.gtk_sheet_columns_set_sensitivity sheet setting=:ColumnsSensitive) >>| + toState (gtk_sheet_columns_set_sensitivity sheet setting=:ColumnsSensitive) >>| pure sheet instance tune GtkSheet GtkSheetRowResizability where tune setting sheet = - toState ('I'.gtk_sheet_rows_set_resizable sheet setting=:RowsResizable) >>| + toState (gtk_sheet_rows_set_resizable sheet setting=:RowsResizable) >>| pure sheet instance tune GtkSheet GtkSheetRowSensitity where tune setting sheet = - toState ('I'.gtk_sheet_rows_set_sensitivity sheet setting=:RowsSensitive) >>| + toState (gtk_sheet_rows_set_sensitivity sheet setting=:RowsSensitive) >>| pure sheet -- cgit v1.2.3