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.314 by root, Mon Jun 26 21:59:04 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 my $focus = $FOCUS; $FOCUS = $self;
417 429
418 $self->_emit (focus_in => $focus);
419
420 $focus->update if $focus; 430 $focus->update if $focus;
421 $FOCUS->update; 431 $FOCUS->update;
422}
423 432
433 0
434}
435
424sub focus_out { 436sub invoke_focus_out {
425 my ($self) = @_; 437 my ($self) = @_;
426 438
427 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
428 440
429 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
430 442
431 $self->_emit (focus_out => $focus);
432
433 $focus->update if $focus; #? 443 $focus->update if $focus; #?
434 444
435 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
436 unless $FOCUS; 446 unless $FOCUS;
437}
438 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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->hide };
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
1065sub button_down { 1160sub invoke_button_down {
1066 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1067 1162
1068 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1069 my $border = $self->border; 1164 my $border = $self->border;
1070 1165
… …
1083 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
1084 1179
1085 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
1086 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1087 1182
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092 $self->move ($self->{user_x}, $self->{user_y}); 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 $self->realloc; 1187 $self->realloc;
1094 }; 1188 };
1095 1189
1096 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1097 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1100 $self->{motion} = sub { 1194 $self->{motion} = sub {
1101 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1102 1196
1103 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1104 1198
1105 $self->{user_x} = $bx + $x - $ox; 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106 $self->{user_y} = $by + $y - $oy; 1200 # HACK: the next line is required to enforce placement
1107 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1108 $self->move ($self->{user_x}, $self->{user_y});
1109 $self->realloc;
1110 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1111 } 1207 1
1112} 1208}
1113 1209
1114sub button_up { 1210sub invoke_button_up {
1115 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1116 1212
1117 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1118} 1214}
1119 1215
1120sub mouse_motion { 1216sub invoke_mouse_motion {
1121 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1122 1218
1123 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1124} 1222}
1125 1223
1126sub _draw { 1224sub _draw {
1127 my ($self) = @_; 1225 my ($self) = @_;
1128 1226
1227 my $child = $self->{children}[0];
1228
1129 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1131 1231
1132 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134 1234
1135 my $border = $self->border; 1235 my $border = $self->border;
1136 1236
1137 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142 1242
1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
1145 1245
1146 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1147 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1148 my $rep_y = $ch / $bg->{h}; 1249 $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); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 } 1251 }
1157 1252
1158 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1159 1254
1160 $self->{title}->draw if $self->{title};
1161
1162 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1163} 1266}
1164 1267
1165############################################################################# 1268#############################################################################
1166 1269
1167package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1190 1293
1191 $child->set_parent ($self); 1294 $child->set_parent ($self);
1192 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1193 1296
1194 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1195} 1304}
1196 1305
1197# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1198sub clear { 1307sub clear {
1199 my ($self) = @_; 1308 my ($self) = @_;
… …
1240 (sum @$ws), 1349 (sum @$ws),
1241 (sum @$hs), 1350 (sum @$hs),
1242 ) 1351 )
1243} 1352}
1244 1353
1245sub size_allocate { 1354sub invoke_size_allocate {
1246 my ($self, $w, $h, $changed) = @_; 1355 my ($self, $w, $h) = @_;
1247 1356
1248 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1249 1358
1250 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1251 my $req_h = (sum @$hs) || 1; 1360 my $req_h = (sum @$hs) || 1;
… …
1282 } 1391 }
1283 1392
1284 $y += $row_h; 1393 $y += $row_h;
1285 } 1394 }
1286 1395
1396 1
1287} 1397}
1288 1398
1289sub find_widget { 1399sub find_widget {
1290 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1291 1401
… …
1328 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1329 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1330 ) 1440 )
1331} 1441}
1332 1442
1333sub size_allocate { 1443sub invoke_size_allocate {
1334 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1335 1445
1336 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1337 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1338 1448
1339 my @req; 1449 my @req;
1340 1450
1341 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1342 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1343 } else { 1453 } else {
1344 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1345 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1346 1456
1347 if ($req > $space) { 1457 if ($req > $space) {
1348 # ah well, not enough space 1458 # ah well, not enough space
1349 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1350 } else { 1460 } else {
1351 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1352 1462
1353 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1354 1464
1355 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1356 for 0 .. $#$children; 1466 for 0 .. $#children;
1357 } 1467 }
1358 } 1468 }
1359 1469
1360 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1361 1471
1362 my $pos = 0; 1472 my $pos = 0;
1363 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1364 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1365 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1366 1476
1367 $pos += $alloc; 1477 $pos += $alloc;
1368 } 1478 }
1369 1479
1370 1 1480 1
… …
1422 ellipsise => 3, # end 1532 ellipsise => 3, # end
1423 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1424 fontsize => 1, 1534 fontsize => 1,
1425 align => -1, 1535 align => -1,
1426 valign => -1, 1536 valign => -1,
1427 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1428 can_events => 0, 1539 can_events => 0,
1429 %arg 1540 %arg
1430 ); 1541 );
1431 1542
1432 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1459 1570
1460 delete $self->{texture}; 1571 delete $self->{texture};
1461 $self->SUPER::update; 1572 $self->SUPER::update;
1462} 1573}
1463 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1464sub set_text { 1582sub set_text {
1465 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1466 1584
1467 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1468 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1469 1587
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1472 1590
1591 delete $self->{size_req};
1473 $self->realloc; 1592 $self->realloc;
1593 $self->update;
1474} 1594}
1475 1595
1476sub set_markup { 1596sub set_markup {
1477 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1478 1598
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1603
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1486 1606
1607 delete $self->{size_req};
1487 $self->realloc; 1608 $self->realloc;
1609 $self->update;
1488} 1610}
1489 1611
1490sub size_request { 1612sub size_request {
1491 my ($self) = @_; 1613 my ($self) = @_;
1492 1614
1615 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1621
1499 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1500 1623
1501 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1627
1505 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1506 1629
1507 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1509 } 1635 };
1510 1636
1511 ( 1637 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1638}
1516 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1517sub size_allocate { 1644sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1519 1648
1520 delete $self->{texture} 1649 delete $self->{texture}
1521 if $changed; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1522} 1653}
1523 1654
1524sub set_fontsize { 1655sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1526 1657
1527 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1659 delete $self->{texture};
1529 1660
1530 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1531} 1670}
1532 1671
1533sub _draw { 1672sub _draw {
1534 my ($self) = @_; 1673 my ($self) = @_;
1535 1674
… …
1541 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1684
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1547 1687
1688 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1551 1692
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1696 };
1558 1697
1559 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1702
1562 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1710 }
1568 1711
1569 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1570} 1713}
1571 1714
… …
1588 can_hover => 1, 1731 can_hover => 1,
1589 can_focus => 1, 1732 can_focus => 1,
1590 valign => 0, 1733 valign => 0,
1591 can_events => 1, 1734 can_events => 1,
1592 #text => ... 1735 #text => ...
1736 #hidden => "*",
1593 @_ 1737 @_
1594 ) 1738 )
1595} 1739}
1596 1740
1597sub _set_text { 1741sub _set_text {
… …
1599 1743
1600 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1601 1745
1602 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1603 1747
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1749 $self->{text} = $text;
1608 1750
1609 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1611 1754
1612 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1613} 1759}
1614 1760
1615sub set_text { 1761sub set_text {
1616 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1617 1763
1618 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1765 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1766}
1623 1767
1624sub get_text { 1768sub get_text {
1625 $_[0]{text} 1769 $_[0]{text}
1626} 1770}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1632 1776
1633 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1634} 1778}
1635 1779
1636sub key_down { 1780sub invoke_key_down {
1637 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1638 1782
1639 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1802 $self->emit ('escape');
1659 } elsif ($uni) { 1803 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1661 } 1807 }
1662 1808
1663 $self->_set_text ($text); 1809 $self->_set_text ($text);
1664 1810
1665 $self->realloc; 1811 $self->realloc;
1666}
1667 1812
1813 1
1814}
1815
1668sub focus_in { 1816sub invoke_focus_in {
1669 my ($self) = @_; 1817 my ($self) = @_;
1670 1818
1671 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1672 1820
1673 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1674} 1822}
1675 1823
1676sub button_down { 1824sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1678 1826
1679 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1828
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1830
1683 # byte-index to char-index 1831 # byte-index to char-index
1684 my $text = $self->{text}; 1832 my $text = $self->{text};
1685 utf8::encode $text; 1833 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1687 1835
1688 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1689 $self->update; 1837 $self->update;
1838
1839 1
1690} 1840}
1691 1841
1692sub mouse_motion { 1842sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1695} 1847}
1696 1848
1697sub _draw { 1849sub _draw {
1698 my ($self) = @_; 1850 my ($self) = @_;
1699 1851
1700 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1701 1853
1702 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1705 } else { 1857 } else {
1706 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1707 } 1859 }
1708 1860
1709 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1864 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1740 1892
1741our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1742 1894
1743use CFClient::OpenGL; 1895use CFClient::OpenGL;
1744 1896
1745sub key_down { 1897sub invoke_key_down {
1746 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1747 1899
1748 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1749 1901
1750 if ($sym == 13) { 1902 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1753 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1756 $self->update; 1909 $self->update;
1757 1910
1758 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 1929 } else {
1777 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1778 } 1931 }
1779 1932
1780 } else { 1933 } else {
1781 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1782 } 1937 1
1783
1784} 1938}
1785 1939
1786############################################################################# 1940#############################################################################
1787 1941
1788package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1797 1951
1798sub new { 1952sub new {
1799 my $class = shift; 1953 my $class = shift;
1800 1954
1801 $class->SUPER::new ( 1955 $class->SUPER::new (
1802 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1803 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1805 can_hover => 1, 1960 can_hover => 1,
1806 align => 0, 1961 align => 0,
1807 valign => 0, 1962 valign => 0,
1808 can_events => 1, 1963 can_events => 1,
1809 @_ 1964 @_
1810 ) 1965 )
1811} 1966}
1812 1967
1813sub activate { }
1814
1815sub button_up { 1968sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1817 1970
1818 $self->emit ("activate") 1971 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1821} 1976}
1822 1977
1823sub _draw { 1978sub _draw {
1824 my ($self) = @_; 1979 my ($self) = @_;
1825 1980
1826 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1982
1832 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1835 1986
… …
1840 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1841} 1992}
1842 1993
1843############################################################################# 1994#############################################################################
1844 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1845package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1846 2033
1847our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1848 2035
1849my @tex = 2036my @tex =
… …
1854 2041
1855sub new { 2042sub new {
1856 my $class = shift; 2043 my $class = shift;
1857 2044
1858 $class->SUPER::new ( 2045 $class->SUPER::new (
1859 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1860 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2052 state => 0,
… …
1868} 2056}
1869 2057
1870sub size_request { 2058sub size_request {
1871 my ($self) = @_; 2059 my ($self) = @_;
1872 2060
1873 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1874} 2062}
1875 2063
1876sub button_down { 2064sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1878 2066
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1883 } 2075 1
1884} 2076}
1885 2077
1886sub _draw { 2078sub _draw {
1887 my ($self) = @_; 2079 my ($self) = @_;
1888 2080
1889 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1890 2082
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2084
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2088
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2090
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2092
… …
1906package CFClient::UI::Image; 2100package CFClient::UI::Image;
1907 2101
1908our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1909 2103
1910use CFClient::OpenGL; 2104use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2105
1913our %loaded_images; 2106our %texture_cache;
1914 2107
1915sub new { 2108sub new {
1916 my $class = shift; 2109 my $class = shift;
1917 2110
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1919 2115
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1921 2118
1922 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924 2121
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2123
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2125
1931 $self 2126 $self
1932} 2127}
1933 2128
1934sub size_request { 2129sub size_request {
1935 my ($self) = @_; 2130 my ($self) = @_;
1936 2131
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1938} 2133}
1939 2134
1940sub _draw { 2135sub _draw {
1941 my ($self) = @_; 2136 my ($self) = @_;
1942 2137
… …
2053 2248
2054 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2056 2251
2057 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2257
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2163 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2164 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2165 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2166 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2167 range => [0, 0, 100, 10, 0], 2363 range => [0, 0, 100, 10, 0],
2168 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2169 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2170 vertical => 0, 2366 vertical => 0,
2171 can_hover => 1, 2367 can_hover => 1,
2172 inner_pad => 0.02, 2368 inner_pad => 0.02,
2173 @_ 2369 @_
2174 ); 2370 );
… …
2177 $self->update; 2373 $self->update;
2178 2374
2179 $self 2375 $self
2180} 2376}
2181 2377
2182sub changed { }
2183
2184sub set_range { 2378sub set_range {
2185 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2186 2380
2187 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2188 2382
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2191} 2387}
2192 2388
2193sub set_value { 2389sub set_value {
2194 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2195 2391
… …
2206 if $unit; 2402 if $unit;
2207 2403
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2405
2210 if ($value != $old_value) { 2406 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2212 $self->update; 2408 $self->update;
2213 } 2409 }
2214} 2410}
2215 2411
2216sub size_request { 2412sub size_request {
2217 my ($self) = @_; 2413 my ($self) = @_;
2218 2414
2219 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2220 my $h = $self->{req_h};
2221
2222 $self->{vertical} ? ($h, $w) : ($w, $h)
2223} 2416}
2224 2417
2225sub button_down { 2418sub invoke_button_down {
2226 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2227 2420
2228 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2229 2422
2230 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231 2424
2232 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2233} 2426}
2234 2427
2235sub mouse_motion { 2428sub invoke_mouse_motion {
2236 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2237 2430
2238 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2239 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2240 2433
2241 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2242 2435
2243 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244 2437
2245 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2246 } 2443 1
2247} 2444}
2248 2445
2249sub update { 2446sub update {
2250 my ($self) = @_; 2447 my ($self) = @_;
2251 2448
2252 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2253 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2254 2458
2255 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2256 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2257 2461
… …
2263 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2264 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2265 2469
2266 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2267 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2268 }); 2472 }
2269
2270 $self->SUPER::update;
2271}
2272
2273sub _draw {
2274 my ($self) = @_;
2275 2473
2276 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2277 2475
2278 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2279 2477
… …
2340sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2341sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2342 2540
2343############################################################################# 2541#############################################################################
2344 2542
2345package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2346 2544
2347our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2348 2546
2349use CFClient::OpenGL; 2547use CFClient::OpenGL;
2350 2548
… …
2352 my $class = shift; 2550 my $class = shift;
2353 2551
2354 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2355 fontsize => 1, 2553 fontsize => 1,
2356 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2357 #font => default_font 2556 #font => default_font
2358 @_, 2557 @_,
2359 2558
2360 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2361 par => [], 2560 par => [],
… …
2376 2575
2377 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2378 $self->reflow; 2577 $self->reflow;
2379} 2578}
2380 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2381sub size_allocate { 2589sub invoke_size_allocate {
2382 my ($self, $w, $h, $changed) = @_; 2590 my ($self, $w, $h) = @_;
2383 2591
2384 $self->SUPER::size_allocate ($w, $h, $changed); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2385 2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2386 return unless $changed;
2387 2594
2388 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 2599
2392 $self->reflow; 2600 $self->reflow;
2393}
2394 2601
2395sub text_size { 2602 local $self->{children} = [$empty, $slider];
2396 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2397 2608
2398 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2399 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2400 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2401 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2402 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2403 2622 );
2623
2404 $layout->size 2624 $layout
2405} 2625}
2406 2626
2407sub reflow { 2627sub reflow {
2408 my ($self) = @_; 2628 my ($self) = @_;
2409 2629
… …
2418 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2419} 2639}
2420 2640
2421sub clear { 2641sub clear {
2422 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2423 2646
2424 $self->{par} = []; 2647 $self->{par} = [];
2425 $self->{height} = 0; 2648 $self->{height} = 0;
2426 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2427} 2650}
2428 2651
2429sub add_paragraph { 2652sub add_paragraph {
2430 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2431 2654
2432 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2433 my ($w, $h) = $self->text_size ($line); 2656
2434 $self->{height} += $h; 2657 $para = {
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2436 } 2664 };
2437 2665
2438 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2439} 2678}
2440 2679
2441sub update { 2680sub update {
2442 my ($self) = @_; 2681 my ($self) = @_;
2443 2682
… …
2445 2684
2446 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2447 2686
2448 delete $self->{texture}; 2687 delete $self->{texture};
2449 2688
2450 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452 2691
2453 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2454 my $height = 0; 2693 my $height = 0;
2455 2694
2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2460 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2461 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2462 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2463 $layout->set_markup ($_->[4]);
2464 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2465 $_->[0] = $w + $_->[3]; 2699
2466 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2467 } 2703 }
2468 2704
2469 $height += $_->[1]; 2705 $height += $para->{h};
2470 } 2706 }
2471 2707
2472 $self->{height} = $height; 2708 $self->{height} = $height;
2473 2709
2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2475 2711
2476 delete $self->{texture}; 2712 delete $self->{texture};
2477 } 2713 }
2478 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2479 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2480 glClearColor 0.5, 0.5, 0.5, 0; 2720 glClearColor 0, 0, 0, 0;
2481 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2482 2722
2483 my $top = int $self->{children}[1]{range}[0]; 2723 my $top = int $self->{children}[1]{range}[0];
2484 2724
2485 my $y0 = $top; 2725 my $y0 = $top;
2486 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2487 2727
2488 my $y = 0; 2728 my $y = 0;
2489
2490 my $layout = $self->{layout};
2491
2492 $layout->set_font ($self->{font}) if $self->{font};
2493 2729
2494 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2497 2733
2498 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2499 my $h = $par->[1]; 2735 my $h = $para->{h};
2500 2736
2501 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] }); 2738
2503 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2504 $layout->set_markup ($par->[4]);
2505 2740
2506 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2507 2742
2508 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2509 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2510 } 2761 }
2511 2762
2512 $y += $h; 2763 $y += $h;
2513 } 2764 }
2514 2765
2515 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2516 }; 2767 };
2517 }); 2768 });
2518} 2769}
2519 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2520sub _draw { 2780sub _draw {
2521 my ($self) = @_; 2781 my ($self) = @_;
2522 2782
2523 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2525 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2526 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2527 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2528 2788
2529 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2530
2531} 2790}
2532 2791
2533############################################################################# 2792#############################################################################
2534 2793
2535package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2614} 2873}
2615 2874
2616sub set_tooltip_from { 2875sub set_tooltip_from {
2617 my ($self, $widget) = @_; 2876 my ($self, $widget) = @_;
2618 2877
2878 my $tooltip = $widget->{tooltip};
2879
2880 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2883 . "req $widget->{req_w} $widget->{req_h}\n"
2884 . "visible $widget->{visible}";
2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2889
2619 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2620 markup => $widget->{tooltip}, 2891 markup => $tooltip,
2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8, 2893 fontsize => 0.8,
2623 fg => [0, 0, 0, 1], 2894 fg => [0, 0, 0, 1],
2624 ellipsise => 0, 2895 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP), 2896 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2633 2904
2634 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2635} 2906}
2636 2907
2637sub size_allocate { 2908sub invoke_size_allocate {
2638 my ($self, $w, $h, $changed) = @_; 2909 my ($self, $w, $h) = @_;
2639 2910
2640 return unless $changed;
2641
2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2912}
2913
2914sub invoke_visibility_change {
2915 my ($self, $visible) = @_;
2916
2917 return unless $visible;
2918
2919 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner}
2921 or return;
2922
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w};
2927
2928 $self->move_abs ($x, $y);
2929 });
2643} 2930}
2644 2931
2645sub _draw { 2932sub _draw {
2646 my ($self) = @_; 2933 my ($self) = @_;
2647 2934
… …
2664 glVertex $w, $h; 2951 glVertex $w, $h;
2665 glVertex $w, 0; 2952 glVertex $w, 0;
2666 glEnd; 2953 glEnd;
2667 2954
2668 glTranslate 2 - 0.375, 2 - 0.375; 2955 glTranslate 2 - 0.375, 2 - 0.375;
2956
2669 $self->SUPER::_draw; 2957 $self->SUPER::_draw;
2670} 2958}
2671 2959
2672############################################################################# 2960#############################################################################
2673 2961
… …
2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2733 3021
2734 if ($tex) { 3022 if ($tex) {
2735 glEnable GL_TEXTURE_2D; 3023 glEnable GL_TEXTURE_2D;
2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2737 glColor 1, 1, 1, 1; 3025 glColor 0, 0, 0, 1;
2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2739 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2740 } 3028 }
2741} 3029}
2742 3030
2743sub DESTROY { 3031sub destroy {
2744 my ($self) = @_; 3032 my ($self) = @_;
2745 3033
2746 $self->{timer}->cancel 3034 $self->{timer}->cancel
2747 if $self->{timer}; 3035 if $self->{timer};
2748 3036
2749 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2750} 3038}
2751 3039
2752############################################################################# 3040#############################################################################
2753 3041
2754package CFClient::UI::Inventory; 3042package CFClient::UI::Buttonbar;
2755 3043
2756our @ISA = CFClient::UI::ScrolledWindow::; 3044our @ISA = CFClient::UI::HBox::;
2757 3045
2758sub new { 3046# 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 3047
2794############################################################################# 3048#############################################################################
2795 3049
2796package CFClient::UI::Menu; 3050package CFClient::UI::Menu;
2797 3051
… …
2809 ); 3063 );
2810 3064
2811 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2812 3066
2813 for my $item (@{ $self->{items} }) { 3067 for my $item (@{ $self->{items} }) {
2814 my ($widget, $cb) = @$item; 3068 my ($widget, $cb, $tooltip) = @$item;
2815 3069
2816 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2817 if (!ref $widget) { 3071 if (!ref $widget) {
2818 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2819 can_hover => 1, 3073 can_hover => 1,
2820 can_events => 1, 3074 can_events => 1,
2821 text => $widget; 3075 markup => $widget,
3076 tooltip => $tooltip
2822 } 3077 }
2823 3078
2824 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2825 3080
2826 $self->{vbox}->add ($widget); 3081 $self->{vbox}->add ($widget);
… …
2831 3086
2832# popup given the event (must be a mouse button down event currently) 3087# popup given the event (must be a mouse button down event currently)
2833sub popup { 3088sub popup {
2834 my ($self, $ev) = @_; 3089 my ($self, $ev) = @_;
2835 3090
2836 $self->_emit ("popdown"); 3091 $self->emit ("popdown");
2837 3092
2838 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2839 $GRAB = $self; 3094 $GRAB = $self;
2840 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2841 3096
2842 $self->show; 3097 $self->show;
2843 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844} 3099}
2845 3100
2846sub mouse_motion { 3101sub invoke_mouse_motion {
2847 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2848 3103
2849 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2850 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2852}
2853 3107
3108 0
3109}
3110
2854sub button_up { 3111sub invoke_button_up {
2855 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2856 3113
2857 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2858 undef $GRAB; 3115 undef $GRAB;
2859 $self->hide; 3116 $self->hide;
2860 3117
2861 $self->_emit ("popdown"); 3118 $self->emit ("popdown");
2862 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
3120 } else {
3121 return 0
3122 }
3123
2863 } 3124 1
2864} 3125}
2865 3126
2866############################################################################# 3127#############################################################################
2867 3128
2868package CFClient::UI::Statusbox; 3129package CFClient::UI::Multiplexer;
2869 3130
2870our @ISA = CFClient::UI::VBox::; 3131our @ISA = CFClient::UI::Container::;
2871 3132
2872sub new { 3133sub new {
2873 my $class = shift; 3134 my $class = shift;
2874 3135
2875 $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
3137 @_,
3138 );
3139
3140 $self->{current} = $self->{children}[0]
3141 if @{ $self->{children} };
3142
3143 $self
3144}
3145
3146sub add {
3147 my ($self, @widgets) = @_;
3148
3149 $self->SUPER::add (@widgets);
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153}
3154
3155sub set_current_page {
3156 my ($self, $page_or_widget) = @_;
3157
3158 my $widget = ref $page_or_widget
3159 ? $page_or_widget
3160 : $self->{children}[$page_or_widget];
3161
3162 $self->{current} = $widget;
3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3164
3165 $self->emit (page_changed => $self->{current});
3166
3167 $self->realloc;
3168}
3169
3170sub visible_children {
3171 $_[0]{current}
3172}
3173
3174sub size_request {
3175 my ($self) = @_;
3176
3177 $self->{current}->size_request
3178}
3179
3180sub invoke_size_allocate {
3181 my ($self, $w, $h) = @_;
3182
3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3186}
3187
3188sub _draw {
3189 my ($self) = @_;
3190
3191 $self->{current}->draw;
3192}
3193
3194#############################################################################
3195
3196package CFClient::UI::Notebook;
3197
3198our @ISA = CFClient::UI::VBox::;
3199
3200sub new {
3201 my $class = shift;
3202
3203 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self
3207 @_,
3208 );
3209
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3211 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3212
3213 $self
3214}
3215
3216sub add {
3217 my ($self, $title, $widget, $tooltip) = @_;
3218
3219 Scalar::Util::weaken $self;
3220
3221 $self->{buttonbar}->add (new CFClient::UI::Button
3222 markup => $title,
3223 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) },
3225 );
3226
3227 $self->{multiplexer}->add ($widget);
3228}
3229
3230sub set_current_page {
3231 my ($self, $page) = @_;
3232
3233 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current});
3235}
3236
3237#############################################################################
3238
3239package CFClient::UI::Combobox;
3240
3241use utf8;
3242
3243our @ISA = CFClient::UI::Button::;
3244
3245sub new {
3246 my $class = shift;
3247
3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
2876 fontsize => 0.8, 3303 fontsize => 0.8,
2877 @_, 3304 @_,
2878 ) 3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
2879} 3312}
2880 3313
2881sub reorder { 3314sub reorder {
2882 my ($self) = @_; 3315 my ($self) = @_;
2883 my $NOW = time; 3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
2884 3322
2885 while (my ($k, $v) = each %{ $self->{item} }) { 3323 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 } 3325 }
2888 3326
… …
2891 my @items = sort { 3329 my @items = sort {
2892 $a->{pri} <=> $b->{pri} 3330 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id} 3331 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} }; 3332 } values %{ $self->{item} };
2895 3333
3334 $self->{timer}->interval (1);
3335
2896 my $count = 10 + 1; 3336 my $count = 10 + 1;
2897 for my $item (@items) { 3337 for my $item (@items) {
2898 last unless --$count; 3338 last unless --$count;
2899 3339
2900 push @widgets, $item->{label} ||= do { 3340 my $label = $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all) 3341 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1 3342 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}" 3343 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text}; 3344 : $item->{text};
2905 3345
… …
2913 tooltip => $item->{tooltip}, 3353 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP, 3354 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67, 3355 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize}, 3356 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44, 3357 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg}, 3358 fg => [@{ $item->{fg} }],
2919 can_events => 1, 3359 can_events => 1,
2920 can_hover => 1 3360 can_hover => 1
2921 }; 3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
2922 } 3374 }
2923 3375
2924 $self->clear; 3376 $self->clear;
2925 $self->SUPER::add (reverse @widgets); 3377 $self->SUPER::add (reverse @widgets);
2926} 3378}
… …
2931 $text =~ s/^\s+//; 3383 $text =~ s/^\s+//;
2932 $text =~ s/\s+$//; 3384 $text =~ s/\s+$//;
2933 3385
2934 return unless $text; 3386 return unless $text;
2935 3387
2936 my $timeout = time + ((delete $arg{timeout}) || 60); 3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2937 3389
2938 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2939 3391
2940 if (my $item = $self->{item}{$group}) { 3392 if (my $item = $self->{item}{$group}) {
2941 if ($item->{text} eq $text) { 3393 if ($item->{text} eq $text) {
2942 $item->{count}++; 3394 $item->{count}++;
2943 } else { 3395 } else {
2944 $item->{count} = 1; 3396 $item->{count} = 1;
2945 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
2946 } 3398 }
2947 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
2948 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
2949 delete $item->{label}; 3401 delete $item->{label};
2950 } else { 3402 } else {
2951 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
2952 id => ++$self->{id}, 3404 id => ++$self->{id},
… …
2971 3423
2972 $self->reorder; 3424 $self->reorder;
2973 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
2974} 3426}
2975 3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
2976############################################################################# 3436#############################################################################
2977 3437
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
2978package CFClient::UI::Root; 3602package CFClient::UI::Root;
2979 3603
2980our @ISA = CFClient::UI::Container::; 3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
2981 3607
2982use CFClient::OpenGL; 3608use CFClient::OpenGL;
2983 3609
2984sub new { 3610sub new {
2985 my $class = shift; 3611 my $class = shift;
… …
2992 Scalar::Util::weaken ($self->{root} = $self); 3618 Scalar::Util::weaken ($self->{root} = $self);
2993 3619
2994 $self 3620 $self
2995} 3621}
2996 3622
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 { 3623sub size_request {
3014 my ($self) = @_; 3624 my ($self) = @_;
3015 3625
3016 ($self->{w}, $self->{h}) 3626 ($self->{w}, $self->{h})
3017} 3627}
3018 3628
3629sub _to_pixel {
3630 my ($coord, $size, $max) = @_;
3631
3632 $coord =
3633 $coord eq "center" ? ($max - $size) * 0.5
3634 : $coord eq "max" ? $max
3635 : $coord;
3636
3637 $coord = 0 if $coord < 0;
3638 $coord = $max - $size if $coord > $max - $size;
3639
3640 int $coord + 0.5
3641}
3642
3019sub size_allocate { 3643sub invoke_size_allocate {
3020 my ($self, $w, $h, $changed) = @_; 3644 my ($self, $w, $h) = @_;
3021 3645
3022 for my $child ($self->children) { 3646 for my $child ($self->children) {
3023 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024 3648
3025 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3649 $X = $child->{force_x} if exists $child->{force_x};
3026 if exists $child->{req_x}; 3650 $Y = $child->{force_y} if exists $child->{force_y};
3027 3651
3028 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3652 $X = _to_pixel $X, $W, $self->{w};
3029 if exists $child->{req_y}; 3653 $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 3654
3036 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3037 } 3656 }
3657
3658 1
3038} 3659}
3039 3660
3040sub coord2local { 3661sub coord2local {
3041 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3042 3663
… …
3056} 3677}
3057 3678
3058sub add { 3679sub add {
3059 my ($self, @children) = @_; 3680 my ($self, @children) = @_;
3060 3681
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1; 3682 $_->{is_toplevel} = 1
3063 3683 for @children;
3064 # integerise window positions
3065 $child->{x} = int $child->{x};
3066 $child->{y} = int $child->{y};
3067 }
3068 3684
3069 $self->SUPER::add (@children); 3685 $self->SUPER::add (@children);
3070} 3686}
3071 3687
3072sub remove { 3688sub remove {
3073 my ($self, @children) = @_; 3689 my ($self, @children) = @_;
3074 3690
3075 $self->SUPER::remove (@children); 3691 $self->SUPER::remove (@children);
3692
3693 delete $self->{is_toplevel}
3694 for @children;
3076 3695
3077 while (@children) { 3696 while (@children) {
3078 my $w = pop @children; 3697 my $w = pop @children;
3079 push @children, $w->children; 3698 push @children, $w->children;
3080 $w->set_invisible; 3699 $w->set_invisible;
… …
3100 $_->() 3719 $_->()
3101 for values %{delete $self->{refresh_hook}}; 3720 for values %{delete $self->{refresh_hook}};
3102 } 3721 }
3103 3722
3104 if ($self->{realloc}) { 3723 if ($self->{realloc}) {
3724 my %queue;
3105 my @queue; 3725 my @queue;
3726 my $widget;
3106 3727
3728 outer:
3107 while () { 3729 while () {
3108 if ($self->{realloc}) { 3730 if (my $realloc = delete $self->{realloc}) {
3109 #TODO use array-of-depth approach 3731 for $widget (values %$realloc) {
3732 $widget->{visible} or next; # do not resize invisible widgets
3110 3733
3111 @queue = sort { $a->{visible} <=> $b->{visible} } 3734 $queue{$widget+0}++ and next; # duplicates are common
3112 @queue, values %{delete $self->{realloc}}; 3735
3736 push @{ $queue[$widget->{visible}] }, $widget;
3737 }
3113 } 3738 }
3114 3739
3740 while () {
3741 @queue or last outer;
3742
3743 $widget = pop @{ $queue[-1] || [] }
3744 and last;
3745
3746 pop @queue;
3747 }
3748
3749 delete $queue{$widget+0};
3750
3751 my ($w, $h) = $widget->size_request;
3752
3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3758
3759 $w = $widget->{force_w} if exists $widget->{force_w};
3760 $h = $widget->{force_h} if exists $widget->{force_h};
3761
3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3763 || delete $widget->{force_realloc}) {
3764 $widget->{req_w} = $w;
3765 $widget->{req_h} = $h;
3766
3767 $self->{size_alloc}{$widget+0} = $widget;
3768
3769 if (my $parent = $widget->{parent}) {
3770 $self->{realloc}{$parent+0} = $parent
3771 unless $queue{$parent+0};
3772
3773 $parent->{force_size_alloc} = 1;
3774 $self->{size_alloc}{$parent+0} = $parent;
3775 }
3776 }
3777
3778 delete $self->{realloc}{$widget+0};
3779 }
3780 }
3781
3782 while (my $size_alloc = delete $self->{size_alloc}) {
3783 my @queue = sort { $b->{visible} <=> $a->{visible} }
3784 values %$size_alloc;
3785
3786 while () {
3115 my $widget = pop @queue || last; 3787 my $widget = pop @queue || last;
3116 3788
3117 $widget->{visible} or last; # do not resize invisible widgets 3789 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 3790
3142 $w = 0 if $w < 0; 3791 $w = 0 if $w < 0;
3143 $h = 0 if $h < 0; 3792 $h = 0 if $h < 0;
3144 3793
3794 $w = int $w + 0.5;
3795 $h = int $h + 0.5;
3796
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w};
3799 $widget->{old_h} = $widget->{h};
3800
3145 $widget->{w} = $w; 3801 $widget->{w} = $w;
3146 $widget->{h} = $h; 3802 $widget->{h} = $h;
3803
3147 $widget->emit (size_allocate => $w, $h, 1); 3804 $widget->emit (size_allocate => $w, $h);
3805 }
3148 } 3806 }
3149 } 3807 }
3150 3808
3151 while ($self->{post_alloc_hook}) { 3809 while ($self->{post_alloc_hook}) {
3152 $_->() 3810 $_->()
3153 for values %{delete $self->{post_alloc_hook}}; 3811 for values %{delete $self->{post_alloc_hook}};
3154 } 3812 }
3813
3155 3814
3156 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3815 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158 glClear GL_COLOR_BUFFER_BIT; 3817 glClear GL_COLOR_BUFFER_BIT;
3159 3818
… …
3161 glLoadIdentity; 3820 glLoadIdentity;
3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163 glMatrixMode GL_MODELVIEW; 3822 glMatrixMode GL_MODELVIEW;
3164 glLoadIdentity; 3823 glLoadIdentity;
3165 3824
3825 {
3826 package CFClient::UI::Base;
3827
3828 ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h});
3830 }
3831
3166 $self->_draw; 3832 $self->_draw;
3167} 3833}
3168 3834
3169############################################################################# 3835#############################################################################
3170 3836

Diff Legend

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