Skip to content

reapply a theme to previous formats #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Apr 30, 2020
Merged

reapply a theme to previous formats #1079

merged 6 commits into from
Apr 30, 2020

Conversation

ailin-nemui
Copy link
Contributor

@ailin-nemui ailin-nemui commented Aug 7, 2019 •
edited
Loading

  • fix /set hide_colors
  • fix line IDs on perl side
  • reimplement the colour stripping in line2text

@ailin-nemui
Copy link
Contributor Author

another attempt at #1063

@ailin-nemui ailin-nemui mentioned this pull request Aug 7, 2019
Closed
@ailin-nemui
Copy link
Contributor Author

ailin-nemui commented Aug 7, 2019 •
edited
Loading

  • reimplement glib code, do not require newer glib

  • design doesn't waste twice the memory, uses cache and original formats

  • completely removed the old textbuffer representation ( https://github.com/shabble/irssi-docs/wiki/Notes-256-Colour#textbuffer-encoding )

    • this may have some drawbacks:
      • texts are no longer NUL-safe
      • additional escaping routines would need to be introduced if text is supposed to contain formatting codes
    • benefits
      • one less layer of indirection
      • NUL-terminated strings, no weird issues with cut off UTF8 (although we fixed that)
      • simpler code

  • the textbuffer-formats is an extra module, so if we unhook the signals it should go back to the "old way" of storing pre-rendered text

Todos

  • differentiate between deleted formats and empty lines
  • fix all the bugs
  • we should check if the removal of the optimised textbuffer has any visible performance implications

@vague666

This comment has been minimized.

Sign in to view
@vague666
Copy link
Member

vague666 commented Aug 7, 2019

/scrollback redraw seems to work well, too bad it's not done automatically yet :)

@ailin-nemui
Copy link
Contributor Author

-> under what circumstances would we "want" an automated scrollback redraw?

@vague666
Copy link
Member

vague666 commented Aug 7, 2019

/set theme and /format .... imo, and /window theme
basically in all instances :)
Maybe control it with a setting

@ailin-nemui

This comment has been minimized.

Sign in to view
@ailin-nemui ailin-nemui force-pushed the reformat2 branch 2 times, most recently from 91f3b14 to 831e18e Compare August 8, 2019 19:55
@dequis

This comment has been minimized.

Sign in to view
@ailin-nemui ailin-nemui changed the title reapply a theme to previous formats reapply a theme to previous formats& ircv3 Aug 13, 2019
@dequis

This comment has been minimized.

Sign in to view
@ailin-nemui ailin-nemui mentioned this pull request Aug 13, 2019
Merged
@ailin-nemui ailin-nemui changed the title reapply a theme to previous formats& ircv3 reapply a theme to previous formats Aug 13, 2019
@ailin-nemui
Copy link
Contributor Author

ailin-nemui commented Aug 13, 2019 •
edited
Loading

the code is mostly split into 3 parts;

  • ripping out the old textbuffer implementation and storing the line texts and formats
  • the expando caching in special-vars
  • the perl code

@ailin-nemui
Copy link
Contributor Author

you should be able to review each commit individually, but it's still a big hairy lump

for the view_update_line_cache in textbuffer-view.c, it would make sense to review with white-space ignored (?w=1 )

@ailin-nemui ailin-nemui force-pushed the reformat2 branch 2 times, most recently from 1103a93 to 7b5bf8f Compare March 16, 2020 23:27
@ailin-nemui
Copy link
Contributor Author

@irssi/developers please test

@vague666
Copy link
Member

vague666 commented Mar 25, 2020 •
edited
Loading

There's some drawing issues
tested with 1079.diff on HEAD, Irssi v1.2-dev-522-g991e24fb-dirty and themes https://irssi-import.github.io/themes/elite.theme and https://bitbucket.org/realnot/dirssi/src/master/

irssi elite dirssi
HEAD + diff elite.theme patched dirssi.theme patched
g991e24fb elite.theme unpatched dirssi.theme unpatched

Also, I'd still like the scrollback to be redrawn automatically if possible when theme is applied

@ailin-nemui
Copy link
Contributor Author

thank you very much for the detailed report. btw the auto redraw will come, just not in this PR!

@ailin-nemui ailin-nemui changed the title reapply a theme to previous formats reapply a theme to previous formats Mar 29, 2020
@ailin-nemui
Copy link
Contributor Author

I think I fixed dirssi, still need to check elite

@ailin-nemui
Copy link
Contributor Author

@irssi/developers last chance to review....

@ailin-nemui ailin-nemui added the auto-merge This PR is scheduled for merge if no further comments are opened label Apr 20, 2020
@ailin-nemui ailin-nemui force-pushed the reformat2 branch 6 times, most recently from 1a55b3c to 2ceb4a9 Compare April 21, 2020 21:17
@ailin-nemui
make lines reformattable
f95fc81 
- completely removed the old textbuffer representation (
  https://github.com/shabble/irssi-docs/wiki/Notes-256-Colour#textbuffer-encoding
  )

- textbuffer-formats is an extra module, so if we unhook the signals it
  should go back to the "old way" of storing pre-rendered tex

- design uses cache, original formats and list of arguments
@ailin-nemui
implement expando cache
6b93d6e 
- the expando values need to be stored now that the lines are
  reformattable, otherwise the old values are lost (and they depend on
  context only available at the time the line is initially printed)

- the cache is collected from the special-vars evaluation code

- the cache is controlled by the textbuffer-formats code, and stored in
  the text_buffer_format_rec
@ailin-nemui ailin-nemui force-pushed the reformat2 branch 2 times, most recently from f6474d7 to 138ff1a Compare April 28, 2020 13:40
@ailin-nemui
add perl code for textbuffer-formats
57fb173 
- compatibility shim for new line

- make format accessible from perl

- fix perl line IDs being mixed up due to wrapper
@ailin-nemui
enable mirc colour processing
8fd6dcc
@ailin-nemui
add setting to disable reformat
449d86c
@ailin-nemui
up abi
675696a
@ailin-nemui ailin-nemui merged commit 86b72d5 into irssi:master Apr 30, 2020
@ailin-nemui ailin-nemui deleted the reformat2 branch April 30, 2020 07:00
@dequis dequis mentioned this pull request May 8, 2020
Merged
This was referenced May 8, 2020
Closed
Merged
Merged
This was referenced Jul 4, 2020
Merged
Merged
@ailin-nemui ailin-nemui mentioned this pull request Jul 22, 2020
Merged
@vague666 vague666 mentioned this pull request Mar 2, 2021
Closed
@ailin-nemui ailin-nemui added this to the 1.3.0 milestone Oct 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
auto-merge This PR is scheduled for merge if no further comments are opened
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@ailin-nemui @vague666 @dequis