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.333 by root, Sun Jul 23 11:09:58 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 {
413 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
414 442
443 Carp::confess unless $self->{parent};#d#
444
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 446}
417 447
418sub invoke_focus_in { 448sub invoke_focus_in {
419 my ($self) = @_; 449 my ($self) = @_;
420 450
421 return if $FOCUS == $self; 451 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
423 453
424 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
425 455
426 $focus->update if $focus; 456 $self->update;
427 $FOCUS->update;
428 457
429 0 458 0
430} 459}
431 460
432sub invoke_focus_out { 461sub invoke_focus_out {
433 my ($self) = @_; 462 my ($self) = @_;
434 463
435 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
436 465
437 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
438 467
439 $focus->update if $focus; #? 468 $self->update;
440 469
441 $::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
442 unless $FOCUS; 471 unless $FOCUS;
443 472
444 0 473 0
445} 474}
446 475
447sub grab_focus { 476sub grab_focus {
448 my ($self) = @_; 477 my ($self) = @_;
449 478
479 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
451} 481}
452 482
453sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
457 488
458sub invoke_button_down { 489sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
460 491
461 $self->grab_focus; 492 $self->grab_focus;
462 493
463 1 494 0
464} 495}
465 496
466sub connect { 497sub connect {
467 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
468 499
469 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 }
470} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
471 514
472sub emit { 515sub emit {
473 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
474 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
527 #d##TODO# stop propagating at first true, do not use sum
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478} 531}
479 532
480sub find_widget { 533sub find_widget {
481 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
482 535
… …
534 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
535 588
536 # update screen rectangle 589 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541 592
542 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
545 596
… …
584} 635}
585 636
586sub DESTROY { 637sub DESTROY {
587 my ($self) = @_; 638 my ($self) = @_;
588 639
640 return if CFClient::in_destruct;
641
589 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
590 643
591 eval { $self->destroy }; 644 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
593} 646}
… …
676 729
677 $self->add (@$children) 730 $self->add (@$children)
678 if $children; 731 if $children;
679 732
680 $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;
681} 742}
682 743
683sub add { 744sub add {
684 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
685 746
… …
972 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
973 }, 1034 },
974 ; 1035 ;
975 1036
976 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
978 slider => $slider, 1040 slider => $slider,
979 %arg, 1041 %arg,
980 ); 1042 );
981 1043
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
984 1046
985 $self 1047 $self
986} 1048}
987 1049
1050#TODO# update range on size_allocate depending on child
1051
988sub add { 1052sub add {
989 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
990 1054
991 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
992} 1056}
993 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
994sub update { 1074sub update {
995 my ($self) = @_; 1075 my ($self) = @_;
996 1076
997 $self->SUPER::update; 1077 $self->SUPER::update;
998 1078
999 # todo: overwrite size_allocate of child 1079 $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} 1080}
1003 1081
1004sub invoke_size_allocate { 1082sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1006 1084
1007 my $child = $self->{vp}->child; 1085 $self->update_slider;
1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009 1086
1010 $self->SUPER::invoke_size_allocate ($w, $h) 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1088}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015 1089
1016############################################################################# 1090#############################################################################
1017 1091
1018package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1019 1093
… …
1075 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1152 border => 0.6,
1079 can_events => 1, 1153 can_events => 1,
1080 min_w => 16, 1154 min_w => 64,
1081 min_h => 16, 1155 min_h => 32,
1082 %arg, 1156 %arg,
1083 ); 1157 );
1084 1158
1085 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1086 align => 0, 1160 align => 0,
… …
1090 if exists $self->{title}; 1164 if exists $self->{title};
1091 1165
1092 if ($self->{has_close_button}) { 1166 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1167 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1168 new CFClient::UI::ImageButton
1095 image => 'x1_close.png', 1169 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1170 on_activate => sub { $self->emit ("delete") };
1097 1171
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1172 $self->CFClient::UI::Container::add ($self->{close_button});
1099 } 1173 }
1100 1174
1101 $self 1175 $self
… …
1147 $self->child->configure ($border, $border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1148 1222
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1224 if $self->{close_button};
1151 1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1233
1152 1 1234 1
1153} 1235}
1154 1236
1155sub invoke_button_down { 1237sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
… …
1282sub children { 1364sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284} 1366}
1285 1367
1286sub add { 1368sub add {
1287 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1288 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1289 $child->set_parent ($self); 1373 $child->set_parent ($self);
1290 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1291 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1292 $self->realloc; 1379 $self->realloc;
1293} 1380}
1294 1381
1295sub remove { 1382sub remove {
1296 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
1437 1524
1438sub invoke_size_allocate { 1525sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1440 1527
1441 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1443 1530
1444 my @req; 1531 my @req;
1445 1532
1446 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1448 } else { 1535 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1451 1538
1452 if ($req > $space) { 1539 if ($req > $space) {
1453 # ah well, not enough space 1540 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1455 } else { 1542 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1544
1458 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1459 1546
1460 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1548 for 0 .. $#children;
1462 } 1549 }
1463 } 1550 }
1464 1551
1465 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1466 1553
1467 my $pos = 0; 1554 my $pos = 0;
1468 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1558
1472 $pos += $alloc; 1559 $pos += $alloc;
1473 } 1560 }
1474 1561
1475 1 1562 1
… …
1578 my ($self, $text) = @_; 1665 my ($self, $text) = @_;
1579 1666
1580 return if $self->{text} eq "T$text"; 1667 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1668 $self->{text} = "T$text";
1582 1669
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1670 $self->{layout}->set_text ($text);
1585 1671
1586 delete $self->{size_req}; 1672 delete $self->{size_req};
1587 $self->realloc; 1673 $self->realloc;
1588 $self->update; 1674 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1680 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1681 $self->{text} = "M$markup";
1596 1682
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1683 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1684
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1685 $self->{layout}->set_markup ($markup);
1601 1686
1602 delete $self->{size_req}; 1687 delete $self->{size_req};
1603 $self->realloc; 1688 $self->realloc;
1604 $self->update; 1689 $self->update;
… …
1616 1701
1617 my ($w, $h) = $self->{layout}->size; 1702 my ($w, $h) = $self->{layout}->size;
1618 1703
1619 if (exists $self->{template}) { 1704 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1705 $self->{template}->set_font ($self->{font}) if $self->{font};
1706 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1707 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1708
1623 my ($w2, $h2) = $self->{template}->size; 1709 my ($w2, $h2) = $self->{template}->size;
1624 1710
1625 $w = List::Util::max $w, $w2; 1711 $w = List::Util::max $w, $w2;
… …
1630 }; 1716 };
1631 1717
1632 @{ $self->{size_req} } 1718 @{ $self->{size_req} }
1633} 1719}
1634 1720
1721sub baseline_shift {
1722 $_[0]{layout}->descent
1723}
1724
1635sub invoke_size_allocate { 1725sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1726 my ($self, $w, $h) = @_;
1637 1727
1638 delete $self->{ox}; 1728 delete $self->{ox};
1639 1729
… …
1645 1735
1646sub set_fontsize { 1736sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1737 my ($self, $fontsize) = @_;
1648 1738
1649 $self->{fontsize} = $fontsize; 1739 $self->{fontsize} = $fontsize;
1740 delete $self->{size_req};
1650 delete $self->{texture}; 1741 delete $self->{texture};
1651 1742
1652 $self->realloc; 1743 $self->realloc;
1653} 1744}
1654 1745
1655sub reconfigure { 1746sub reconfigure {
1656 my ($self) = @_; 1747 my ($self) = @_;
1657 1748
1658 delete $self->{size_req}; 1749 delete $self->{size_req};
1750 delete $self->{texture};
1659 1751
1660 $self->SUPER::reconfigure; 1752 $self->SUPER::reconfigure;
1661} 1753}
1662 1754
1663sub _draw { 1755sub _draw {
1664 my ($self) = @_; 1756 my ($self) = @_;
1665 1757
1666 $self->SUPER::_draw; # draw background, if applicable 1758 $self->SUPER::_draw; # draw background, if applicable
1667 1759
1668 my $tex = $self->{texture} ||= do { 1760 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 1761 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1762 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 1763 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1764 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1765 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1766 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 1767
1676 new_from_layout CFClient::Texture $self->{layout} 1768 [$self->{layout}->size]
1677 }; 1769 };
1678 1770
1679 unless (exists $self->{ox}) { 1771 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1772 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1773 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 1774 : ($self->{w} - $size->[0]) * 0.5);
1683 1775
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1776 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1777 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 1778 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 1779 };
1688 1780
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1781 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1782 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 1783
1694 if ($tex->{format} == GL_ALPHA) { 1784 $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} 1785}
1705 1786
1706############################################################################# 1787#############################################################################
1707 1788
1708package CFClient::UI::EntryBase; 1789package CFClient::UI::EntryBase;
… …
1819 1900
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 1901 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 1902
1822 # byte-index to char-index 1903 # byte-index to char-index
1823 my $text = $self->{text}; 1904 my $text = $self->{text};
1824 utf8::encode $text; 1905 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 1906 $self->{cursor} = length $text;
1826 1907
1827 $self->_set_text ($self->{text}); 1908 $self->_set_text ($self->{text});
1828 $self->update; 1909 $self->update;
1829 1910
1830 1 1911 1
… …
1891 my $sym = $ev->{sym}; 1972 my $sym = $ev->{sym};
1892 1973
1893 if ($sym == 13) { 1974 if ($sym == 13) {
1894 unshift @{$self->{history}}, 1975 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 1976 my $txt = $self->get_text;
1977
1896 $self->{history_pointer} = -1; 1978 $self->{history_pointer} = -1;
1897 $self->{history_saveback} = ''; 1979 $self->{history_saveback} = '';
1898 $self->emit (activate => $txt); 1980 $self->emit (activate => $txt);
1899 $self->update; 1981 $self->update;
1900 1982
… …
2049 my ($self) = @_; 2131 my ($self) = @_;
2050 2132
2051 (6) x 2 2133 (6) x 2
2052} 2134}
2053 2135
2136sub toggle {
2137 my ($self) = @_;
2138
2139 $self->{state} = !$self->{state};
2140 $self->emit (changed => $self->{state});
2141 $self->update;
2142}
2143
2054sub invoke_button_down { 2144sub invoke_button_down {
2055 my ($self, $ev, $x, $y) = @_; 2145 my ($self, $ev, $x, $y) = @_;
2056 2146
2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2147 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2148 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2059 $self->{state} = !$self->{state}; 2149 $self->toggle;
2060 $self->emit (changed => $self->{state});
2061 } else { 2150 } else {
2062 return 0 2151 return 0
2063 } 2152 }
2064 2153
2065 1 2154 1
… …
2090package CFClient::UI::Image; 2179package CFClient::UI::Image;
2091 2180
2092our @ISA = CFClient::UI::Base::; 2181our @ISA = CFClient::UI::Base::;
2093 2182
2094use CFClient::OpenGL; 2183use CFClient::OpenGL;
2095use Carp qw/confess/;
2096 2184
2097our %loaded_images; 2185our %texture_cache;
2098 2186
2099sub new { 2187sub new {
2100 my $class = shift; 2188 my $class = shift;
2101 2189
2102 my $self = $class->SUPER::new (can_events => 0, @_); 2190 my $self = $class->SUPER::new (
2191 can_events => 0,
2192 @_,
2193 );
2103 2194
2104 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2195 $self->{path} || $self->{tex}
2196 or Carp::croak "'path' or 'tex' attributes required";
2105 2197
2106 $loaded_images{$self->{image}} ||= 2198 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2107 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2199 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2108 2200
2109 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2201 Scalar::Util::weaken $texture_cache{$self->{path}};
2110 2202
2111 Scalar::Util::weaken $loaded_images{$self->{image}}; 2203 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2112
2113 $self->{aspect} = $tex->{w} / $tex->{h};
2114 2204
2115 $self 2205 $self
2116} 2206}
2117 2207
2118sub size_request { 2208sub size_request {
2119 my ($self) = @_; 2209 my ($self) = @_;
2120 2210
2121 ($self->{tex}->{w}, $self->{tex}->{h}) 2211 ($self->{tex}{w}, $self->{tex}{h})
2122} 2212}
2123 2213
2124sub _draw { 2214sub _draw {
2125 my ($self) = @_; 2215 my ($self) = @_;
2126 2216
… …
2235 my $ycut1 = max 0, min 1, $ycut; 2325 my $ycut1 = max 0, min 1, $ycut;
2236 my $ycut2 = max 0, min 1, $ycut - 1; 2326 my $ycut2 = max 0, min 1, $ycut - 1;
2237 2327
2238 my $h1 = $self->{h} * (1 - $ycut1); 2328 my $h1 = $self->{h} * (1 - $ycut1);
2239 my $h2 = $self->{h} * (1 - $ycut2); 2329 my $h2 = $self->{h} * (1 - $ycut2);
2330 my $h3 = $self->{h};
2331
2332 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2240 2333
2241 glEnable GL_BLEND; 2334 glEnable GL_BLEND;
2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2335 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2336 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2244 glEnable GL_TEXTURE_2D; 2337 glEnable GL_TEXTURE_2D;
… …
2263 2356
2264 if ($t3) { 2357 if ($t3) {
2265 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2358 glBindTexture GL_TEXTURE_2D, $t3->{name};
2266 glBegin GL_QUADS; 2359 glBegin GL_QUADS;
2267 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2360 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2268 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2361 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2269 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2362 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2270 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2363 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2271 glEnd; 2364 glEnd;
2272 } 2365 }
2273 2366
2274 glDisable GL_BLEND; 2367 glDisable GL_BLEND;
… …
2409 2502
2410 $self->SUPER::invoke_button_down ($ev, $x, $y); 2503 $self->SUPER::invoke_button_down ($ev, $x, $y);
2411 2504
2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2505 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2413 2506
2414 $self->mouse_motion ($ev, $x, $y) 2507 $self->invoke_mouse_motion ($ev, $x, $y)
2415} 2508}
2416 2509
2417sub invoke_mouse_motion { 2510sub invoke_mouse_motion {
2418 my ($self, $ev, $x, $y) = @_; 2511 my ($self, $ev, $x, $y) = @_;
2419 2512
… …
2428 } else { 2521 } else {
2429 return 0; 2522 return 0;
2430 } 2523 }
2431 2524
2432 1 2525 1
2526}
2527
2528sub invoke_mouse_wheel {
2529 my ($self, $ev) = @_;
2530
2531 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532
2533 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2534
2535 ! ! $delta
2433} 2536}
2434 2537
2435sub update { 2538sub update {
2436 my ($self) = @_; 2539 my ($self) = @_;
2437 2540
… …
2538sub new { 2641sub new {
2539 my $class = shift; 2642 my $class = shift;
2540 2643
2541 my $self = $class->SUPER::new ( 2644 my $self = $class->SUPER::new (
2542 fontsize => 1, 2645 fontsize => 1,
2543 can_events => 0, 2646 can_events => 1,
2544 indent => 0, 2647 indent => 0,
2545 #font => default_font 2648 #font => default_font
2546 @_, 2649 @_,
2547 2650
2548 layout => (new CFClient::Layout 1), 2651 layout => (new CFClient::Layout),
2549 par => [], 2652 par => [],
2550 height => 0, 2653 height => 0,
2551 children => [ 2654 children => [
2552 (new CFClient::UI::Empty expand => 1), 2655 (new CFClient::UI::Empty expand => 1),
2553 (new CFClient::UI::Slider vertical => 1), 2656 (new CFClient::UI::Slider vertical => 1),
… …
2564 2667
2565 $self->{fontsize} = $fontsize; 2668 $self->{fontsize} = $fontsize;
2566 $self->reflow; 2669 $self->reflow;
2567} 2670}
2568 2671
2672sub size_request {
2673 my ($self) = @_;
2674
2675 my ($empty, $slider) = @{ $self->{children} };
2676
2677 local $self->{children} = [$empty, $slider];
2678 $self->SUPER::size_request
2679}
2680
2569sub invoke_size_allocate { 2681sub invoke_size_allocate {
2570 my ($self, $w, $h) = @_; 2682 my ($self, $w, $h) = @_;
2571 2683
2684 my ($empty, $slider, @other) = @{ $self->{children} };
2685 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2686
2572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2687 $self->{layout}->set_font ($self->{font}) if $self->{font};
2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2688 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2574 $self->{layout}->set_width ($self->{children}[0]{w}); 2689 $self->{layout}->set_width ($empty->{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2690 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2576 2691
2577 $self->reflow; 2692 $self->reflow;
2578 2693
2694 local $self->{children} = [$empty, $slider];
2579 $self->SUPER::invoke_size_allocate ($w, $h) 2695 $self->SUPER::invoke_size_allocate ($w, $h)
2580} 2696}
2581 2697
2582sub text_size { 2698sub invoke_mouse_wheel {
2583 my ($self, $text, $indent) = @_; 2699 my ($self, $ev) = @_;
2700
2701 return 0 unless $ev->{dy}; # only vertical movements
2702
2703 $self->{children}[1]->emit (mouse_wheel => $ev);
2704
2705 1
2706}
2707
2708sub get_layout {
2709 my ($self, $para) = @_;
2584 2710
2585 my $layout = $self->{layout}; 2711 my $layout = $self->{layout};
2586 2712
2713 $layout->set_font ($self->{font}) if $self->{font};
2714 $layout->set_foreground (@{$para->{fg}});
2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2715 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2588 $layout->set_width ($self->{children}[0]{w} - $indent); 2716 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2717 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($text); 2718 $layout->set_markup ($para->{markup});
2719
2720 $layout->set_shapes (
2721 map
2722 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2723 @{$para->{widget}}
2591 2724 );
2725
2592 $layout->size 2726 $layout
2593} 2727}
2594 2728
2595sub reflow { 2729sub reflow {
2596 my ($self) = @_; 2730 my ($self) = @_;
2597 2731
… …
2606 $self->{children}[1]->set_value ($offset); 2740 $self->{children}[1]->set_value ($offset);
2607} 2741}
2608 2742
2609sub clear { 2743sub clear {
2610 my ($self) = @_; 2744 my ($self) = @_;
2745
2746 my (undef, undef, @other) = @{ $self->{children} };
2747 $self->remove ($_) for @other;
2611 2748
2612 $self->{par} = []; 2749 $self->{par} = [];
2613 $self->{height} = 0; 2750 $self->{height} = 0;
2614 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2751 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2615} 2752}
2616 2753
2617sub add_paragraph { 2754sub add_paragraph {
2618 my ($self, $color, $text, $indent) = @_; 2755 my ($self, $color, $para, $indent) = @_;
2619 2756
2620 for my $line (split /\n/, $text) { 2757 my ($text, @w) = ref $para ? @$para : $para;
2621 my ($w, $h) = $self->text_size ($line); 2758
2622 $self->{height} += $h; 2759 $para = {
2623 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2760 w => 1e10,
2761 wrapped => 1,
2762 fg => $color,
2763 indent => $indent,
2764 markup => $text,
2765 widget => \@w,
2624 } 2766 };
2625 2767
2626 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2768 $self->add (@w) if @w;
2769 push @{$self->{par}}, $para;
2770
2771 $self->{need_reflow}++;
2772 $self->update;
2773}
2774
2775sub scroll_to_bottom {
2776 my ($self) = @_;
2777
2778 $self->{scroll_to_bottom} = 1;
2779 $self->update;
2627} 2780}
2628 2781
2629sub update { 2782sub update {
2630 my ($self) = @_; 2783 my ($self) = @_;
2631 2784
… …
2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2792 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2640 2793
2641 if (delete $self->{need_reflow}) { 2794 if (delete $self->{need_reflow}) {
2642 my $height = 0; 2795 my $height = 0;
2643 2796
2644 my $layout = $self->{layout};
2645
2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2647
2648 for (@{$self->{par}}) { 2797 for my $para (@{$self->{par}}) {
2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2798 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2650 $layout->set_width ($W - $_->[3]); 2799 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; 2800 my ($w, $h) = $layout->size;
2654 $_->[0] = $w + $_->[3]; 2801
2655 $_->[1] = $h; 2802 $para->{w} = $w + $para->{indent};
2803 $para->{h} = $h;
2804 $para->{wrapped} = $layout->has_wrapped;
2656 } 2805 }
2657 2806
2658 $height += $_->[1]; 2807 $height += $para->{h};
2659 } 2808 }
2660 2809
2661 $self->{height} = $height; 2810 $self->{height} = $height;
2662 2811
2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2812 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2664 2813
2665 delete $self->{texture}; 2814 delete $self->{texture};
2815 }
2816
2817 if (delete $self->{scroll_to_bottom}) {
2818 $self->{children}[1]->set_value (1e10);
2666 } 2819 }
2667 2820
2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2821 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2669 glClearColor 0, 0, 0, 0; 2822 glClearColor 0, 0, 0, 0;
2670 glClear GL_COLOR_BUFFER_BIT; 2823 glClear GL_COLOR_BUFFER_BIT;
… …
2674 my $y0 = $top; 2827 my $y0 = $top;
2675 my $y1 = $top + $H; 2828 my $y1 = $top + $H;
2676 2829
2677 my $y = 0; 2830 my $y = 0;
2678 2831
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}}) { 2832 for my $para (@{$self->{par}}) {
2688 my $h = $par->[1]; 2833 my $h = $para->{h};
2689 2834
2690 if ($y0 < $y + $h && $y < $y1) { 2835 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 2836
2696 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2837 my $layout = $self->get_layout ($para);
2697 2838
2698 glRasterPos $par->[3], $y - $y0; 2839 $layout->render ($para->{indent}, $y - $y0);
2699 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2840
2841 if (my @w = @{ $para->{widget} }) {
2842 my @s = $layout->get_shapes;
2843
2844 for (@w) {
2845 my ($dx, $dy) = splice @s, 0, 2, ();
2846
2847 $_->{x} = $dx + $para->{indent};
2848 $_->{y} = $dy + $y - $y0;
2849
2850 $_->draw;
2851 }
2852 }
2700 } 2853 }
2701 2854
2702 $y += $h; 2855 $y += $h;
2703 } 2856 }
2704
2705 glDisable GL_BLEND;
2706 }; 2857 };
2707 }); 2858 });
2859}
2860
2861sub reconfigure {
2862 my ($self) = @_;
2863
2864 $self->SUPER::reconfigure;
2865
2866 $_->{w} = 1e10 for @{ $self->{par} };
2867 $self->reflow;
2708} 2868}
2709 2869
2710sub _draw { 2870sub _draw {
2711 my ($self) = @_; 2871 my ($self) = @_;
2712 2872
… …
2715 glColor 0, 0, 0, 1; 2875 glColor 0, 0, 0, 1;
2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2876 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2717 glDisable GL_TEXTURE_2D; 2877 glDisable GL_TEXTURE_2D;
2718 2878
2719 $self->{children}[1]->draw; 2879 $self->{children}[1]->draw;
2720
2721} 2880}
2722 2881
2723############################################################################# 2882#############################################################################
2724 2883
2725package CFClient::UI::Animator; 2884package CFClient::UI::Animator;
… …
2849 3008
2850 $self->{root}->on_post_alloc ("move_$self" => sub { 3009 $self->{root}->on_post_alloc ("move_$self" => sub {
2851 my $widget = $self->{owner} 3010 my $widget = $self->{owner}
2852 or return; 3011 or return;
2853 3012
3013 if ($widget->{visible}) {
2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3014 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2855 3015
2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3016 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2857 if $x + $self->{w} > $self->{root}{w}; 3017 if $x + $self->{w} > $self->{root}{w};
2858 3018
2859 $self->move_abs ($x, $y); 3019 $self->move_abs ($x, $y);
3020 } else {
3021 $self->hide;
3022 }
2860 }); 3023 });
2861} 3024}
2862 3025
2863sub _draw { 3026sub _draw {
2864 my ($self) = @_; 3027 my ($self) = @_;
… …
2998 for my $item (@{ $self->{items} }) { 3161 for my $item (@{ $self->{items} }) {
2999 my ($widget, $cb, $tooltip) = @$item; 3162 my ($widget, $cb, $tooltip) = @$item;
3000 3163
3001 # handle various types of items, only text for now 3164 # handle various types of items, only text for now
3002 if (!ref $widget) { 3165 if (!ref $widget) {
3166 if ($widget =~ /\t/) {
3167 my ($left, $right) = split /\t/, $widget, 2;
3168
3169 $widget = new CFClient::UI::HBox
3170 can_hover => 1,
3171 can_events => 1,
3172 tooltip => $tooltip,
3173 children => [
3174 (new CFClient::UI::Label markup => $left, expand => 1),
3175 (new CFClient::UI::Label markup => $right, align => +1),
3176 ],
3177 ;
3178
3179 } else {
3003 $widget = new CFClient::UI::Label 3180 $widget = new CFClient::UI::Label
3004 can_hover => 1, 3181 can_hover => 1,
3005 can_events => 1, 3182 can_events => 1,
3006 markup => $widget, 3183 markup => $widget,
3007 tooltip => $tooltip 3184 tooltip => $tooltip;
3185 }
3008 } 3186 }
3009 3187
3010 $self->{item}{$widget} = $item; 3188 $self->{item}{$widget} = $item;
3011 3189
3012 $self->{vbox}->add ($widget); 3190 $self->{vbox}->add ($widget);
… …
3079 3257
3080 $self->SUPER::add (@widgets); 3258 $self->SUPER::add (@widgets);
3081 3259
3082 $self->{current} = $self->{children}[0] 3260 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} }; 3261 if @{ $self->{children} };
3262}
3263
3264sub get_current_page {
3265 my ($self) = @_;
3266
3267 $self->{current}
3084} 3268}
3085 3269
3086sub set_current_page { 3270sub set_current_page {
3087 my ($self, $page_or_widget) = @_; 3271 my ($self, $page_or_widget) = @_;
3088 3272
… …
3154 tooltip => $tooltip, 3338 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) }, 3339 on_activate => sub { $self->set_current_page ($widget) },
3156 ); 3340 );
3157 3341
3158 $self->{multiplexer}->add ($widget); 3342 $self->{multiplexer}->add ($widget);
3343}
3344
3345sub get_current_page {
3346 my ($self) = @_;
3347
3348 $self->{multiplexer}->get_current_page
3159} 3349}
3160 3350
3161sub set_current_page { 3351sub set_current_page {
3162 my ($self, $page) = @_; 3352 my ($self, $page) = @_;
3163 3353
… …
3341 count => 1, 3531 count => 1,
3342 %arg, 3532 %arg,
3343 }; 3533 };
3344 } 3534 }
3345 3535
3536 $ROOT->on_refresh (reorder => sub {
3346 $self->reorder; 3537 $self->reorder;
3538 });
3347} 3539}
3348 3540
3349sub reconfigure { 3541sub reconfigure {
3350 my ($self) = @_; 3542 my ($self) = @_;
3351 3543
… …
3366 3558
3367############################################################################# 3559#############################################################################
3368 3560
3369package CFClient::UI::Inventory; 3561package CFClient::UI::Inventory;
3370 3562
3371our @ISA = CFClient::UI::ScrolledWindow::; 3563our @ISA = CFClient::UI::Table::;
3372 3564
3373sub new { 3565sub new {
3374 my $class = shift; 3566 my $class = shift;
3375 3567
3376 my $self = $class->SUPER::new ( 3568 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3569 col_expand => [0, 1, 0],
3570 items => [],
3378 @_, 3571 @_,
3379 ); 3572 );
3380 3573
3574 $self->set_sort_order (undef);
3575
3381 $self 3576 $self
3577}
3578
3579sub update_items {
3580 my ($self) = @_;
3581
3582 $self->clear;
3583
3584 my @item = $self->{sort}->(@{ $self->{items} });
3585
3586 my @adds;
3587 my $row = 0;
3588 for my $item ($self->{sort}->(@{ $self->{items} })) {
3589 CFClient::Item::update_widgets $item;
3590
3591 push @adds, 0, $row, $item->{face_widget};
3592 push @adds, 1, $row, $item->{desc_widget};
3593 push @adds, 2, $row, $item->{weight_widget};
3594
3595 $row++;
3596 }
3597
3598 $self->add (@adds);
3599}
3600
3601sub set_sort_order {
3602 my ($self, $order) = @_;
3603
3604 $self->{sort} = $order ||= sub {
3605 sort {
3606 $a->{type} <=> $b->{type}
3607 or $a->{name} cmp $b->{name}
3608 } @_
3609 };
3610
3611 $self->update_items;
3382} 3612}
3383 3613
3384sub set_items { 3614sub set_items {
3385 my ($self, $items) = @_; 3615 my ($self, $items) = @_;
3386 3616
3387 $self->{child}->clear; 3617 $self->{items} = [$items ? values %$items : ()];
3388 return unless $items;
3389
3390 my @items = sort {
3391 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name})
3393 } @$items;
3394
3395 $self->{real_items} = \@items;
3396
3397 my $row = 0;
3398 for my $item (@items) {
3399 CFClient::Item::update_widgets $item;
3400
3401 $self->{child}->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget});
3404
3405 $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; 3618 $self->update_items;
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 }
3605} 3619}
3606 3620
3607############################################################################# 3621#############################################################################
3608 3622
3609package CFClient::UI::SpellList; 3623package CFClient::UI::SpellList;
… …
3662 } elsif ($ev->{button} == 2) { 3676 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}"); 3677 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) { 3678 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu 3679 (new CFClient::UI::Menu
3666 items => [ 3680 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3681 ["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}"]) }], 3682 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ], 3683 ],
3670 )->popup ($ev); 3684 )->popup ($ev);
3671 } else { 3685 } else {
3672 return 0; 3686 return 0;
… …
3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3932 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3919 3933
3920 $w = 0 if $w < 0; 3934 $w = 0 if $w < 0;
3921 $h = 0 if $h < 0; 3935 $h = 0 if $h < 0;
3922 3936
3937 $w = max $widget->{min_w}, $w;
3938 $h = max $widget->{min_h}, $h;
3939
3940 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942
3923 $w = int $w + 0.5; 3943 $w = int $w + 0.5;
3924 $h = int $h + 0.5; 3944 $h = int $h + 0.5;
3925 3945
3926 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3946 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927 $widget->{old_w} = $widget->{w}; 3947 $widget->{old_w} = $widget->{w};

Diff Legend

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