diff --git a/Makefile b/Makefile index 88c30a0..30d2f64 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := /bin/bash -O extglob build: $(wildcard ./src/*) mkdir -p ./build - cat ./src/!(main).js ./src/main.js > ./build/main.js + tsc --outFile ./build/main.js cp ./src/main.qml ./build/main.qml run: build diff --git a/src/Column.js b/src/Column.ts similarity index 95% rename from src/Column.js rename to src/Column.ts index 49bdd76..57f1b3f 100644 --- a/src/Column.js +++ b/src/Column.ts @@ -1,9 +1,14 @@ class Column { + public grid: Grid; + public gridX: number; + private windows: LinkedList; + private width: number; + constructor() { this.grid = null; this.gridX = null; - this.windows = new LinkedList(); // private - this.width = 0; // private + this.windows = new LinkedList(); + this.width = 0; } addWindow(window) { diff --git a/src/Grid.js b/src/Grid.ts similarity index 96% rename from src/Grid.js rename to src/Grid.ts index 5ad1b65..d17a86c 100644 --- a/src/Grid.js +++ b/src/Grid.ts @@ -1,8 +1,14 @@ class Grid { + private columns: LinkedList; + private scrollX: number; + private width: number; + public allowAutoAdjustScroll: boolean; + public area: any; + constructor(desktopIndex) { - this.columns = new LinkedList(); // private - this.scrollX = 0; // private - this.width = 0; // private + this.columns = new LinkedList(); + this.scrollX = 0; + this.width = 0; this.allowAutoAdjustScroll = true; diff --git a/src/LinkedList.js b/src/LinkedList.ts similarity index 90% rename from src/LinkedList.js rename to src/LinkedList.ts index 05dbecd..c073bd1 100644 --- a/src/LinkedList.js +++ b/src/LinkedList.ts @@ -1,8 +1,12 @@ class LinkedList { + private firstNode: LinkedListNode; + private lastNode: LinkedListNode; + private itemMap: Map; + constructor() { - this.firstNode = null; // private - this.lastNode = null; // private - this.itemMap = new Map(); // private + this.firstNode = null; + this.lastNode = null; + this.itemMap = new Map(); } insertBefore(item, nextItem) { @@ -23,8 +27,7 @@ class LinkedList { this.insert(item, this.lastNode, null); } - // private - insert(item, prevNode, nextNode) { + private insert(item, prevNode, nextNode) { const node = new LinkedListNode(item, prevNode, nextNode); this.itemMap.set(item, node); if (nextNode !== null) { @@ -92,8 +95,7 @@ class LinkedList { } } - // private - swap(node0, node1) { + private swap(node0, node1) { console.assert(node0.next === node1 && node1.prev === node0); const prevNode = node0.prev; const nextNode = node1.next; @@ -153,6 +155,10 @@ class LinkedList { // TODO (optimization): reuse nodes class LinkedListNode { + public item: any; + public prev: LinkedListNode; + public next: LinkedListNode; + constructor(item, prev, next) { this.item = item; this.prev = prev; diff --git a/src/Window.js b/src/Window.ts similarity index 83% rename from src/Window.js rename to src/Window.ts index 2d774bc..7162a07 100644 --- a/src/Window.js +++ b/src/Window.ts @@ -1,4 +1,17 @@ class Window { + public column: Column; + public client: any; + private height: number; + private preferredWidth: number; + private skipArrange: boolean; + private lastResize: boolean; + public floatingState: { width: number; keepBelow: number; height: number; keepAbove: number }; + private clientSignalHandlers: { + desktopChanged: () => void; + moveResizedChanged: () => void; + frameGeometryChanged: (client, oldGeometry) => void; + }; + constructor(client) { this.column = null; this.client = client; @@ -12,7 +25,11 @@ class Window { keepAbove: client.keepAbove, keepBelow: client.keepBelow, }; - this.clientSignalHandlers = {}; + this.clientSignalHandlers = { + desktopChanged: undefined, + moveResizedChanged: undefined, + frameGeometryChanged: undefined, + }; } setRect(x, y, width, height) { diff --git a/src/World.js b/src/World.ts similarity index 91% rename from src/World.js rename to src/World.ts index 3724f26..b232174 100644 --- a/src/World.js +++ b/src/World.ts @@ -1,8 +1,12 @@ class World { + private grids: Grid[]; + public clientMap: Map; + public minimizedTiled: Set; + constructor(nDesktops) { // TODO: react to changes in number of desktops // TODO: support Plasma activities - this.grids = new Array(nDesktops); + this.grids = new Array(nDesktops); for (let i = 0; i < nDesktops; i++) { this.grids[i] = new Grid(i); } diff --git a/src/actions.js b/src/actions.ts similarity index 100% rename from src/actions.js rename to src/actions.ts diff --git a/src/constants.js b/src/constants.ts similarity index 100% rename from src/constants.js rename to src/constants.ts diff --git a/src/extern.d.ts b/src/extern.d.ts new file mode 100644 index 0000000..b465b4f --- /dev/null +++ b/src/extern.d.ts @@ -0,0 +1,4 @@ +const console; +const KWin; +const Qt; +const workspace; diff --git a/src/main.js b/src/main.ts similarity index 100% rename from src/main.js rename to src/main.ts diff --git a/src/shortcuts.js b/src/shortcuts.ts similarity index 100% rename from src/shortcuts.js rename to src/shortcuts.ts diff --git a/src/signals.js b/src/signals.ts similarity index 100% rename from src/signals.js rename to src/signals.ts diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..9fe3e7c --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,118 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2020", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "lib": [ + "es2020", + ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "none", /* Specify what module code is generated. */ + // "rootDir": "./", /* Specify the root folder within your source files. */ + // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + "allowJs": false, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "outFile": "./ts_built.js", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + // "outDir": "./", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": false, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": false, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + }, + "files": [ + "./src/actions.ts", + "./src/Column.ts", + "./src/constants.ts", + "./src/extern.d.ts", + "./src/Grid.ts", + "./src/LinkedList.ts", + "./src/shortcuts.ts", + "./src/signals.ts", + "./src/Window.ts", + "./src/World.ts", + "./src/main.ts" + ] +}