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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 2006 UTC

… …
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 CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
61 } 39 }
62 40
63 return; 41 return;
64 } 42 }
65 } 43 }
66 } 44 }
67 45
68 $TOOLTIP->hide; 46 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
70} 71}
71 72
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
171sub rescale_widgets { 172sub rescale_widgets {
172 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
173 174
174 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
176 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
178 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
179 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
180 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
181 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
182 } 190 }
183 } 191 }
184 192
185 reconfigure_widgets; 193 reconfigure_widgets;
186} 194}
… …
195 203
196sub new { 204sub new {
197 my $class = shift; 205 my $class = shift;
198 206
199 my $self = bless { 207 my $self = bless {
200 x => 0, 208 x => "center",
201 y => 0, 209 y => "center",
202 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
203 can_events => 1, 213 can_events => 1,
204 @_ 214 @_
205 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206 218
207 for (keys %$self) { 219 for (keys %$self) {
208 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
209 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
210 } 222 }
211 } 223 }
212 224
213 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
219 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
220 } 235 }
221 236
222 $self 237 $self
223} 238}
224 239
… …
235 return if $self->{parent}; 250 return if $self->{parent};
236 251
237 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
238} 253}
239 254
240sub center {
241 my ($self) = @_;
242
243 $CFClient::UI::ROOT->on_post_alloc (
244 "center_$self" => sub {
245 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246 },
247 );
248
249 $self->update;
250}
251
252sub set_visible { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
254 257
255 return if $self->{visible}; 258 return if $self->{visible};
256 259
257 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
258 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
259 262
260 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
261 264
262 $self->realloc unless exists $self->{req_w}; 265 $self->realloc if !exists $self->{req_w};
263 266
264 $_->set_visible for $self->children; 267 $_->set_visible for $self->children;
265} 268}
266 269
267sub set_invisible { 270sub set_invisible {
… …
269 272
270 return unless $self->{visible}; 273 return unless $self->{visible};
271 274
272 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
273 276
277 delete $self->{visible};
274 delete $self->{root}; 278 delete $self->{root};
275 delete $self->{visible};
276 279
277 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
278 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
279 282
280 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
281 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
282 285
283 $self->focus_out; 286 $self->emit ("focus_out");
284
285 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
286} 288}
287 289
288sub set_visibility { 290sub set_visibility {
289 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
309 311
310 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
311 if $self->{parent}; 313 if $self->{parent};
312} 314}
313 315
314sub move { 316sub move_abs {
315 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
316 318
317 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
318 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
319 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
320 322
321 $self->update; 323 $self->update;
322} 324}
323 325
324sub set_size { 326sub set_size {
325 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
326 328
327 $self->{def_w} = $w; 329 $self->{force_w} = $w;
328 $self->{def_h} = $h; 330 $self->{force_h} = $h;
329 331
330 $self->realloc; 332 $self->realloc;
331} 333}
332 334
333sub size_request { 335sub size_request {
334 require Carp; 336 require Carp;
335 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
336} 338}
337 339
340sub baseline_shift {
341 0
342}
343
338sub configure { 344sub configure {
339 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
340 346
341 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
342 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
343 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
344 352
345 # use alignment to adjust x, y 353 # use alignment to adjust x, y
346 354
347 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
348 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
349
350 ($w, $h) = ($w2, $h2);
351 } 357 }
352 358
353 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
354 $self->{x} = $x; 360 $self->{x} = $x;
355 $self->{y} = $y; 361 $self->{y} = $y;
356 $self->update; 362 $self->update;
357 } 363 }
358 364
359 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360 return unless $self->{visible}; 366 return unless $self->{visible};
361 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
363 } 372 }
364}
365
366sub size_allocate {
367 # nothing to be done
368} 373}
369 374
370sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
371} 381}
372 382
373sub set_max_size { 383sub set_max_size {
374 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
375 385
376 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
377 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
378} 390}
379 391
380sub set_tooltip { 392sub set_tooltip {
381 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
382 394
… …
387 399
388 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
389 401
390 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
391 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
392 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
393 } 405 }
394} 406}
395 407
396# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
397sub coord2local { 409sub coord2local {
… …
405 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
406 418
407 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
408} 420}
409 421
410sub focus_in { 422sub invoke_focus_in {
411 my ($self) = @_; 423 my ($self) = @_;
412 424
413 return if $FOCUS == $self; 425 return if $FOCUS == $self;
414 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
415 427
416 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
417 429
418 $self->_emit (focus_in => $focus); 430 $self->update;
419 431
420 $focus->update if $focus; 432 0
421 $FOCUS->update;
422} 433}
423 434
424sub focus_out { 435sub invoke_focus_out {
425 my ($self) = @_; 436 my ($self) = @_;
426 437
427 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
428 439
429 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
430 441
431 $self->_emit (focus_out => $focus); 442 $self->update;
432 443
433 $focus->update if $focus; #?
434
435 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
436 unless $FOCUS; 445 unless $FOCUS;
437}
438 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
439sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
440sub button_up { } 458sub invoke_button_up { 1 }
441sub key_down { } 459sub invoke_key_down { 1 }
442sub key_up { } 460sub invoke_key_up { 1 }
443 461
444sub button_down { 462sub invoke_button_down {
445 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
446 464
447 $self->focus_in; 465 $self->grab_focus;
448}
449 466
450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
454sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
455 484
456sub find_widget { 485sub find_widget {
457 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
458 487
459 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
… …
467 496
468sub set_parent { 497sub set_parent {
469 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
470 499
471 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
472
473 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
474
475 $self->realloc;
476}
477
478sub connect {
479 my ($self, $signal, $cb) = @_;
480
481 push @{ $self->{signal_cb}{$signal} }, $cb;
482}
483
484sub _emit {
485 my ($self, $signal, @args) = @_;
486
487 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
488}
489
490sub emit {
491 my ($self, $signal, @args) = @_;
492
493 $self->_emit ($signal, @args)
494 || $self->$signal (@args);
495}
496
497sub visibility_change {
498 #my ($self, $visible) = @_;
499} 502}
500 503
501sub realloc { 504sub realloc {
502 my ($self) = @_; 505 my ($self) = @_;
503 506
504 return unless $self->{visible}; 507 if ($self->{visible}) {
505
506 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
507 509
508 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update; 511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
510} 516}
511 517
512sub update { 518sub update {
513 my ($self) = @_; 519 my ($self) = @_;
514 520
515 $self->{parent}->update 521 $self->{parent}->update
516 if $self->{parent}; 522 if $self->{parent};
517} 523}
518 524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
519sub draw { 536sub draw {
520 my ($self) = @_; 537 my ($self) = @_;
521 538
522 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
523 548
524 glPushMatrix; 549 glPushMatrix;
525 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
526 $self->_draw;
527 glPopMatrix;
528 551
529 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
530 my ($x, $y) = @$self{qw(x y)};
531
532 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
533 glEnable GL_BLEND; 554 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 556 glBegin GL_QUADS;
536 glVertex $x , $y; 557 glVertex 0 , 0;
537 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
538 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
539 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
540 glEnd; 561 glEnd;
541 glDisable GL_BLEND; 562 glDisable GL_BLEND;
542 } 563 }
543 564
544 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
545 glPushMatrix; 566 glPushMatrix;
546 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
548 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
549 glVertex 0 , 0; 570 glVertex 0 , 0;
550 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
551 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
552 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
553 glEnd; 574 glEnd;
554 glPopMatrix; 575 glPopMatrix;
555 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
556 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
557} 581}
558 582
559sub _draw { 583sub _draw {
560 my ($self) = @_; 584 my ($self) = @_;
561 585
… …
564 588
565sub DESTROY { 589sub DESTROY {
566 my ($self) = @_; 590 my ($self) = @_;
567 591
568 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
569 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
570} 596}
571 597
572############################################################################# 598#############################################################################
573 599
574package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
599 625
600 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
601 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
602 628
603 glEnable GL_BLEND; 629 glEnable GL_BLEND;
604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605 glColor @$color; 631 glColor_premultiply @$color;
606 632
607 glBegin GL_QUADS; 633 glBegin GL_QUADS;
608 glVertex 0 , 0; 634 glVertex 0 , 0;
609 glVertex 0 , $h; 635 glVertex 0 , $h;
610 glVertex $w, $h; 636 glVertex $w, $h;
… …
625 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
626 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
627} 653}
628 654
629sub size_request { 655sub size_request {
630 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
631} 659}
632 660
633sub draw { } 661sub draw { }
634 662
635############################################################################# 663#############################################################################
… …
639our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
640 668
641sub new { 669sub new {
642 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
643 671
644 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
645 673
646 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
647 children => [], 675 children => [],
648 can_events => 0, 676 can_events => 0,
649 %arg, 677 %arg,
650 ); 678 );
679
651 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
652 682
653 $self 683 $self
654} 684}
655 685
656sub add { 686sub add {
… …
704 $x -= $self->{x}; 734 $x -= $self->{x};
705 $y -= $self->{y}; 735 $y -= $self->{y};
706 736
707 my $res; 737 my $res;
708 738
709 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
710 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
711 and return $res; 741 and return $res;
712 } 742 }
713 743
714 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735} 765}
736 766
737sub add { 767sub add {
738 my ($self, $child) = @_; 768 my ($self, $child) = @_;
739 769
740 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
741
742 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
743} 772}
744 773
745sub remove { 774sub remove {
746 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
755 784
756sub size_request { 785sub size_request {
757 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
758} 787}
759 788
760sub size_allocate { 789sub invoke_size_allocate {
761 my ($self, $w, $h, $changed) = @_; 790 my ($self, $w, $h) = @_;
762 791
763 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
764} 795}
765 796
766############################################################################# 797#############################################################################
798
799# back-buffered drawing area
767 800
768package CFClient::UI::Window; 801package CFClient::UI::Window;
769 802
770our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
771 804
… …
782 815
783 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
784 $self->SUPER::update; 817 $self->SUPER::update;
785} 818}
786 819
787sub size_allocate { 820sub invoke_size_allocate {
788 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
789 822
790 $self->SUPER::size_allocate ($w, $h, $changed);
791 $self->update 823 $self->update;
792 if $changed; 824
825 $self->SUPER::invoke_size_allocate ($w, $h)
793} 826}
794 827
795sub _render { 828sub _render {
829 my ($self) = @_;
830
796 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
797} 832}
798 833
799sub render_child { 834sub render_child {
800 my ($self) = @_; 835 my ($self) = @_;
801 836
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
805 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
806 $self->_render; 848 $self->_render;
807 }; 849 };
808} 850}
809 851
810sub _draw { 852sub _draw {
811 my ($self) = @_; 853 my ($self) = @_;
812 854
813 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
814 856
815 my $tex = $self->{texture} 857 my $tex = $self->{texture}
816 or return; 858 or return;
817 859
818 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
821 863
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 865
824 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
825} 867}
… …
841} 883}
842 884
843sub size_request { 885sub size_request {
844 my ($self) = @_; 886 my ($self) = @_;
845 887
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 889
848 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
850 892
851 ($w, $h) 893 ($w, $h)
852} 894}
853 895
854sub size_allocate { 896sub invoke_size_allocate {
855 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
856 898
899 my $child = $self->child;
900
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 903
860 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
861 $self->update; 905 $self->update;
906
907 1
862} 908}
863 909
864sub set_offset { 910sub set_offset {
865 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
866 912
… …
899} 945}
900 946
901sub _render { 947sub _render {
902 my ($self) = @_; 948 my ($self) = @_;
903 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 954
906 $self->SUPER::_render; 955 $self->SUPER::_render;
907} 956}
908 957
… …
911package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
912 961
913our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
914 963
915sub new { 964sub new {
916 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
917 968
918 my $self; 969 my $self;
919 970
920 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
921 vertical => 1, 972 vertical => 1,
… …
926 ; 977 ;
927 978
928 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 981 slider => $slider,
931 @_, 982 %arg,
932 ); 983 );
933 984
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
937 987
938 $self 988 $self
939} 989}
940 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
941sub update { 1005sub update {
942 my ($self) = @_; 1006 my ($self) = @_;
943 1007
944 $self->SUPER::update; 1008 $self->SUPER::update;
945 1009
946 # todo: overwrite size_allocate of child 1010 $self->update_slider;
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1011}
950 1012
951sub size_allocate { 1013sub invoke_size_allocate {
952 my ($self, $w, $h, $changed) = @_; 1014 my ($self, $w, $h) = @_;
953 1015
1016 $self->update_slider;
1017
954 $self->SUPER::size_allocate ($w, $h, $changed); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1019}
959
960#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll
962 1020
963############################################################################# 1021#############################################################################
964 1022
965package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
966 1024
… …
982 1040
983 if ($self->{bg}) { 1041 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
985 1043
986 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
989 1047
990 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
991 glVertex 0 , 0; 1049 glVertex 0 , 0;
992 glVertex 0 , $h; 1050 glVertex 0 , $h;
993 glVertex $w, $h; 1051 glVertex $w, $h;
… …
1006 1064
1007our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
1008 1066
1009use CFClient::OpenGL; 1067use CFClient::OpenGL;
1010 1068
1011my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1076
1015sub new { 1077sub new {
1016 my $class = shift; 1078 my ($class, %arg) = @_;
1017 1079
1018 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1083 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1084 can_events => 1,
1024 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1025 ); 1088 );
1026 1089
1027 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1091 align => 0,
1029 valign => 1, 1092 valign => 1,
1030 text => $self->{title}, 1093 text => $self->{title},
1031 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1032 1105
1033 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1115}
1035 1116
1036sub border { 1117sub border {
1037 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1038} 1119}
1039 1120
1040sub size_request { 1121sub size_request {
1041 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1042 1129
1043 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1044 1131
1045 ( 1132 (
1046 $w + $self->border * 2, 1133 $w + $self->border * 2,
1047 $h + $self->border * 2, 1134 $h + $self->border * 2,
1048 ) 1135 )
1049} 1136}
1050 1137
1051sub size_allocate { 1138sub invoke_size_allocate {
1052 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1053 1140
1054 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1055 1146
1147 my $border = $self->border;
1148
1056 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1057 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1058 1151
1059 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060 if $self->{title};
1061
1062 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1063}
1064 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1065sub button_down { 1168sub invoke_button_down {
1066 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1067 1170
1068 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1069 my $border = $self->border; 1172 my $border = $self->border;
1070 1173
… …
1083 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
1084 1187
1085 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1087 1190
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1195 $self->realloc;
1094 }; 1196 };
1095 1197
1096 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1202 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1102 1204
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1206
1105 $self->{user_x} = $bx + $x - $ox; 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1208 # HACK: the next line is required to enforce placement
1107 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1111 } 1215 1
1112} 1216}
1113 1217
1114sub button_up { 1218sub invoke_button_up {
1115 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1116 1220
1117 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1118} 1222}
1119 1223
1120sub mouse_motion { 1224sub invoke_mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1122 1226
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1124} 1230}
1125 1231
1126sub _draw { 1232sub _draw {
1127 my ($self) = @_; 1233 my ($self) = @_;
1128 1234
1235 my $child = $self->{children}[0];
1236
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1239
1132 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1242
1135 my $border = $self->border; 1243 my $border = $self->border;
1136 1244
1137 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1250
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1145 1253
1146 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
1149
1150 glColor @{ $self->{bg} };
1151
1152 $bg->{s} = $rep_x;
1153 $bg->{t} = $rep_y;
1154 $bg->{wrap_mode} = 1;
1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1259 }
1157 1260
1158 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1159 1262
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1163} 1274}
1164 1275
1165############################################################################# 1276#############################################################################
1166 1277
1167package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1190 1301
1191 $child->set_parent ($self); 1302 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1193 1304
1194 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1195} 1312}
1196 1313
1197# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1198sub clear { 1315sub clear {
1199 my ($self) = @_; 1316 my ($self) = @_;
… …
1240 (sum @$ws), 1357 (sum @$ws),
1241 (sum @$hs), 1358 (sum @$hs),
1242 ) 1359 )
1243} 1360}
1244 1361
1245sub size_allocate { 1362sub invoke_size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1363 my ($self, $w, $h) = @_;
1247 1364
1248 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1249 1366
1250 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1368 my $req_h = (sum @$hs) || 1;
… …
1282 } 1399 }
1283 1400
1284 $y += $row_h; 1401 $y += $row_h;
1285 } 1402 }
1286 1403
1404 1
1287} 1405}
1288 1406
1289sub find_widget { 1407sub find_widget {
1290 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1291 1409
… …
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1448 )
1331} 1449}
1332 1450
1333sub size_allocate { 1451sub invoke_size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1452 my ($self, $w, $h) = @_;
1335 1453
1336 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1338 1456
1339 my @req; 1457 my @req;
1340 1458
1341 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1343 } else { 1461 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1345 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1346 1464
1347 if ($req > $space) { 1465 if ($req > $space) {
1348 # ah well, not enough space 1466 # ah well, not enough space
1349 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1350 } else { 1468 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1352 1470
1353 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1354 1472
1355 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1356 for 0 .. $#$children; 1474 for 0 .. $#children;
1357 } 1475 }
1358 } 1476 }
1359 1477
1360 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1361 1479
1362 my $pos = 0; 1480 my $pos = 0;
1363 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1364 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366 1484
1367 $pos += $alloc; 1485 $pos += $alloc;
1368 } 1486 }
1369 1487
1370 1 1488 1
… …
1418 #font => default_font 1536 #font => default_font
1419 #text => initial text 1537 #text => initial text
1420 #markup => initial narkup 1538 #markup => initial narkup
1421 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1422 ellipsise => 3, # end 1540 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1424 fontsize => 1, 1542 fontsize => 1,
1425 align => -1, 1543 align => -1,
1426 valign => -1, 1544 valign => -1,
1427 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1428 can_events => 0, 1547 can_events => 0,
1429 %arg 1548 %arg
1430 ); 1549 );
1431 1550
1432 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1433 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1434 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1435 $self->{template} = $layout; 1554 $self->{template} = $layout;
1436 } 1555 }
1437 1556
1438 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1459 1578
1460 delete $self->{texture}; 1579 delete $self->{texture};
1461 $self->SUPER::update; 1580 $self->SUPER::update;
1462} 1581}
1463 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1464sub set_text { 1590sub set_text {
1465 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1466 1592
1467 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1469 1595
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1472 1597
1598 delete $self->{size_req};
1473 $self->realloc; 1599 $self->realloc;
1600 $self->update;
1474} 1601}
1475 1602
1476sub set_markup { 1603sub set_markup {
1477 my ($self, $markup) = @_; 1604 my ($self, $markup) = @_;
1478 1605
1479 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1481 1608
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1610
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1486 1612
1613 delete $self->{size_req};
1487 $self->realloc; 1614 $self->realloc;
1615 $self->update;
1488} 1616}
1489 1617
1490sub size_request { 1618sub size_request {
1491 my ($self) = @_; 1619 my ($self) = @_;
1492 1620
1621 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1627
1499 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1500 1629
1501 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1633
1505 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1506 1635
1507 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1509 } 1641 };
1510 1642
1511 ( 1643 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1644}
1516 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1517sub size_allocate { 1650sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1651 my ($self, $w, $h) = @_;
1652
1653 delete $self->{ox};
1519 1654
1520 delete $self->{texture} 1655 delete $self->{texture}
1521 if $changed; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1522} 1659}
1523 1660
1524sub set_fontsize { 1661sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1526 1663
1527 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1528 delete $self->{texture}; 1666 delete $self->{texture};
1529 1667
1530 $self->realloc; 1668 $self->realloc;
1531} 1669}
1532 1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1678}
1679
1533sub _draw { 1680sub _draw {
1534 my ($self) = @_; 1681 my ($self) = @_;
1535 1682
1536 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1537 1684
1538 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1540 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1541 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1692
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1693 $self->{size_req}
1547
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1550 : ($self->{w} - $tex->{w}) * 0.5);
1551
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1554 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1694 };
1558 1695
1559 glEnable GL_TEXTURE_2D; 1696 unless (exists $self->{ox}) {
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1699 : ($self->{w} - $size->[0]) * 0.5);
1561 1700
1562 if ($tex->{format} == GL_ALPHA) { 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1563 glColor @{$self->{fg}}; 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1703 : ($self->{h} - $size->[1]) * 0.5);
1565 } else {
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567 } 1704 };
1568 1705
1569 glDisable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1708
1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1570} 1710}
1571 1711
1572############################################################################# 1712#############################################################################
1573 1713
1574package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1588 can_hover => 1, 1728 can_hover => 1,
1589 can_focus => 1, 1729 can_focus => 1,
1590 valign => 0, 1730 valign => 0,
1591 can_events => 1, 1731 can_events => 1,
1592 #text => ... 1732 #text => ...
1733 #hidden => "*",
1593 @_ 1734 @_
1594 ) 1735 )
1595} 1736}
1596 1737
1597sub _set_text { 1738sub _set_text {
… …
1599 1740
1600 delete $self->{cur_h}; 1741 delete $self->{cur_h};
1601 1742
1602 return if $self->{text} eq $text; 1743 return if $self->{text} eq $text;
1603 1744
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1746 $self->{text} = $text;
1608 1747
1609 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1611 1751
1612 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1755 $self->update;
1613} 1756}
1614 1757
1615sub set_text { 1758sub set_text {
1616 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1617 1760
1618 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1762 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1763}
1623 1764
1624sub get_text { 1765sub get_text {
1625 $_[0]{text} 1766 $_[0]{text}
1626} 1767}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1632 1773
1633 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1634} 1775}
1635 1776
1636sub key_down { 1777sub invoke_key_down {
1637 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1638 1779
1639 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1799 $self->emit ('escape');
1659 } elsif ($uni) { 1800 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1802 } else {
1803 return 0;
1661 } 1804 }
1662 1805
1663 $self->_set_text ($text); 1806 $self->_set_text ($text);
1664 1807
1665 $self->realloc; 1808 $self->realloc;
1666}
1667 1809
1810 1
1811}
1812
1668sub focus_in { 1813sub invoke_focus_in {
1669 my ($self) = @_; 1814 my ($self) = @_;
1670 1815
1671 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1672 1817
1673 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1674} 1819}
1675 1820
1676sub button_down { 1821sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1678 1823
1679 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1825
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1827
1683 # byte-index to char-index 1828 # byte-index to char-index
1684 my $text = $self->{text}; 1829 my $text = $self->{text};
1685 utf8::encode $text; 1830 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1831 $self->{cursor} = length substr $text, 0, $idx;
1687 1832
1688 $self->_set_text ($self->{text}); 1833 $self->_set_text ($self->{text});
1689 $self->update; 1834 $self->update;
1835
1836 1
1690} 1837}
1691 1838
1692sub mouse_motion { 1839sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1842
1843 1
1695} 1844}
1696 1845
1697sub _draw { 1846sub _draw {
1698 my ($self) = @_; 1847 my ($self) = @_;
1699 1848
1700 local $self->{fg} = $self->{fg}; 1849 local $self->{fg} = $self->{fg};
1701 1850
1702 if ($FOCUS == $self) { 1851 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1852 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1853 $self->{fg} = $self->{active_fg};
1705 } else { 1854 } else {
1706 glColor @{$self->{bg}}; 1855 glColor_premultiply @{$self->{bg}};
1707 } 1856 }
1708 1857
1709 glEnable GL_BLEND; 1858 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1859 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1860 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1861 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1862 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1863 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1864 glVertex $self->{w}, 0;
… …
1740 1889
1741our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1742 1891
1743use CFClient::OpenGL; 1892use CFClient::OpenGL;
1744 1893
1745sub key_down { 1894sub invoke_key_down {
1746 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1747 1896
1748 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1749 1898
1750 if ($sym == 13) { 1899 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1753 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1756 $self->update; 1906 $self->update;
1757 1907
1758 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 1926 } else {
1777 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1778 } 1928 }
1779 1929
1780 } else { 1930 } else {
1781 $self->SUPER::key_down ($ev); 1931 return $self->SUPER::invoke_key_down ($ev)
1932 }
1933
1782 } 1934 1
1783
1784} 1935}
1785 1936
1786############################################################################# 1937#############################################################################
1787 1938
1788package CFClient::UI::Button; 1939package CFClient::UI::Button;
… …
1797 1948
1798sub new { 1949sub new {
1799 my $class = shift; 1950 my $class = shift;
1800 1951
1801 $class->SUPER::new ( 1952 $class->SUPER::new (
1802 padding => 4, 1953 padding_x => 4,
1954 padding_y => 4,
1803 fg => [1, 1, 1], 1955 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1956 active_fg => [0, 0, 1],
1805 can_hover => 1, 1957 can_hover => 1,
1806 align => 0, 1958 align => 0,
1807 valign => 0, 1959 valign => 0,
1808 can_events => 1, 1960 can_events => 1,
1809 @_ 1961 @_
1810 ) 1962 )
1811} 1963}
1812 1964
1813sub activate { }
1814
1815sub button_up { 1965sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1817 1967
1818 $self->emit ("activate") 1968 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
1971
1972 1
1821} 1973}
1822 1974
1823sub _draw { 1975sub _draw {
1824 my ($self) = @_; 1976 my ($self) = @_;
1825 1977
1826 local $self->{fg} = $self->{fg}; 1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1979
1832 glEnable GL_TEXTURE_2D; 1980 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1982 glColor 0, 0, 0, 1;
1835 1983
… …
1840 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1841} 1989}
1842 1990
1843############################################################################# 1991#############################################################################
1844 1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
2025}
2026
2027#############################################################################
2028
1845package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
1846 2030
1847our @ISA = CFClient::UI::DrawBG::; 2031our @ISA = CFClient::UI::DrawBG::;
1848 2032
1849my @tex = 2033my @tex =
… …
1854 2038
1855sub new { 2039sub new {
1856 my $class = shift; 2040 my $class = shift;
1857 2041
1858 $class->SUPER::new ( 2042 $class->SUPER::new (
1859 padding => 2, 2043 padding_x => 2,
2044 padding_y => 2,
1860 fg => [1, 1, 1], 2045 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2046 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2047 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2048 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2049 state => 0,
… …
1868} 2053}
1869 2054
1870sub size_request { 2055sub size_request {
1871 my ($self) = @_; 2056 my ($self) = @_;
1872 2057
1873 ($self->{padding} * 2 + 6) x 2 2058 (6) x 2
1874} 2059}
1875 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1876sub button_down { 2069sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1878 2071
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2074 $self->toggle;
1882 $self->_emit (changed => $self->{state}); 2075 } else {
2076 return 0
2077 }
2078
1883 } 2079 1
1884} 2080}
1885 2081
1886sub _draw { 2082sub _draw {
1887 my ($self) = @_; 2083 my ($self) = @_;
1888 2084
1889 $self->SUPER::_draw; 2085 $self->SUPER::_draw;
1890 2086
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2087 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2088
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2089 my ($w, $h) = @$self{qw(w h)};
2090
2091 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2092
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2093 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2094
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2095 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2096
… …
1906package CFClient::UI::Image; 2104package CFClient::UI::Image;
1907 2105
1908our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
1909 2107
1910use CFClient::OpenGL; 2108use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2109
1913our %loaded_images; 2110our %texture_cache;
1914 2111
1915sub new { 2112sub new {
1916 my $class = shift; 2113 my $class = shift;
1917 2114
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
1919 2119
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
1921 2122
1922 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924 2125
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2127
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2129
1931 $self 2130 $self
1932} 2131}
1933 2132
1934sub size_request { 2133sub size_request {
1935 my ($self) = @_; 2134 my ($self) = @_;
1936 2135
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
1938} 2137}
1939 2138
1940sub _draw { 2139sub _draw {
1941 my ($self) = @_; 2140 my ($self) = @_;
1942 2141
… …
2051 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2052 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2053 2252
2054 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2056 2258
2057 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2264
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2265 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2266 glBegin GL_QUADS;
… …
2078 2281
2079 if ($t3) { 2282 if ($t3) {
2080 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2081 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2082 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glEnd; 2289 glEnd;
2087 } 2290 }
2088 2291
2089 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2163 fg => [1, 1, 1], 2366 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2367 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2368 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2369 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2370 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2371 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2372 min_h => $::WIDTH / 80,
2170 vertical => 0, 2373 vertical => 0,
2171 can_hover => 1, 2374 can_hover => 1,
2172 inner_pad => 0.02, 2375 inner_pad => 0.02,
2173 @_ 2376 @_
2174 ); 2377 );
… …
2177 $self->update; 2380 $self->update;
2178 2381
2179 $self 2382 $self
2180} 2383}
2181 2384
2182sub changed { }
2183
2184sub set_range { 2385sub set_range {
2185 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2186 2387
2187 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2188 2389
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2390 if ("@$range" ne "@{$self->{range}}") {
2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2191} 2394}
2192 2395
2193sub set_value { 2396sub set_value {
2194 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2195 2398
… …
2206 if $unit; 2409 if $unit;
2207 2410
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2412
2210 if ($value != $old_value) { 2413 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2212 $self->update; 2415 $self->update;
2213 } 2416 }
2214} 2417}
2215 2418
2216sub size_request { 2419sub size_request {
2217 my ($self) = @_; 2420 my ($self) = @_;
2218 2421
2219 my $w = $self->{req_w}; 2422 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2423}
2224 2424
2225sub button_down { 2425sub invoke_button_down {
2226 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2227 2427
2228 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2229 2429
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2431
2232 $self->mouse_motion ($ev, $x, $y); 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2233} 2433}
2234 2434
2235sub mouse_motion { 2435sub invoke_mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2237 2437
2238 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240 2440
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2441 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2442
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2443 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2444
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2445 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2446 } else {
2447 return 0;
2448 }
2449
2246 } 2450 1
2247} 2451}
2248 2452
2249sub update { 2453sub update {
2250 my ($self) = @_; 2454 my ($self) = @_;
2251 2455
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2456 delete $self->{knob_w};
2457 $self->SUPER::update;
2458}
2459
2460sub _draw {
2461 my ($self) = @_;
2462
2463 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2464 $self->set_value ($self->{range}[0]);
2254 2465
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2466 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2467 my $range = ($hi - $page - $lo) || 1e-100;
2257 2468
… …
2263 $value = ($value - $lo) / $range; 2474 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2475 $value = $value * $self->{scale} + $self->{offset};
2265 2476
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2477 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2478 $self->{knob_w} = $knob_w;
2268 }); 2479 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2480
2276 $self->SUPER::_draw (); 2481 $self->SUPER::_draw ();
2277 2482
2278 glScale $self->{w}, $self->{h}; 2483 glScale $self->{w}, $self->{h};
2279 2484
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2342 2547
2343############################################################################# 2548#############################################################################
2344 2549
2345package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2346 2551
2347our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2348 2553
2349use CFClient::OpenGL; 2554use CFClient::OpenGL;
2350 2555
… …
2352 my $class = shift; 2557 my $class = shift;
2353 2558
2354 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2355 fontsize => 1, 2560 fontsize => 1,
2356 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2357 #font => default_font 2563 #font => default_font
2358 @_, 2564 @_,
2359 2565
2360 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2361 par => [], 2567 par => [],
2362 height => 0, 2568 height => 0,
2363 children => [ 2569 children => [
2364 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2365 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2376 2582
2377 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2584 $self->reflow;
2379} 2585}
2380 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2381sub size_allocate { 2596sub invoke_size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2597 my ($self, $w, $h) = @_;
2383 2598
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2385 2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2386 return unless $changed;
2387 2601
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 2606
2392 $self->reflow; 2607 $self->reflow;
2393}
2394 2608
2395sub text_size { 2609 local $self->{children} = [$empty, $slider];
2396 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2397 2615
2398 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2399 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2403 2629 );
2630
2404 $layout->size 2631 $layout
2405} 2632}
2406 2633
2407sub reflow { 2634sub reflow {
2408 my ($self) = @_; 2635 my ($self) = @_;
2409 2636
… …
2418 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2419} 2646}
2420 2647
2421sub clear { 2648sub clear {
2422 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2423 2653
2424 $self->{par} = []; 2654 $self->{par} = [];
2425 $self->{height} = 0; 2655 $self->{height} = 0;
2426 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427} 2657}
2428 2658
2429sub add_paragraph { 2659sub add_paragraph {
2430 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2431 2661
2432 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2433 my ($w, $h) = $self->text_size ($line); 2663
2434 $self->{height} += $h; 2664 $para = {
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2436 } 2671 };
2437 2672
2438 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2439} 2685}
2440 2686
2441sub update { 2687sub update {
2442 my ($self) = @_; 2688 my ($self) = @_;
2443 2689
… …
2445 2691
2446 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2447 2693
2448 delete $self->{texture}; 2694 delete $self->{texture};
2449 2695
2450 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2698
2453 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2700 my $height = 0;
2455 2701
2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2460 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2462 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2463 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2706
2466 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2467 } 2710 }
2468 2711
2469 $height += $_->[1]; 2712 $height += $para->{h};
2470 } 2713 }
2471 2714
2472 $self->{height} = $height; 2715 $self->{height} = $height;
2473 2716
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2475 2718
2476 delete $self->{texture}; 2719 delete $self->{texture};
2477 } 2720 }
2478 2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2727 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2482 2729
2483 my $top = int $self->{children}[1]{range}[0]; 2730 my $top = int $self->{children}[1]{range}[0];
2484 2731
2485 my $y0 = $top; 2732 my $y0 = $top;
2486 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2487 2734
2488 my $y = 0; 2735 my $y = 0;
2489 2736
2490 my $layout = $self->{layout};
2491
2492 $layout->set_font ($self->{font}) if $self->{font};
2493
2494 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off
2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497
2498 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2499 my $h = $par->[1]; 2738 my $h = $para->{h};
2500 2739
2501 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] });
2503 $layout->set_width ($W - $par->[3]);
2504 $layout->set_markup ($par->[4]);
2505 2741
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2507 2743
2508 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2509 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2510 } 2758 }
2511 2759
2512 $y += $h; 2760 $y += $h;
2513 } 2761 }
2514
2515 glDisable GL_BLEND;
2516 }; 2762 };
2517 }); 2763 });
2518} 2764}
2519 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2520sub _draw { 2775sub _draw {
2521 my ($self) = @_; 2776 my ($self) = @_;
2522 2777
2523 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2528 2783
2529 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2530
2531} 2785}
2532 2786
2533############################################################################# 2787#############################################################################
2534 2788
2535package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2614} 2868}
2615 2869
2616sub set_tooltip_from { 2870sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2618 2872
2873 my $tooltip = $widget->{tooltip};
2874
2875 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}";
2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2884
2619 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2888 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2890 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633 2899
2634 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2635} 2901}
2636 2902
2637sub size_allocate { 2903sub invoke_size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2904 my ($self, $w, $h) = @_;
2639 2905
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2907}
2908
2909sub invoke_visibility_change {
2910 my ($self, $visible) = @_;
2911
2912 return unless $visible;
2913
2914 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner}
2916 or return;
2917
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w};
2922
2923 $self->move_abs ($x, $y);
2924 });
2643} 2925}
2644 2926
2645sub _draw { 2927sub _draw {
2646 my ($self) = @_; 2928 my ($self) = @_;
2647 2929
… …
2664 glVertex $w, $h; 2946 glVertex $w, $h;
2665 glVertex $w, 0; 2947 glVertex $w, 0;
2666 glEnd; 2948 glEnd;
2667 2949
2668 glTranslate 2 - 0.375, 2 - 0.375; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2951
2669 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2670} 2953}
2671 2954
2672############################################################################# 2955#############################################################################
2673 2956
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 3016
2734 if ($tex) { 3017 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2740 } 3023 }
2741} 3024}
2742 3025
2743sub DESTROY { 3026sub destroy {
2744 my ($self) = @_; 3027 my ($self) = @_;
2745 3028
2746 $self->{timer}->cancel 3029 $self->{timer}->cancel
2747 if $self->{timer}; 3030 if $self->{timer};
2748 3031
2749 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2750} 3033}
2751 3034
2752############################################################################# 3035#############################################################################
2753 3036
2754package CFClient::UI::Inventory; 3037package CFClient::UI::Buttonbar;
2755 3038
2756our @ISA = CFClient::UI::ScrolledWindow::; 3039our @ISA = CFClient::UI::HBox::;
2757 3040
2758sub new { 3041# TODO: should actualyl wrap buttons and other goodies.
2759 my $class = shift;
2760
2761 my $self = $class->SUPER::new (
2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763 @_,
2764 );
2765
2766 $self
2767}
2768
2769sub set_items {
2770 my ($self, $items) = @_;
2771
2772 $self->{scrolled}->clear;
2773 return unless $items;
2774
2775 my @items = sort {
2776 ($a->{type} <=> $b->{type})
2777 or ($a->{name} cmp $b->{name})
2778 } @$items;
2779
2780 $self->{real_items} = \@items;
2781
2782 my $row = 0;
2783 for my $item (@items) {
2784 CFClient::Item::update_widgets $item;
2785
2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790 $row++;
2791 }
2792}
2793 3042
2794############################################################################# 3043#############################################################################
2795 3044
2796package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2797 3046
… …
2809 ); 3058 );
2810 3059
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 3061
2813 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2815 3064
2816 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2817 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
2818 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
2819 can_hover => 1, 3082 can_hover => 1,
2820 can_events => 1, 3083 can_events => 1,
2821 text => $widget; 3084 markup => $widget,
3085 tooltip => $tooltip;
3086 }
2822 } 3087 }
2823 3088
2824 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
2825 3090
2826 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
2831 3096
2832# popup given the event (must be a mouse button down event currently) 3097# popup given the event (must be a mouse button down event currently)
2833sub popup { 3098sub popup {
2834 my ($self, $ev) = @_; 3099 my ($self, $ev) = @_;
2835 3100
2836 $self->_emit ("popdown"); 3101 $self->emit ("popdown");
2837 3102
2838 # maybe save $GRAB? must be careful about events... 3103 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 3104 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 3105 $self->{button} = $ev->{button};
2841 3106
2842 $self->show; 3107 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3108 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 3109}
2845 3110
2846sub mouse_motion { 3111sub invoke_mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2848 3113
2849 # TODO: should use vbox->find_widget or so 3114 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3115 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 3116 $self->{hover} = $self->{item}{$HOVER};
2852}
2853 3117
3118 0
3119}
3120
2854sub button_up { 3121sub invoke_button_up {
2855 my ($self, $ev, $x, $y) = @_; 3122 my ($self, $ev, $x, $y) = @_;
2856 3123
2857 if ($ev->{button} == $self->{button}) { 3124 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB; 3125 undef $GRAB;
2859 $self->hide; 3126 $self->hide;
2860 3127
2861 $self->_emit ("popdown"); 3128 $self->emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 3129 $self->{hover}[1]->() if $self->{hover};
3130 } else {
3131 return 0
3132 }
3133
2863 } 3134 1
2864} 3135}
2865 3136
2866############################################################################# 3137#############################################################################
2867 3138
2868package CFClient::UI::Statusbox; 3139package CFClient::UI::Multiplexer;
2869 3140
2870our @ISA = CFClient::UI::VBox::; 3141our @ISA = CFClient::UI::Container::;
2871 3142
2872sub new { 3143sub new {
2873 my $class = shift; 3144 my $class = shift;
2874 3145
2875 $class->SUPER::new ( 3146 my $self = $class->SUPER::new (
3147 @_,
3148 );
3149
3150 $self->{current} = $self->{children}[0]
3151 if @{ $self->{children} };
3152
3153 $self
3154}
3155
3156sub add {
3157 my ($self, @widgets) = @_;
3158
3159 $self->SUPER::add (@widgets);
3160
3161 $self->{current} = $self->{children}[0]
3162 if @{ $self->{children} };
3163}
3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3169}
3170
3171sub set_current_page {
3172 my ($self, $page_or_widget) = @_;
3173
3174 my $widget = ref $page_or_widget
3175 ? $page_or_widget
3176 : $self->{children}[$page_or_widget];
3177
3178 $self->{current} = $widget;
3179 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3180
3181 $self->emit (page_changed => $self->{current});
3182
3183 $self->realloc;
3184}
3185
3186sub visible_children {
3187 $_[0]{current}
3188}
3189
3190sub size_request {
3191 my ($self) = @_;
3192
3193 $self->{current}->size_request
3194}
3195
3196sub invoke_size_allocate {
3197 my ($self, $w, $h) = @_;
3198
3199 $self->{current}->configure (0, 0, $w, $h);
3200
3201 1
3202}
3203
3204sub _draw {
3205 my ($self) = @_;
3206
3207 $self->{current}->draw;
3208}
3209
3210#############################################################################
3211
3212package CFClient::UI::Notebook;
3213
3214our @ISA = CFClient::UI::VBox::;
3215
3216sub new {
3217 my $class = shift;
3218
3219 my $self = $class->SUPER::new (
3220 buttonbar => (new CFClient::UI::Buttonbar),
3221 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3222 # filter => # will be put between multiplexer and $self
3223 @_,
3224 );
3225
3226 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3227 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3228
3229 $self
3230}
3231
3232sub add {
3233 my ($self, $title, $widget, $tooltip) = @_;
3234
3235 Scalar::Util::weaken $self;
3236
3237 $self->{buttonbar}->add (new CFClient::UI::Button
3238 markup => $title,
3239 tooltip => $tooltip,
3240 on_activate => sub { $self->set_current_page ($widget) },
3241 );
3242
3243 $self->{multiplexer}->add ($widget);
3244}
3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3250}
3251
3252sub set_current_page {
3253 my ($self, $page) = @_;
3254
3255 $self->{multiplexer}->set_current_page ($page);
3256 $self->emit (page_changed => $self->{multiplexer}{current});
3257}
3258
3259#############################################################################
3260
3261package CFClient::UI::Combobox;
3262
3263use utf8;
3264
3265our @ISA = CFClient::UI::Button::;
3266
3267sub new {
3268 my $class = shift;
3269
3270 my $self = $class->SUPER::new (
3271 options => [], # [value, title, longdesc], ...
3272 value => undef,
3273 @_,
3274 );
3275
3276 $self->_set_value ($self->{value});
3277
3278 $self
3279}
3280
3281sub invoke_button_down {
3282 my ($self, $ev) = @_;
3283
3284 my @menu_items;
3285
3286 for (@{ $self->{options} }) {
3287 my ($value, $title, $tooltip) = @$_;
3288
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 }
3291
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293}
3294
3295sub _set_value {
3296 my ($self, $value) = @_;
3297
3298 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3299 or return;
3300
3301 $self->{value} = $item->[0];
3302 $self->set_markup ("$item->[1] ⇓");
3303 $self->set_tooltip ($item->[2]);
3304}
3305
3306sub set_value {
3307 my ($self, $value) = @_;
3308
3309 return unless $self->{value} ne $value;
3310
3311 $self->_set_value ($value);
3312 $self->emit (changed => $value);
3313}
3314
3315#############################################################################
3316
3317package CFClient::UI::Statusbox;
3318
3319our @ISA = CFClient::UI::VBox::;
3320
3321sub new {
3322 my $class = shift;
3323
3324 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3325 fontsize => 0.8,
2877 @_, 3326 @_,
2878 ) 3327 );
3328
3329 Scalar::Util::weaken (my $this = $self);
3330
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332
3333 $self
2879} 3334}
2880 3335
2881sub reorder { 3336sub reorder {
2882 my ($self) = @_; 3337 my ($self) = @_;
2883 my $NOW = time; 3338 my $NOW = Time::HiRes::time;
3339
3340 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} };
2884 3344
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3345 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3346 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3347 }
2888 3348
… …
2891 my @items = sort { 3351 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3352 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3353 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3354 } values %{ $self->{item} };
2895 3355
3356 $self->{timer}->interval (1);
3357
2896 my $count = 10 + 1; 3358 my $count = 10 + 1;
2897 for my $item (@items) { 3359 for my $item (@items) {
2898 last unless --$count; 3360 last unless --$count;
2899 3361
2900 push @widgets, $item->{label} ||= do { 3362 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3363 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3364 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3365 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3366 : $item->{text};
2905 3367
… …
2913 tooltip => $item->{tooltip}, 3375 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3376 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3377 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3378 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3379 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3380 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3381 can_events => 1,
2920 can_hover => 1 3382 can_hover => 1
2921 }; 3383 };
3384
3385 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387 $label->update;
3388 $label->set_max_size (undef, $label->{req_h} * $diff)
3389 if $diff < 1;
3390 $self->{timer}->interval (1/30);
3391 } else {
3392 $label->{fg}[3] = $item->{fg}[3] || 1;
3393 }
3394
3395 push @widgets, $label;
2922 } 3396 }
2923 3397
2924 $self->clear; 3398 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3399 $self->SUPER::add (reverse @widgets);
2926} 3400}
… …
2931 $text =~ s/^\s+//; 3405 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3406 $text =~ s/\s+$//;
2933 3407
2934 return unless $text; 3408 return unless $text;
2935 3409
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3410 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3411
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3412 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3413
2940 if (my $item = $self->{item}{$group}) { 3414 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3415 if ($item->{text} eq $text) {
2942 $item->{count}++; 3416 $item->{count}++;
2943 } else { 3417 } else {
2944 $item->{count} = 1; 3418 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3419 $item->{text} = $item->{tooltip} = $text;
2946 } 3420 }
2947 $item->{id} = ++$self->{id}; 3421 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3422 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3423 delete $item->{label};
2950 } else { 3424 } else {
2951 $self->{item}{$group} = { 3425 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3426 id => ++$self->{id},
… …
2958 count => 1, 3432 count => 1,
2959 %arg, 3433 %arg,
2960 }; 3434 };
2961 } 3435 }
2962 3436
3437 $ROOT->on_refresh (reorder => sub {
2963 $self->reorder; 3438 $self->reorder;
3439 });
2964} 3440}
2965 3441
2966sub reconfigure { 3442sub reconfigure {
2967 my ($self) = @_; 3443 my ($self) = @_;
2968 3444
… …
2971 3447
2972 $self->reorder; 3448 $self->reorder;
2973 $self->SUPER::reconfigure; 3449 $self->SUPER::reconfigure;
2974} 3450}
2975 3451
3452sub destroy {
3453 my ($self) = @_;
3454
3455 $self->{timer}->cancel;
3456
3457 $self->SUPER::destroy;
3458}
3459
2976############################################################################# 3460#############################################################################
2977 3461
3462package CFClient::UI::Inventory;
3463
3464our @ISA = CFClient::UI::Table::;
3465
3466sub new {
3467 my $class = shift;
3468
3469 my $self = $class->SUPER::new (
3470 col_expand => [0, 1, 0],
3471 @_,
3472 );
3473
3474 $self
3475}
3476
3477sub set_items {
3478 my ($self, $items) = @_;
3479
3480 $self->clear;
3481 return unless $items;
3482
3483 my @items = sort {
3484 ($a->{type} <=> $b->{type})
3485 or ($a->{name} cmp $b->{name})
3486 } values %$items;
3487
3488 $self->{real_items} = \@items;
3489
3490 my $row = 0;
3491 for my $item (@items) {
3492 CFClient::Item::update_widgets $item;
3493
3494 $self->add (0, $row, $item->{face_widget});
3495 $self->add (1, $row, $item->{desc_widget});
3496 $self->add (2, $row, $item->{weight_widget});
3497
3498 $row++;
3499 }
3500}
3501
3502#############################################################################
3503
3504package CFClient::UI::SpellList;
3505
3506our @ISA = CFClient::UI::Table::;
3507
3508sub new {
3509 my $class = shift;
3510
3511 my $self = $class->SUPER::new (
3512 binding => [],
3513 commands => [],
3514 @_,
3515 )
3516}
3517
3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3519
3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530
3531sub rebuild_spell_list {
3532 my ($self) = @_;
3533
3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3535 $self->clear;
3536
3537 return unless $::CONN;
3538
3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3566 } else {
3567 return 0;
3568 }
3569
3570 1
3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599 }
3600 });
3601}
3602
3603sub add_spell {
3604 my ($self, $spell) = @_;
3605
3606 $self->{spell}->{$spell->{name}} = $spell;
3607 $self->rebuild_spell_list;
3608}
3609
3610sub remove_spell {
3611 my ($self, $spell) = @_;
3612
3613 delete $self->{spell}->{$spell->{name}};
3614 $self->rebuild_spell_list;
3615}
3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3624#############################################################################
3625
2978package CFClient::UI::Root; 3626package CFClient::UI::Root;
2979 3627
2980our @ISA = CFClient::UI::Container::; 3628our @ISA = CFClient::UI::Container::;
3629
3630use List::Util qw(min max);
2981 3631
2982use CFClient::OpenGL; 3632use CFClient::OpenGL;
2983 3633
2984sub new { 3634sub new {
2985 my $class = shift; 3635 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3642 Scalar::Util::weaken ($self->{root} = $self);
2993 3643
2994 $self 3644 $self
2995} 3645}
2996 3646
2997sub configure {
2998 my ($self, $x, $y, $w, $h) = @_;
2999
3000 $self->{w} = $w;
3001 $self->{h} = $h;
3002}
3003
3004sub reconfigure {
3005 my ($self) = @_;
3006
3007 $self->SUPER::reconfigure;
3008
3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
3010 if $self->{w};
3011}
3012
3013sub size_request { 3647sub size_request {
3014 my ($self) = @_; 3648 my ($self) = @_;
3015 3649
3016 ($self->{w}, $self->{h}) 3650 ($self->{w}, $self->{h})
3017} 3651}
3018 3652
3653sub _to_pixel {
3654 my ($coord, $size, $max) = @_;
3655
3656 $coord =
3657 $coord eq "center" ? ($max - $size) * 0.5
3658 : $coord eq "max" ? $max
3659 : $coord;
3660
3661 $coord = 0 if $coord < 0;
3662 $coord = $max - $size if $coord > $max - $size;
3663
3664 int $coord + 0.5
3665}
3666
3019sub size_allocate { 3667sub invoke_size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3668 my ($self, $w, $h) = @_;
3021 3669
3022 for my $child ($self->children) { 3670 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3671 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3672
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3673 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3674 $Y = $child->{force_y} if exists $child->{force_y};
3027 3675
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3676 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3677 $Y = _to_pixel $Y, $H, $self->{h};
3030
3031 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3678
3036 $child->configure ($X, $Y, $W, $H); 3679 $child->configure ($X, $Y, $W, $H);
3037 } 3680 }
3681
3682 1
3038} 3683}
3039 3684
3040sub coord2local { 3685sub coord2local {
3041 my ($self, $x, $y) = @_; 3686 my ($self, $x, $y) = @_;
3042 3687
… …
3056} 3701}
3057 3702
3058sub add { 3703sub add {
3059 my ($self, @children) = @_; 3704 my ($self, @children) = @_;
3060 3705
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3706 $_->{is_toplevel} = 1
3063 3707 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3708
3069 $self->SUPER::add (@children); 3709 $self->SUPER::add (@children);
3070} 3710}
3071 3711
3072sub remove { 3712sub remove {
3073 my ($self, @children) = @_; 3713 my ($self, @children) = @_;
3074 3714
3075 $self->SUPER::remove (@children); 3715 $self->SUPER::remove (@children);
3716
3717 delete $self->{is_toplevel}
3718 for @children;
3076 3719
3077 while (@children) { 3720 while (@children) {
3078 my $w = pop @children; 3721 my $w = pop @children;
3079 push @children, $w->children; 3722 push @children, $w->children;
3080 $w->set_invisible; 3723 $w->set_invisible;
… …
3100 $_->() 3743 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3744 for values %{delete $self->{refresh_hook}};
3102 } 3745 }
3103 3746
3104 if ($self->{realloc}) { 3747 if ($self->{realloc}) {
3748 my %queue;
3105 my @queue; 3749 my @queue;
3750 my $widget;
3106 3751
3752 outer:
3107 while () { 3753 while () {
3108 if ($self->{realloc}) { 3754 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3755 for $widget (values %$realloc) {
3756 $widget->{visible} or next; # do not resize invisible widgets
3110 3757
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3758 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3759
3760 push @{ $queue[$widget->{visible}] }, $widget;
3761 }
3113 } 3762 }
3114 3763
3764 while () {
3765 @queue or last outer;
3766
3767 $widget = pop @{ $queue[-1] || [] }
3768 and last;
3769
3770 pop @queue;
3771 }
3772
3773 delete $queue{$widget+0};
3774
3775 my ($w, $h) = $widget->size_request;
3776
3777 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3778 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3779
3780 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3781 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3782
3783 $w = $widget->{force_w} if exists $widget->{force_w};
3784 $h = $widget->{force_h} if exists $widget->{force_h};
3785
3786 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3787 || delete $widget->{force_realloc}) {
3788 $widget->{req_w} = $w;
3789 $widget->{req_h} = $h;
3790
3791 $self->{size_alloc}{$widget+0} = $widget;
3792
3793 if (my $parent = $widget->{parent}) {
3794 $self->{realloc}{$parent+0} = $parent
3795 unless $queue{$parent+0};
3796
3797 $parent->{force_size_alloc} = 1;
3798 $self->{size_alloc}{$parent+0} = $parent;
3799 }
3800 }
3801
3802 delete $self->{realloc}{$widget+0};
3803 }
3804 }
3805
3806 while (my $size_alloc = delete $self->{size_alloc}) {
3807 my @queue = sort { $b->{visible} <=> $a->{visible} }
3808 values %$size_alloc;
3809
3810 while () {
3115 my $widget = pop @queue || last; 3811 my $widget = pop @queue || last;
3116 3812
3117 $widget->{visible} or last; # do not resize invisible widgets 3813 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120 ? @$widget{qw(def_w def_h)}
3121 : $widget->size_request;
3122
3123 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125 $widget->{req_w} = $w;
3126 $widget->{req_h} = $h;
3127
3128 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130 push @queue, $widget->{parent}
3131 if $widget->{parent};
3132 }
3133 }
3134
3135 while (my $size_alloc = delete $self->{size_alloc}) {
3136 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137 values %$size_alloc;
3138
3139 while () {
3140 my ($widget, $w, $h) = @{ pop @queue or last };
3141 3814
3142 $w = 0 if $w < 0; 3815 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3816 $h = 0 if $h < 0;
3144 3817
3818 $w = int $w + 0.5;
3819 $h = int $h + 0.5;
3820
3821 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822 $widget->{old_w} = $widget->{w};
3823 $widget->{old_h} = $widget->{h};
3824
3145 $widget->{w} = $w; 3825 $widget->{w} = $w;
3146 $widget->{h} = $h; 3826 $widget->{h} = $h;
3827
3147 $widget->emit (size_allocate => $w, $h, 1); 3828 $widget->emit (size_allocate => $w, $h);
3829 }
3148 } 3830 }
3149 } 3831 }
3150 3832
3151 while ($self->{post_alloc_hook}) { 3833 while ($self->{post_alloc_hook}) {
3152 $_->() 3834 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3835 for values %{delete $self->{post_alloc_hook}};
3154 } 3836 }
3837
3155 3838
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3839 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3840 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3841 glClear GL_COLOR_BUFFER_BIT;
3159 3842
… …
3161 glLoadIdentity; 3844 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3845 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3846 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3847 glLoadIdentity;
3165 3848
3849 {
3850 package CFClient::UI::Base;
3851
3852 ($draw_x, $draw_y, $draw_w, $draw_h) =
3853 (0, 0, $self->{w}, $self->{h});
3854 }
3855
3166 $self->_draw; 3856 $self->_draw;
3167} 3857}
3168 3858
3169############################################################################# 3859#############################################################################
3170 3860

Diff Legend

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