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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 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 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
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;
… …
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
338} 360}
339 361
362sub baseline_shift {
363 0
364}
365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
343 if ($self->{aspect}) { 369 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
… …
403 429
404# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
405sub coord2local { 431sub coord2local {
406 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
407 433
434 Carp::confess unless $self->{parent};#d#
435
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 437}
410 438
411# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
412sub coord2global { 440sub coord2global {
… …
419 my ($self) = @_; 447 my ($self) = @_;
420 448
421 return if $FOCUS == $self; 449 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
423 451
424 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
425 453
426 $focus->update if $focus; 454 $self->update;
427 $FOCUS->update;
428 455
429 0 456 0
430} 457}
431 458
432sub invoke_focus_out { 459sub invoke_focus_out {
433 my ($self) = @_; 460 my ($self) = @_;
434 461
435 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
436 463
437 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
438 465
439 $focus->update if $focus; #? 466 $self->update;
440 467
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 469 unless $FOCUS;
443 470
444 0 471 0
445} 472}
446 473
447sub grab_focus { 474sub grab_focus {
448 my ($self) = @_; 475 my ($self) = @_;
449 476
477 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 478 $self->emit ("focus_in");
451} 479}
452 480
453sub invoke_mouse_motion { 1 } 481sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 482sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 483sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
457 486
458sub invoke_button_down { 487sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
460 489
461 $self->grab_focus; 490 $self->grab_focus;
462 491
463 1 492 0
464} 493}
465 494
466sub connect { 495sub connect {
467 my ($self, $signal, $cb) = @_; 496 my ($self, $signal, $cb) = @_;
468 497
469 push @{ $self->{signal_cb}{$signal} }, $cb; 498 push @{ $self->{signal_cb}{$signal} }, $cb;
470} 499}
471 500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
472sub emit { 508sub emit {
473 my ($self, $signal, @args) = @_; 509 my ($self, $signal, @args) = @_;
474 510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478} 522}
479 523
480sub find_widget { 524sub find_widget {
481 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
482 526
… …
534 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
535 579
536 # update screen rectangle 580 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 583
542 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 587
… …
584} 626}
585 627
586sub DESTROY { 628sub DESTROY {
587 my ($self) = @_; 629 my ($self) = @_;
588 630
631 return if CFClient::in_destruct;
632
589 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
590 634
591 eval { $self->destroy }; 635 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593} 637}
… …
972 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
973 }, 1017 },
974 ; 1018 ;
975 1019
976 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
978 slider => $slider, 1023 slider => $slider,
979 %arg, 1024 %arg,
980 ); 1025 );
981 1026
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
984 1029
985 $self 1030 $self
986} 1031}
987 1032
1033#TODO# update range on size_allocate depending on child
1034
988sub add { 1035sub add {
989 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
990 1037
991 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
992} 1039}
993 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
994sub update { 1057sub update {
995 my ($self) = @_; 1058 my ($self) = @_;
996 1059
997 $self->SUPER::update; 1060 $self->SUPER::update;
998 1061
999 # todo: overwrite size_allocate of child 1062 $self->update_slider;
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1063}
1003 1064
1004sub invoke_size_allocate { 1065sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1006 1067
1007 my $child = $self->{vp}->child; 1068 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1069
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1070 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1071}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1072
1016############################################################################# 1073#############################################################################
1017 1074
1018package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1019 1076
… …
1075 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1135 border => 0.6,
1079 can_events => 1, 1136 can_events => 1,
1080 min_w => 16, 1137 min_w => 64,
1081 min_h => 16, 1138 min_h => 32,
1082 %arg, 1139 %arg,
1083 ); 1140 );
1084 1141
1085 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1143 align => 0,
… …
1090 if exists $self->{title}; 1147 if exists $self->{title};
1091 1148
1092 if ($self->{has_close_button}) { 1149 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1150 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1151 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1152 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1153 on_activate => sub { $self->emit ("delete") };
1097 1154
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1155 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1156 }
1100 1157
1101 $self 1158 $self
… …
1147 $self->child->configure ($border, $border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1148 1205
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1207 if $self->{close_button};
1151 1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1152 1 1217 1
1153} 1218}
1154 1219
1155sub invoke_button_down { 1220sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
… …
1437 1502
1438sub invoke_size_allocate { 1503sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1440 1505
1441 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1443 1508
1444 my @req; 1509 my @req;
1445 1510
1446 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1448 } else { 1513 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1451 1516
1452 if ($req > $space) { 1517 if ($req > $space) {
1453 # ah well, not enough space 1518 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1455 } else { 1520 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1522
1458 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1459 1524
1460 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1526 for 0 .. $#children;
1462 } 1527 }
1463 } 1528 }
1464 1529
1465 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1466 1531
1467 my $pos = 0; 1532 my $pos = 0;
1468 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1536
1472 $pos += $alloc; 1537 $pos += $alloc;
1473 } 1538 }
1474 1539
1475 1 1540 1
… …
1578 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1579 1644
1580 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1582 1647
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1585 1649
1586 delete $self->{size_req}; 1650 delete $self->{size_req};
1587 $self->realloc; 1651 $self->realloc;
1588 $self->update; 1652 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1596 1660
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1662
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1601 1664
1602 delete $self->{size_req}; 1665 delete $self->{size_req};
1603 $self->realloc; 1666 $self->realloc;
1604 $self->update; 1667 $self->update;
… …
1616 1679
1617 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1618 1681
1619 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1686
1623 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1624 1688
1625 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1630 }; 1694 };
1631 1695
1632 @{ $self->{size_req} } 1696 @{ $self->{size_req} }
1633} 1697}
1634 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1635sub invoke_size_allocate { 1703sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1637 1705
1638 delete $self->{ox}; 1706 delete $self->{ox};
1639 1707
… …
1645 1713
1646sub set_fontsize { 1714sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1648 1716
1649 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1650 delete $self->{texture}; 1719 delete $self->{texture};
1651 1720
1652 $self->realloc; 1721 $self->realloc;
1653} 1722}
1654 1723
1655sub reconfigure { 1724sub reconfigure {
1656 my ($self) = @_; 1725 my ($self) = @_;
1657 1726
1658 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1659 1729
1660 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1661} 1731}
1662 1732
1663sub _draw { 1733sub _draw {
1664 my ($self) = @_; 1734 my ($self) = @_;
1665 1735
1666 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1667 1737
1668 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1745
1676 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1677 }; 1747 };
1678 1748
1679 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1683 1753
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1757 };
1688 1758
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1761
1694 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1696 glColor @{$self->{fg}};
1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1701 }
1702
1703 glDisable GL_TEXTURE_2D;
1704} 1763}
1705 1764
1706############################################################################# 1765#############################################################################
1707 1766
1708package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1819 1878
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 1880
1822 # byte-index to char-index 1881 # byte-index to char-index
1823 my $text = $self->{text}; 1882 my $text = $self->{text};
1824 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1826 1885
1827 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1828 $self->update; 1887 $self->update;
1829 1888
1830 1 1889 1
… …
1891 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1892 1951
1893 if ($sym == 13) { 1952 if ($sym == 13) {
1894 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1896 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 1958 $self->emit (activate => $txt);
1899 $self->update; 1959 $self->update;
1900 1960
… …
2049 my ($self) = @_; 2109 my ($self) = @_;
2050 2110
2051 (6) x 2 2111 (6) x 2
2052} 2112}
2053 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
2054sub invoke_button_down { 2122sub invoke_button_down {
2055 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
2056 2124
2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059 $self->{state} = !$self->{state}; 2127 $self->toggle;
2060 $self->emit (changed => $self->{state});
2061 } else { 2128 } else {
2062 return 0 2129 return 0
2063 } 2130 }
2064 2131
2065 1 2132 1
… …
2090package CFClient::UI::Image; 2157package CFClient::UI::Image;
2091 2158
2092our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
2093 2160
2094use CFClient::OpenGL; 2161use CFClient::OpenGL;
2095use Carp qw/confess/;
2096 2162
2097our %loaded_images; 2163our %texture_cache;
2098 2164
2099sub new { 2165sub new {
2100 my $class = shift; 2166 my $class = shift;
2101 2167
2102 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2103 2172
2104 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2105 2175
2106 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2107 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2108 2178
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2110 2180
2111 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114 2182
2115 $self 2183 $self
2116} 2184}
2117 2185
2118sub size_request { 2186sub size_request {
2119 my ($self) = @_; 2187 my ($self) = @_;
2120 2188
2121 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2122} 2190}
2123 2191
2124sub _draw { 2192sub _draw {
2125 my ($self) = @_; 2193 my ($self) = @_;
2126 2194
… …
2235 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2236 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2237 2305
2238 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2239 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240 2311
2241 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2263 2334
2264 if ($t3) { 2335 if ($t3) {
2265 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2266 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2267 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271 glEnd; 2342 glEnd;
2272 } 2343 }
2273 2344
2274 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2409 2480
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2482
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2484
2414 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2486}
2416 2487
2417sub invoke_mouse_motion { 2488sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2419 2490
… …
2428 } else { 2499 } else {
2429 return 0; 2500 return 0;
2430 } 2501 }
2431 2502
2432 1 2503 1
2504}
2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2433} 2514}
2434 2515
2435sub update { 2516sub update {
2436 my ($self) = @_; 2517 my ($self) = @_;
2437 2518
… …
2538sub new { 2619sub new {
2539 my $class = shift; 2620 my $class = shift;
2540 2621
2541 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2542 fontsize => 1, 2623 fontsize => 1,
2543 can_events => 0, 2624 can_events => 1,
2544 indent => 0, 2625 indent => 0,
2545 #font => default_font 2626 #font => default_font
2546 @_, 2627 @_,
2547 2628
2548 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2549 par => [], 2630 par => [],
2550 height => 0, 2631 height => 0,
2551 children => [ 2632 children => [
2552 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2553 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2564 2645
2565 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2566 $self->reflow; 2647 $self->reflow;
2567} 2648}
2568 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2569sub invoke_size_allocate { 2659sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2571 2661
2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2664
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 2669
2577 $self->reflow; 2670 $self->reflow;
2578 2671
2672 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 2673 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 2674}
2581 2675
2582sub text_size { 2676sub invoke_mouse_wheel {
2583 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2584 2688
2585 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2586 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2591 2702 );
2703
2592 $layout->size 2704 $layout
2593} 2705}
2594 2706
2595sub reflow { 2707sub reflow {
2596 my ($self) = @_; 2708 my ($self) = @_;
2597 2709
… …
2606 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2607} 2719}
2608 2720
2609sub clear { 2721sub clear {
2610 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2611 2726
2612 $self->{par} = []; 2727 $self->{par} = [];
2613 $self->{height} = 0; 2728 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 2730}
2616 2731
2617sub add_paragraph { 2732sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2619 2734
2620 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2621 my ($w, $h) = $self->text_size ($line); 2736
2622 $self->{height} += $h; 2737 $para = {
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2624 } 2744 };
2625 2745
2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2627} 2758}
2628 2759
2629sub update { 2760sub update {
2630 my ($self) = @_; 2761 my ($self) = @_;
2631 2762
… …
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 2771
2641 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2642 my $height = 0; 2773 my $height = 0;
2643 2774
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2650 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2652 $layout->set_markup ($_->[4]);
2653 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3]; 2779
2655 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2656 } 2783 }
2657 2784
2658 $height += $_->[1]; 2785 $height += $para->{h};
2659 } 2786 }
2660 2787
2661 $self->{height} = $height; 2788 $self->{height} = $height;
2662 2789
2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2664 2791
2665 delete $self->{texture}; 2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2666 } 2797 }
2667 2798
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 2800 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
… …
2674 my $y0 = $top; 2805 my $y0 = $top;
2675 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2676 2807
2677 my $y = 0; 2808 my $y = 0;
2678 2809
2679 my $layout = $self->{layout};
2680
2681 $layout->set_font ($self->{font}) if $self->{font};
2682
2683 glEnable GL_BLEND;
2684 #TODO# not correct in windows where rgba is forced off
2685 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2686
2687 for my $par (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 2811 my $h = $para->{h};
2689 2812
2690 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2691 $layout->set_foreground (@{ $par->[2] });
2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2694 $layout->set_markup ($par->[4]);
2695 2814
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2697 2816
2698 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2700 } 2831 }
2701 2832
2702 $y += $h; 2833 $y += $h;
2703 } 2834 }
2704
2705 glDisable GL_BLEND;
2706 }; 2835 };
2707 }); 2836 });
2837}
2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2708} 2846}
2709 2847
2710sub _draw { 2848sub _draw {
2711 my ($self) = @_; 2849 my ($self) = @_;
2712 2850
… …
2715 glColor 0, 0, 0, 1; 2853 glColor 0, 0, 0, 1;
2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2718 2856
2719 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2720
2721} 2858}
2722 2859
2723############################################################################# 2860#############################################################################
2724 2861
2725package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2998 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2999 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3000 3137
3001 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3002 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
3003 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3004 can_hover => 1, 3155 can_hover => 1,
3005 can_events => 1, 3156 can_events => 1,
3006 markup => $widget, 3157 markup => $widget,
3007 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3008 } 3160 }
3009 3161
3010 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3011 3163
3012 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3079 3231
3080 $self->SUPER::add (@widgets); 3232 $self->SUPER::add (@widgets);
3081 3233
3082 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3084} 3242}
3085 3243
3086sub set_current_page { 3244sub set_current_page {
3087 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3088 3246
… …
3154 tooltip => $tooltip, 3312 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) }, 3313 on_activate => sub { $self->set_current_page ($widget) },
3156 ); 3314 );
3157 3315
3158 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3317}
3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3159} 3323}
3160 3324
3161sub set_current_page { 3325sub set_current_page {
3162 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3163 3327
… …
3341 count => 1, 3505 count => 1,
3342 %arg, 3506 %arg,
3343 }; 3507 };
3344 } 3508 }
3345 3509
3510 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3511 $self->reorder;
3512 });
3347} 3513}
3348 3514
3349sub reconfigure { 3515sub reconfigure {
3350 my ($self) = @_; 3516 my ($self) = @_;
3351 3517
… …
3366 3532
3367############################################################################# 3533#############################################################################
3368 3534
3369package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3370 3536
3371our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3372 3538
3373sub new { 3539sub new {
3374 my $class = shift; 3540 my $class = shift;
3375 3541
3376 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3378 @_, 3544 @_,
3379 ); 3545 );
3380 3546
3381 $self 3547 $self
3382} 3548}
3383 3549
3384sub set_items { 3550sub set_items {
3385 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3386 3552
3387 $self->{child}->clear; 3553 $self->clear;
3388 return unless $items; 3554 return unless $items;
3389 3555
3390 my @items = sort { 3556 my @items = sort {
3391 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3393 } @$items; 3559 } values %$items;
3394 3560
3395 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3396 3562
3397 my $row = 0; 3563 my $row = 0;
3398 for my $item (@items) { 3564 for my $item (@items) {
3399 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3400 3566
3401 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3404 3570
3405 $row++; 3571 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 } 3572 }
3605} 3573}
3606 3574
3607############################################################################# 3575#############################################################################
3608 3576
… …
3662 } elsif ($ev->{button} == 2) { 3630 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}"); 3631 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) { 3632 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu 3633 (new CFClient::UI::Menu
3666 items => [ 3634 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ], 3637 ],
3670 )->popup ($ev); 3638 )->popup ($ev);
3671 } else { 3639 } else {
3672 return 0; 3640 return 0;
… …
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919 3887
3920 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3921 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3922 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3923 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3924 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3925 3899
3926 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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