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.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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