git-svn-id: http://svn.code.sf.net/p/netboot65/code@34 93682198-c243-4bdb-bd91-e943c89aac3b

client/inc/menu.i

@@ -1,15 +1,15 @@
 
-OPTIONS_PER_PAGE = 18
+OPTIONS_PER_PAGE = $10
 .bss
 
-number_of_options: .res 1
-current_option: .res 1
+number_of_options: .res 2
+current_option: .res 2
+temp_option_counter: .res 2
 
-first_option_this_page: .res 1
+first_option_this_page: .res 2
 options_shown_this_page: .res 1
-
-option_description_pointers: .res 256  ;table of addresses of up to 128 options
-
+options_table_pointer: .res 2
+jump_to_prefix: .res 1
 .code
 
 
@@ -17,74 +17,120 @@ option_description_pointers: .res 256  ;table of addresses of up to 128 options
 ;on exit, AX points to the selected string
 select_option_from_menu:
 
-  stax  @lda_from_options_source+1
-  ldy #0
-  sty number_of_options
+  stax options_table_pointer
+  stax @get_current_byte+1
+  lda #0
+  sta current_option
+  sta current_option+1
+  sta number_of_options
+  sta number_of_options+1
 
 
-@copy_one_pointer:
-  jsr @lda_from_options_source
-  beq @found_last_option_string
-  
-  lda   @lda_from_options_source+1
-  sta   option_description_pointers,y
-  lda   @lda_from_options_source+2
-  sta   option_description_pointers+1,y
-  iny
-  iny  
-  beq @found_last_option_string ;if we overflow y, then stop scanning options
+;count the number of options. this is done by scanning till we find a double zero, incrementing the count on each single zero
+@count_strings:
+  jsr @skip_past_next_null_byte
   inc number_of_options
+  bne :+
+  inc number_of_options+1
+:
+  jsr @get_current_byte
+  bne @count_strings 
 
-@scan_for_null_byte:
+ jmp @display_first_page_of_options
+
+@skip_past_next_null_byte:
   jsr @move_to_next_byte
-  jsr @lda_from_options_source
-  bne @scan_for_null_byte
-  
+  jsr @get_current_byte
+  bne @skip_past_next_null_byte  
   jsr @move_to_next_byte
-  jmp @copy_one_pointer
+  rts
   
-@lda_from_options_source:
+@get_current_byte:
   lda $FFFF ;filled in from above
   rts
 
 @move_to_next_byte:
-  inc @lda_from_options_source+1
+  inc @get_current_byte+1
   bne :+
-  inc @lda_from_options_source+2
+  inc @get_current_byte+2
 :  
   rts
 
-@found_last_option_string:  
+;move the ptr along till it's pointing at the whatever is the value of current_option
+@move_to_current_option:
+  ldax  options_table_pointer
+  stax @get_current_byte+1
+  lda #0
+  sta temp_option_counter
+  sta temp_option_counter+1
+
+@skip_over_strings:
+  lda temp_option_counter
+  cmp current_option
+  bne  @not_at_current_option
+  lda temp_option_counter+1
+  cmp current_option+1
+  bne @not_at_current_option
+  rts
+@not_at_current_option:    
+  jsr @skip_past_next_null_byte
+
+  inc temp_option_counter
+  bne :+
+  inc temp_option_counter+1
+:    
+  jmp @skip_over_strings  
+
+
+
+
   
 @display_first_page_of_options:
   lda   #0
   sta   first_option_this_page
+  sta   first_option_this_page+1
+;  lda   #$D1
+;  sta   first_option_this_page
+  
 
 @print_current_page:
+  lda   first_option_this_page  
+  sta   current_option
+  lda   first_option_this_page+1
+  sta   current_option+1
+  
+  
+  jsr   @move_to_current_option
+  
+  
   jsr   cls
+  
   ldax  #select_from_following_options
   jsr   print
   
+  lda   number_of_options+1
+  bne   @print_arrow_keys_msg
   lda   number_of_options
   cmp   #OPTIONS_PER_PAGE
   bcc   :+
+@print_arrow_keys_msg:  
   ldax  #arrow_keys_to_move
   jsr   print  
-  
 :  
   lda   #'('
   jsr   print_a
   lda   #'$'
   jsr   print_a
+  lda   first_option_this_page+1
+  jsr   print_hex
   lda   first_option_this_page
-  sta   current_option
-  clc
-  adc   #1
   jsr   print_hex
   lda   #'/'
   jsr   print_a
   lda   #'$'
   jsr   print_a
+  lda   number_of_options+1
+  jsr   print_hex
   lda   number_of_options
   jsr   print_hex
   lda   #')'
@@ -107,30 +153,73 @@ select_option_from_menu:
   lda  #' '
   jsr print_a
 
-  lda   current_option
-  asl
-  tax
-  lda option_description_pointers,x
-  tay
-  lda option_description_pointers+1,x
-  tax
-  tya
+;  lda @get_current_byte+2
+;  jsr print_hex
+;  lda @get_current_byte+1
+;  jsr print_hex
+ 
+  lda @get_current_byte+1
+  ldx @get_current_byte+2
+ 
   jsr print
   jsr print_cr
-  
+  jsr @skip_past_next_null_byte
   inc current_option
+  bne :+
+  inc current_option+1
+:  
   lda current_option
   cmp number_of_options
-  beq @get_keypress
+  bne :+
+  lda current_option+1
+  cmp number_of_options+1
+  bne :+
+  jmp @get_keypress
+:  
   inc options_shown_this_page
   lda options_shown_this_page
   cmp #OPTIONS_PER_PAGE
   beq @get_keypress
   jmp @print_loop
 
+@jump_to:
+  jsr print_cr
+  ldax #jump_to_prompt
+  jsr print
+  lda #'?'
+  jsr get_key
+  ora #$e0      ;make it a lower case letter with high bit set
+  
+  sta jump_to_prefix
+  ldax  options_table_pointer
+  stax @get_current_byte+1
+  lda #0
+  sta first_option_this_page
+  sta first_option_this_page+1
+  
+@check_if_at_jump_to_prefix:  
+  jsr @get_current_byte
+  ora #$e0      ;make it a lower case letter with high bit set
+  cmp jump_to_prefix
+;  bmi @gone_past_prefix
+  beq @at_prefix
+  jsr @skip_past_next_null_byte
+  inc  first_option_this_page
+  bne :+
+  inc  first_option_this_page+1
+:      
+  jmp @check_if_at_jump_to_prefix
+@gone_past_prefix:
+@at_prefix:
+   jmp  @print_current_page
+
+  
+
 @get_keypress:
   lda #'?'
   jsr get_key
+  cmp #'/'+$80
+  beq @jump_to
   cmp #$95
   beq @forward_one_page
   cmp #$8a
@@ -148,20 +237,18 @@ select_option_from_menu:
   beq @got_valid_option
   bpl @get_keypress ;if we have underflowed, it wasn't a valid option
 
-@got_valid_option:
 
+@got_valid_option:
   clc
   adc first_option_this_page
-  cmp number_of_options
-  bcs @get_keypress   ;this cmp/bcs is to check the case where we are on the last page of options (which can have less than then
-                      ;normal number of options) and have pressed a letter that is not a valid option for this page, but is for all other
-                      ;pages.
-                      ;a now contains the index of the selected option
-  asl   ;double it
-  tay
-  lda option_description_pointers+1,y
-  tax
-  lda option_description_pointers,y
+  sta  current_option
+  lda #0
+  adc first_option_this_page+1
+
+  sta  current_option+1
+  jsr  @move_to_current_option
+  ldax @get_current_byte+1
+  
   rts
 
 
@@ -170,30 +257,46 @@ select_option_from_menu:
   lda first_option_this_page
   adc #OPTIONS_PER_PAGE
   sta first_option_this_page
+  bcc :+
+  inc first_option_this_page+1
+:
+
+  lda first_option_this_page+1
+  cmp number_of_options+1
+  bne @not_last_page_of_options
+  lda first_option_this_page
   cmp number_of_options
-  bmi @not_last_page_of_options
+  bne @not_last_page_of_options
+  
 @back_to_first_page:    
   jmp @display_first_page_of_options
 @not_last_page_of_options:
+
   jmp @print_current_page
 
 @back_one_page:  
   sec
   lda first_option_this_page
   sbc #OPTIONS_PER_PAGE
-  bcc @show_last_page_of_options
   sta first_option_this_page
+  lda first_option_this_page+1
+  sbc #0
+  sta first_option_this_page+1    
+  bmi @show_last_page_of_options
+  
   jmp @print_current_page
 @show_last_page_of_options:
   sec
   lda number_of_options  
   sbc #OPTIONS_PER_PAGE
-  bcc @back_to_first_page
   sta first_option_this_page
+  lda number_of_options+1
+  sbc #0
+  sta first_option_this_page+1
+  bmi @back_to_first_page
   jmp @print_current_page
-;  ldax  #tftp_dir_buffer
-;  stax  temp_filename_ptr
 
 .rodata
 select_from_following_options: .byte "SELECT ONE OF THE FOLLOWING OPTIONS:",13,0
 arrow_keys_to_move: .byte "ARROW KEYS NAVIGATE BETWEEN MENU PAGES",13,0
+jump_to_prompt: .byte "JUMP TO:",0