ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
82} 82}
83 83
84sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87
88 warn "button down $ev->{button}\n";#d#
87 89
88 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
90 92
91 $GRAB = $widget; 93 $GRAB = $widget;
… …
423 my ($self) = @_; 425 my ($self) = @_;
424 426
425 return if $FOCUS == $self; 427 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
427 429
428 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
429 431
430 $focus->update if $focus; 432 $self->update;
431 $FOCUS->update;
432 433
433 0 434 0
434} 435}
435 436
436sub invoke_focus_out { 437sub invoke_focus_out {
437 my ($self) = @_; 438 my ($self) = @_;
438 439
439 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
440 441
441 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
442 443
443 $focus->update if $focus; #? 444 $self->update;
444 445
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 447 unless $FOCUS;
447 448
448 0 449 0
449} 450}
450 451
451sub grab_focus { 452sub grab_focus {
452 my ($self) = @_; 453 my ($self) = @_;
453 454
455 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 456 $self->emit ("focus_in");
455} 457}
456 458
457sub invoke_mouse_motion { 1 } 459sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 460sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 461sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 462sub invoke_key_up { 0 }
461 463
462sub invoke_button_down { 464sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
464 466
465 $self->grab_focus; 467 $self->grab_focus;
466 468
469 warn "button down $ev->{button} $x $y\n";#d#
470
467 1 471 0
468} 472}
469 473
470sub connect { 474sub connect {
471 my ($self, $signal, $cb) = @_; 475 my ($self, $signal, $cb) = @_;
472 476
… …
539 return unless $self->{h} && $self->{w}; 543 return unless $self->{h} && $self->{w};
540 544
541 # update screen rectangle 545 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 546 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 547 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 548
547 # skip widgets that are entirely outside the drawing area 549 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 552
… …
589} 591}
590 592
591sub DESTROY { 593sub DESTROY {
592 my ($self) = @_; 594 my ($self) = @_;
593 595
596 return if CFClient::in_destruct;
597
594 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
595 599
596 eval { $self->destroy }; 600 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 602}
… …
988 $self->add ($child) if $child; 992 $self->add ($child) if $child;
989 993
990 $self 994 $self
991} 995}
992 996
997#TODO# update range on size_allocate depending on child
998
993sub add { 999sub add {
994 my ($self, $widget) = @_; 1000 my ($self, $widget) = @_;
995 1001
996 $self->{vp}->add ($self->{child} = $widget); 1002 $self->{vp}->add ($self->{child} = $widget);
997} 1003}
998 1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
1013sub update_slider {
1014 my ($self) = @_;
1015
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1017}
1018
999sub update { 1019sub update {
1000 my ($self) = @_; 1020 my ($self) = @_;
1001 1021
1002 $self->SUPER::update; 1022 $self->SUPER::update;
1003 1023
1004 # todo: overwrite size_allocate of child 1024 $self->update_slider;
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007} 1025}
1008 1026
1009sub invoke_size_allocate { 1027sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1028 my ($self, $w, $h) = @_;
1011 1029
1012 my $child = $self->{vp}->child; 1030 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1031
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1032 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1033}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1034
1021############################################################################# 1035#############################################################################
1022 1036
1023package CFClient::UI::Frame; 1037package CFClient::UI::Frame;
1024 1038
… …
1080 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1097 border => 0.6,
1084 can_events => 1, 1098 can_events => 1,
1085 min_w => 16, 1099 min_w => 64,
1086 min_h => 16, 1100 min_h => 32,
1087 %arg, 1101 %arg,
1088 ); 1102 );
1089 1103
1090 $self->{title_widget} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1105 align => 0,
… …
1096 1110
1097 if ($self->{has_close_button}) { 1111 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1112 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1113 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1114 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1115 on_activate => sub { $self->emit ("delete") };
1102 1116
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1117 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1118 }
1105 1119
1106 $self 1120 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1153 1167
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1169 if $self->{close_button};
1156 1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1157 1 1179 1
1158} 1180}
1159 1181
1160sub invoke_button_down { 1182sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1584 1606
1585 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1587 1609
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1590 1611
1591 delete $self->{size_req}; 1612 delete $self->{size_req};
1592 $self->realloc; 1613 $self->realloc;
1593 $self->update; 1614 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1601 1622
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1624
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1606 1626
1607 delete $self->{size_req}; 1627 delete $self->{size_req};
1608 $self->realloc; 1628 $self->realloc;
1609 $self->update; 1629 $self->update;
… …
1621 1641
1622 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1623 1643
1624 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1648
1628 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1629 1650
1630 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
… …
1654 1675
1655sub set_fontsize { 1676sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1677 my ($self, $fontsize) = @_;
1657 1678
1658 $self->{fontsize} = $fontsize; 1679 $self->{fontsize} = $fontsize;
1680 delete $self->{size_req};
1659 delete $self->{texture}; 1681 delete $self->{texture};
1660 1682
1661 $self->realloc; 1683 $self->realloc;
1662} 1684}
1663 1685
1664sub reconfigure { 1686sub reconfigure {
1665 my ($self) = @_; 1687 my ($self) = @_;
1666 1688
1667 delete $self->{size_req}; 1689 delete $self->{size_req};
1690 delete $self->{texture};
1668 1691
1669 $self->SUPER::reconfigure; 1692 $self->SUPER::reconfigure;
1670} 1693}
1671 1694
1672sub _draw { 1695sub _draw {
1673 my ($self) = @_; 1696 my ($self) = @_;
1674 1697
1675 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1676 1699
1677 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1707
1685 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1686 }; 1709 };
1687 1710
1688 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1692 1715
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1719 };
1697 1720
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1723
1703 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1725}
1714 1726
1715############################################################################# 1727#############################################################################
1716 1728
1717package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1828 1840
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1842
1831 # byte-index to char-index 1843 # byte-index to char-index
1832 my $text = $self->{text}; 1844 my $text = $self->{text};
1833 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1835 1847
1836 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1837 $self->update; 1849 $self->update;
1838 1850
1839 1 1851 1
… …
2059 my ($self) = @_; 2071 my ($self) = @_;
2060 2072
2061 (6) x 2 2073 (6) x 2
2062} 2074}
2063 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2064sub invoke_button_down { 2084sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
2066 2086
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2089 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2090 } else {
2072 return 0 2091 return 0
2073 } 2092 }
2074 2093
2075 1 2094 1
… …
2111 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2112 can_events => 0, 2131 can_events => 0,
2113 @_, 2132 @_,
2114 ); 2133 );
2115 2134
2116 $self->{path} 2135 $self->{path} || $self->{tex}
2117 or Carp::croak "required attribute 'path' not set"; 2136 or Carp::croak "'path' or 'tex' attributes required";
2118 2137
2119 $self->{tex} = $texture_cache{$self->{path}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121 2140
2122 Scalar::Util::weaken $texture_cache{$self->{path}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2123 2142
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2267
2249 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2273
2252 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
… …
2274 2296
2275 if ($t3) { 2297 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2304 glEnd;
2283 } 2305 }
2284 2306
2285 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2554 can_events => 0, 2576 can_events => 0,
2555 indent => 0, 2577 indent => 0,
2556 #font => default_font 2578 #font => default_font
2557 @_, 2579 @_,
2558 2580
2559 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2560 par => [], 2582 par => [],
2561 height => 0, 2583 height => 0,
2562 children => [ 2584 children => [
2563 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2575 2597
2576 $self->{fontsize} = $fontsize; 2598 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2599 $self->reflow;
2578} 2600}
2579 2601
2580sub visible_children { 2602sub size_request {
2581 my ($self) = @_; 2603 my ($self) = @_;
2582 2604
2583 @{$self->{children}}[0,1] 2605 my ($empty, $slider) = @{ $self->{children} };
2606
2607 local $self->{children} = [$empty, $slider];
2608 $self->SUPER::size_request
2584} 2609}
2585 2610
2586sub invoke_size_allocate { 2611sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2612 my ($self, $w, $h) = @_;
2588 2613
… …
2594 $self->{layout}->set_width ($empty->{w}); 2619 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2620 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2621
2597 $self->reflow; 2622 $self->reflow;
2598 2623
2624 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2625 $self->SUPER::invoke_size_allocate ($w, $h)
2600} 2626}
2601 2627
2602sub get_layout { 2628sub get_layout {
2603 my ($self, $para) = @_; 2629 my ($self, $para) = @_;
… …
2721 my $y0 = $top; 2747 my $y0 = $top;
2722 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2723 2749
2724 my $y = 0; 2750 my $y = 0;
2725 2751
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2753 my $h = $para->{h};
2732 2754
2733 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2734 2756
2735 my $layout = $self->get_layout ($para); 2757 my $layout = $self->get_layout ($para);
2736 2758
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2760
2742 if (my @w = @{ $para->{widget} }) { 2761 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2762 my @s = $layout->get_shapes;
2744 2763
2745 for (@w) { 2764 for (@w) {
… …
2753 } 2772 }
2754 } 2773 }
2755 2774
2756 $y += $h; 2775 $y += $h;
2757 } 2776 }
2758
2759 glDisable GL_BLEND;
2760 }; 2777 };
2761 }); 2778 });
2762} 2779}
2763 2780
2764sub reconfigure { 2781sub reconfigure {
… …
3060 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
3062 3079
3063 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
3064 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
3065 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
3066 can_hover => 1, 3097 can_hover => 1,
3067 can_events => 1, 3098 can_events => 1,
3068 markup => $widget, 3099 markup => $widget,
3069 tooltip => $tooltip 3100 tooltip => $tooltip;
3101 }
3070 } 3102 }
3071 3103
3072 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
3073 3105
3074 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
3141 3173
3142 $self->SUPER::add (@widgets); 3174 $self->SUPER::add (@widgets);
3143 3175
3144 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3146} 3184}
3147 3185
3148sub set_current_page { 3186sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
3150 3188
… …
3216 tooltip => $tooltip, 3254 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3255 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3256 );
3219 3257
3220 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3221} 3265}
3222 3266
3223sub set_current_page { 3267sub set_current_page {
3224 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3225 3269
… …
3403 count => 1, 3447 count => 1,
3404 %arg, 3448 %arg,
3405 }; 3449 };
3406 } 3450 }
3407 3451
3452 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3453 $self->reorder;
3454 });
3409} 3455}
3410 3456
3411sub reconfigure { 3457sub reconfigure {
3412 my ($self) = @_; 3458 my ($self) = @_;
3413 3459
… …
3428 3474
3429############################################################################# 3475#############################################################################
3430 3476
3431package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3432 3478
3433our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3434 3480
3435sub new { 3481sub new {
3436 my $class = shift; 3482 my $class = shift;
3437 3483
3438 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3440 @_, 3486 @_,
3441 ); 3487 );
3442 3488
3443 $self 3489 $self
3444} 3490}
3445 3491
3446sub set_items { 3492sub set_items {
3447 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3448 3494
3449 $self->{child}->clear; 3495 $self->clear;
3450 return unless $items; 3496 return unless $items;
3451 3497
3452 my @items = sort { 3498 my @items = sort {
3453 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
3455 } @$items; 3501 } values %$items;
3456 3502
3457 $self->{real_items} = \@items; 3503 $self->{real_items} = \@items;
3458 3504
3459 my $row = 0; 3505 my $row = 0;
3460 for my $item (@items) { 3506 for my $item (@items) {
3461 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3462 3508
3463 $self->{child}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3466 3512
3467 $row++; 3513 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 } 3514 }
3677} 3515}
3678 3516
3679############################################################################# 3517#############################################################################
3680 3518
… …
3734 } elsif ($ev->{button} == 2) { 3572 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3573 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3574 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3575 (new CFClient::UI::Menu
3738 items => [ 3576 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ], 3579 ],
3742 )->popup ($ev); 3580 )->popup ($ev);
3743 } else { 3581 } else {
3744 return 0; 3582 return 0;
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 3829
3992 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3994 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3995 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3997 3841
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 3843 $widget->{old_w} = $widget->{w};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines