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.262 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner};
51});
20 52
21sub get_layout { 53sub get_layout {
22 my $layout; 54 my $layout;
23 55
24 for (grep { $_->{name} } values %WIDGET) { 56 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 71 my ($layout) = @_;
40 72
41 $LAYOUT = $layout; 73 $LAYOUT = $layout;
42} 74}
43 75
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 76# class methods for events
72sub feed_sdl_key_down_event { 77sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 78 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 79 if $FOCUS;
75} 80}
… …
77sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
78 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS; 84 if $FOCUS;
80} 85}
81 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
82sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
83 my ($ev) = @_; 101 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
85 103
86 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
87 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
88 108
89 $GRAB = $widget; 109 $GRAB = $widget;
90 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
91 111
92 check_tooltip; 112 $TOOLTIP_WATCHER->cb->();
93 } 113 }
94 114
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
96 120
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
98 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
99} 129}
100 130
101sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
102 my ($ev) = @_; 132 my ($ev) = @_;
103 my ($x, $y) = ($ev->{x}, $ev->{y});
104 133
105 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106 135
107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108 137
109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
110 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111 140
112 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 143 $grab->update if $grab;
115 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
116 145
117 check_tooltip; 146 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->();
118 } 148 }
119} 149}
120 150
121sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
122 my ($ev) = @_; 152 my ($ev) = @_;
123 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
124 154
125 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126 156
127 if ($widget != $HOVER) { 157 check_hover $widget;
128 my $hover = $HOVER; $HOVER = $widget;
129 158
130 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
131 $HOVER->update if $HOVER && $HOVER->{can_hover};
132
133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 160 if $HOVER;
138} 161}
139 162
140# convert position array to integers 163# convert position array to integers
141sub harmonize { 164sub harmonize {
… …
170sub rescale_widgets { 193sub rescale_widgets {
171 my ($sx, $sy) = @_; 194 my ($sx, $sy) = @_;
172 195
173 for my $widget (values %WIDGET) { 196 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 197 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 200
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 203 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 204 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 205 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 206 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 207
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 208 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 209 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 210
188 } 211 }
189 } 212 }
190 213
191 reconfigure_widgets; 214 reconfigure_widgets;
192} 215}
193 216
194############################################################################# 217#############################################################################
195 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
196package CFClient::UI::Base; 227package CFPlus::UI::Base;
197 228
198use strict; 229use strict;
199 230
200use CFClient::OpenGL; 231use CFPlus::OpenGL;
201 232
202sub new { 233sub new {
203 my $class = shift; 234 my $class = shift;
204 235
205 my $self = bless { 236 my $self = bless {
… …
210 h => undef, 241 h => undef,
211 can_events => 1, 242 can_events => 1,
212 @_ 243 @_
213 }, $class; 244 }, $class;
214 245
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
216 247
217 for (keys %$self) { 248 for (keys %$self) {
218 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
219 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
220 } 251 }
221 } 252 }
222 253
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
228 259
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 262
232 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
237 268
238sub destroy { 269sub destroy {
239 my ($self) = @_; 270 my ($self) = @_;
240 271
241 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
242 %$self = (); 274 %$self = ();
243} 275}
244 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
245sub show { 281sub show {
246 my ($self) = @_; 282 my ($self) = @_;
247 283
248 return if $self->{parent}; 284 return if $self->{parent};
249 285
250 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
251} 287}
252 288
253sub set_visible { 289sub set_visible {
254 my ($self) = @_; 290 my ($self) = @_;
255 291
… …
270 306
271 return unless $self->{visible}; 307 return unless $self->{visible};
272 308
273 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
274 310
311 delete $self->{visible};
275 delete $self->{root}; 312 delete $self->{root};
276 delete $self->{visible};
277 313
278 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
280 316
281 CFClient::UI::check_tooltip 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
283 319
284 $self->focus_out; 320 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
287} 322}
288 323
289sub set_visibility { 324sub set_visibility {
290 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
291 326
292 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
293 328
294 $visible ? $self->hide 329 $visible ? $self->show
295 : $self->show; 330 : $self->hide;
296} 331}
297 332
298sub toggle_visibility { 333sub toggle_visibility {
299 my ($self) = @_; 334 my ($self) = @_;
300 335
… …
313} 348}
314 349
315sub move_abs { 350sub move_abs {
316 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
317 352
318 $self->{x} = List::Util::max 0, int $x; 353 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
321 356
322 $self->update; 357 $self->update;
323} 358}
324 359
… …
334sub size_request { 369sub size_request {
335 require Carp; 370 require Carp;
336 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
337} 372}
338 373
374sub baseline_shift {
375 0
376}
377
339sub configure { 378sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
341 380
342 if ($self->{aspect}) { 381 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
344 383
345 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
347 386
348 # use alignment to adjust x, y 387 # use alignment to adjust x, y
349 388
350 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
365 404
366 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
367 } 406 }
368} 407}
369 408
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 409sub children {
410 # nop
411}
412
413sub visible_children {
414 $_[0]->children
375} 415}
376 416
377sub set_max_size { 417sub set_max_size {
378 my ($self, $w, $h) = @_; 418 my ($self, $w, $h) = @_;
379 419
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 420 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 421 $self->{max_h} = int $h if defined $h;
422
423 $self->realloc;
382} 424}
383 425
384sub set_tooltip { 426sub set_tooltip {
385 my ($self, $tooltip) = @_; 427 my ($self, $tooltip) = @_;
386 428
… …
389 431
390 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
391 433
392 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
393 435
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
397 } 439 }
398} 440}
399 441
400# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
401sub coord2local { 443sub coord2local {
402 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
403 445
446 Carp::confess unless $self->{parent};#d#
447
404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
405} 449}
406 450
407# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
408sub coord2global { 452sub coord2global {
409 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
410 454
455 Carp::confess unless $self->{parent};#d#
456
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 458}
413 459
414sub focus_in { 460sub invoke_focus_in {
415 my ($self) = @_; 461 my ($self) = @_;
416 462
417 return if $FOCUS == $self; 463 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
419 465
420 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
421 467
422 $self->_emit (focus_in => $focus); 468 $self->update;
423 469
424 $focus->update if $focus; 470 0
425 $FOCUS->update;
426} 471}
427 472
428sub focus_out { 473sub invoke_focus_out {
429 my ($self) = @_; 474 my ($self) = @_;
430 475
431 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
432 477
433 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
434 479
435 $self->_emit (focus_out => $focus); 480 $self->update;
436 481
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 483 unless $FOCUS;
441}
442 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
443sub mouse_motion { } 495sub invoke_mouse_motion { 0 }
444sub button_up { } 496sub invoke_button_up { 0 }
445sub key_down { } 497sub invoke_key_down { 0 }
446sub key_up { } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
447 500
448sub button_down { 501sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
450 503
451 $self->focus_in; 504 $self->grab_focus;
452}
453 505
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 506 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 507}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459 508
509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
460sub find_widget { 556#sub find_widget {
461 my ($self, $x, $y) = @_; 557# in .xs
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471 558
472sub set_parent { 559sub set_parent {
473 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
474 561
475 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 564}
501 565
502sub realloc { 566sub realloc {
503 my ($self) = @_; 567 my ($self) = @_;
504 568
… …
525 589
526 $self->realloc; 590 $self->realloc;
527 $self->update; 591 $self->update;
528} 592}
529 593
594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597
530sub draw { 598#sub draw {
531 my ($self) = @_; 599#CFPlus.xs
532
533 return unless $self->{h} && $self->{w};
534
535 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539
540 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2;
544 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS;
547 glVertex $x , $y;
548 glVertex $x + $self->{w}, $y;
549 glVertex $x + $self->{w}, $y + $self->{h};
550 glVertex $x , $y + $self->{h};
551 glEnd;
552 glDisable GL_BLEND;
553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
568}
569 600
570sub _draw { 601sub _draw {
571 my ($self) = @_; 602 my ($self) = @_;
572 603
573 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
574} 605}
575 606
576sub DESTROY { 607sub DESTROY {
577 my ($self) = @_; 608 my ($self) = @_;
578 609
610 return if CFPlus::in_destruct;
611
612 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
579 delete $WIDGET{$self+0}; 615 delete $WIDGET{$self+0};
580 #$self->deactivate;
581} 616}
582 617
583############################################################################# 618#############################################################################
584 619
585package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
586 621
587our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
588 623
589use strict; 624use strict;
590use CFClient::OpenGL; 625use CFPlus::OpenGL;
591 626
592sub new { 627sub new {
593 my $class = shift; 628 my $class = shift;
594 629
595 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
610 645
611 if ($color && (@$color < 4 || $color->[3])) { 646 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 647 my ($w, $h) = @$self{qw(w h)};
613 648
614 glEnable GL_BLEND; 649 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 651 glColor_premultiply @$color;
617 652
618 glBegin GL_QUADS; 653 glBegin GL_QUADS;
619 glVertex 0 , 0; 654 glVertex 0 , 0;
620 glVertex 0 , $h; 655 glVertex 0 , $h;
621 glVertex $w, $h; 656 glVertex $w, $h;
… …
626 } 661 }
627} 662}
628 663
629############################################################################# 664#############################################################################
630 665
631package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
632 667
633our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
634 669
635sub new { 670sub new {
636 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
638} 673}
… …
645 680
646sub draw { } 681sub draw { }
647 682
648############################################################################# 683#############################################################################
649 684
650package CFClient::UI::Container; 685package CFPlus::UI::Container;
651 686
652our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
653 688
654sub new { 689sub new {
655 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
656 691
657 my $children = delete $arg{children} || []; 692 my $children = delete $arg{children};
658 693
659 my $self = $class->SUPER::new ( 694 my $self = $class->SUPER::new (
660 children => [], 695 children => [],
661 can_events => 0, 696 can_events => 0,
662 %arg, 697 %arg,
663 ); 698 );
699
664 $self->add ($_) for @$children; 700 $self->add (@$children)
701 if $children && @$children;
665 702
666 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
667} 712}
668 713
669sub add { 714sub add {
670 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
671 716
672 $_->set_parent ($self) 717 $_->set_parent ($self)
673 for @widgets; 718 for @widgets;
674 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
675 use sort 'stable'; 721 use sort 'stable';
676 722
677 $self->{children} = [ 723 $self->{children} = [
678 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
679 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
680 ]; 726 ];
681 727
682 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
683} 733}
684 734
685sub children { 735sub children {
686 @{ $_[0]{children} } 736 @{ $_[0]{children} }
687} 737}
688 738
689sub remove { 739sub remove {
690 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
691 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
692 delete $child->{parent}; 745 delete $child->{parent};
693 $child->hide; 746 $child->hide;
694
695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
696 749
697 $self->realloc; 750 $self->realloc;
698} 751}
699 752
700sub clear { 753sub clear {
701 my ($self) = @_; 754 my ($self) = @_;
702 755
703 my $children = delete $self->{children}; 756 my $children = $self->{children};
704 $self->{children} = []; 757 $self->{children} = [];
705 758
706 for (@$children) { 759 for (@$children) {
707 delete $_->{parent}; 760 delete $_->{parent};
708 $_->hide; 761 $_->hide;
… …
717 $x -= $self->{x}; 770 $x -= $self->{x};
718 $y -= $self->{y}; 771 $y -= $self->{y};
719 772
720 my $res; 773 my $res;
721 774
722 for (reverse @{ $self->{children} }) { 775 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 776 $res = $_->find_widget ($x, $y)
724 and return $res; 777 and return $res;
725 } 778 }
726 779
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 780 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
728} 781}
729 782
730sub _draw { 783sub _draw {
731 my ($self) = @_; 784 my ($self) = @_;
732 785
733 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
734} 787}
735 788
736############################################################################# 789#############################################################################
737 790
738package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
739 792
740our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
741 794
742sub new { 795sub new {
743 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
744 797
745 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
746 799
747 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
748} 801}
749 802
750sub add { 803sub add {
751 my ($self, $child) = @_; 804 my ($self, $child) = @_;
752 805
753 $self->{children} = []; 806 $self->clear;
754
755 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
756} 808}
757 809
758sub remove { 810sub remove {
759 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
760 812
761 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
762 814
763 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
764 unless @{$self->{children}}; 816 unless @{$self->{children}};
765} 817}
766 818
767sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
768 820
769sub size_request { 821sub size_request {
770 $_[0]{children}[0]->size_request 822 $_[0]{children}[0]->size_request
771} 823}
772 824
773sub size_allocate { 825sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 826 my ($self, $w, $h) = @_;
775 827
776 $self->{children}[0]->configure (0, 0, $w, $h); 828 $self->{children}[0]->configure (0, 0, $w, $h);
829
830 1
777} 831}
778 832
779############################################################################# 833#############################################################################
780 834
835# back-buffered drawing area
836
781package CFClient::UI::Window; 837package CFPlus::UI::Window;
782 838
783our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
784 840
785use CFClient::OpenGL; 841use CFPlus::OpenGL;
786 842
787sub new { 843sub new {
788 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
789 845
790 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
795 851
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 852 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 853 $self->SUPER::update;
798} 854}
799 855
800sub size_allocate { 856sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 857 my ($self, $w, $h) = @_;
802 858
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 859 $self->update;
860
861 $self->SUPER::invoke_size_allocate ($w, $h)
805} 862}
806 863
807sub _render { 864sub _render {
865 my ($self) = @_;
866
808 $_[0]{children}[0]->draw; 867 $self->{children}[0]->draw;
809} 868}
810 869
811sub render_child { 870sub render_child {
812 my ($self) = @_; 871 my ($self) = @_;
813 872
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
817 876
877 {
878 package CFPlus::UI::Base;
879
880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
881 (0, 0, $self->{w}, $self->{h});
882
818 $self->_render; 883 $self->_render;
884 }
819 }; 885 };
820} 886}
821 887
822sub _draw { 888sub _draw {
823 my ($self) = @_; 889 my ($self) = @_;
824
825 my ($w, $h) = ($self->w, $self->h);
826 890
827 my $tex = $self->{texture} 891 my $tex = $self->{texture}
828 or return; 892 or return;
829 893
830 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 896 glColor 0, 0, 0, 1;
833 897
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
835 899
836 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
837} 901}
838 902
839############################################################################# 903#############################################################################
840 904
841package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
842 906
907use List::Util qw(min max);
908
843our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
844 910
845sub new { 911sub new {
846 my $class = shift; 912 my $class = shift;
847 913
848 $class->SUPER::new ( 914 $class->SUPER::new (
… …
855sub size_request { 921sub size_request {
856 my ($self) = @_; 922 my ($self) = @_;
857 923
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859 925
860 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
862 928
863 ($w, $h) 929 ($w, $h)
864} 930}
865 931
866sub size_allocate { 932sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 933 my ($self, $w, $h) = @_;
868 934
869 my $child = $self->child; 935 my $child = $self->child;
870 936
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 937 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 938 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 939
874 $self->child->configure (0, 0, $w, $h); 940 $self->child->configure (0, 0, $w, $h);
875 $self->update; 941 $self->update;
942
943 1
876} 944}
877 945
878sub set_offset { 946sub set_offset {
879 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
880 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
881 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
882 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
883 955
956 $self->emit (changed => $x, $y);
884 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
885} 977}
886 978
887# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local { 980sub coord2local {
889 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
904 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
905 997
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) { 1000 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else { 1002 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
912 } 1004 }
913} 1005}
914 1006
915sub _render { 1007sub _render {
916 my ($self) = @_; 1008 my ($self) = @_;
917 1009
1010 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1011 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1012
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1013 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 1014
920 $self->SUPER::_render; 1015 $self->SUPER::_render;
921} 1016}
922 1017
923############################################################################# 1018#############################################################################
924 1019
925package CFClient::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
926 1021
927our @ISA = CFClient::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
928 1023
929sub new { 1024sub new {
930 my $class = shift; 1025 my ($class, %arg) = @_;
1026
1027 my $child = delete $arg{child};
931 1028
932 my $self; 1029 my $self;
933 1030
934 my $slider = new CFClient::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
935 vertical => 1, 1045 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub { 1047 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
939 }, 1050 },
940 ; 1051 ;
941 1052
942 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1056 can_events => 1,
944 slider => $slider, 1057 hslider => $hslider,
945 @_, 1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1061 %arg,
946 ); 1062 );
947 1063
948 $self->{vp}->add ($self->{scrolled}); 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
949 $self->add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
950 $self->add ($self->{slider}); 1086
1087 $self->add ($child) if $child;
951 1088
952 $self 1089 $self
953} 1090}
954 1091
1092sub add {
1093 my ($self, $widget) = @_;
1094
1095 $self->{vp}->add ($self->{child} = $widget);
1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
955sub update { 1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
956 my ($self) = @_; 1133 my ($self, $ev) = @_;
957 1134
958 $self->SUPER::update; 1135 $self->grab_focus;
959 1136
960 # todo: overwrite size_allocate of child 1137 my $ox = $self->{vp}{view_x};
961 my $child = $self->{vp}->child; 1138 my $oy = $self->{vp}{view_y};
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1139
963} 1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
964 1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1150sub invoke_mouse_wheel {
1151 my ($self, $ev) = @_;
1152
1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155
1156 1
1157}
1158
1159sub invoke_button_down {
1160 my ($self, $ev, $x, $y) = @_;
1161
1162 if ($ev->{button} == 2) {
1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
965sub size_allocate { 1191sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
967 1193
1194 $self->update_slider;
968 $self->SUPER::size_allocate ($w, $h); 1195 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1196}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1197
977############################################################################# 1198#############################################################################
978 1199
979package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
980 1201
981our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
982 1203
983use CFClient::OpenGL; 1204use CFPlus::OpenGL;
984 1205
985sub new { 1206sub new {
986 my $class = shift; 1207 my $class = shift;
987 1208
988 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
996 1217
997 if ($self->{bg}) { 1218 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
999 1220
1000 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1003 1224
1004 glBegin GL_QUADS; 1225 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1226 glVertex 0 , 0;
1006 glVertex 0 , $h; 1227 glVertex 0 , $h;
1007 glVertex $w, $h; 1228 glVertex $w, $h;
… …
1014 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1015} 1236}
1016 1237
1017############################################################################# 1238#############################################################################
1018 1239
1019package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1020 1241
1021our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1022 1243
1023use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1024 1345
1025my $bg = 1346my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1028 1349
1029my @border = 1350my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1033sub new { 1358sub new {
1034 my $class = shift; 1359 my ($class, %arg) = @_;
1035 1360
1036 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1363 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1364 border => 0.6,
1040 can_events => 1, 1365 can_events => 1,
1041 min_w => 16, 1366 min_w => 64,
1042 min_h => 16, 1367 min_h => 32,
1043 @_ 1368 %arg,
1044 ); 1369 );
1045 1370
1046 $self->{title} &&= new CFClient::UI::Label 1371 $self->{title_widget} = new CFPlus::UI::Label
1047 align => 0, 1372 align => 0,
1048 valign => 1, 1373 valign => 1,
1049 text => $self->{title}, 1374 text => $self->{title},
1050 fontsize => $self->{border}; 1375 fontsize => $self->{border},
1376 if exists $self->{title};
1377
1378 if ($self->{has_close_button}) {
1379 $self->{close_button} =
1380 new CFPlus::UI::ImageButton
1381 path => 'x1_close.png',
1382 on_activate => sub { $self->emit ("delete") };
1383
1384 $self->CFPlus::UI::Container::add ($self->{close_button});
1385 }
1051 1386
1052 $self 1387 $self
1388}
1389
1390sub add {
1391 my ($self, @widgets) = @_;
1392
1393 $self->SUPER::add (@widgets);
1394 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1396}
1054 1397
1055sub border { 1398sub border {
1056 int $_[0]{border} * $::FONTSIZE 1399 int $_[0]{border} * $::FONTSIZE
1057} 1400}
1058 1401
1059sub size_request { 1402sub size_request {
1060 my ($self) = @_; 1403 my ($self) = @_;
1404
1405 $self->{title_widget}->size_request
1406 if $self->{title_widget};
1407
1408 $self->{close_button}->size_request
1409 if $self->{close_button};
1061 1410
1062 my ($w, $h) = $self->SUPER::size_request; 1411 my ($w, $h) = $self->SUPER::size_request;
1063 1412
1064 ( 1413 (
1065 $w + $self->border * 2, 1414 $w + $self->border * 2,
1066 $h + $self->border * 2, 1415 $h + $self->border * 2,
1067 ) 1416 )
1068} 1417}
1069 1418
1070sub size_allocate { 1419sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1420 my ($self, $w, $h) = @_;
1072 1421
1422 if ($self->{title_widget}) {
1423 $self->{title_widget}{w} = $w;
1424 $self->{title_widget}{h} = $h;
1425 $self->{title_widget}->invoke_size_allocate ($w, $h);
1426 }
1427
1428 my $border = $self->border;
1429
1073 $h -= List::Util::max 0, $self->border * 2; 1430 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1431 $w -= List::Util::max 0, $border * 2;
1075 1432
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1433 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1434
1435 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1436 if $self->{close_button};
1437
1438 1
1439}
1440
1441sub invoke_delete {
1442 my ($self) = @_;
1443
1444 $self->hide;
1445
1446 1
1447}
1448
1082sub button_down { 1449sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
1084 1451
1085 my ($w, $h) = @$self{qw(w h)}; 1452 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1453 my $border = $self->border;
1087 1454
… …
1103 my $dy = $ev->{y} - $oy; 1470 my $dy = $ev->{y} - $oy;
1104 1471
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1474
1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1476 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1477 };
1111 1478
1112 } elsif ($lr ^ $td) { 1479 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1480 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1481 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
1118 1485
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1486 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1487
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1488 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1489 # HACK: the next line is required to enforce placement
1490 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1491 };
1492 } else {
1493 return 0;
1494 }
1495
1123 } 1496 1
1124} 1497}
1125 1498
1126sub button_up { 1499sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
1128 1501
1129 delete $self->{motion}; 1502 ! ! delete $self->{motion}
1130} 1503}
1131 1504
1132sub mouse_motion { 1505sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
1134 1507
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1508 $self->{motion}->($ev, $x, $y) if $self->{motion};
1509
1510 ! ! $self->{motion}
1511}
1512
1513sub invoke_visibility_change {
1514 my ($self, $visible) = @_;
1515
1516 delete $self->{motion} unless $visible;
1517
1518 0
1136} 1519}
1137 1520
1138sub _draw { 1521sub _draw {
1139 my ($self) = @_; 1522 my ($self) = @_;
1140 1523
1524 my $child = $self->{children}[0];
1525
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1526 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1527 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1528
1144 glEnable GL_TEXTURE_2D; 1529 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1531
1147 my $border = $self->border; 1532 my $border = $self->border;
1148 1533
1149 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1150 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1154 1553
1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1157 1556
1158 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1561 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1562 }
1164 1563
1165 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1166 1565
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1566 $child->draw;
1567
1568 if ($self->{title_widget}) {
1569 glTranslate 0, $border - $self->{h};
1570 $self->{title_widget}->_draw;
1571
1572 glTranslate 0, - ($border - $self->{h});
1573 }
1574
1575 $self->{close_button}->draw
1576 if $self->{close_button};
1170} 1577}
1171 1578
1172############################################################################# 1579#############################################################################
1173 1580
1174package CFClient::UI::Table; 1581package CFPlus::UI::Table;
1175 1582
1176our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1177 1584
1178use List::Util qw(max sum); 1585use List::Util qw(max sum);
1179 1586
1180use CFClient::OpenGL; 1587use CFPlus::OpenGL;
1181 1588
1182sub new { 1589sub new {
1183 my $class = shift; 1590 my $class = shift;
1184 1591
1185 $class->SUPER::new ( 1592 $class->SUPER::new (
1186 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1187 @_, 1595 @_,
1188 ) 1596 )
1189} 1597}
1190 1598
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193}
1194
1195sub add { 1599sub add {
1196 my ($self, $x, $y, $child) = @_;
1197
1198 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child;
1200
1201 $self->realloc;
1202}
1203
1204# TODO: move to container class maybe? send children a signal on removal?
1205sub clear {
1206 my ($self) = @_; 1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1611 my $self = shift;
1612
1613 my @widgets;
1614
1615 while (@_) {
1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1617
1618 $child->{c_row} = $row;
1619 $child->{c_col} = $col;
1620
1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1628 my ($self) = @_;
1629
1630 my (@w, @h);
1207 1631
1208 my @children = $self->children; 1632 my @children = $self->children;
1209 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1210 1643 }
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215 1644
1216 $self->realloc; 1645 # second pass, rows
1217} 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1218
1219sub get_wh {
1220 my ($self) = @_;
1221
1222 my (@w, @h);
1223
1224 for my $y (0 .. $#{$self->{children}}) {
1225 my $row = $self->{children}[$y]
1226 or next;
1227
1228 for my $x (0 .. $#$row) {
1229 my $widget = $row->[$x]
1230 or next;
1231 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1232 1648
1233 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1234 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1235 } 1653 }
1236 } 1654 }
1237 1655
1238 (\@w, \@h) 1656 (\@w, \@h)
1239} 1657}
… …
1247 (sum @$ws), 1665 (sum @$ws),
1248 (sum @$hs), 1666 (sum @$hs),
1249 ) 1667 )
1250} 1668}
1251 1669
1252sub size_allocate { 1670sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
1254 1672
1255 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1256 1674
1257 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1258 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1259 1677
1260 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1261 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1262 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1263 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1264 1682
1265 # linearly scale sizes
1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1268 1684
1269 CFClient::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1270 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1271 1694
1272 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1273 1697
1274 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1275 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1276 or next;
1277 1700
1278 my $x = 0; 1701 $widget->configure (
1279 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1280 1704 );
1281 for my $c (0 .. $#$row) { 1705 }
1282 my $col_w = $ws->[$c];
1283 1706
1284 if (my $widget = $row->[$c]) { 1707 1
1285 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1286 }
1287 1709
1288 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1289 } 1737 }
1290
1291 $y += $row_h;
1292 } 1738 }
1293 1739
1294} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1295 1742
1296sub find_widget { 1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1297 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1298 1762
1299 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1300 $y -= $self->{y}; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1301 1766
1302 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1303 1769
1304 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1305 $res = $_->find_widget ($x, $y) 1771 }
1306 and return $res; 1772
1307 } 1773 1
1308
1309 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 for (grep $_, @{$self->{children}}) {
1316 $_->draw for grep $_, @$_;
1317 }
1318} 1774}
1319 1775
1320############################################################################# 1776#############################################################################
1321 1777
1322package CFClient::UI::Box; 1778package CFPlus::UI::Box;
1323 1779
1324our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1325 1781
1326sub size_request { 1782sub size_request {
1327 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1328 1786
1329 $self->{vertical} 1787 $self->{vertical}
1330 ? ( 1788 ? (
1331 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1333 ) 1791 )
1334 : ( 1792 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1337 ) 1795 )
1338} 1796}
1339 1797
1340sub size_allocate { 1798sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
1342 1800
1343 my $space = $self->{vertical} ? $h : $w; 1801 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1802 my @children = $self->visible_children;
1345 1803
1346 my @req; 1804 my @req;
1347 1805
1348 if ($self->{homogeneous}) { 1806 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1807 @req = ($space / (@children || 1)) x @children;
1350 } else { 1808 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1809 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1810 my $req = List::Util::sum @req;
1353 1811
1354 if ($req > $space) { 1812 if ($req > $space) {
1355 # ah well, not enough space 1813 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1814 $_ *= $space / $req for @req;
1357 } else { 1815 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1816 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1817
1360 $space = ($space - $req) / $expand; # remaining space to give away 1818 $space = ($space - $req) / $expand; # remaining space to give away
1361 1819
1362 $req[$_] += $space * $children->[$_]{expand} 1820 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1821 for 0 .. $#children;
1364 } 1822 }
1365 } 1823 }
1366 1824
1367 CFClient::UI::harmonize \@req; 1825 CFPlus::UI::harmonize \@req;
1368 1826
1369 my $pos = 0; 1827 my $pos = 0;
1370 for (0 .. $#$children) { 1828 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1829 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1830 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1831
1374 $pos += $alloc; 1832 $pos += $alloc;
1375 } 1833 }
1376 1834
1377 1 1835 1
1378} 1836}
1379 1837
1380############################################################################# 1838#############################################################################
1381 1839
1382package CFClient::UI::HBox; 1840package CFPlus::UI::HBox;
1383 1841
1384our @ISA = CFClient::UI::Box::; 1842our @ISA = CFPlus::UI::Box::;
1385 1843
1386sub new { 1844sub new {
1387 my $class = shift; 1845 my $class = shift;
1388 1846
1389 $class->SUPER::new ( 1847 $class->SUPER::new (
… …
1392 ) 1850 )
1393} 1851}
1394 1852
1395############################################################################# 1853#############################################################################
1396 1854
1397package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1398 1856
1399our @ISA = CFClient::UI::Box::; 1857our @ISA = CFPlus::UI::Box::;
1400 1858
1401sub new { 1859sub new {
1402 my $class = shift; 1860 my $class = shift;
1403 1861
1404 $class->SUPER::new ( 1862 $class->SUPER::new (
… …
1407 ) 1865 )
1408} 1866}
1409 1867
1410############################################################################# 1868#############################################################################
1411 1869
1412package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1413 1871
1414our @ISA = CFClient::UI::DrawBG::; 1872our @ISA = CFPlus::UI::DrawBG::;
1415 1873
1416use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1417 1875
1418sub new { 1876sub new {
1419 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1420 1878
1421 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
… …
1424 #active_bg => none 1882 #active_bg => none
1425 #font => default_font 1883 #font => default_font
1426 #text => initial text 1884 #text => initial text
1427 #markup => initial narkup 1885 #markup => initial narkup
1428 #max_w => maximum pixel width 1886 #max_w => maximum pixel width
1887 #style => 0, # render flags
1429 ellipsise => 3, # end 1888 ellipsise => 3, # end
1430 layout => (new CFClient::Layout), 1889 layout => (new CFPlus::Layout),
1431 fontsize => 1, 1890 fontsize => 1,
1432 align => -1, 1891 align => -1,
1433 valign => -1, 1892 valign => -1,
1434 padding_x => 2, 1893 padding_x => 2,
1435 padding_y => 2, 1894 padding_y => 2,
1436 can_events => 0, 1895 can_events => 0,
1437 %arg 1896 %arg
1438 ); 1897 );
1439 1898
1440 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1442 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout; 1902 $self->{template} = $layout;
1444 } 1903 }
1445 1904
1446 if (exists $self->{markup}) { 1905 if (exists $self->{markup}) {
… …
1450 } 1909 }
1451 1910
1452 $self 1911 $self
1453} 1912}
1454 1913
1455sub escape($) {
1456 local $_ = $_[0];
1457
1458 s/&/&amp;/g;
1459 s/>/&gt;/g;
1460 s/</&lt;/g;
1461
1462 $_
1463}
1464
1465sub update { 1914sub update {
1466 my ($self) = @_; 1915 my ($self) = @_;
1467 1916
1468 delete $self->{texture}; 1917 delete $self->{texture};
1469 $self->SUPER::update; 1918 $self->SUPER::update;
1470} 1919}
1471 1920
1921sub realloc {
1922 my ($self) = @_;
1923
1924 delete $self->{ox};
1925 $self->SUPER::realloc;
1926}
1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1472sub set_text { 1934sub set_text {
1473 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1474 1936
1475 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
1477 1939
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1940 $self->{layout}->set_text ($text);
1480 1941
1942 delete $self->{size_req};
1481 $self->realloc; 1943 $self->realloc;
1482 $self->update; 1944 $self->update;
1483} 1945}
1484 1946
1485sub set_markup { 1947sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1950 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1951 $self->{text} = "M$markup";
1490 1952
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1953 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1954
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1955 $self->{layout}->set_markup ($markup);
1495 1956
1957 delete $self->{size_req};
1496 $self->realloc; 1958 $self->realloc;
1497 $self->update; 1959 $self->update;
1498} 1960}
1499 1961
1500sub size_request { 1962sub size_request {
1501 my ($self) = @_; 1963 my ($self) = @_;
1502 1964
1965 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1966 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1967 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1968 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1969 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1970 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1971
1509 my ($w, $h) = $self->{layout}->size; 1972 my ($w, $h) = $self->{layout}->size;
1510 1973
1511 if (exists $self->{template}) { 1974 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1975 $self->{template}->set_font ($self->{font}) if $self->{font};
1976 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1977 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1978
1515 my ($w2, $h2) = $self->{template}->size; 1979 my ($w2, $h2) = $self->{template}->size;
1516 1980
1517 $w = List::Util::max $w, $w2; 1981 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1982 $h = List::Util::max $h, $h2;
1983 }
1984
1985 [$w, $h]
1519 } 1986 };
1520 1987
1521 ($w, $h) 1988 @{ $self->{size_req} }
1522} 1989}
1523 1990
1991sub baseline_shift {
1992 $_[0]{layout}->descent
1993}
1994
1524sub size_allocate { 1995sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1996 my ($self, $w, $h) = @_;
1526 1997
1998 delete $self->{ox};
1999
1527 delete $self->{texture}; 2000 delete $self->{texture}
2001 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2002
2003 1
1528} 2004}
1529 2005
1530sub set_fontsize { 2006sub set_fontsize {
1531 my ($self, $fontsize) = @_; 2007 my ($self, $fontsize) = @_;
1532 2008
1533 $self->{fontsize} = $fontsize; 2009 $self->{fontsize} = $fontsize;
2010 delete $self->{size_req};
1534 delete $self->{texture}; 2011 delete $self->{texture};
1535 2012
1536 $self->realloc; 2013 $self->realloc;
1537} 2014}
1538 2015
2016sub reconfigure {
2017 my ($self) = @_;
2018
2019 delete $self->{size_req};
2020 delete $self->{texture};
2021
2022 $self->SUPER::reconfigure;
2023}
2024
1539sub _draw { 2025sub _draw {
1540 my ($self) = @_; 2026 my ($self) = @_;
1541 2027
1542 $self->SUPER::_draw; # draw background, if applicable 2028 $self->SUPER::_draw; # draw background, if applicable
1543 2029
1544 my $tex = $self->{texture} ||= do { 2030 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 2031 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2032 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 2033 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2034 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2035 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2036 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 2037
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2038 [$self->{layout}->size]
2039 };
1553 2040
2041 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2042 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2043 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
1557 2045
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
1561 2049
1562 $tex 2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1563 }; 2051 };
1564 2052
1565 glEnable GL_TEXTURE_2D; 2053# unless ($self->{list}) {
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
1567 2055# CFPlus::OpenGL::glNewList $self->{list};
1568 if ($tex->{format} == GL_ALPHA) { 2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1569 glColor @{$self->{fg}}; 2057# CFPlus::OpenGL::glEndList;
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 } 2058# }
2059#
2060# CFPlus::OpenGL::glCallList $self->{list};
1574 2061
1575 glDisable GL_TEXTURE_2D; 2062 $self->{layout}->draw;
1576} 2063}
2064
2065#sub destroy {
2066# my ($self) = @_;
2067#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069#
2070# $self->SUPER::destroy;
2071#}
1577 2072
1578############################################################################# 2073#############################################################################
1579 2074
1580package CFClient::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
1581 2076
1582our @ISA = CFClient::UI::Label::; 2077our @ISA = CFPlus::UI::Label::;
1583 2078
1584use CFClient::OpenGL; 2079use CFPlus::OpenGL;
1585 2080
1586sub new { 2081sub new {
1587 my $class = shift; 2082 my $class = shift;
1588 2083
1589 $class->SUPER::new ( 2084 $class->SUPER::new (
1590 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
1591 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
1592 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
1593 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
1594 can_hover => 1, 2091 can_hover => 1,
1595 can_focus => 1, 2092 can_focus => 1,
1596 valign => 0, 2093 valign => 0,
1597 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0,
1598 #text => ... 2096 #text => ...
2097 #hidden => "*",
1599 @_ 2098 @_
1600 ) 2099 )
1601} 2100}
1602 2101
1603sub _set_text { 2102sub _set_text {
… …
1605 2104
1606 delete $self->{cur_h}; 2105 delete $self->{cur_h};
1607 2106
1608 return if $self->{text} eq $text; 2107 return if $self->{text} eq $text;
1609 2108
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 2109 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 2110 $self->{text} = $text;
1614 2111
1615 $text =~ s/./*/g if $self->{hidden}; 2112 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 2113 $self->{layout}->set_text ("$text ");
2114 delete $self->{size_req};
1617 2115
1618 $self->_emit (changed => $self->{text}); 2116 $self->emit (changed => $self->{text});
2117
2118 $self->realloc;
2119 $self->update;
1619} 2120}
1620 2121
1621sub set_text { 2122sub set_text {
1622 my ($self, $text) = @_; 2123 my ($self, $text) = @_;
1623 2124
1624 $self->{cursor} = length $text; 2125 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 2126 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 2127}
1629 2128
1630sub get_text { 2129sub get_text {
1631 $_[0]{text} 2130 $_[0]{text}
1632} 2131}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 2136 my ($w, $h) = $self->SUPER::size_request;
1638 2137
1639 ($w + 1, $h) # add 1 for cursor 2138 ($w + 1, $h) # add 1 for cursor
1640} 2139}
1641 2140
1642sub key_down { 2141sub invoke_key_down {
1643 my ($self, $ev) = @_; 2142 my ($self, $ev) = @_;
1644 2143
1645 my $mod = $ev->{mod}; 2144 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 2145 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 2146 my $uni = $ev->{unicode};
1648 2147
1649 my $text = $self->get_text; 2148 my $text = $self->get_text;
2149
2150 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1650 2151
1651 if ($uni == 8) { 2152 if ($uni == 8) {
1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2153 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1653 } elsif ($uni == 127) { 2154 } elsif ($uni == 127) {
1654 substr $text, $self->{cursor}, 1, ""; 2155 substr $text, $self->{cursor}, 1, "";
1655 } elsif ($sym == CFClient::SDLK_LEFT) { 2156 } elsif ($sym == CFPlus::SDLK_LEFT) {
1656 --$self->{cursor} if $self->{cursor}; 2157 --$self->{cursor} if $self->{cursor};
1657 } elsif ($sym == CFClient::SDLK_RIGHT) { 2158 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1658 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2159 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1659 } elsif ($sym == CFClient::SDLK_HOME) { 2160 } elsif ($sym == CFPlus::SDLK_HOME) {
2161 # what a hack
2162 $self->{cursor} =
2163 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2164 ? length $1
2165 : 0;
2166 } elsif ($sym == CFPlus::SDLK_END) {
2167 # uh, again
2168 $self->{cursor} =
2169 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2170 ? $self->{cursor} + length $1
2171 : length $self->{text};
2172 } elsif ($uni == 21) { # ctrl-u
2173 $text = "";
1660 $self->{cursor} = 0; 2174 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 2175 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 2176 $self->emit ('escape');
1665 } elsif ($uni) { 2177 } elsif ($uni == 0x0d) {
2178 substr $text, $self->{cursor}++, 0, "\012";
2179 } elsif ($uni >= 0x20) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 2180 substr $text, $self->{cursor}++, 0, chr $uni;
2181 } else {
2182 return 0;
1667 } 2183 }
1668 2184
1669 $self->_set_text ($text); 2185 $self->_set_text ($text);
1670 2186
1671 $self->realloc; 2187 $self->realloc;
1672} 2188 $self->update;
1673 2189
2190 1
2191}
2192
1674sub focus_in { 2193sub invoke_focus_in {
1675 my ($self) = @_; 2194 my ($self) = @_;
1676 2195
1677 $self->{last_activity} = $::NOW; 2196 $self->{last_activity} = $::NOW;
1678 2197
1679 $self->SUPER::focus_in; 2198 $self->SUPER::invoke_focus_in
1680} 2199}
1681 2200
1682sub button_down { 2201sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2202 my ($self, $ev, $x, $y) = @_;
1684 2203
1685 $self->SUPER::button_down ($ev, $x, $y); 2204 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 2205
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 2206 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 2207
1689 # byte-index to char-index 2208 # byte-index to char-index
1690 my $text = $self->{text}; 2209 my $text = $self->{text};
1691 utf8::encode $text; 2210 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 2211 $self->{cursor} = length $text;
1693 2212
1694 $self->_set_text ($self->{text}); 2213 $self->_set_text ($self->{text});
1695 $self->update; 2214 $self->update;
2215
2216 1
1696} 2217}
1697 2218
1698sub mouse_motion { 2219sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 2220 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2221# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2222
2223 1
1701} 2224}
1702 2225
1703sub _draw { 2226sub _draw {
1704 my ($self) = @_; 2227 my ($self) = @_;
1705 2228
1706 local $self->{fg} = $self->{fg}; 2229 local $self->{fg} = $self->{fg};
1707 2230
1708 if ($FOCUS == $self) { 2231 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 2232 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 2233 $self->{fg} = $self->{active_fg};
1711 } else { 2234 } else {
1712 glColor @{$self->{bg}}; 2235 glColor_premultiply @{$self->{bg}};
1713 } 2236 }
1714 2237
1715 glEnable GL_BLEND; 2238 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 2240 glBegin GL_QUADS;
1718 glVertex 0 , 0; 2241 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 2242 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 2243 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 2244 glVertex $self->{w}, 0;
… …
1729 2252
1730 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
1731 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
1732 utf8::encode $text; 2255 utf8::encode $text;
1733 2256
1734 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1735 } 2258 }
1736 2259
1737 glColor @{$self->{fg}}; 2260 glColor_premultiply @{$self->{active_fg}};
1738 glBegin GL_LINES; 2261 glBegin GL_LINES;
1739 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1740 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1741 glEnd; 2264 glEnd;
1742 }
1743}
1744 2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2284 glEnd;
2285 }
2286}
2287
2288#############################################################################
2289
1745package CFClient::UI::Entry; 2290package CFPlus::UI::Entry;
1746 2291
1747our @ISA = CFClient::UI::EntryBase::; 2292our @ISA = CFPlus::UI::EntryBase::;
1748 2293
1749use CFClient::OpenGL; 2294use CFPlus::OpenGL;
1750 2295
1751sub key_down { 2296sub invoke_key_down {
1752 my ($self, $ev) = @_; 2297 my ($self, $ev) = @_;
1753 2298
1754 my $sym = $ev->{sym}; 2299 my $sym = $ev->{sym};
1755 2300
1756 if ($sym == 13) { 2301 if ($ev->{uni} == 0x0d || $sym == 13) {
1757 unshift @{$self->{history}}, 2302 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 2303 my $txt = $self->get_text;
2304
1759 $self->{history_pointer} = -1; 2305 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 2306 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 2307 $self->emit (activate => $txt);
1762 $self->update; 2308 $self->update;
1763 2309
1764 } elsif ($sym == CFClient::SDLK_UP) { 2310 } elsif ($sym == CFPlus::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 2311 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 2312 $self->{history_saveback} = $self->get_text;
1767 } 2313 }
1768 if (@{$self->{history} || []} > 0) { 2314 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++; 2315 $self->{history_pointer}++;
… …
1771 $self->{history_pointer} = @{$self->{history} || []} - 1; 2317 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 } 2318 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } 2320 }
1775 2321
1776 } elsif ($sym == CFClient::SDLK_DOWN) { 2322 } elsif ($sym == CFPlus::SDLK_DOWN) {
1777 $self->{history_pointer}--; 2323 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2324 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779 2325
1780 if ($self->{history_pointer} >= 0) { 2326 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2327 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else { 2328 } else {
1783 $self->set_text ($self->{history_saveback}); 2329 $self->set_text ($self->{history_saveback});
1784 } 2330 }
1785 2331
1786 } else { 2332 } else {
1787 $self->SUPER::key_down ($ev); 2333 return $self->SUPER::invoke_key_down ($ev)
2334 }
2335
1788 } 2336 1
1789
1790} 2337}
1791 2338
1792############################################################################# 2339#############################################################################
1793 2340
2341package CFPlus::UI::TextEdit;
2342
2343our @ISA = CFPlus::UI::EntryBase::;
2344
2345use CFPlus::OpenGL;
2346
2347sub move_cursor_ver {
2348 my ($self, $dy) = @_;
2349
2350 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2351
2352 $y += $dy;
2353
2354 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2355 $self->{cursor} = $index;
2356 delete $self->{cur_h};
2357 $self->update;
2358 return;
2359 }
2360}
2361
2362sub invoke_key_down {
2363 my ($self, $ev) = @_;
2364
2365 my $sym = $ev->{sym};
2366
2367 if ($sym == CFPlus::SDLK_UP) {
2368 $self->move_cursor_ver (-1);
2369 } elsif ($sym == CFPlus::SDLK_DOWN) {
2370 $self->move_cursor_ver (+1);
2371 } else {
2372 return $self->SUPER::invoke_key_down ($ev)
2373 }
2374
2375 1
2376}
2377
2378#############################################################################
2379
1794package CFClient::UI::Button; 2380package CFPlus::UI::ButtonBin;
1795 2381
1796our @ISA = CFClient::UI::Label::; 2382our @ISA = CFPlus::UI::Bin::;
1797 2383
1798use CFClient::OpenGL; 2384use CFPlus::OpenGL;
1799 2385
1800my @tex = 2386my @tex =
1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1802 qw(b1_button_active.png); 2388 qw(b1_button_inactive.png b1_button_active.png);
1803 2389
1804sub new { 2390sub new {
1805 my $class = shift; 2391 my $class = shift;
1806 2392
1807 $class->SUPER::new ( 2393 $class->SUPER::new (
1808 padding_x => 4,
1809 padding_y => 4,
1810 fg => [1, 1, 1],
1811 active_fg => [0, 0, 1],
1812 can_hover => 1, 2394 can_hover => 1,
1813 align => 0, 2395 align => 0,
1814 valign => 0, 2396 valign => 0,
1815 can_events => 1, 2397 can_events => 1,
1816 @_ 2398 @_
1817 ) 2399 )
1818} 2400}
1819 2401
1820sub activate { }
1821
1822sub button_up { 2402sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2403 my ($self, $ev, $x, $y) = @_;
1824 2404
1825 $self->emit ("activate") 2405 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2406 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2407 && $y >= 0 && $y < $self->{h};
2408
2409 1
1828} 2410}
1829 2411
1830sub _draw { 2412sub _draw {
1831 my ($self) = @_; 2413 my ($self) = @_;
1832
1833 local $self->{fg} = $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2414
1839 glEnable GL_TEXTURE_2D; 2415 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2417 glColor 0, 0, 0, 1;
1842 2418
2419 my $tex = $tex[$GRAB == $self];
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 2421
1845 glDisable GL_TEXTURE_2D; 2422 glDisable GL_TEXTURE_2D;
1846 2423
1847 $self->SUPER::_draw; 2424 $self->SUPER::_draw;
1848} 2425}
1849 2426
1850############################################################################# 2427#############################################################################
1851 2428
1852package CFClient::UI::CheckBox; 2429package CFPlus::UI::Button;
1853 2430
1854our @ISA = CFClient::UI::DrawBG::; 2431our @ISA = CFPlus::UI::Label::;
2432
2433use CFPlus::OpenGL;
1855 2434
1856my @tex = 2435my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2437 qw(b1_button_inactive.png b1_button_active.png);
2438
2439sub new {
2440 my $class = shift;
2441
2442 $class->SUPER::new (
2443 padding_x => 4,
2444 padding_y => 4,
2445 fg => [1.0, 1.0, 1.0],
2446 active_fg => [0.8, 0.8, 0.8],
2447 can_hover => 1,
2448 align => 0,
2449 valign => 0,
2450 can_events => 1,
2451 @_
2452 )
2453}
2454
2455sub invoke_button_up {
2456 my ($self, $ev, $x, $y) = @_;
2457
2458 $self->emit ("activate")
2459 if $x >= 0 && $x < $self->{w}
2460 && $y >= 0 && $y < $self->{h};
2461
2462 1
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2469
2470 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 0, 0, 0, 1;
2473
2474 my $tex = $tex[$GRAB == $self];
2475 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2476
2477 glDisable GL_TEXTURE_2D;
2478
2479 $self->SUPER::_draw;
2480}
2481
2482#############################################################################
2483
2484package CFPlus::UI::CheckBox;
2485
2486our @ISA = CFPlus::UI::DrawBG::;
2487
2488my @tex =
2489 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2490 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859 2491
1860use CFClient::OpenGL; 2492use CFPlus::OpenGL;
1861 2493
1862sub new { 2494sub new {
1863 my $class = shift; 2495 my $class = shift;
1864 2496
1865 $class->SUPER::new ( 2497 $class->SUPER::new (
… …
1879 my ($self) = @_; 2511 my ($self) = @_;
1880 2512
1881 (6) x 2 2513 (6) x 2
1882} 2514}
1883 2515
2516sub toggle {
2517 my ($self) = @_;
2518
2519 $self->{state} = !$self->{state};
2520 $self->emit (changed => $self->{state});
2521 $self->update;
2522}
2523
1884sub button_down { 2524sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
1886 2526
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2527 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2528 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2529 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2530 } else {
2531 return 0
2532 }
2533
1891 } 2534 1
1892} 2535}
1893 2536
1894sub _draw { 2537sub _draw {
1895 my ($self) = @_; 2538 my ($self) = @_;
1896 2539
… …
1911 glDisable GL_TEXTURE_2D; 2554 glDisable GL_TEXTURE_2D;
1912} 2555}
1913 2556
1914############################################################################# 2557#############################################################################
1915 2558
1916package CFClient::UI::Image; 2559package CFPlus::UI::Image;
1917 2560
1918our @ISA = CFClient::UI::Base::; 2561our @ISA = CFPlus::UI::Base::;
1919 2562
1920use CFClient::OpenGL; 2563use CFPlus::OpenGL;
1921use Carp qw/confess/;
1922 2564
1923our %loaded_images; 2565our %texture_cache;
1924 2566
1925sub new { 2567sub new {
1926 my $class = shift; 2568 my $class = shift;
1927 2569
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2570 my $self = $class->SUPER::new (
2571 can_events => 0,
2572 scale => 1,
2573 @_,
2574 );
1929 2575
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2576 $self->{path} || $self->{tex}
2577 or Carp::croak "'path' or 'tex' attributes required";
1931 2578
1932 $loaded_images{$self->{image}} ||= 2579 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2580 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1934 2581
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2582 CFPlus::weaken $texture_cache{$self->{path}};
1936 2583
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2584 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2585
1941 $self 2586 $self
1942} 2587}
1943 2588
2589sub STORABLE_freeze {
2590 my ($self, $cloning) = @_;
2591
2592 $self->{path}
2593 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2594
2595 $self->{path}
2596}
2597
2598sub STORABLE_attach {
2599 my ($self, $cloning, $path) = @_;
2600
2601 $self->new (path => $path)
2602}
2603
1944sub size_request { 2604sub size_request {
1945 my ($self) = @_; 2605 my ($self) = @_;
1946 2606
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1948} 2608}
1949 2609
1950sub _draw { 2610sub _draw {
1951 my ($self) = @_; 2611 my ($self) = @_;
1952 2612
… …
1969 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
1970} 2630}
1971 2631
1972############################################################################# 2632#############################################################################
1973 2633
2634package CFPlus::UI::ImageButton;
2635
2636our @ISA = CFPlus::UI::Image::;
2637
2638use CFPlus::OpenGL;
2639
2640my %textures;
2641
2642sub new {
2643 my $class = shift;
2644
2645 my $self = $class->SUPER::new (
2646 padding_x => 4,
2647 padding_y => 4,
2648 fg => [1, 1, 1],
2649 active_fg => [0, 0, 1],
2650 can_hover => 1,
2651 align => 0,
2652 valign => 0,
2653 can_events => 1,
2654 @_
2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2662}
2663
2664sub invoke_button_up {
2665 my ($self, $ev, $x, $y) = @_;
2666
2667 $self->emit ("activate")
2668 if $x >= 0 && $x < $self->{w}
2669 && $y >= 0 && $y < $self->{h};
2670
2671 1
2672}
2673
2674#############################################################################
2675
1974package CFClient::UI::VGauge; 2676package CFPlus::UI::VGauge;
1975 2677
1976our @ISA = CFClient::UI::Base::; 2678our @ISA = CFPlus::UI::Base::;
1977 2679
1978use List::Util qw(min max); 2680use List::Util qw(min max);
1979 2681
1980use CFClient::OpenGL; 2682use CFPlus::OpenGL;
1981 2683
1982my %tex = ( 2684my %tex = (
1983 food => [ 2685 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2686 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2687 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ], 2688 ],
1987 grace => [ 2689 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2690 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1989 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2691 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ], 2692 ],
1991 hp => [ 2693 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2694 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2695 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ], 2696 ],
1995 mana => [ 2697 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2698 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1997 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2699 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ], 2700 ],
1999); 2701);
2000 2702
2001# eg. VGauge->new (gauge => 'food'), default gauge: food 2703# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2763 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2764 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2765
2064 my $h1 = $self->{h} * (1 - $ycut1); 2766 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2767 my $h2 = $self->{h} * (1 - $ycut2);
2768 my $h3 = $self->{h};
2769
2770 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2771
2067 glEnable GL_BLEND; 2772 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2773 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2774 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2775 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2777
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2778 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2779 glBegin GL_QUADS;
… …
2088 2794
2089 if ($t3) { 2795 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2796 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2797 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2798 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2799 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2800 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2801 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2802 glEnd;
2097 } 2803 }
2098 2804
2099 glDisable GL_BLEND; 2805 glDisable GL_BLEND;
2100 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2101} 2807}
2102 2808
2103############################################################################# 2809#############################################################################
2104 2810
2105package CFClient::UI::Gauge; 2811package CFPlus::UI::Gauge;
2106 2812
2107our @ISA = CFClient::UI::VBox::; 2813our @ISA = CFPlus::UI::VBox::;
2108 2814
2109sub new { 2815sub new {
2110 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2111 2817
2112 my $self = $class->SUPER::new ( 2818 my $self = $class->SUPER::new (
… …
2114 can_hover => 1, 2820 can_hover => 1,
2115 can_events => 1, 2821 can_events => 1,
2116 %arg, 2822 %arg,
2117 ); 2823 );
2118 2824
2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2825 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2826 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2827 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2122 2828
2123 $self 2829 $self
2124} 2830}
2125 2831
2126sub set_fontsize { 2832sub set_fontsize {
… …
2147 $self->{value}->set_text ($val); 2853 $self->{value}->set_text ($val);
2148} 2854}
2149 2855
2150############################################################################# 2856#############################################################################
2151 2857
2152package CFClient::UI::Slider; 2858package CFPlus::UI::Slider;
2153 2859
2154use strict; 2860use strict;
2155 2861
2156use CFClient::OpenGL; 2862use CFPlus::OpenGL;
2157 2863
2158our @ISA = CFClient::UI::DrawBG::; 2864our @ISA = CFPlus::UI::DrawBG::;
2159 2865
2160my @tex = 2866my @tex =
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2867 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2162 qw(s1_slider.png s1_slider_bg.png); 2868 qw(s1_slider.png s1_slider_bg.png);
2163 2869
2164sub new { 2870sub new {
2165 my $class = shift; 2871 my $class = shift;
2166 2872
… …
2187 $self->update; 2893 $self->update;
2188 2894
2189 $self 2895 $self
2190} 2896}
2191 2897
2192sub changed { }
2193
2194sub set_range { 2898sub set_range {
2195 my ($self, $range) = @_; 2899 my ($self, $range) = @_;
2196 2900
2197 ($range, $self->{range}) = ($self->{range}, $range); 2901 ($range, $self->{range}) = ($self->{range}, $range);
2198 2902
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2903 if ("@$range" ne "@{$self->{range}}") {
2904 $self->update;
2905 $self->set_value ($self->{range}[0]);
2906 }
2201} 2907}
2202 2908
2203sub set_value { 2909sub set_value {
2204 my ($self, $value) = @_; 2910 my ($self, $value) = @_;
2205 2911
… …
2216 if $unit; 2922 if $unit;
2217 2923
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2924 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2925
2220 if ($value != $old_value) { 2926 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2927 $self->emit (changed => $value);
2222 $self->update; 2928 $self->update;
2223 } 2929 }
2224} 2930}
2225 2931
2226sub size_request { 2932sub size_request {
2227 my ($self) = @_; 2933 my ($self) = @_;
2228 2934
2229 ($self->{req_w}, $self->{req_h}) 2935 ($self->{req_w}, $self->{req_h})
2230} 2936}
2231 2937
2232sub button_down { 2938sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2234 2940
2235 $self->SUPER::button_down ($ev, $x, $y); 2941 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2942
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2943 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2944
2239 $self->mouse_motion ($ev, $x, $y); 2945 $self->invoke_mouse_motion ($ev, $x, $y);
2240}
2241 2946
2947 1
2948}
2949
2242sub mouse_motion { 2950sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2951 my ($self, $ev, $x, $y) = @_;
2244 2952
2245 if ($GRAB == $self) { 2953 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2954 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2955
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2956 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2957
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2958 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2959
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2960 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2961 } else {
2962 return 0;
2963 }
2964
2253 } 2965 1
2966}
2967
2968sub invoke_mouse_wheel {
2969 my ($self, $ev) = @_;
2970
2971 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2972
2973 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2974
2975 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2976
2977 1
2254} 2978}
2255 2979
2256sub update { 2980sub update {
2257 my ($self) = @_; 2981 my ($self) = @_;
2258 2982
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2983 delete $self->{knob_w};
2984 $self->SUPER::update;
2985}
2986
2987sub _draw {
2988 my ($self) = @_;
2989
2990 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2991 $self->set_value ($self->{range}[0]);
2261 2992
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2993 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2994 my $range = ($hi - $page - $lo) || 1e-100;
2264 2995
… …
2270 $value = ($value - $lo) / $range; 3001 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 3002 $value = $value * $self->{scale} + $self->{offset};
2272 3003
2273 $self->{knob_x} = $value - $knob_w * 0.5; 3004 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 3005 $self->{knob_w} = $knob_w;
2275 }); 3006 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 3007
2283 $self->SUPER::_draw (); 3008 $self->SUPER::_draw ();
2284 3009
2285 glScale $self->{w}, $self->{h}; 3010 glScale $self->{w}, $self->{h};
2286 3011
… …
2306 glDisable GL_TEXTURE_2D; 3031 glDisable GL_TEXTURE_2D;
2307} 3032}
2308 3033
2309############################################################################# 3034#############################################################################
2310 3035
2311package CFClient::UI::ValSlider; 3036package CFPlus::UI::ValSlider;
2312 3037
2313our @ISA = CFClient::UI::HBox::; 3038our @ISA = CFPlus::UI::HBox::;
2314 3039
2315sub new { 3040sub new {
2316 my ($class, %arg) = @_; 3041 my ($class, %arg) = @_;
2317 3042
2318 my $range = delete $arg{range}; 3043 my $range = delete $arg{range};
2319 3044
2320 my $self = $class->SUPER::new ( 3045 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3046 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3047 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift }, 3048 to_value => sub { shift },
2324 from_value => sub { shift }, 3049 from_value => sub { shift },
2325 %arg, 3050 %arg,
2326 ); 3051 );
2327 3052
… …
2347sub set_range { shift->{slider}->set_range (@_) } 3072sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 3073sub set_value { shift->{slider}->set_value (@_) }
2349 3074
2350############################################################################# 3075#############################################################################
2351 3076
2352package CFClient::UI::TextView; 3077package CFPlus::UI::TextScroller;
2353 3078
2354our @ISA = CFClient::UI::HBox::; 3079our @ISA = CFPlus::UI::HBox::;
2355 3080
2356use CFClient::OpenGL; 3081use CFPlus::OpenGL;
2357 3082
2358sub new { 3083sub new {
2359 my $class = shift; 3084 my $class = shift;
2360 3085
2361 my $self = $class->SUPER::new ( 3086 my $self = $class->SUPER::new (
2362 fontsize => 1, 3087 fontsize => 1,
2363 can_events => 0, 3088 can_events => 1,
3089 indent => 0,
2364 #font => default_font 3090 #font => default_font
2365 @_, 3091 @_,
2366 3092
2367 layout => (new CFClient::Layout 1), 3093 layout => (new CFPlus::Layout),
2368 par => [], 3094 par => [],
3095 max_par => 0,
2369 height => 0, 3096 height => 0,
2370 children => [ 3097 children => [
2371 (new CFClient::UI::Empty expand => 1), 3098 (new CFPlus::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 3099 (new CFPlus::UI::Slider vertical => 1),
2373 ], 3100 ],
2374 ); 3101 );
2375 3102
2376 $self->{children}[1]->connect (changed => sub { $self->update }); 3103 $self->{children}[1]->connect (changed => sub { $self->update });
2377 3104
… …
2383 3110
2384 $self->{fontsize} = $fontsize; 3111 $self->{fontsize} = $fontsize;
2385 $self->reflow; 3112 $self->reflow;
2386} 3113}
2387 3114
3115sub size_request {
3116 my ($self) = @_;
3117
3118 my ($empty, $slider) = $self->visible_children;
3119
3120 local $self->{children} = [$empty, $slider];
3121 $self->SUPER::size_request
3122}
3123
2388sub size_allocate { 3124sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 3125 my ($self, $w, $h) = @_;
2390 3126
2391 $self->SUPER::size_allocate ($w, $h); 3127 my ($empty, $slider, @other) = @{ $self->{children} };
3128 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 3129
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3130 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3131 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 3132 $self->{layout}->set_width ($empty->{w});
3133 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 3134
2397 $self->reflow; 3135 $self->reflow;
2398}
2399 3136
2400sub text_size { 3137 local $self->{children} = [$empty, $slider];
3138 $self->SUPER::invoke_size_allocate ($w, $h)
3139}
3140
3141sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 3142 my ($self, $ev) = @_;
3143
3144 return 0 unless $ev->{dy}; # only vertical movements
3145
3146 $self->{children}[1]->emit (mouse_wheel => $ev);
3147
3148 1
3149}
3150
3151sub get_layout {
3152 my ($self, $para) = @_;
2402 3153
2403 my $layout = $self->{layout}; 3154 my $layout = $self->{layout};
2404 3155
3156 $layout->set_font ($self->{font}) if $self->{font};
3157 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3158 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 3159 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3160 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 3161 $layout->set_markup ($para->{markup});
3162
3163 $layout->set_shapes (
3164 map
3165 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3166 @{$para->{widget}}
2408 3167 );
3168
2409 $layout->size 3169 $layout
2410} 3170}
2411 3171
2412sub reflow { 3172sub reflow {
2413 my ($self) = @_; 3173 my ($self) = @_;
2414 3174
… …
2421 3181
2422 # todo: base offset on lines or so, not on pixels 3182 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset); 3183 $self->{children}[1]->set_value ($offset);
2424} 3184}
2425 3185
3186sub current_paragraph {
3187 my ($self) = @_;
3188
3189 $self->{top_paragraph} - 1
3190}
3191
3192sub scroll_to {
3193 my ($self, $para) = @_;
3194
3195 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3196
3197 $self->{scroll_to} = $para;
3198 $self->update;
3199}
3200
2426sub clear { 3201sub clear {
2427 my ($self) = @_; 3202 my ($self) = @_;
3203
3204 my (undef, undef, @other) = @{ $self->{children} };
3205 $self->remove ($_) for @other;
2428 3206
2429 $self->{par} = []; 3207 $self->{par} = [];
2430 $self->{height} = 0; 3208 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3209 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 3210}
2433 3211
2434sub add_paragraph { 3212sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 3213 my $self = shift;
2436 3214
2437 for my $line (split /\n/, $text) { 3215 for my $para (@_) {
2438 my ($w, $h) = $self->text_size ($line); 3216 $para = {
3217 fg => [1, 1, 1, 1],
3218 indent => 0,
3219 markup => "",
3220 widget => [],
3221 ref $para ? %$para : (markup => $para),
3222 w => 1e10,
3223 wrapped => 1,
3224 };
3225
3226 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3227 push @{$self->{par}}, $para;
3228 }
3229
3230 if (my $max = $self->{max_par}) {
3231 shift @{$self->{par}} while @{$self->{par}} > $max;
3232 }
3233
3234 $self->{need_reflow}++;
3235 $self->update;
3236}
3237
3238sub scroll_to_bottom {
3239 my ($self) = @_;
3240
3241 $self->{scroll_to} = $#{$self->{par}};
3242 $self->update;
3243}
3244
3245sub force_uptodate {
3246 my ($self) = @_;
3247
3248 if (delete $self->{need_reflow}) {
3249 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3250
3251 my $height = 0;
3252
3253 for my $para (@{$self->{par}}) {
3254 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3255 my $layout = $self->get_layout ($para);
3256 my ($w, $h) = $layout->size;
3257
3258 $para->{w} = $w + $para->{indent};
3259 $para->{h} = $h;
3260 $para->{wrapped} = $layout->has_wrapped;
3261 }
3262
3263 $para->{y} = $height;
3264 $height += $para->{h};
3265 }
3266
2439 $self->{height} += $h; 3267 $self->{height} = $height;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3268 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441 }
2442 3269
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3270 delete $self->{texture};
3271 }
3272
3273 if (my $paridx = delete $self->{scroll_to}) {
3274 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3275 }
2444} 3276}
2445 3277
2446sub update { 3278sub update {
2447 my ($self) = @_; 3279 my ($self) = @_;
2448 3280
… …
2450 3282
2451 return unless $self->{h} > 0; 3283 return unless $self->{h} > 0;
2452 3284
2453 delete $self->{texture}; 3285 delete $self->{texture};
2454 3286
2455 $ROOT->on_post_alloc ($self, sub { 3287 $ROOT->on_post_alloc ($self => sub {
3288 $self->force_uptodate;
3289
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3290 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 3291
2458 if (delete $self->{need_reflow}) {
2459 my $height = 0;
2460
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
2476
2477 $self->{height} = $height;
2478
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480
2481 delete $self->{texture};
2482 }
2483
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3292 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 3293 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 3294 glClear GL_COLOR_BUFFER_BIT;
2487 3295
3296 package CFPlus::UI::Base;
3297 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3298 (0, 0, $self->{w}, $self->{h});
3299
3300 my $top = int $self->{children}[1]{range}[0];
3301
3302 my $paridx = 0;
3303 my $top_paragraph;
2488 my $top = int $self->{children}[1]{range}[0]; 3304 my $top = int $self->{children}[1]{range}[0];
2489 3305
2490 my $y0 = $top; 3306 my $y0 = $top;
2491 my $y1 = $top + $H; 3307 my $y1 = $top + $H;
2492 3308
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 3309 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 3310 my $h = $para->{h};
3311 my $y = $para->{y};
2505 3312
2506 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 3314 my $layout = $self->get_layout ($para);
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 3315
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
2512 3318
2513 glRasterPos $par->[3], $y - $y0; 3319 if (my @w = @{ $para->{widget} }) {
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3320 my @s = $layout->get_shapes;
3321
3322 for (@w) {
3323 my ($dx, $dy) = splice @s, 0, 2, ();
3324
3325 $_->{x} = $dx + $para->{indent};
3326 $_->{y} = $dy + $y - $y0;
3327
3328 $_->draw;
3329 }
3330 }
2515 } 3331 }
2516 3332
2517 $y += $h; 3333 $paridx++;
3334 $top_paragraph ||= $paridx if $y >= $top;
2518 } 3335 }
2519 3336
2520 glDisable GL_BLEND; 3337 $self->{top_paragraph} = $top_paragraph;
2521 }; 3338 };
2522 }); 3339 });
2523} 3340}
2524 3341
3342sub reconfigure {
3343 my ($self) = @_;
3344
3345 $self->SUPER::reconfigure;
3346
3347 $_->{w} = 1e10 for @{ $self->{par} };
3348 $self->reflow;
3349}
3350
2525sub _draw { 3351sub _draw {
2526 my ($self) = @_; 3352 my ($self) = @_;
2527 3353
2528 glEnable GL_TEXTURE_2D; 3354 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3355 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 3356 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3357 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 3358 glDisable GL_TEXTURE_2D;
2533 3359
2534 $self->{children}[1]->draw; 3360 $self->{children}[1]->draw;
2535
2536} 3361}
2537 3362
2538############################################################################# 3363#############################################################################
2539 3364
2540package CFClient::UI::Animator; 3365package CFPlus::UI::Animator;
2541 3366
2542use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2543 3368
2544our @ISA = CFClient::UI::Bin::; 3369our @ISA = CFPlus::UI::Bin::;
2545 3370
2546sub moveto { 3371sub moveto {
2547 my ($self, $x, $y) = @_; 3372 my ($self, $x, $y) = @_;
2548 3373
2549 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3374 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2577 glPopMatrix; 3402 glPopMatrix;
2578} 3403}
2579 3404
2580############################################################################# 3405#############################################################################
2581 3406
2582package CFClient::UI::Flopper; 3407package CFPlus::UI::Flopper;
2583 3408
2584our @ISA = CFClient::UI::Button::; 3409our @ISA = CFPlus::UI::Button::;
2585 3410
2586sub new { 3411sub new {
2587 my $class = shift; 3412 my $class = shift;
2588 3413
2589 my $self = $class->SUPER::new ( 3414 my $self = $class->SUPER::new (
… …
2601 $self->{other}->toggle_visibility; 3426 $self->{other}->toggle_visibility;
2602} 3427}
2603 3428
2604############################################################################# 3429#############################################################################
2605 3430
2606package CFClient::UI::Tooltip; 3431package CFPlus::UI::Tooltip;
2607 3432
2608our @ISA = CFClient::UI::Bin::; 3433our @ISA = CFPlus::UI::Bin::;
2609 3434
2610use CFClient::OpenGL; 3435use CFPlus::OpenGL;
2611 3436
2612sub new { 3437sub new {
2613 my $class = shift; 3438 my $class = shift;
2614 3439
2615 $class->SUPER::new ( 3440 $class->SUPER::new (
… …
2618 ) 3443 )
2619} 3444}
2620 3445
2621sub set_tooltip_from { 3446sub set_tooltip_from {
2622 my ($self, $widget) = @_; 3447 my ($self, $widget) = @_;
3448
3449 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3450 if $widget->{tooltip} =~ /^#(.*)$/;
2623 3451
2624 my $tooltip = $widget->{tooltip}; 3452 my $tooltip = $widget->{tooltip};
2625 3453
2626 if ($ENV{CFPLUS_DEBUG} & 2) { 3454 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 3455 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3456 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 3457 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 3458 . "visible $widget->{visible}";
2631 } 3459 }
2632 3460
3461 $tooltip =~ s/^\n+//;
3462 $tooltip =~ s/\n+$//;
3463
2633 $self->add (new CFClient::UI::Label 3464 $self->add (new CFPlus::UI::Label
2634 markup => $tooltip, 3465 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3466 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 3467 fontsize => 0.8,
2637 fg => [0, 0, 0, 1], 3468 style => 1, # FLAG_INVERSE
2638 ellipsise => 0, 3469 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP), 3470 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 ); 3471 );
2641} 3472}
2642 3473
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3477 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 3478
2648 ($w + 4, $h + 4) 3479 ($w + 4, $h + 4)
2649} 3480}
2650 3481
2651sub size_allocate { 3482sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 3483 my ($self, $w, $h) = @_;
2653 3484
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 3485 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 3486}
2656 3487
2657sub visibility_change { 3488sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 3489 my ($self, $visible) = @_;
2659 3490
2660 return unless $visible; 3491 return unless $visible;
2661 3492
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 3493 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner} 3494 my $widget = $self->{owner}
2664 or return; 3495 or return;
2665 3496
3497 if ($widget->{visible}) {
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3498 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 3499
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3500 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 3501 if $x + $self->{w} > $self->{root}{w};
2670 3502
2671 $self->move_abs ($x, $y); 3503 $self->move_abs ($x, $y);
3504 } else {
3505 $self->hide;
3506 }
2672 }); 3507 });
2673} 3508}
2674 3509
2675sub _draw { 3510sub _draw {
2676 my ($self) = @_; 3511 my ($self) = @_;
… …
2678 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
2679 3514
2680 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
2681 3516
2682 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
2683 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
2684 glVertex 0 , 0;
2685 glVertex 0 , $h;
2686 glVertex $w, $h;
2687 glVertex $w, 0;
2688 glEnd;
2689 3519
2690 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
2691 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
2692 glVertex 0 , 0; 3522 glVertex 0 , 0;
2693 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
2700 $self->SUPER::_draw; 3530 $self->SUPER::_draw;
2701} 3531}
2702 3532
2703############################################################################# 3533#############################################################################
2704 3534
2705package CFClient::UI::Face; 3535package CFPlus::UI::Face;
2706 3536
2707our @ISA = CFClient::UI::Base::; 3537our @ISA = CFPlus::UI::DrawBG::;
2708 3538
2709use CFClient::OpenGL; 3539use CFPlus::OpenGL;
2710 3540
2711sub new { 3541sub new {
2712 my $class = shift; 3542 my $class = shift;
2713 3543
2714 my $self = $class->SUPER::new ( 3544 my $self = $class->SUPER::new (
3545 size_w => 32,
3546 size_h => 8,
2715 aspect => 1, 3547 aspect => 1,
2716 can_events => 0, 3548 can_events => 0,
2717 @_, 3549 @_,
2718 ); 3550 );
2719 3551
2720 if ($self->{anim} && $self->{animspeed}) { 3552 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self); 3553 CFPlus::weaken (my $widget = $self);
2722 3554
3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2723 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1, 3558 parked => 1,
2726 interval => $self->{animspeed},
2727 cb => sub { 3559 cb => sub {
3560 return unless $::CONN;
3561
3562 my $w = $widget
3563 or return;
3564
2728 ++$widget->{frame}; 3565 ++$w->{frame};
3566 $w->update_face;
3567
3568 # somehow, $widget can go away
2729 $widget->update; 3569 $w->update;
3570 $w->update_timer;
2730 }, 3571 },
2731 ); 3572 );
3573
3574 $self->update_face;
3575 $self->update_timer;
2732 } 3576 }
2733 3577
2734 $self 3578 $self
2735} 3579}
2736 3580
3581sub update_timer {
3582 my ($self) = @_;
3583
3584 return unless $self->{timer};
3585
3586 if ($self->{visible}) {
3587 $self->{timer}->at (
3588 $self->{anim_start}
3589 + $self->{animspeed}
3590 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3591 );
3592 $self->{timer}->start;
3593 } else {
3594 $self->{timer}->stop;
3595 }
3596}
3597
3598sub update_face {
3599 my ($self) = @_;
3600
3601 if ($::CONN) {
3602 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3603 if ($anim && @$anim) {
3604 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3605 delete $self->{face_change_cb};
3606
3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3611 }
3612 }
3613 }
3614 }
3615}
3616
2737sub size_request { 3617sub size_request {
2738 (32, 8) 3618 my ($self) = @_;
3619
3620 if ($::CONN) {
3621 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3622 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3623 if ($tex->{name}) {
3624 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3625 } elsif (!$tex->{loading}) {
3626 $tex->upload (sub { $self->reconfigure });
3627 }
3628 }
3629
3630 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3631 }
3632 }
3633
3634 ($self->{size_w} || 8, $self->{size_h} || 8)
2739} 3635}
2740 3636
2741sub update { 3637sub update {
2742 my ($self) = @_; 3638 my ($self) = @_;
2743 3639
2744 return unless $self->{visible}; 3640 return unless $self->{visible};
2745 3641
2746 $self->SUPER::update; 3642 $self->SUPER::update;
2747} 3643}
2748 3644
3645sub invoke_visibility_change {
3646 my ($self) = @_;
3647
3648 $self->update_timer;
3649
3650 0
3651}
3652
2749sub _draw { 3653sub _draw {
2750 my ($self) = @_; 3654 my ($self) = @_;
2751 3655
2752 return unless $::CONN; 3656 $self->SUPER::_draw;
2753 3657
2754 my $face; 3658 if (my $tex = $self->{tex}) {
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3659 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3661 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3663 glDisable GL_TEXTURE_2D;
2771 } 3664 }
2772} 3665}
2773 3666
2774sub DESTROY { 3667sub destroy {
2775 my ($self) = @_; 3668 my ($self) = @_;
2776 3669
2777 $self->{timer}->cancel 3670 (delete $self->{timer})->cancel
2778 if $self->{timer}; 3671 if $self->{timer};
2779 3672
2780 $self->SUPER::DESTROY; 3673 $self->SUPER::destroy;
2781} 3674}
2782 3675
2783############################################################################# 3676#############################################################################
2784 3677
2785package CFClient::UI::Inventory; 3678package CFPlus::UI::Buttonbar;
2786 3679
2787our @ISA = CFClient::UI::ScrolledWindow::; 3680our @ISA = CFPlus::UI::HBox::;
2788 3681
2789sub new { 3682# TODO: should actually wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 3683
2825############################################################################# 3684#############################################################################
2826 3685
2827package CFClient::UI::Menu; 3686package CFPlus::UI::Menu;
2828 3687
2829our @ISA = CFClient::UI::FancyFrame::; 3688our @ISA = CFPlus::UI::Toplevel::;
2830 3689
2831use CFClient::OpenGL; 3690use CFPlus::OpenGL;
2832 3691
2833sub new { 3692sub new {
2834 my $class = shift; 3693 my $class = shift;
2835 3694
2836 my $self = $class->SUPER::new ( 3695 my $self = $class->SUPER::new (
2837 items => [], 3696 items => [],
2838 z => 100, 3697 z => 100,
2839 @_, 3698 @_,
2840 ); 3699 );
2841 3700
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3701 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2843 3702
2844 for my $item (@{ $self->{items} }) { 3703 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3704 my ($widget, $cb, $tooltip) = @$item;
2846 3705
2847 # handle various types of items, only text for now 3706 # handle various types of items, only text for now
2848 if (!ref $widget) { 3707 if (!ref $widget) {
3708 if ($widget =~ /\t/) {
3709 my ($left, $right) = split /\t/, $widget, 2;
3710
2849 $widget = new CFClient::UI::Label 3711 $widget = new CFPlus::UI::HBox
2850 can_hover => 1, 3712 can_hover => 1,
2851 can_events => 1, 3713 can_events => 1,
3714 tooltip => $tooltip,
3715 children => [
3716 (new CFPlus::UI::Label markup => $left, expand => 1),
3717 (new CFPlus::UI::Label markup => $right, align => +1),
3718 ],
3719 ;
3720
3721 } else {
3722 $widget = new CFPlus::UI::Label
3723 can_hover => 1,
3724 can_events => 1,
2852 text => $widget; 3725 markup => $widget,
3726 tooltip => $tooltip;
3727 }
2853 } 3728 }
2854 3729
2855 $self->{item}{$widget} = $item; 3730 $self->{item}{$widget} = $item;
2856 3731
2857 $self->{vbox}->add ($widget); 3732 $self->{vbox}->add ($widget);
… …
2862 3737
2863# popup given the event (must be a mouse button down event currently) 3738# popup given the event (must be a mouse button down event currently)
2864sub popup { 3739sub popup {
2865 my ($self, $ev) = @_; 3740 my ($self, $ev) = @_;
2866 3741
2867 $self->_emit ("popdown"); 3742 $self->emit ("popdown");
2868 3743
2869 # maybe save $GRAB? must be careful about events... 3744 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3745 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3746 $self->{button} = $ev->{button};
2872 3747
2873 $self->show; 3748 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3749 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3750}
2876 3751
2877sub mouse_motion { 3752sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3753 my ($self, $ev, $x, $y) = @_;
2879 3754
2880 # TODO: should use vbox->find_widget or so 3755 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3756 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3757 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3758
3759 0
3760}
3761
2885sub button_up { 3762sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3763 my ($self, $ev, $x, $y) = @_;
2887 3764
2888 if ($ev->{button} == $self->{button}) { 3765 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3766 undef $GRAB;
2890 $self->hide; 3767 $self->hide;
2891 3768
2892 $self->_emit ("popdown"); 3769 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3770 $self->{hover}[1]->() if $self->{hover};
3771 } else {
3772 return 0
3773 }
3774
2894 } 3775 1
2895} 3776}
2896 3777
2897############################################################################# 3778#############################################################################
2898 3779
2899package CFClient::UI::Statusbox; 3780package CFPlus::UI::Multiplexer;
2900 3781
2901our @ISA = CFClient::UI::VBox::; 3782our @ISA = CFPlus::UI::Container::;
2902 3783
2903sub new { 3784sub new {
2904 my $class = shift; 3785 my $class = shift;
2905 3786
2906 $class->SUPER::new ( 3787 my $self = $class->SUPER::new (
3788 @_,
3789 );
3790
3791 $self->{current} = $self->{children}[0]
3792 if @{ $self->{children} };
3793
3794 $self
3795}
3796
3797sub add {
3798 my ($self, @widgets) = @_;
3799
3800 $self->SUPER::add (@widgets);
3801
3802 $self->{current} = $self->{children}[0]
3803 if @{ $self->{children} };
3804}
3805
3806sub get_current_page {
3807 my ($self) = @_;
3808
3809 $self->{current}
3810}
3811
3812sub set_current_page {
3813 my ($self, $page_or_widget) = @_;
3814
3815 my $widget = ref $page_or_widget
3816 ? $page_or_widget
3817 : $self->{children}[$page_or_widget];
3818
3819 $self->{current} = $widget;
3820 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3821
3822 $self->emit (page_changed => $self->{current});
3823
3824 $self->realloc;
3825}
3826
3827sub visible_children {
3828 $_[0]{current}
3829}
3830
3831sub size_request {
3832 my ($self) = @_;
3833
3834 $self->{current}->size_request
3835}
3836
3837sub invoke_size_allocate {
3838 my ($self, $w, $h) = @_;
3839
3840 $self->{current}->configure (0, 0, $w, $h);
3841
3842 1
3843}
3844
3845sub _draw {
3846 my ($self) = @_;
3847
3848 $self->{current}->draw;
3849}
3850
3851#############################################################################
3852
3853package CFPlus::UI::Notebook;
3854
3855our @ISA = CFPlus::UI::VBox::;
3856
3857sub new {
3858 my $class = shift;
3859
3860 my $self = $class->SUPER::new (
3861 buttonbar => (new CFPlus::UI::Buttonbar),
3862 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3863 # filter => # will be put between multiplexer and $self
3864 @_,
3865 );
3866
3867 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3868 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3869
3870 {
3871 Scalar::Util::weaken (my $wself = $self);
3872
3873 $self->{multiplexer}->connect (c_add => sub {
3874 my ($mplex, $widgets) = @_;
3875
3876 for my $child (@$widgets) {
3877 Scalar::Util::weaken $child;
3878 $child->{c_tab_} ||= do {
3879 my $tab =
3880 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3881 ? $child->{c_tab}
3882 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3883
3884 $tab->connect (activate => sub {
3885 $wself->set_current_page ($child);
3886 });
3887
3888 $tab
3889 };
3890
3891 $self->{buttonbar}->add ($child->{c_tab_});
3892 }
3893 });
3894
3895 $self->{multiplexer}->connect (c_remove => sub {
3896 my ($mplex, $widgets) = @_;
3897
3898 for my $child (@$widgets) {
3899 $wself->{buttonbar}->remove ($child->{c_tab_});
3900 }
3901 });
3902 }
3903
3904 $self
3905}
3906
3907sub add {
3908 my ($self, @widgets) = @_;
3909
3910 $self->{multiplexer}->add (@widgets)
3911}
3912
3913sub remove {
3914 my ($self, @widgets) = @_;
3915
3916 $self->{multiplexer}->remove (@widgets)
3917}
3918
3919sub pages {
3920 my ($self) = @_;
3921 $self->{multiplexer}->children
3922}
3923
3924sub add_tab {
3925 my ($self, $title, $widget, $tooltip) = @_;
3926
3927 $title = [$title, $tooltip] unless ref $title;
3928 $widget->{c_tab} = $title;
3929
3930 $self->add ($widget);
3931}
3932
3933sub get_current_page {
3934 my ($self) = @_;
3935
3936 $self->{multiplexer}->get_current_page
3937}
3938
3939sub set_current_page {
3940 my ($self, $page) = @_;
3941
3942 $self->{multiplexer}->set_current_page ($page);
3943 $self->emit (page_changed => $self->{multiplexer}{current});
3944}
3945
3946#############################################################################
3947
3948package CFPlus::UI::Selector;
3949
3950use utf8;
3951
3952our @ISA = CFPlus::UI::Button::;
3953
3954sub new {
3955 my $class = shift;
3956
3957 my $self = $class->SUPER::new (
3958 options => [], # [value, title, longdesc], ...
3959 value => undef,
3960 @_,
3961 );
3962
3963 $self->_set_value ($self->{value});
3964
3965 $self
3966}
3967
3968sub invoke_button_down {
3969 my ($self, $ev) = @_;
3970
3971 my @menu_items;
3972
3973 for (@{ $self->{options} }) {
3974 my ($value, $title, $tooltip) = @$_;
3975
3976 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3977 }
3978
3979 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3980}
3981
3982sub _set_value {
3983 my ($self, $value) = @_;
3984
3985 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3986 or return;
3987
3988 $self->{value} = $item->[0];
3989 $self->set_markup ("$item->[1] ⇓");
3990 $self->set_tooltip ($item->[2]);
3991}
3992
3993sub set_value {
3994 my ($self, $value) = @_;
3995
3996 return unless $self->{value} ne $value;
3997
3998 $self->_set_value ($value);
3999 $self->emit (changed => $value);
4000}
4001
4002#############################################################################
4003
4004package CFPlus::UI::Statusbox;
4005
4006our @ISA = CFPlus::UI::VBox::;
4007
4008sub new {
4009 my $class = shift;
4010
4011 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 4012 fontsize => 0.8,
2908 @_, 4013 @_,
2909 ) 4014 );
4015
4016 CFPlus::weaken (my $this = $self);
4017
4018 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4019
4020 $self
2910} 4021}
2911 4022
2912sub reorder { 4023sub reorder {
2913 my ($self) = @_; 4024 my ($self) = @_;
2914 my $NOW = time; 4025 my $NOW = Time::HiRes::time;
4026
4027 # freeze display when hovering over any label
4028 return if $CFPlus::UI::TOOLTIP->{owner}
4029 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4030 values %{ $self->{item} };
2915 4031
2916 while (my ($k, $v) = each %{ $self->{item} }) { 4032 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4033 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 4034 }
2919 4035
… …
2922 my @items = sort { 4038 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 4039 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 4040 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 4041 } values %{ $self->{item} };
2926 4042
4043 $self->{timer}->interval (1);
4044
2927 my $count = 10 + 1; 4045 my $count = 10 + 1;
2928 for my $item (@items) { 4046 for my $item (@items) {
2929 last unless --$count; 4047 last unless --$count;
2930 4048
2931 push @widgets, $item->{label} ||= do { 4049 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 4050 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 4051 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 4052 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 4053 : $item->{text};
2936 4054
2937 for ($short) { 4055 for ($short) {
2938 s/^\s+//; 4056 s/^\s+//;
2939 s/\s+/ /g; 4057 s/\s+/ /g;
2940 } 4058 }
2941 4059
2942 new CFClient::UI::Label 4060 new CFPlus::UI::Label
2943 markup => $short, 4061 markup => $short,
2944 tooltip => $item->{tooltip}, 4062 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 4063 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 4064 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 4065 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 4066 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 4067 fg => [@{ $item->{fg} }],
2950 can_events => 1, 4068 can_events => 1,
2951 can_hover => 1 4069 can_hover => 1
2952 }; 4070 };
4071
4072 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4073 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4074 $label->update;
4075 $label->set_max_size (undef, $label->{req_h} * $diff)
4076 if $diff < 1;
4077 $self->{timer}->interval (1/30);
4078 } else {
4079 $label->{fg}[3] = $item->{fg}[3] || 1;
4080 }
4081
4082 push @widgets, $label;
2953 } 4083 }
2954 4084
2955 $self->clear; 4085 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 4086 $self->SUPER::add (reverse @widgets);
2957} 4087}
… …
2962 $text =~ s/^\s+//; 4092 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 4093 $text =~ s/\s+$//;
2964 4094
2965 return unless $text; 4095 return unless $text;
2966 4096
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 4097 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 4098
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4099 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 4100
2971 if (my $item = $self->{item}{$group}) { 4101 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 4102 if ($item->{text} eq $text) {
2973 $item->{count}++; 4103 $item->{count}++;
2974 } else { 4104 } else {
2975 $item->{count} = 1; 4105 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 4106 $item->{text} = $item->{tooltip} = $text;
2977 } 4107 }
2978 $item->{id} = ++$self->{id}; 4108 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 4109 $item->{timeout} = $timeout;
2980 delete $item->{label}; 4110 delete $item->{label};
2981 } else { 4111 } else {
2982 $self->{item}{$group} = { 4112 $self->{item}{$group} = {
2983 id => ++$self->{id}, 4113 id => ++$self->{id},
… …
2989 count => 1, 4119 count => 1,
2990 %arg, 4120 %arg,
2991 }; 4121 };
2992 } 4122 }
2993 4123
4124 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 4125 $self->reorder;
4126 });
2995} 4127}
2996 4128
2997sub reconfigure { 4129sub reconfigure {
2998 my ($self) = @_; 4130 my ($self) = @_;
2999 4131
… …
3002 4134
3003 $self->reorder; 4135 $self->reorder;
3004 $self->SUPER::reconfigure; 4136 $self->SUPER::reconfigure;
3005} 4137}
3006 4138
4139sub destroy {
4140 my ($self) = @_;
4141
4142 $self->{timer}->cancel;
4143
4144 $self->SUPER::destroy;
4145}
4146
3007############################################################################# 4147#############################################################################
3008 4148
3009package CFClient::UI::Root; 4149package CFPlus::UI::Root;
3010 4150
3011our @ISA = CFClient::UI::Container::; 4151our @ISA = CFPlus::UI::Container::;
3012 4152
4153use List::Util qw(min max);
4154
3013use CFClient::OpenGL; 4155use CFPlus::OpenGL;
3014 4156
3015sub new { 4157sub new {
3016 my $class = shift; 4158 my $class = shift;
3017 4159
3018 my $self = $class->SUPER::new ( 4160 my $self = $class->SUPER::new (
3019 visible => 1, 4161 visible => 1,
3020 @_, 4162 @_,
3021 ); 4163 );
3022 4164
3023 Scalar::Util::weaken ($self->{root} = $self); 4165 CFPlus::weaken ($self->{root} = $self);
3024 4166
3025 $self 4167 $self
3026} 4168}
3027 4169
3028sub size_request { 4170sub size_request {
… …
3043 $coord = $max - $size if $coord > $max - $size; 4185 $coord = $max - $size if $coord > $max - $size;
3044 4186
3045 int $coord + 0.5 4187 int $coord + 0.5
3046} 4188}
3047 4189
3048sub size_allocate { 4190sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 4191 my ($self, $w, $h) = @_;
3050 4192
3051 for my $child ($self->children) { 4193 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4194 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 4195
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 4199 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 4200 $Y = _to_pixel $Y, $H, $self->{h};
3059 4201
3060 $child->configure ($X, $Y, $W, $H); 4202 $child->configure ($X, $Y, $W, $H);
3061 } 4203 }
4204
4205 1
3062} 4206}
3063 4207
3064sub coord2local { 4208sub coord2local {
3065 my ($self, $x, $y) = @_; 4209 my ($self, $x, $y) = @_;
3066 4210
… …
3074} 4218}
3075 4219
3076sub update { 4220sub update {
3077 my ($self) = @_; 4221 my ($self) = @_;
3078 4222
3079 $::WANT_REFRESH++; 4223 $::WANT_REFRESH->start;
3080} 4224}
3081 4225
3082sub add { 4226sub add {
3083 my ($self, @children) = @_; 4227 my ($self, @children) = @_;
3084 4228
… …
3121 while ($self->{refresh_hook}) { 4265 while ($self->{refresh_hook}) {
3122 $_->() 4266 $_->()
3123 for values %{delete $self->{refresh_hook}}; 4267 for values %{delete $self->{refresh_hook}};
3124 } 4268 }
3125 4269
3126 if ($self->{realloc}) { 4270 while ($self->{realloc}) {
4271 my %queue;
3127 my @queue; 4272 my @queue;
4273 my $widget;
3128 4274
4275 outer:
3129 while () { 4276 while () {
3130 if ($self->{realloc}) { 4277 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 4278 for $widget (values %$realloc) {
4279 $widget->{visible} or next; # do not resize invisible widgets
3132 4280
3133 use sort 'stable'; 4281 $queue{$widget+0}++ and next; # duplicates are common
3134 4282
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 4283 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 4284 }
3137 } 4285 }
3138 4286
4287 while () {
4288 @queue or last outer;
4289
3139 my $widget = pop @queue || last; 4290 $widget = pop @{ $queue[-1] || [] }
4291 and last;
4292
4293 pop @queue;
4294 }
3140 4295
3141 $widget->{visible} or last; # do not resize invisible widgets 4296 delete $queue{$widget+0};
3142 4297
3143 my ($w, $h) = $widget->size_request; 4298 my ($w, $h) = $widget->size_request;
3144 4299
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4300 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4301 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4302
4303 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4304 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 4305
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 4306 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 4307 $h = $widget->{force_h} if exists $widget->{force_h};
3150 4308
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4309 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 4312 $widget->{req_h} = $h;
3155 4313
3156 $self->{size_alloc}{$widget+0} = $widget; 4314 $self->{size_alloc}{$widget+0} = $widget;
3157 4315
3158 if (my $parent = $widget->{parent}) { 4316 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 4317 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 4318 unless $queue{$parent+0};
4319
3161 $parent->{force_size_alloc} = 1; 4320 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 4321 $self->{size_alloc}{$parent+0} = $parent;
3163 } 4322 }
3164 } 4323 }
3165 4324
3166 delete $self->{realloc}{$widget+0}; 4325 delete $self->{realloc}{$widget+0};
3167 } 4326 }
3168 }
3169 4327
3170 while (my $size_alloc = delete $self->{size_alloc}) { 4328 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} } 4329 my @queue = sort { $a->{visible} <=> $b->{visible} }
3172 values %$size_alloc; 4330 values %$size_alloc;
3173 4331
3174 while () { 4332 while () {
3175 my $widget = pop @queue || last; 4333 my $widget = pop @queue || last;
3176 4334
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4335 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 4336
3179 $w = 0 if $w < 0; 4337 $w = max $widget->{min_w}, $w;
3180 $h = 0 if $h < 0; 4338 $h = max $widget->{min_h}, $h;
3181 4339
4340# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4341# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4342
4343 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4344 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4345
3182 $w = int $w + 0.5; 4346 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 4347 $h = int $h + 0.5;
3184 4348
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4349 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4350 $widget->{old_w} = $widget->{w};
4351 $widget->{old_h} = $widget->{h};
4352
3186 $widget->{w} = $w; 4353 $widget->{w} = $w;
3187 $widget->{h} = $h; 4354 $widget->{h} = $h;
3188 4355
3189 $widget->emit (size_allocate => $w, $h); 4356 $widget->emit (size_allocate => $w, $h);
4357 }
3190 } 4358 }
3191 } 4359 }
3192 } 4360 }
3193 4361
3194 while ($self->{post_alloc_hook}) { 4362 while ($self->{post_alloc_hook}) {
3195 $_->() 4363 $_->()
3196 for values %{delete $self->{post_alloc_hook}}; 4364 for values %{delete $self->{post_alloc_hook}};
3197 } 4365 }
3198
3199 4366
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4367 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4368 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 4369 glClear GL_COLOR_BUFFER_BIT;
3203 4370
… …
3205 glLoadIdentity; 4372 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4373 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 4374 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 4375 glLoadIdentity;
3209 4376
4377 {
4378 package CFPlus::UI::Base;
4379
4380 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4381 (0, 0, $self->{w}, $self->{h});
4382
3210 $self->_draw; 4383 $self->_draw;
4384 }
3211} 4385}
3212 4386
3213############################################################################# 4387#############################################################################
3214 4388
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315# if $commit is true, the binding will be set after the user entered a key combo
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Button
3392 text => "delete",
3393 tooltip => "Deletes the action from the record",
3394 on_activate => sub {
3395 $self->{cmdbox}->remove ($hb);
3396 $cmds->[$i] = undef;
3397 });
3398
3399 $hb->add (new CFClient::UI::Label text => $_);
3400
3401 $idx++
3402 }
3403}
3404
3405
3406#############################################################################
3407
3408package CFClient::UI::SpellList;
3409
3410our @ISA = CFClient::UI::FancyFrame::;
3411
3412sub new {
3413 my $class = shift;
3414
3415 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3416
3417 $self->add (new CFClient::UI::ScrolledWindow
3418 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3419
3420 $self;
3421}
3422
3423# XXX: Do sorting? Argl...
3424sub add_spell {
3425 my ($self, $spell) = @_;
3426 $self->{spells}->{$spell->{name}} = $spell;
3427
3428 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3429 face => $spell->{face},
3430 can_hover => 1,
3431 can_events => 1,
3432 tooltip => $spell->{message});
3433
3434 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3435 text => $spell->{name},
3436 can_hover => 1,
3437 can_events => 1,
3438 tooltip => $spell->{message},
3439 expand => 1);
3440 $self->{spellbox}->add (2, $self->{tbl_idx}++, new CFClient::UI::Button
3441 text => "bind to key",
3442 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3443}
3444
3445sub rebuild_spell_list {
3446 my ($self) = @_;
3447 $self->{tbl_idx} = 0;
3448 $self->add_spell ($_) for values %{$self->{spells}};
3449}
3450
3451sub remove_spell {
3452 my ($self, $spell) = @_;
3453 delete $self->{spells}->{$spell->{name}};
3454 $self->rebuild_spell_list;
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI; 4389package CFPlus::UI;
3460 4390
3461$ROOT = new CFClient::UI::Root; 4391$ROOT = new CFPlus::UI::Root;
3462$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4392$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3463 4393
34641 43941
3465 4395

Diff Legend

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