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.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
… …
539 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
540 588
541 # update screen rectangle 589 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 592
547 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 596
… …
589} 635}
590 636
591sub DESTROY { 637sub DESTROY {
592 my ($self) = @_; 638 my ($self) = @_;
593 639
640 return if CFClient::in_destruct;
641
594 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
595 643
596 eval { $self->destroy }; 644 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 646}
… …
681 729
682 $self->add (@$children) 730 $self->add (@$children)
683 if $children; 731 if $children;
684 732
685 $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;
686} 742}
687 743
688sub add { 744sub add {
689 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
690 746
… …
977 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
978 }, 1034 },
979 ; 1035 ;
980 1036
981 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
983 slider => $slider, 1040 slider => $slider,
984 %arg, 1041 %arg,
985 ); 1042 );
986 1043
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
989 1046
990 $self 1047 $self
991} 1048}
992 1049
1050#TODO# update range on size_allocate depending on child
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);
997} 1056}
998 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
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
999sub update { 1074sub update {
1000 my ($self) = @_; 1075 my ($self) = @_;
1001 1076
1002 $self->SUPER::update; 1077 $self->SUPER::update;
1003 1078
1004 # todo: overwrite size_allocate of child 1079 $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} 1080}
1008 1081
1009sub invoke_size_allocate { 1082sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1011 1084
1012 my $child = $self->{vp}->child; 1085 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014 1086
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1088}
1017
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020 1089
1021############################################################################# 1090#############################################################################
1022 1091
1023package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1024 1093
… …
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;
… …
1654 1733
1655sub set_fontsize { 1734sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1657 1736
1658 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1659 delete $self->{texture}; 1739 delete $self->{texture};
1660 1740
1661 $self->realloc; 1741 $self->realloc;
1662} 1742}
1663 1743
1664sub reconfigure { 1744sub reconfigure {
1665 my ($self) = @_; 1745 my ($self) = @_;
1666 1746
1667 delete $self->{size_req}; 1747 delete $self->{size_req};
1748 delete $self->{texture};
1668 1749
1669 $self->SUPER::reconfigure; 1750 $self->SUPER::reconfigure;
1670} 1751}
1671 1752
1672sub _draw { 1753sub _draw {
1673 my ($self) = @_; 1754 my ($self) = @_;
1674 1755
1675 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1676 1757
1677 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1765
1685 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1686 }; 1767 };
1687 1768
1688 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1692 1773
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1777 };
1697 1778
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1781
1703 if ($tex->{format} == GL_ALPHA) { 1782 $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} 1783}
1714 1784
1715############################################################################# 1785#############################################################################
1716 1786
1717package CFClient::UI::EntryBase; 1787package CFClient::UI::EntryBase;
… …
1828 1898
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1900
1831 # byte-index to char-index 1901 # byte-index to char-index
1832 my $text = $self->{text}; 1902 my $text = $self->{text};
1833 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1835 1905
1836 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1837 $self->update; 1907 $self->update;
1838 1908
1839 1 1909 1
… …
1991 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1992} 2062}
1993 2063
1994############################################################################# 2064#############################################################################
1995 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
1996package CFClient::UI::ImageButton; 2215package CFClient::UI::ImageButton;
1997 2216
1998our @ISA = CFClient::UI::Image::; 2217our @ISA = CFClient::UI::Image::;
1999 2218
2000use CFClient::OpenGL; 2219use CFClient::OpenGL;
… …
2023 $self->emit ("activate") 2242 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w} 2243 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h}; 2244 && $y >= 0 && $y < $self->{h};
2026 2245
2027 1 2246 1
2028}
2029
2030#############################################################################
2031
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image;
2101
2102our @ISA = CFClient::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155} 2247}
2156 2248
2157############################################################################# 2249#############################################################################
2158 2250
2159package CFClient::UI::VGauge; 2251package CFClient::UI::VGauge;
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2340
2249 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2250 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);
2251 2346
2252 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2348 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2349 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
… …
2274 2369
2275 if ($t3) { 2370 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2377 glEnd;
2283 } 2378 }
2284 2379
2285 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
… …
2441 } 2536 }
2442 2537
2443 1 2538 1
2444} 2539}
2445 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
2446sub update { 2551sub update {
2447 my ($self) = @_; 2552 my ($self) = @_;
2448 2553
2449 delete $self->{knob_w}; 2554 delete $self->{knob_w};
2450 $self->SUPER::update; 2555 $self->SUPER::update;
… …
2549sub new { 2654sub new {
2550 my $class = shift; 2655 my $class = shift;
2551 2656
2552 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2553 fontsize => 1, 2658 fontsize => 1,
2554 can_events => 0, 2659 can_events => 1,
2555 indent => 0, 2660 indent => 0,
2556 #font => default_font 2661 #font => default_font
2557 @_, 2662 @_,
2558 2663
2559 layout => (new CFClient::Layout 1), 2664 layout => (new CFClient::Layout),
2560 par => [], 2665 par => [],
2561 height => 0, 2666 height => 0,
2562 children => [ 2667 children => [
2563 (new CFClient::UI::Empty expand => 1), 2668 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2669 (new CFClient::UI::Slider vertical => 1),
… …
2575 2680
2576 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2577 $self->reflow; 2682 $self->reflow;
2578} 2683}
2579 2684
2580sub visible_children { 2685sub size_request {
2581 my ($self) = @_; 2686 my ($self) = @_;
2582 2687
2583 @{$self->{children}}[0,1] 2688 my ($empty, $slider) = @{ $self->{children} };
2689
2690 local $self->{children} = [$empty, $slider];
2691 $self->SUPER::size_request
2584} 2692}
2585 2693
2586sub invoke_size_allocate { 2694sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2588 2696
… …
2594 $self->{layout}->set_width ($empty->{w}); 2702 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2703 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 2704
2597 $self->reflow; 2705 $self->reflow;
2598 2706
2707 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
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
2600} 2719}
2601 2720
2602sub get_layout { 2721sub get_layout {
2603 my ($self, $para) = @_; 2722 my ($self, $para) = @_;
2604 2723
… …
2644 $self->{height} = 0; 2763 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 2765}
2647 2766
2648sub add_paragraph { 2767sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 2768 my $self = shift;
2650 2769
2651 my ($text, @w) = ref $para ? @$para : $para; 2770 for my $para (@_) {
2652
2653 $para = { 2771 $para = {
2772 fg => [1, 1, 1, 1],
2773 indent => 0,
2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 2777 w => 1e10,
2655 wrapped => 1, 2778 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 2779 };
2661 2780
2662 $self->add (@w) if @w; 2781 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 2782 push @{$self->{par}}, $para;
2783 }
2664 2784
2665 $self->{need_reflow}++; 2785 $self->{need_reflow}++;
2666 $self->update; 2786 $self->update;
2667} 2787}
2668 2788
… …
2721 my $y0 = $top; 2841 my $y0 = $top;
2722 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2723 2843
2724 my $y = 0; 2844 my $y = 0;
2725 2845
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}}) { 2846 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 2847 my $h = $para->{h};
2732 2848
2733 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2734 2850
2735 my $layout = $self->get_layout ($para); 2851 my $layout = $self->get_layout ($para);
2736 2852
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 2854
2742 if (my @w = @{ $para->{widget} }) { 2855 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 2856 my @s = $layout->get_shapes;
2744 2857
2745 for (@w) { 2858 for (@w) {
… …
2753 } 2866 }
2754 } 2867 }
2755 2868
2756 $y += $h; 2869 $y += $h;
2757 } 2870 }
2758
2759 glDisable GL_BLEND;
2760 }; 2871 };
2761 }); 2872 });
2762} 2873}
2763 2874
2764sub reconfigure { 2875sub reconfigure {
… …
2911 3022
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2914 or return; 3025 or return;
2915 3026
3027 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3029
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3031 if $x + $self->{w} > $self->{root}{w};
2920 3032
2921 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2922 }); 3037 });
2923} 3038}
2924 3039
2925sub _draw { 3040sub _draw {
2926 my ($self) = @_; 3041 my ($self) = @_;
… …
2952 3067
2953############################################################################# 3068#############################################################################
2954 3069
2955package CFClient::UI::Face; 3070package CFClient::UI::Face;
2956 3071
2957our @ISA = CFClient::UI::Base::; 3072our @ISA = CFClient::UI::DrawBG::;
2958 3073
2959use CFClient::OpenGL; 3074use CFClient::OpenGL;
2960 3075
2961sub new { 3076sub new {
2962 my $class = shift; 3077 my $class = shift;
… …
2999sub _draw { 3114sub _draw {
3000 my ($self) = @_; 3115 my ($self) = @_;
3001 3116
3002 return unless $::CONN; 3117 return unless $::CONN;
3003 3118
3119 $self->SUPER::_draw;
3120
3004 my $face; 3121 my $face;
3005 3122
3006 if ($self->{frame}) { 3123 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
3008 3125
… …
3060 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
3062 3179
3063 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
3064 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 {
3065 $widget = new CFClient::UI::Label 3196 $widget = new CFClient::UI::Label
3066 can_hover => 1, 3197 can_hover => 1,
3067 can_events => 1, 3198 can_events => 1,
3068 markup => $widget, 3199 markup => $widget,
3069 tooltip => $tooltip 3200 tooltip => $tooltip;
3201 }
3070 } 3202 }
3071 3203
3072 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
3073 3205
3074 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
3141 3273
3142 $self->SUPER::add (@widgets); 3274 $self->SUPER::add (@widgets);
3143 3275
3144 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3277 if @{ $self->{children} };
3278}
3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3146} 3284}
3147 3285
3148sub set_current_page { 3286sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
3150 3288
… …
3218 ); 3356 );
3219 3357
3220 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3221} 3359}
3222 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3223sub set_current_page { 3367sub set_current_page {
3224 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3225 3369
3226 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3372}
3229 3373
3230############################################################################# 3374#############################################################################
3231 3375
3232package CFClient::UI::Combobox; 3376package CFClient::UI::Selector;
3233 3377
3234use utf8; 3378use utf8;
3235 3379
3236our @ISA = CFClient::UI::Button::; 3380our @ISA = CFClient::UI::Button::;
3237 3381
… …
3403 count => 1, 3547 count => 1,
3404 %arg, 3548 %arg,
3405 }; 3549 };
3406 } 3550 }
3407 3551
3552 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3553 $self->reorder;
3554 });
3409} 3555}
3410 3556
3411sub reconfigure { 3557sub reconfigure {
3412 my ($self) = @_; 3558 my ($self) = @_;
3413 3559
… …
3428 3574
3429############################################################################# 3575#############################################################################
3430 3576
3431package CFClient::UI::Inventory; 3577package CFClient::UI::Inventory;
3432 3578
3433our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFClient::UI::Table::;
3434 3580
3435sub new { 3581sub new {
3436 my $class = shift; 3582 my $class = shift;
3437 3583
3438 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3440 @_, 3587 @_,
3441 ); 3588 );
3442 3589
3590 $self->set_sort_order (undef);
3591
3443 $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;
3444} 3628}
3445 3629
3446sub set_items { 3630sub set_items {
3447 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3448 3632
3449 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $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; 3634 $self->update_items;
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 }
3677} 3635}
3678 3636
3679############################################################################# 3637#############################################################################
3680 3638
3681package CFClient::UI::SpellList; 3639package CFClient::UI::SpellList;
… …
3734 } elsif ($ev->{button} == 2) { 3692 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}"); 3693 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) { 3694 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu 3695 (new CFClient::UI::Menu
3738 items => [ 3696 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3697 ["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}"]) }], 3698 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ], 3699 ],
3742 )->popup ($ev); 3700 )->popup ($ev);
3743 } else { 3701 } else {
3744 return 0; 3702 return 0;
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 3949
3992 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 3951 $h = 0 if $h < 0;
3994 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
3995 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3997 3964
3998 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}) {
3999 $widget->{old_w} = $widget->{w}; 3966 $widget->{old_w} = $widget->{w};

Diff Legend

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