bold text for file selector cwd

11 files changed, 236 insertions, 16 deletions

diff --git a/assets/apache2.txt b/assets/apache2.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/assets/apache2.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/assets/font-bold.ttf b/assets/font-bold.ttf
new file mode 100644
index 0000000..47179fa
--- /dev/null
+++ b/assets/font-bold.ttf
diff --git a/assets/font.ttf b/assets/font.ttf
index 3560a3a..dd3e6d0 100644
--- a/assets/font.ttf
+++ b/assets/font.ttf
diff --git a/command.c b/command.c
index f5ceb0c..442989b 100644
--- a/command.c
+++ b/command.c
@@ -131,14 +131,14 @@ void command_execute(Ted *ted, Command c, i64 argument) {
 		i64 new_text_size = settings->text_size + argument;
 		if (new_text_size >= TEXT_SIZE_MIN && new_text_size <= TEXT_SIZE_MAX) {
 			settings->text_size = (u16)new_text_size;
-			ted_load_font(ted);
+			ted_load_fonts(ted);
 		}
 	} break;
 	case CMD_TEXT_SIZE_DECREASE: {
 		i64 new_text_size = settings->text_size - argument;	
 		if (new_text_size >= TEXT_SIZE_MIN && new_text_size <= TEXT_SIZE_MAX) {
 			settings->text_size = (u16)new_text_size;
-			ted_load_font(ted);
+			ted_load_fonts(ted);
 		}
 	} break;
 	
diff --git a/credits.txt b/credits.txt
new file mode 100644
index 0000000..8ddf296
--- /dev/null
+++ b/credits.txt
@@ -0,0 +1,5 @@
+assets/font-code.ttf (Noto Sans Mono Regular), assets/font-regular.ttf (Noto Sans Regular), assets/font-bold.ttf (Noto Sans Bold):
+    These are from the Noto font family, licensed under the Apache License, version 2.0, as found in apache2.txt.
+    They can be found here: https://www.google.com/get/noto/
+stb_truetype.h:
+	See https://github.com/nothings/stb
diff --git a/main.c b/main.c
index 953b109..2c35958 100644
--- a/main.c
+++ b/main.c
@@ -179,7 +179,7 @@ int main(int argc, char **argv) {
 
 	SDL_GL_SetSwapInterval(1); // vsync
 
-	ted_load_font(ted);
+	ted_load_fonts(ted);
 	if (ted_haserr(ted))
 		die("Error loading font: %s", ted_geterr(ted));
 	{
diff --git a/ted-base.c b/ted-base.c
index 001cb94..d8acf0c 100644
--- a/ted-base.c
+++ b/ted-base.c
@@ -68,15 +68,17 @@ static Status ted_get_file(char const *name, char *out, size_t outsz) {
 	return false;
 }
 
-static void ted_load_font(Ted *ted) {
+// Loads font from filename into *out, freeing any font that was previously there.
+// *out is left unchanged on failure.
+static void ted_load_font(Ted *ted, char const *filename, Font **out) {
 	char font_filename[TED_PATH_MAX];
-	if (ted_get_file("assets/font.ttf", font_filename, sizeof font_filename)) {
+	if (ted_get_file(filename, font_filename, sizeof font_filename)) {
 		Font *font = text_font_load(font_filename, ted->settings.text_size);
 		if (font) {
-			if (ted->font) {
-				text_font_free(ted->font);
+			if (*out) {
+				text_font_free(*out);
 			}
-			ted->font = font;
+			*out = font;
 		} else {
 			ted_seterr(ted, "Couldn't load font: %s", text_get_err());
 			text_clear_err();
@@ -84,6 +86,13 @@ static void ted_load_font(Ted *ted) {
 	} else {
 		ted_seterr(ted, "Couldn't find font file. There is probably a problem with your ted installation.");
 	}
+	
+}
+
+// Load all the fonts ted will use.
+static void ted_load_fonts(Ted *ted) {
+	ted_load_font(ted, "assets/font.ttf", &ted->font);
+	ted_load_font(ted, "assets/font-bold.ttf", &ted->font_bold);
 }
 
 // returns buffer of new file, or NULL on failure
diff --git a/ted.cfg b/ted.cfg
index 108808f..0033965 100644
--- a/ted.cfg
+++ b/ted.cfg
@@ -9,7 +9,7 @@ cursor-blink-time-off = 0.3
 # if you do a bunch of typing, then undo, it will generally
 # undo the past this many seconds of editing.
 undo-save-time = 6
-text-size = 16
+text-size = 18
 border-thickness = 1
 max-menu-width = 600
 padding = 10
diff --git a/ted.h b/ted.h
index 86f3269..fedd317 100644
--- a/ted.h
+++ b/ted.h
@@ -92,7 +92,9 @@ typedef struct {
 } FileSelector;
 
 typedef struct Ted {
+	Font *font_bold;
 	Font *font;
+
 	TextBuffer *active_buffer;
 	// buffer we are currently drag-to-selecting in, if any
 	TextBuffer *drag_buffer;
diff --git a/text.c b/text.c
index 54694ce..fbce4eb 100644
--- a/text.c
+++ b/text.c
@@ -75,7 +75,7 @@ static Status text_load_char_page(Font *font, int page) {
 				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 			#if DEBUG
-				debug_println("Loaded font page %d with %dx%d bitmap as texture %u.", page, bitmap_width, bitmap_height, texture);
+				debug_println("Loaded font page %p:%03d with %dx%d bitmap as texture %u.", (void *)font, page, bitmap_width, bitmap_height, texture);
 			#endif
 				font->textures[page] = texture;
 				font->tex_widths[page]  = bitmap_width;
diff --git a/ui.c b/ui.c
index 7b36c81..57b6177 100644
--- a/ui.c
+++ b/ui.c
@@ -5,9 +5,10 @@ static bool file_selector_entry_pos(Ted const *ted, FileSelector const *fs,
 	Rect bounds = fs->bounds;
 	float padding = ted->settings.padding;
 	float char_height = text_font_char_height(ted->font);
+	float char_height_bold = text_font_char_height(ted->font_bold);
 	*r = rect(V2(bounds.pos.x, bounds.pos.y 
-		+ char_height // make room for cwd
-		+ char_height * 1.5f + padding // make room for line buffer
+		+ char_height_bold + padding // make room for cwd
+		+ char_height * 1.5f // make room for line buffer
 		+ char_height * (float)i), 
 		V2(bounds.size.x, char_height));
 	return rect_clip_to_rect(r, bounds);
@@ -192,16 +193,17 @@ static void file_selector_render(Ted *ted, FileSelector *fs) {
 	Rect bounds = fs->bounds;
 	u32 n_entries = fs->n_entries;
 	FileEntry const *entries = fs->entries;
-	Font *font = ted->font;
+	Font *font = ted->font, *font_bold = ted->font_bold;
 	float padding = settings->padding;
-	float char_height = text_font_char_height(ted->font);
+	float char_height = text_font_char_height(font);
+	float char_height_bold = text_font_char_height(font_bold);
 	float x1, y1, x2, y2;
 	rect_coords(bounds, &x1, &y1, &x2, &y2);
 
 	// current working directory
 	gl_color_rgba(colors[COLOR_TEXT]);
-	text_render(font, fs->cwd, x1, y1);
-	y1 += char_height + padding;
+	text_render(font_bold, fs->cwd, x1, y1);
+	y1 += char_height_bold + padding;
 
 	// search buffer
 	float line_buffer_height = char_height * 1.5f;