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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.340 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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