WIP

Author: Totto16

src/components/codePanoItem.ts

@@ -49,7 +49,15 @@ export class CodePanoItem extends PanoItem {
       this.setTextStyle();
     });
 
-    this.codeItemSettings.connect('changed', (_source, key) => {
+    this.codeItemSettings.connect('changed', (_source, _key) => {
+      if (this._type !== 'code') {
+        return;
+      }
+
+      this.setCodeStyle(undefined);
+    });
+
+    ext.markdownDetector?.connect('changed', (_source, key) => {
       if (key === 'code-highlighter-enabled') {
         const isEnabled = this.codeItemSettings.get_boolean('code-highlighter-enabled');
 
@@ -143,7 +151,9 @@ export class CodePanoItem extends PanoItem {
     this.label.set_style(`font-size: ${bodyFontSize}px; font-family: ${bodyFontFamily};`);
 
     if (markdown) {
+      debug('SET markup: ' + markdown);
       this.label.clutterText.set_markup(markdown);
+      //this.label.ensure_style();
     }
   }
 

src/utils/code/pygments.ts

@@ -173,7 +173,10 @@ export class PygmentsCodeHighlighter extends CodeHighlighter {
     let cancellable: CancellableWrapper | undefined;
 
     try {
-      const proc = this._launcher.spawnv([this.cliName, '-l', language, '-f', 'pango', ...this.getOptionsForCLI()]);
+      const cliOptions = await this.getOptionsForCLI();
+      console.log('cliOptions: ' + cliOptions.join(', '));
+
+      const proc = this._launcher.spawnv([this.cliName, '-l', language, '-f', 'pango', ...cliOptions]);
 
       cancellable = this.cancellableCollection.add(new Gio.Cancellable());
 
@@ -209,11 +212,39 @@ export class PygmentsCodeHighlighter extends CodeHighlighter {
     }
   }
 
+  private goodStyleValues = [
+    'pano',
+    'material',
+    'solarized-dark',
+    'github-dark',
+    'github-dark-high-contrast',
+    'fruity',
+    'pitaya-smoothie',
+    'greative',
+  ];
+
+  private getDefaultStyle(styles: string[]) {
+    let defaultStyleValue: string | number = 0;
+
+    for (const goodStyleValue of this.goodStyleValues) {
+      if (typeof defaultStyleValue !== 'number') {
+        break;
+      }
+
+      if (styles.includes(goodStyleValue)) {
+        defaultStyleValue = goodStyleValue;
+      }
+    }
+
+    return defaultStyleValue;
+  }
+
   private getOptionsForCLI(): string[] {
     const options: string[] = [];
 
-    for (const [name, value] of Object.entries(this._options)) {
-      options.push(`-P=${name}=${value}`);
+    const style = this._options.style;
+    if (style) {
+      options.push(`-Pstyle=${style}`);
     }
 
     return options;
@@ -241,17 +272,21 @@ export class PygmentsCodeHighlighter extends CodeHighlighter {
       return {};
     }
 
+    //TODO: add "title" widget between those recommended ones, and the other ones sorted
     const styles = Object.keys(this._features.styles);
-    styles.sort();
+    styles.sort((a, b) => {
+      if (this.goodStyleValues.includes(a)) {
+        return -1;
+      }
 
-    let defaultStyleValue: string | number = 0;
-    if (styles.includes('default')) {
-      defaultStyleValue = 'default';
-    }
+      if (this.goodStyleValues.includes(b)) {
+        return 1;
+      }
 
-    if (styles.includes('pano')) {
-      defaultStyleValue = 'pano';
-    }
+      return b.localeCompare(b);
+    });
+
+    const defaultStyleValue: string | number = this.getDefaultStyle(styles);
 
     return {
       style: {

src/utils/pango.ts

@@ -1,9 +1,11 @@
 import Gio from '@girs/gio-2.0';
 import GLib from '@girs/glib-2.0';
 import type { ExtensionBase } from '@girs/gnome-shell/dist/extensions/sharedInternals';
+import GObject from '@girs/gobject-2.0';
 import { ActiveCollection } from '@pano/utils/code/active';
 import type { CodeHighlighter, CodeHighlighterMetaData, Language } from '@pano/utils/code/highlight';
 import { PygmentsCodeHighlighter } from '@pano/utils/code/pygments';
+import { registerGObjectClass, SignalRepresentationType, SignalsDefinition } from '@pano/utils/gjs';
 import { logger } from '@pano/utils/shell';
 
 //TODO: add highlight.js back, if it is installed and can be found via "require()"" or dynamic "await import()""
@@ -117,7 +119,24 @@ class TaskScheduler {
 
 type LoadCallback = () => void | Promise<void>;
 
-export class PangoMarkdown {
+export type PangoMarkdownSignalType = 'changed';
+
+interface PangoMarkdownSignals extends SignalsDefinition<PangoMarkdownSignalType> {
+  changed: SignalRepresentationType<[GObject.GType<string>]>;
+}
+
+@registerGObjectClass
+export class PangoMarkdown extends GObject.Object {
+  static metaInfo: GObject.MetaInfo<Record<string, never>, Record<string, never>, PangoMarkdownSignals> = {
+    GTypeName: 'PangoMarkdown',
+    Signals: {
+      changed: {
+        param_types: [GObject.TYPE_STRING],
+        accumulator: 0,
+      },
+    },
+  };
+
   private _detectedHighlighter: CodeHighlighter[] = [];
   private _currentHighlighter: CodeHighlighter | null = null;
 
@@ -136,6 +155,7 @@ export class PangoMarkdown {
     enableWatch = false,
     schedulerConcurrency: number = 4,
   ) {
+    super();
     this._scheduler = new TaskScheduler(schedulerConcurrency);
 
     this._availableCodeHighlighter = [new PygmentsCodeHighlighter(ext)];
@@ -251,31 +271,39 @@ export class PangoMarkdown {
   public static readonly enabledKey = 'code-highlighter-enabled';
 
   private enableWatch(settings: Gio.Settings) {
-    const settingsChanged = async () => {
+    const settingsChanged = async (key: string) => {
       const isEnabled = settings.get_boolean(PangoMarkdown.enabledKey);
       if (!isEnabled) {
         this._currentHighlighter = null;
+        this.emit('changed', key);
         return;
       }
 
       const highlighterValue = settings.get_uint(PangoMarkdown.codeHighlighterKey);
 
       await this.detectHighlighter(PangoMarkdown.availableCodeHighlighter[highlighterValue]!.name);
+      this.emit('changed', key);
     };
 
-    settings.connect(`changed::${PangoMarkdown.enabledKey}`, settingsChanged);
+    settings.connect(`changed::${PangoMarkdown.enabledKey}`, () => settingsChanged(PangoMarkdown.enabledKey));
 
-    settings.connect(`changed::${PangoMarkdown.codeHighlighterKey}`, settingsChanged);
+    settings.connect(`changed::${PangoMarkdown.codeHighlighterKey}`, () =>
+      settingsChanged(PangoMarkdown.codeHighlighterKey),
+    );
+
+    const charLengthKey = ' char-length';
+
+    settings.connect(`changed::${charLengthKey}`, () => settingsChanged(charLengthKey));
 
     for (const codeHighlighter of this._availableCodeHighlighter) {
-      const schemaKey = `changed::${PangoMarkdown.getSchemaKeyForOptions(codeHighlighter)}`;
+      const optionSchemaKey = PangoMarkdown.getSchemaKeyForOptions(codeHighlighter);
+      const schemaKey = `changed::${optionSchemaKey}`;
       settings.connect(schemaKey, () => {
         if (this._currentHighlighter?.name === codeHighlighter.name) {
           this._currentHighlighter.options = settings.get_string(schemaKey);
+          this.emit('changed', optionSchemaKey);
         }
       });
-
-      codeHighlighter;
     }
   }
 

src/utils/panoItemFactory.ts

@@ -205,6 +205,8 @@ const findOrCreateDbItem = async (ext: PanoExtension, clip: ClipboardContent): P
         .get_child('code-item')
         .get_double('highlighter-detection-relevance');
 
+      debug('GIOT language: ' + detectedLanguage?.language + 'with relevance ' + detectedLanguage?.relevance);
+
       if (ext.markdownDetector && detectedLanguage && detectedLanguage.relevance >= minimumLanguageRelevance) {
         return db.save({
           content: value,

test.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+# yarn run build
+
+export SHELL_DEBUG=all
+
+#export G_MESSAGES_DEBUG=all
+
+export MUTTER_DEBUG_DUMMY_MODE_SPECS=1366x768
+
+dbus-run-session  -- gnome-shell --nested --wayland > test.txt 2>&1
+
+
+# TODO: use formatn or gettextn and overhaul notifications for gnome 46