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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
98 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
100 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
345 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
346 368
347 if ($self->{aspect}) { 369 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
349 371
350 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
352 374
353 # use alignment to adjust x, y 375 # use alignment to adjust x, y
354 376
355 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub invoke_focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
424 450
425 return if $FOCUS == $self; 451 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
427 453
428 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
429 455
430 $focus->update if $focus; 456 $self->update;
431 $FOCUS->update;
432 457
433 0 458 0
434} 459}
435 460
436sub invoke_focus_out { 461sub invoke_focus_out {
437 my ($self) = @_; 462 my ($self) = @_;
438 463
439 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
440 465
441 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
442 467
443 $focus->update if $focus; #? 468 $self->update;
444 469
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 471 unless $FOCUS;
447 472
448 0 473 0
449} 474}
450 475
451sub grab_focus { 476sub grab_focus {
452 my ($self) = @_; 477 my ($self) = @_;
453 478
479 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
455} 481}
456 482
457sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
461 488
462sub invoke_button_down { 489sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
464 491
465 $self->grab_focus; 492 $self->grab_focus;
466 493
467 1 494 0
468} 495}
469 496
470sub connect { 497sub connect {
471 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
472 499
473 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
474} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
475 514
476sub emit { 515sub emit {
477 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
478 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
479 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 531}
484 532
485sub find_widget { 533sub find_widget {
486 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
487 535
… …
587} 635}
588 636
589sub DESTROY { 637sub DESTROY {
590 my ($self) = @_; 638 my ($self) = @_;
591 639
640 return if CFClient::in_destruct;
641
592 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
593 643
594 eval { $self->destroy }; 644 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
… …
679 729
680 $self->add (@$children) 730 $self->add (@$children)
681 if $children; 731 if $children;
682 732
683 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
684} 742}
685 743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
… …
975 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
976 }, 1034 },
977 ; 1035 ;
978 1036
979 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
981 slider => $slider, 1040 slider => $slider,
982 %arg, 1041 %arg,
983 ); 1042 );
984 1043
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
992 1051
993sub add { 1052sub add {
994 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
995 1054
996 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
997} 1066}
998 1067
999sub update_slider { 1068sub update_slider {
1000 my ($self) = @_; 1069 my ($self) = @_;
1001 1070
… …
1080 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1152 border => 0.6,
1084 can_events => 1, 1153 can_events => 1,
1085 min_w => 16, 1154 min_w => 64,
1086 min_h => 16, 1155 min_h => 32,
1087 %arg, 1156 %arg,
1088 ); 1157 );
1089 1158
1090 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1160 align => 0,
… …
1096 1165
1097 if ($self->{has_close_button}) { 1166 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1167 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1168 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1169 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1170 on_activate => sub { $self->emit ("delete") };
1102 1171
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1172 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1173 }
1105 1174
1106 $self 1175 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1153 1222
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1224 if $self->{close_button};
1156 1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1157 1 1234 1
1158} 1235}
1159 1236
1160sub invoke_button_down { 1237sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1297
1221 ! ! $self->{motion} 1298 ! ! $self->{motion}
1222} 1299}
1223 1300
1301sub invoke_visibility_change {
1302 my ($self, $visible) = @_;
1303
1304 delete $self->{motion} unless $visible;
1305
1306 0
1307}
1308
1224sub _draw { 1309sub _draw {
1225 my ($self) = @_; 1310 my ($self) = @_;
1226 1311
1227 my $child = $self->{children}[0]; 1312 my $child = $self->{children}[0];
1228 1313
… …
1287sub children { 1372sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1374}
1290 1375
1291sub add { 1376sub add {
1292 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1293 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1381 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1296 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1387 $self->realloc;
1298} 1388}
1299 1389
1300sub remove { 1390sub remove {
1301 my ($self, $child) = @_; 1391 my ($self, $child) = @_;
… …
1553 } 1643 }
1554 1644
1555 $self 1645 $self
1556} 1646}
1557 1647
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1648sub update {
1569 my ($self) = @_; 1649 my ($self) = @_;
1570 1650
1571 delete $self->{texture}; 1651 delete $self->{texture};
1572 $self->SUPER::update; 1652 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1584 1664
1585 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1587 1667
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1590 1669
1591 delete $self->{size_req}; 1670 delete $self->{size_req};
1592 $self->realloc; 1671 $self->realloc;
1593 $self->update; 1672 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1601 1680
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1682
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1606 1684
1607 delete $self->{size_req}; 1685 delete $self->{size_req};
1608 $self->realloc; 1686 $self->realloc;
1609 $self->update; 1687 $self->update;
… …
1621 1699
1622 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1623 1701
1624 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1706
1628 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1629 1708
1630 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
… …
1664 1743
1665sub reconfigure { 1744sub reconfigure {
1666 my ($self) = @_; 1745 my ($self) = @_;
1667 1746
1668 delete $self->{size_req}; 1747 delete $self->{size_req};
1748 delete $self->{texture};
1669 1749
1670 $self->SUPER::reconfigure; 1750 $self->SUPER::reconfigure;
1671} 1751}
1672 1752
1673sub _draw { 1753sub _draw {
1674 my ($self) = @_; 1754 my ($self) = @_;
1675 1755
1676 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1677 1757
1678 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1765
1686 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1687 }; 1767 };
1688 1768
1689 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1693 1773
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1777 };
1698 1778
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1781
1704 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1783}
1715 1784
1716############################################################################# 1785#############################################################################
1717 1786
1718package CFClient::UI::EntryBase; 1787package CFClient::UI::EntryBase;
… …
1829 1898
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 1900
1832 # byte-index to char-index 1901 # byte-index to char-index
1833 my $text = $self->{text}; 1902 my $text = $self->{text};
1834 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1836 1905
1837 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1838 $self->update; 1907 $self->update;
1839 1908
1840 1 1909 1
… …
1992 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1993} 2062}
1994 2063
1995############################################################################# 2064#############################################################################
1996 2065
2066package CFClient::UI::CheckBox;
2067
2068our @ISA = CFClient::UI::DrawBG::;
2069
2070my @tex =
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073
2074use CFClient::OpenGL;
2075
2076sub new {
2077 my $class = shift;
2078
2079 $class->SUPER::new (
2080 padding_x => 2,
2081 padding_y => 2,
2082 fg => [1, 1, 1],
2083 active_fg => [1, 1, 0],
2084 bg => [0, 0, 0, 0.2],
2085 active_bg => [1, 1, 1, 0.5],
2086 state => 0,
2087 can_hover => 1,
2088 @_
2089 )
2090}
2091
2092sub size_request {
2093 my ($self) = @_;
2094
2095 (6) x 2
2096}
2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
2106sub invoke_button_down {
2107 my ($self, $ev, $x, $y) = @_;
2108
2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2111 $self->toggle;
2112 } else {
2113 return 0
2114 }
2115
2116 1
2117}
2118
2119sub _draw {
2120 my ($self) = @_;
2121
2122 $self->SUPER::_draw;
2123
2124 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2125
2126 my ($w, $h) = @$self{qw(w h)};
2127
2128 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2129
2130 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2131
2132 my $tex = $self->{state} ? $tex[1] : $tex[0];
2133
2134 glEnable GL_TEXTURE_2D;
2135 $tex->draw_quad_alpha (0, 0, $s, $s);
2136 glDisable GL_TEXTURE_2D;
2137}
2138
2139#############################################################################
2140
2141package CFClient::UI::Image;
2142
2143our @ISA = CFClient::UI::Base::;
2144
2145use CFClient::OpenGL;
2146
2147our %texture_cache;
2148
2149sub new {
2150 my $class = shift;
2151
2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2156
2157 $self->{path} || $self->{tex}
2158 or Carp::croak "'path' or 'tex' attributes required";
2159
2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2161 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2162
2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2164
2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166
2167 $self
2168}
2169
2170sub STORABLE_freeze {
2171 my ($self, $cloning) = @_;
2172
2173 $self->{path}
2174 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2175
2176 $self->{path}
2177}
2178
2179sub STORABLE_attach {
2180 my ($self, $cloning, $path) = @_;
2181
2182 $self->new (path => $path)
2183}
2184
2185sub size_request {
2186 my ($self) = @_;
2187
2188 ($self->{tex}{w}, $self->{tex}{h})
2189}
2190
2191sub _draw {
2192 my ($self) = @_;
2193
2194 my $tex = $self->{tex};
2195
2196 my ($w, $h) = ($self->{w}, $self->{h});
2197
2198 if ($self->{rot90}) {
2199 glRotate 90, 0, 0, 1;
2200 glTranslate 0, -$self->{w}, 0;
2201
2202 ($w, $h) = ($h, $w);
2203 }
2204
2205 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207
2208 $tex->draw_quad (0, 0, $w, $h);
2209
2210 glDisable GL_TEXTURE_2D;
2211}
2212
2213#############################################################################
2214
1997package CFClient::UI::ImageButton; 2215package CFClient::UI::ImageButton;
1998 2216
1999our @ISA = CFClient::UI::Image::; 2217our @ISA = CFClient::UI::Image::;
2000 2218
2001use CFClient::OpenGL; 2219use CFClient::OpenGL;
… …
2024 $self->emit ("activate") 2242 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w} 2243 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h}; 2244 && $y >= 0 && $y < $self->{h};
2027 2245
2028 1 2246 1
2029}
2030
2031#############################################################################
2032
2033package CFClient::UI::CheckBox;
2034
2035our @ISA = CFClient::UI::DrawBG::;
2036
2037my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041use CFClient::OpenGL;
2042
2043sub new {
2044 my $class = shift;
2045
2046 $class->SUPER::new (
2047 padding_x => 2,
2048 padding_y => 2,
2049 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2],
2052 active_bg => [1, 1, 1, 0.5],
2053 state => 0,
2054 can_hover => 1,
2055 @_
2056 )
2057}
2058
2059sub size_request {
2060 my ($self) = @_;
2061
2062 (6) x 2
2063}
2064
2065sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_;
2067
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state};
2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
2076 1
2077}
2078
2079sub _draw {
2080 my ($self) = @_;
2081
2082 $self->SUPER::_draw;
2083
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094 glEnable GL_TEXTURE_2D;
2095 $tex->draw_quad_alpha (0, 0, $s, $s);
2096 glDisable GL_TEXTURE_2D;
2097}
2098
2099#############################################################################
2100
2101package CFClient::UI::Image;
2102
2103our @ISA = CFClient::UI::Base::;
2104
2105use CFClient::OpenGL;
2106
2107our %texture_cache;
2108
2109sub new {
2110 my $class = shift;
2111
2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2116
2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2119
2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127 $self
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 ($self->{tex}{w}, $self->{tex}{h})
2134}
2135
2136sub _draw {
2137 my ($self) = @_;
2138
2139 my $tex = $self->{tex};
2140
2141 my ($w, $h) = ($self->{w}, $self->{h});
2142
2143 if ($self->{rot90}) {
2144 glRotate 90, 0, 0, 1;
2145 glTranslate 0, -$self->{w}, 0;
2146
2147 ($w, $h) = ($h, $w);
2148 }
2149
2150 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153 $tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155 glDisable GL_TEXTURE_2D;
2156} 2247}
2157 2248
2158############################################################################# 2249#############################################################################
2159 2250
2160package CFClient::UI::VGauge; 2251package CFClient::UI::VGauge;
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2340
2250 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2251 my $h2 = $self->{h} * (1 - $ycut2); 2342 my $h2 = $self->{h} * (1 - $ycut2);
2343 my $h3 = $self->{h};
2344
2345 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252 2346
2253 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2275 2369
2276 if ($t3) { 2370 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2377 glEnd;
2284 } 2378 }
2285 2379
2286 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
… …
2442 } 2536 }
2443 2537
2444 1 2538 1
2445} 2539}
2446 2540
2541sub invoke_mouse_wheel {
2542 my ($self, $ev) = @_;
2543
2544 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545
2546 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2547
2548 ! ! $delta
2549}
2550
2447sub update { 2551sub update {
2448 my ($self) = @_; 2552 my ($self) = @_;
2449 2553
2450 delete $self->{knob_w}; 2554 delete $self->{knob_w};
2451 $self->SUPER::update; 2555 $self->SUPER::update;
… …
2550sub new { 2654sub new {
2551 my $class = shift; 2655 my $class = shift;
2552 2656
2553 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2554 fontsize => 1, 2658 fontsize => 1,
2555 can_events => 0, 2659 can_events => 1,
2556 indent => 0, 2660 indent => 0,
2557 #font => default_font 2661 #font => default_font
2558 @_, 2662 @_,
2559 2663
2560 layout => (new CFClient::Layout 1), 2664 layout => (new CFClient::Layout),
2561 par => [], 2665 par => [],
2562 height => 0, 2666 height => 0,
2563 children => [ 2667 children => [
2564 (new CFClient::UI::Empty expand => 1), 2668 (new CFClient::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2669 (new CFClient::UI::Slider vertical => 1),
… …
2602 2706
2603 local $self->{children} = [$empty, $slider]; 2707 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h) 2708 $self->SUPER::invoke_size_allocate ($w, $h)
2605} 2709}
2606 2710
2711sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_;
2713
2714 return 0 unless $ev->{dy}; # only vertical movements
2715
2716 $self->{children}[1]->emit (mouse_wheel => $ev);
2717
2718 1
2719}
2720
2607sub get_layout { 2721sub get_layout {
2608 my ($self, $para) = @_; 2722 my ($self, $para) = @_;
2609 2723
2610 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2611 2725
… …
2649 $self->{height} = 0; 2763 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 2765}
2652 2766
2653sub add_paragraph { 2767sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 2768 my $self = shift;
2655 2769
2656 my ($text, @w) = ref $para ? @$para : $para; 2770 for my $para (@_) {
2657
2658 $para = { 2771 $para = {
2772 fg => [1, 1, 1, 1],
2773 indent => 0,
2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 2777 w => 1e10,
2660 wrapped => 1, 2778 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 2779 };
2666 2780
2667 $self->add (@w) if @w; 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 push @{$self->{par}}, $para; 2782 push @{$self->{par}}, $para;
2783 }
2669 2784
2670 $self->{need_reflow}++; 2785 $self->{need_reflow}++;
2671 $self->update; 2786 $self->update;
2672} 2787}
2673 2788
… …
2726 my $y0 = $top; 2841 my $y0 = $top;
2727 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2728 2843
2729 my $y = 0; 2844 my $y = 0;
2730 2845
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 2847 my $h = $para->{h};
2737 2848
2738 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2739 2850
2740 my $layout = $self->get_layout ($para); 2851 my $layout = $self->get_layout ($para);
2741 2852
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 2854
2747 if (my @w = @{ $para->{widget} }) { 2855 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 2856 my @s = $layout->get_shapes;
2749 2857
2750 glDisable GL_BLEND;
2751 for (@w) { 2858 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 2859 my ($dx, $dy) = splice @s, 0, 2, ();
2753 2860
2754 $_->{x} = $dx + $para->{indent}; 2861 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 2862 $_->{y} = $dy + $y - $y0;
2756 2863
2757 $_->draw; 2864 $_->draw;
2758 } 2865 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 2866 }
2762 } 2867 }
2763 2868
2764 $y += $h; 2869 $y += $h;
2765 } 2870 }
2766
2767 glDisable GL_BLEND;
2768 }; 2871 };
2769 }); 2872 });
2770} 2873}
2771 2874
2772sub reconfigure { 2875sub reconfigure {
… …
2919 3022
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2922 or return; 3025 or return;
2923 3026
3027 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3029
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3031 if $x + $self->{w} > $self->{root}{w};
2928 3032
2929 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2930 }); 3037 });
2931} 3038}
2932 3039
2933sub _draw { 3040sub _draw {
2934 my ($self) = @_; 3041 my ($self) = @_;
… …
2960 3067
2961############################################################################# 3068#############################################################################
2962 3069
2963package CFClient::UI::Face; 3070package CFClient::UI::Face;
2964 3071
2965our @ISA = CFClient::UI::Base::; 3072our @ISA = CFClient::UI::DrawBG::;
2966 3073
2967use CFClient::OpenGL; 3074use CFClient::OpenGL;
2968 3075
2969sub new { 3076sub new {
2970 my $class = shift; 3077 my $class = shift;
… …
3007sub _draw { 3114sub _draw {
3008 my ($self) = @_; 3115 my ($self) = @_;
3009 3116
3010 return unless $::CONN; 3117 return unless $::CONN;
3011 3118
3119 $self->SUPER::_draw;
3120
3012 my $face; 3121 my $face;
3013 3122
3014 if ($self->{frame}) { 3123 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
3016 3125
… …
3068 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
3070 3179
3071 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
3072 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
3185 $widget = new CFClient::UI::HBox
3186 can_hover => 1,
3187 can_events => 1,
3188 tooltip => $tooltip,
3189 children => [
3190 (new CFClient::UI::Label markup => $left, expand => 1),
3191 (new CFClient::UI::Label markup => $right, align => +1),
3192 ],
3193 ;
3194
3195 } else {
3073 $widget = new CFClient::UI::Label 3196 $widget = new CFClient::UI::Label
3074 can_hover => 1, 3197 can_hover => 1,
3075 can_events => 1, 3198 can_events => 1,
3076 markup => $widget, 3199 markup => $widget,
3077 tooltip => $tooltip 3200 tooltip => $tooltip;
3201 }
3078 } 3202 }
3079 3203
3080 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
3081 3205
3082 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
3149 3273
3150 $self->SUPER::add (@widgets); 3274 $self->SUPER::add (@widgets);
3151 3275
3152 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3278}
3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3154} 3284}
3155 3285
3156sub set_current_page { 3286sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3158 3288
… …
3226 ); 3356 );
3227 3357
3228 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3229} 3359}
3230 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3231sub set_current_page { 3367sub set_current_page {
3232 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3233 3369
3234 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 3372}
3237 3373
3238############################################################################# 3374#############################################################################
3239 3375
3240package CFClient::UI::Combobox; 3376package CFClient::UI::Selector;
3241 3377
3242use utf8; 3378use utf8;
3243 3379
3244our @ISA = CFClient::UI::Button::; 3380our @ISA = CFClient::UI::Button::;
3245 3381
… …
3438 3574
3439############################################################################# 3575#############################################################################
3440 3576
3441package CFClient::UI::Inventory; 3577package CFClient::UI::Inventory;
3442 3578
3443our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFClient::UI::Table::;
3444 3580
3445sub new { 3581sub new {
3446 my $class = shift; 3582 my $class = shift;
3447 3583
3448 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3450 @_, 3587 @_,
3451 ); 3588 );
3452 3589
3590 $self->set_sort_order (undef);
3591
3453 $self 3592 $self
3593}
3594
3595sub update_items {
3596 my ($self) = @_;
3597
3598 $self->clear;
3599
3600 my @item = $self->{sort}->(@{ $self->{items} });
3601
3602 my @adds;
3603 my $row = 0;
3604 for my $item ($self->{sort}->(@{ $self->{items} })) {
3605 CFClient::Item::update_widgets $item;
3606
3607 push @adds, 0, $row, $item->{face_widget};
3608 push @adds, 1, $row, $item->{desc_widget};
3609 push @adds, 2, $row, $item->{weight_widget};
3610
3611 $row++;
3612 }
3613
3614 $self->add (@adds);
3615}
3616
3617sub set_sort_order {
3618 my ($self, $order) = @_;
3619
3620 $self->{sort} = $order ||= sub {
3621 sort {
3622 $a->{type} <=> $b->{type}
3623 or $a->{name} cmp $b->{name}
3624 } @_
3625 };
3626
3627 $self->update_items;
3454} 3628}
3455 3629
3456sub set_items { 3630sub set_items {
3457 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3458 3632
3459 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3460 return unless $items; 3634 $self->update_items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479} 3635}
3480 3636
3481############################################################################# 3637#############################################################################
3482 3638
3483package CFClient::UI::SpellList; 3639package CFClient::UI::SpellList;
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 3949
3794 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3796 3952
3953 $w = max $widget->{min_w}, $w;
3954 $h = max $widget->{min_h}, $h;
3955
3956# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3797 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3799 3964
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3965 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};

Diff Legend

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