Fixed merged conflicts of 2973th pull request by keyboardNinjaWarrior · Pull Request #5003 · termux/termux-app

keyboardNinjaWarrior · 2026-03-09T04:56:53Z

Merged Pull Request: Add graphics in terminal support: - Sixel and iTerm2 protocols #2973 into the main branch and did my best to resolve the conflicts.

twaik · 2026-03-09T05:04:35Z

          fi

      - name: Attach universal APK file
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.APK_BASENAME_PREFIX }}_universal
          path: |
            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_universal.apk
            ${{ env.APK_DIR_PATH }}/output-metadata.json

      - name: Attach arm64-v8a APK file
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.APK_BASENAME_PREFIX }}_arm64-v8a
          path: |
            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_arm64-v8a.apk
            ${{ env.APK_DIR_PATH }}/output-metadata.json

      - name: Attach armeabi-v7a APK file
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a
          path: |
            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_armeabi-v7a.apk
            ${{ env.APK_DIR_PATH }}/output-metadata.json

      - name: Attach x86_64 APK file
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.APK_BASENAME_PREFIX }}_x86_64
          path: |
            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_x86_64.apk
            ${{ env.APK_DIR_PATH }}/output-metadata.json

      - name: Attach x86 APK file
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.APK_BASENAME_PREFIX }}_x86
          path: |
            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}_x86.apk
            ${{ env.APK_DIR_PATH }}/output-metadata.json

      - name: Attach sha256sums file
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
        with:
          name: ${{ env.APK_BASENAME_PREFIX }}_sha256sums
          path: |


Must be removed from the PR, not related to the change.

twaik · 2026-03-09T06:42:50Z

Removing debug_build.yml is not acceptable. Dependabot change is out of scope of PR, you should rebase your changes against master branch.

twaik · 2026-03-09T06:45:48Z

Merge commits are not acceptable as well, even though it is not filed this way. You should use git rebasing feature, which effectively means history rewrite.

twaik · 2026-03-09T11:25:09Z

You still have the "rebased pull requeat" commit.

keyboardNinjaWarrior · 2026-03-09T12:28:40Z

I am confused. What do you want me to do? Remove that commit?

robertkirkman · 2026-03-09T12:42:05Z

I think that what is meant is, that the commits should all be re-typed and re-committed so that these 2 commits disappear:

keyboardNinjaWarrior · 2026-03-09T14:12:38Z

I think that what is meant is, that the commits should all be re-typed and re-committed so that these 2 commits disappear.

I have squashed the commits together. Let's see, if there is anything wrong, I'll try my best to fix it.

robertkirkman · 2026-03-09T16:20:31Z

Ok, now try to remove these 2 commits next:

keyboardNinjaWarrior · 2026-03-15T06:27:51Z

This bot's commit message is strange. I am unable to view it in my local repository.

…`KEYCODE_PAGE_DOWN` Found by AstroSnail (termux#5052 (comment)) Closes termux#5052

Add missing {} that change the logic.

- For iterm2 images - catch the error, and cancel the image. - For sixels - if it happens when resizing the bitmap, than ignore drawing outside of the current image.

- Move working bitmap code (drawing current bitmap) to WorkingTerminalBitmap class. - Move bitmap handling code to TerminalBitmap class.

To avoid removing elements from the map while iterating over it. This should solve the Concurrent Modification Exception in the bitmap garbage collection.

Avoid crash when BitmapFactory cannot decode image

…last column. This creates a zero length text run, so skip it.

keyboardNinjaWarrior · 2026-04-21T12:32:04Z

I figured out how to remove the bot's commit and rebased the branch.

robertkirkman · 2026-04-21T13:45:01Z

There is a more heavily tested version of this PR here,

Add graphics in terminal support: - Sixel and iTerm2 protocols #2973

unfortunately, MatanZ might not like the version that is in that PR, so it might not be merged.

@MatanZ is the version in this PR (#5003) still the original way you wanted it to be?

keyboardNinjaWarrior · 2026-04-21T14:19:10Z

I see, agnostic-apollo has increased the limit size and rebased it. I haven't added any code of my own. I've simply resbased it. Let's see what the author has to say.

I don't think this pull request is of any use now.

robertkirkman · 2026-04-21T14:40:27Z

Well, if MatanZ prefers this version more than the other version, they might approve it. but agnostic-apollo has not approved this version, only that other version. my goal is to make those versions which each approved more similar to each other by getting each person to approve successively more similar versions to the other until they both approve the same version, at which point the PR would be possible to merge.

twaik reviewed Mar 9, 2026

View reviewed changes

keyboardNinjaWarrior force-pushed the sixel branch from 6de8723 to d3c8368 Compare March 9, 2026 07:38

keyboardNinjaWarrior force-pushed the sixel branch from d3c8368 to cbb7958 Compare March 9, 2026 14:10

keyboardNinjaWarrior force-pushed the sixel branch from cbb7958 to 3b90f3c Compare March 15, 2026 06:18

Devon-Scott mentioned this pull request Mar 29, 2026

Feature Request: sixel graphics mode #142

Open

Fixed: Fix inverted typo in termcap values for KEYCODE_PAGE_UP and …

09fdd70

…`KEYCODE_PAGE_DOWN` Found by AstroSnail (termux#5052 (comment)) Closes termux#5052

keyboardNinjaWarrior force-pushed the sixel branch from 3b90f3c to bdb769c Compare April 21, 2026 12:22

MatanZ and others added 10 commits April 21, 2026 17:26

Clear LineWrap flag when clearing lines using blockSet.

09cee63

Don't GC the current sixel

d24331d

\007 is bell, only if not ending APC or OSC.

3e0ed5a

Add missing {} that change the logic.

Better handling of Out of Memory errors in bitmap allocations.

da6c031

- For iterm2 images - catch the error, and cancel the image. - For sixels - if it happens when resizing the bitmap, than ignore drawing outside of the current image.

Refactor bitmap code

cca2259

- Move working bitmap code (drawing current bitmap) to WorkingTerminalBitmap class. - Move bitmap handling code to TerminalBitmap class.

Copy the set of keys from the map before iterating.

431be1b

To avoid removing elements from the map while iterating over it. This should solve the Concurrent Modification Exception in the bitmap garbage collection.

Handle another failure path

a46a60b

Avoid crash when BitmapFactory cannot decode image

Ignore line feeds (and similar control characters) inside base64 data

693404f

Start first text run after the last column of bitmap, instead on the …

3751762

…last column. This creates a zero length text run, so skip it.

Catch another out of memory error in image code

bcc20bf

keyboardNinjaWarrior force-pushed the sixel branch from bdb769c to bcc20bf Compare April 21, 2026 12:26

Uh oh!

Conversation

keyboardNinjaWarrior commented Mar 9, 2026

Uh oh!

twaik Mar 9, 2026

Choose a reason for hiding this comment

Uh oh!

twaik commented Mar 9, 2026

Uh oh!

twaik commented Mar 9, 2026

Uh oh!

twaik commented Mar 9, 2026

Uh oh!

keyboardNinjaWarrior commented Mar 9, 2026

Uh oh!

robertkirkman commented Mar 9, 2026

Uh oh!

keyboardNinjaWarrior commented Mar 9, 2026

Uh oh!

robertkirkman commented Mar 9, 2026

Uh oh!

keyboardNinjaWarrior commented Mar 15, 2026

Uh oh!

keyboardNinjaWarrior commented Apr 21, 2026

Uh oh!

robertkirkman commented Apr 21, 2026

Uh oh!

keyboardNinjaWarrior commented Apr 21, 2026

Uh oh!

robertkirkman commented Apr 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants