dwindows: android/DWindows.kt comparison

comparison android/DWindows.kt @ 2620:dcd71b04cc46

Android: Add internal event constants for more clarity about what code does. Several platforms which do not use integer messages for events have our own internal system implemented, adding enum constants for each internal message.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 25 Jul 2021 23:35:02 +0000
parents	dbcd9416e9c9
children	22105f99dd6a

comparison

equal deleted inserted replaced

-:4d5467e57115
+:dcd71b04cc46
 import java.io.File
 import java.io.IOException
 import java.util.*
 import java.util.concurrent.locks.ReentrantLock
+object DWEvent {
+const val TIMER = 0
+const val CONFIGURE = 1
+const val KEY_PRESS = 2
+const val BUTTON_PRESS = 3
+const val BUTTON_RELEASE = 4
+const val MOTION_NOTIFY = 5
+const val DELETE = 6
+const val EXPOSE = 7
+const val CLICKED = 8
+const val ITEM_ENTER = 9
+const val ITEM_CONTEXT = 10
+const val LIST_SELECT = 11
+const val ITEM_SELECT = 12
+const val SET_FOCUS = 13
+const val VALUE_CHANGED = 14
+const val SWITCH_PAGE = 15
+const val TREE_EXPAND = 16
+const val COLUMN_CLICK = 17
+const val HTML_RESULT = 18
+const val HTML_CHANGED = 19
+}
 class DWTabViewPagerAdapter : RecyclerView.Adapter<DWTabViewPagerAdapter.DWEventViewHolder>() {
 val viewList = mutableListOf<LinearLayout>()
 val pageList = mutableListOf<Long>()
 var currentPageID = 0L
 // to match the behavior on the other platforms
 return false
 }
 override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
 // Handle the DW_HTML_CHANGE_STARTED event
-eventHandlerHTMLChanged(view, 19, url, 1)
+eventHandlerHTMLChanged(view, DWEvent.HTML_CHANGED, url, 1)
 }
 override fun onPageFinished(view: WebView, url: String) {
 // Handle the DW_HTML_CHANGE_COMPLETE event
-eventHandlerHTMLChanged(view, 19, url, 4)
+eventHandlerHTMLChanged(view, DWEvent.HTML_CHANGED, url, 4)
 }
 external fun eventHandlerHTMLChanged(obj1: View, message: Int, URI: String, status: Int)
 }
 }
 if(value < minimum) {
 value = minimum
 }
 setText(value.toString())
-eventHandlerInt(14, value.toInt(), 0, 0, 0)
+eventHandlerInt(DWEvent.VALUE_CHANGED, value.toInt(), 0, 0, 0)
 return true
 } else if (event.x <= v.compoundDrawables[DRAWABLE_LEFT].bounds.width()) {
 val newvalue = this.text.toString().toLongOrNull()
 if(newvalue != null) {
 }
 if(value < minimum) {
 value = minimum
 }
 setText(value.toString())
-eventHandlerInt(14, value.toInt(), 0, 0, 0)
+eventHandlerInt(DWEvent.VALUE_CHANGED, value.toInt(), 0, 0, 0)
 return true
 }
 }
 return false
 }
 override fun onItemClick(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
 val item = list[position]
 selected = position
 setText(item)
 lpw!!.dismiss()
-eventHandlerInt(11, position, 0, 0, 0)
+eventHandlerInt(DWEvent.LIST_SELECT, position, 0, 0, 0)
 }
 override fun onTouch(v: View, event: MotionEvent): Boolean {
 val DRAWABLE_RIGHT = 2
 onItemClickListener = this
 }
 override fun onItemClick(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
 selected = position
-eventHandlerInt(11, position, 0, 0, 0)
+eventHandlerInt(DWEvent.LIST_SELECT, position, 0, 0, 0)
 }
 external fun eventHandlerInt(
 message: Int,
 inta: Int,
 var button: Int = 1
 override fun onSizeChanged(width: Int, height: Int, oldWidth: Int, oldHeight: Int) {
 super.onSizeChanged(width, height, oldWidth, oldHeight)
 // Send DW_SIGNAL_CONFIGURE
-eventHandlerInt(1, width, height, 0, 0)
+eventHandlerInt(DWEvent.CONFIGURE, width, height, 0, 0)
 }
 override fun onDraw(canvas: Canvas) {
 super.onDraw(canvas)
 cachedCanvas = canvas
 // Send DW_SIGNAL_EXPOSE
-eventHandlerInt(7, 0, 0, this.width, this.height)
+eventHandlerInt(DWEvent.EXPOSE, 0, 0, this.width, this.height)
 cachedCanvas = null
 }
 external fun eventHandlerInt(
 message: Int,
 menuitem.menuitem = menu?.add(group, menuitem.id, 0, menuitem.title)
 menuitem.menuitem!!.isCheckable = menuitem.check
 menuitem.menuitem!!.isChecked = menuitem.checked
 menuitem.menuitem!!.isEnabled = menuitem.enabled
 menuitem.menuitem!!.setOnMenuItemClickListener { item: MenuItem? ->
-eventHandlerSimple(menuitem, 8)
+eventHandlerSimple(menuitem, DWEvent.CLICKED)
 true
 }
 }
 }
 }
 // Send a DW_SIGNAL_CONFIGURE on orientation change
 if(windowLayout != null) {
 val width: Int = windowLayout!!.width
 val height: Int = windowLayout!!.height
-eventHandlerInt(windowLayout as View, 1, width, height, 0, 0)
+eventHandlerInt(windowLayout as View, DWEvent.CONFIGURE, width, height, 0, 0)
 }
 }
 override fun onCreateOptionsMenu(menu: Menu?): Boolean {
 if(menuBar == null) {
 button!!.isAllCaps = false
 button!!.text = text
 button!!.id = cid
 button!!.setOnClickListener {
 lastClickView = button!!
-eventHandlerSimple(button!!, 8)
+eventHandlerSimple(button!!, DWEvent.CLICKED)
 }
 }
 return button
 }
 button!!.tag = dataArrayMap
 button!!.id = resid
 button!!.setImageResource(resid)
 button!!.setOnClickListener {
 lastClickView = button!!
-eventHandlerSimple(button!!, 8)
+eventHandlerSimple(button!!, DWEvent.CLICKED)
 }
 }
 return button
 }
 button!!.tag = dataArrayMap
 button!!.id = cid
 button!!.setOnClickListener {
 lastClickView = button!!
-eventHandlerSimple(button!!, 8)
+eventHandlerSimple(button!!, DWEvent.CLICKED)
 }
 for (ext in exts) {
 // Try to load the image, and protect against exceptions
 try {
 button!!.tag = dataArrayMap
 button!!.id = cid
 button!!.setOnClickListener {
 lastClickView = button!!
-eventHandlerSimple(button!!, 8)
+eventHandlerSimple(button!!, DWEvent.CLICKED)
 }
 button!!.setImageBitmap(b)
 }
 return button
 }
 radiobutton!!.tag = dataArrayMap
 radiobutton!!.id = cid
 radiobutton!!.text = text
 radiobutton!!.setOnClickListener {
 lastClickView = radiobutton!!
-eventHandlerSimple(radiobutton!!, 8)
+eventHandlerSimple(radiobutton!!, DWEvent.CLICKED)
 }
 }
 return radiobutton
 }
 checkbox!!.tag = dataArrayMap
 checkbox!!.id = cid
 checkbox!!.text = text
 checkbox!!.setOnClickListener {
 lastClickView = checkbox!!
-eventHandlerSimple(checkbox!!, 8)
+eventHandlerSimple(checkbox!!, DWEvent.CLICKED)
 }
 }
 return checkbox
 }
 tabs.addOnTabSelectedListener(object : OnTabSelectedListener {
 override fun onTabSelected(tab: TabLayout.Tab) {
 val adapter = pager.adapter as DWTabViewPagerAdapter
 pager.currentItem = tab.position
-eventHandlerNotebook(notebook!!, 15, adapter.pageList[tab.position])
+eventHandlerNotebook(notebook!!, DWEvent.SWITCH_PAGE, adapter.pageList[tab.position])
 }
 override fun onTabUnselected(tab: TabLayout.Tab) {}
 override fun onTabReselected(tab: TabLayout.Tab) {}
 })
 override fun onStartTrackingTouch(seekBar: SeekBar) {
 }
 override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-eventHandlerInt(slider as View, 14, slider!!.progress, 0, 0, 0)
+eventHandlerInt(slider as View, DWEvent.VALUE_CHANGED, slider!!.progress, 0, 0, 0)
 }
 })
 }
 return slider
 }
 fun htmlJavascriptRun(html: WebView, javascript: String, data: Long)
 {
 waitOnUiThread {
 html.evaluateJavascript(javascript) { value ->
 // Execute onReceiveValue's code
-eventHandlerHTMLResult(html, 18, value, data)
+eventHandlerHTMLResult(html, DWEvent.HTML_RESULT, value, data)
 }
 }
 }
 fun htmlAction(html: WebView, action: Int)
 // If we are single select or we got a double tap...
 // Generate an ENTER event
 if(cont!!.choiceMode != ListView.CHOICE_MODE_MULTIPLE ||
 (position == adapter.lastClickRow &&
 (now - adapter.lastClick) < ViewConfiguration.getDoubleTapTimeout())) {
-eventHandlerContainer(cont!!, 9, title, 0, 0, data)
+eventHandlerContainer(cont!!, DWEvent.ITEM_ENTER, title, 0, 0, data)
 } else {
 // If we are mutiple select, generate a SELECT event
-eventHandlerContainer(cont!!, 12, title, 0, 0, data)
+eventHandlerContainer(cont!!, DWEvent.ITEM_SELECT, title, 0, 0, data)
 }
 adapter.lastClick = now
 adapter.lastClickRow = position
 }
 cont!!.setOnContextClickListener {
 if(adapter.selectedItem > -1 && adapter.selectedItem < adapter.model.numberOfRows()) {
 val title = adapter.model.getRowTitle(adapter.selectedItem)
 val data = adapter.model.getRowData(adapter.selectedItem)
 lastClickView = cont!!
-eventHandlerContainer(cont!!, 10, title, 0, 0, data)
+eventHandlerContainer(cont!!, DWEvent.ITEM_CONTEXT, title, 0, 0, data)
 }
 true
 }
 cont!!.setOnItemLongClickListener { parent, view, position, id ->
 val title = adapter.model.getRowTitle(position)
 val data = adapter.model.getRowData(position)
 lastClickView = cont!!
-eventHandlerContainer(cont!!, 10, title, 0, 0, data)
+eventHandlerContainer(cont!!, DWEvent.ITEM_CONTEXT, title, 0, 0, data)
 true
 }
 }
 return cont
 }
 }
 MotionEvent.ACTION_UP -> {
 render!!.evx = event.x
 render!!.evy = event.y
 lastClickView = render!!
-eventHandlerInt(render!!, 4, event.x.toInt(), event.y.toInt(), render!!.button, 0)
+eventHandlerInt(render!!, DWEvent.BUTTON_RELEASE, event.x.toInt(), event.y.toInt(), render!!.button, 0)
 }
 MotionEvent.ACTION_MOVE -> {
 render!!.evx = event.x
 render!!.evy = event.y
 lastClickView = render!!
-eventHandlerInt(render!!, 5, event.x.toInt(), event.y.toInt(), 1, 0)
+eventHandlerInt(render!!, DWEvent.MOTION_NOTIFY, event.x.toInt(), event.y.toInt(), 1, 0)
 }
 }
 return false
 }
 })
 render!!.setOnLongClickListener{
 // Long click functions as button 2
 render!!.button = 2
 lastClickView = render!!
-eventHandlerInt(render!!, 3, render!!.evx.toInt(), render!!.evy.toInt(), 2, 0)
+eventHandlerInt(render!!, DWEvent.BUTTON_PRESS, render!!.evx.toInt(), render!!.evy.toInt(), 2, 0)
 true
 }
 render!!.setOnClickListener{
 // Normal click functions as button 1
 render!!.button = 1
 lastClickView = render!!
-eventHandlerInt(render!!, 3, render!!.evx.toInt(), render!!.evy.toInt(), 1, 0)
+eventHandlerInt(render!!, DWEvent.BUTTON_PRESS, render!!.evx.toInt(), render!!.evy.toInt(), 1, 0)
 }
 render!!.setOnKeyListener(View.OnKeyListener { v, keyCode, event ->
 if (event.action == KeyEvent.ACTION_DOWN) {
-eventHandlerKey(render!!, 2, keyCode, event.unicodeChar, event.modifiers, event.characters)
+eventHandlerKey(render!!, DWEvent.KEY_PRESS, keyCode, event.unicodeChar, event.modifiers, event.characters)
 }
 false
 })
 }
 return render

Mercurial > dwindows

comparison android/DWindows.kt @ 2620:dcd71b04cc46