Mercurial Hosting > luan

changeset 1878:708e7f047c59 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
swing
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 06 Apr 2025 16:34:20 -0600
parents b30e4b1966a0
children
files src/luan/modules/swing/TextAreaLineNumbersLuan.java src/luan/modules/swing/Text_area.luan src/luan/modules/swing/Text_component.luan
diffstat 3 files changed, 26 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/luan/modules/swing/TextAreaLineNumbersLuan.java	Sat Apr 05 22:50:03 2025 -0600
+++ b/src/luan/modules/swing/TextAreaLineNumbersLuan.java	Sun Apr 06 16:34:20 2025 -0600
@@ -53,7 +53,7 @@
 			if( event.getButton() == MouseEvent.BUTTON1 ) {
 				JLabel label = (JLabel)event.getComponent();
 				int line = (Integer)label.getClientProperty("line");
-				logger.info("clicked "+line);
+				//logger.info("clicked "+line);
 				lineStartSelection = line;
 				int start, end;
 				try {
@@ -76,7 +76,7 @@
 			if( lineStartSelection >= 0 && (event.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) != 0 ) {
 				JLabel label = (JLabel)event.getComponent();
 				int line = (Integer)label.getClientProperty("line");
-				logger.info("entered "+line);
+				//logger.info("entered "+line);
 				int start, end;
 				try {
 					start = textArea.getLineStartOffset(Math.min(line,lineStartSelection));
--- a/src/luan/modules/swing/Text_area.luan	Sat Apr 05 22:50:03 2025 -0600
+++ b/src/luan/modules/swing/Text_area.luan	Sun Apr 06 16:34:20 2025 -0600
@@ -71,6 +71,21 @@
 	new_text_component(text_area)
 	local jtext_area = text_area.java
 	text_area.show_whitespace = jtext_area.showWhitespace
+	function text_area.get_line_from_position(pos)
+		return jtext_area.getLineOfOffset(pos-1) + 1
+	end
+	function text_area.get_line_start_position(line)
+		return jtext_area.getLineStartOffset(line-1) + 1
+	end
+	function text_area.get_line_end_position(line)
+		return jtext_area.getLineEndOffset(line-1) + 1
+	end
+	function text_area.insert(text,pos)
+		return jtext_area.insert(text,pos-1)
+	end
+	function text_area.replace(start_pos,length,text)
+		return jtext_area.getDocument().replace(start_pos-1,length,text)
+	end
 	set_metatable(text_area,mt)
 	return text_area
 end
--- a/src/luan/modules/swing/Text_component.luan	Sat Apr 05 22:50:03 2025 -0600
+++ b/src/luan/modules/swing/Text_component.luan	Sun Apr 06 16:34:20 2025 -0600
@@ -1,6 +1,7 @@
 local Luan = require "luan:Luan.luan"
 local error = Luan.error
 local raw_set = Luan.raw_set or error()
+local stringify = Luan.stringify or error()
 local Utils = require "luan:swing/Utils.luan"
 local fail = Utils.fail or error()
 local Component = require "luan:swing/Component.luan"
@@ -28,9 +29,6 @@
 		raw_set(text_component,"document",document)
 		return document
 	end
-	if key == "caret_position" then
-		return text_component.java.getCaretPosition()
-	end
 	return fail
 end
 
@@ -46,10 +44,6 @@
 		raw_set(text_component,"document",value)
 		return
 	end
-	if key == "caret_position" then
-		text_component.java.setCaretPosition(value)
-		return
-	end
 	return fail
 end
 
@@ -61,6 +55,14 @@
 	component.copy = jcomponent.copy
 	component.paste = jcomponent.paste
 	component.select_all = jcomponent.selectAll
+	function component.get_selection()
+		return jcomponent.getSelectionStart()+1, jcomponent.getSelectionEnd()+1
+	end
+	function component.set_selection(start_pos,end_pos)
+		end_pos = end_pos or start_pos
+		jcomponent.select(start_pos-1,end_pos-1)
+	end
+	--logger.info(stringify{component.get_selection()})
 	return component
 end