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.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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