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.265 by root, Thu Jun 1 02:59:46 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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