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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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