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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01: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->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 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;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
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 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_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};
223 } 235 }
224 236
225 $self 237 $self
226} 238}
227 239
… …
232 %$self = (); 244 %$self = ();
233} 245}
234 246
235sub show { 247sub show {
236 my ($self) = @_; 248 my ($self) = @_;
249
237 return if $self->{parent}; 250 return if $self->{parent};
238 251
239 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
240} 253}
241 254
242sub show_centered { 255sub set_visible {
243 my ($self) = @_; 256 my ($self) = @_;
257
244 return if $self->{parent}; 258 return if $self->{visible};
245 259
246 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
247 262
248 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 264
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
251 }, 266
252 ); 267 $_->set_visible for $self->children;
253} 268}
254 269
255sub set_invisible { 270sub set_invisible {
256 my ($self) = @_; 271 my ($self) = @_;
257 272
258 return unless $self->{visible}; 273 return unless $self->{visible};
259 274
260 # broken show/hide model 275 $_->set_invisible for $self->children;
261 276
277 delete $self->{visible};
262 delete $self->{root}; 278 delete $self->{root};
263 delete $self->{visible};
264 279
265 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
267 282
268 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
270 285
271 $self->focus_out; 286 $self->focus_out;
272 287
273 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
274} 306}
275 307
276sub hide { 308sub hide {
277 my ($self) = @_; 309 my ($self) = @_;
278 310
… …
280 312
281 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
282 if $self->{parent}; 314 if $self->{parent};
283} 315}
284 316
285sub move { 317sub move_abs {
286 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
287 319
288 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
289 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
290 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
291 323
292 $self->update; 324 $self->update;
293} 325}
294 326
295sub set_size { 327sub set_size {
296 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
297 329
298 $self->{user_w} = $w; 330 $self->{force_w} = $w;
299 $self->{user_h} = $h; 331 $self->{force_h} = $h;
300 332
301 $self->check_size; 333 $self->realloc;
302} 334}
303 335
304sub size_request { 336sub size_request {
305 require Carp; 337 require Carp;
306 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
308 340
309sub configure { 341sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
311 343
312 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
315 349
316 # use alignment to adjust x, y 350 # use alignment to adjust x, y
317 351
318 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 354 }
323 355
324 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 357 $self->{x} = $x;
326 $self->{y} = $y; 358 $self->{y} = $y;
327 $self->update; 359 $self->update;
328 } 360 }
329 361
330 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
332 } 369 }
333} 370}
334 371
335sub size_allocate { 372sub size_allocate {
336 # nothing to be done 373 # nothing to be done
337} 374}
338 375
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
347} 382}
348 383
349sub set_max_size { 384sub set_max_size {
350 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
351 386
352 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
353 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
354} 391}
355 392
356sub set_tooltip { 393sub set_tooltip {
357 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
358 395
… …
363 400
364 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
365 402
366 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
367 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
368 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
369 } 406 }
370} 407}
371 408
372# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
373sub coord2local { 410sub coord2local {
… …
410 447
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS; 449 unless $FOCUS;
413} 450}
414 451
415sub mouse_motion { } 452sub mouse_motion { 0 }
416sub button_up { } 453sub button_up { 0 }
417sub key_down { } 454sub key_down { 0 }
418sub key_up { } 455sub key_up { 0 }
419 456
420sub button_down { 457sub button_down {
421 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
422 459
423 $self->focus_in; 460 $self->focus_in;
424}
425 461
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
430sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
431 538
432sub draw { 539sub draw {
433 my ($self) = @_; 540 my ($self) = @_;
434 541
435 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
436 553
437 glPushMatrix; 554 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 556
442 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 559 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 561 glBegin GL_QUADS;
449 glVertex $x , $y; 562 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
453 glEnd; 566 glEnd;
454 glDisable GL_BLEND; 567 glDisable GL_BLEND;
455 } 568 }
456 569
457 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 571 glPushMatrix;
459 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 575 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
466 glEnd; 579 glEnd;
467 glPopMatrix; 580 glPopMatrix;
468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
469 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
470} 586}
471 587
472sub _draw { 588sub _draw {
473 my ($self) = @_; 589 my ($self) = @_;
474 590
475 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
476} 592}
477 593
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545}
546
547sub DESTROY { 594sub DESTROY {
548 my ($self) = @_; 595 my ($self) = @_;
549 596
550 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
551 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
552} 601}
553 602
554############################################################################# 603#############################################################################
555 604
556package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
581 630
582 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
584 633
585 glEnable GL_BLEND; 634 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 636 glColor_premultiply @$color;
588 637
589 glBegin GL_QUADS; 638 glBegin GL_QUADS;
590 glVertex 0 , 0; 639 glVertex 0 , 0;
591 glVertex 0 , $h; 640 glVertex 0 , $h;
592 glVertex $w, $h; 641 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
609} 658}
610 659
611sub size_request { 660sub size_request {
612 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
613} 664}
614 665
615sub draw { } 666sub draw { }
616 667
617############################################################################# 668#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
622 673
623sub new { 674sub new {
624 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
625 676
626 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
627 678
628 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
629 children => [], 680 children => [],
630 can_events => 0, 681 can_events => 0,
631 %arg, 682 %arg,
632 ); 683 );
684
633 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
634 687
635 $self 688 $self
636} 689}
637 690
638sub add { 691sub add {
… …
646 $self->{children} = [ 699 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
649 ]; 702 ];
650 703
651 $self->check_size (1); 704 $self->realloc;
652 $self->update;
653} 705}
654 706
655sub children { 707sub children {
656 @{ $_[0]{children} } 708 @{ $_[0]{children} }
657} 709}
… …
662 delete $child->{parent}; 714 delete $child->{parent};
663 $child->hide; 715 $child->hide;
664 716
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 718
667 $self->check_size (1); 719 $self->realloc;
668 $self->update;
669} 720}
670 721
671sub clear { 722sub clear {
672 my ($self) = @_; 723 my ($self) = @_;
673 724
… …
677 for (@$children) { 728 for (@$children) {
678 delete $_->{parent}; 729 delete $_->{parent};
679 $_->hide; 730 $_->hide;
680 } 731 }
681 732
682 $self->check_size; 733 $self->realloc;
683 $self->update;
684} 734}
685 735
686sub find_widget { 736sub find_widget {
687 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
688 738
689 $x -= $self->{x}; 739 $x -= $self->{x};
690 $y -= $self->{y}; 740 $y -= $self->{y};
691 741
692 my $res; 742 my $res;
693 743
694 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
696 and return $res; 746 and return $res;
697 } 747 }
698 748
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
720} 770}
721 771
722sub add { 772sub add {
723 my ($self, $child) = @_; 773 my ($self, $child) = @_;
724 774
725 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
726
727 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
728} 777}
729 778
730sub remove { 779sub remove {
731 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
749} 798}
750 799
751############################################################################# 800#############################################################################
752 801
802# back-buffered drawing area
803
753package CFClient::UI::Window; 804package CFClient::UI::Window;
754 805
755our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
756 807
757use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 827 $self->update;
777} 828}
778 829
779sub _render { 830sub _render {
831 my ($self) = @_;
832
780 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
781} 834}
782 835
783sub render_child { 836sub render_child {
784 my ($self) = @_; 837 my ($self) = @_;
785 838
786 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
787 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
789 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
790 $self->_render; 850 $self->_render;
791 }; 851 };
792} 852}
793 853
794sub _draw { 854sub _draw {
795 my ($self) = @_; 855 my ($self) = @_;
796 856
797 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
798 858
799 my $tex = $self->{texture} 859 my $tex = $self->{texture}
800 or return; 860 or return;
801 861
802 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
805 865
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
807 867
808 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
809} 869}
… …
825} 885}
826 886
827sub size_request { 887sub size_request {
828 my ($self) = @_; 888 my ($self) = @_;
829 889
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 891
832 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
833} 896}
834 897
835sub size_allocate { 898sub size_allocate {
836 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
837 900
901 my $child = $self->child;
902
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 905
841 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
842 $self->update; 907 $self->update;
843} 908}
844 909
… …
880} 945}
881 946
882sub _render { 947sub _render {
883 my ($self) = @_; 948 my ($self) = @_;
884 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
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 954
887 $self->SUPER::_render; 955 $self->SUPER::_render;
888} 956}
889 957
… …
892package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
893 961
894our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
895 963
896sub new { 964sub new {
897 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
898 968
899 my $self; 969 my $self;
900 970
901 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
902 vertical => 1, 972 vertical => 1,
… …
907 ; 977 ;
908 978
909 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 981 slider => $slider,
912 @_, 982 %arg,
913 ); 983 );
914 984
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
918 987
919 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
920} 995}
921 996
922sub update { 997sub update {
923 my ($self) = @_; 998 my ($self) = @_;
924 999
… …
963 1038
964 if ($self->{bg}) { 1039 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
966 1041
967 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
970 1045
971 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
972 glVertex 0 , 0; 1047 glVertex 0 , 0;
973 glVertex 0 , $h; 1048 glVertex 0 , $h;
974 glVertex $w, $h; 1049 glVertex $w, $h;
… …
987 1062
988our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
989 1064
990use CFClient::OpenGL; 1065use CFClient::OpenGL;
991 1066
992my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
995 1074
996sub new { 1075sub new {
997 my $class = shift; 1076 my ($class, %arg) = @_;
998
999 # TODO: user_x, user_y, overwrite moveto?
1000 1077
1001 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1081 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1082 can_events => 1,
1007 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1008 ); 1086 );
1009 1087
1010 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1011 align => 0, 1089 align => 0,
1012 valign => 1, 1090 valign => 1,
1013 text => $self->{title}, 1091 text => $self->{title},
1014 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1015 1103
1016 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1017} 1113}
1018 1114
1019sub border { 1115sub border {
1020 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1021} 1117}
1022 1118
1023sub size_request { 1119sub size_request {
1024 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1025 1127
1026 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1027 1129
1028 ( 1130 (
1029 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1032} 1134}
1033 1135
1034sub size_allocate { 1136sub size_allocate {
1035 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1036 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1037 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1039 1149
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1044} 1154}
1045 1155
1046sub button_down { 1156sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1048 1158
… …
1064 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1065 1175
1066 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1068 1178
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1181
1074 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1075 }; 1184 };
1076 1185
1077 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1190 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1083 1192
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1194
1086 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1091 } 1203 1
1092} 1204}
1093 1205
1094sub button_up { 1206sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1096 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1097 delete $self->{motion}; 1212 !!delete $self->{motion}
1098} 1213}
1099 1214
1100sub mouse_motion { 1215sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1102 1217
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1104} 1221}
1105 1222
1106sub _draw { 1223sub _draw {
1107 my ($self) = @_; 1224 my ($self) = @_;
1108 1225
1226 my $child = $self->{children}[0];
1227
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1230
1112 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1233
1115 my $border = $self->border; 1234 my $border = $self->border;
1116 1235
1117 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1241
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1125 1244
1126 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1250 }
1137 1251
1138 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1139 1253
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1143} 1265}
1144 1266
1145############################################################################# 1267#############################################################################
1146 1268
1147package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1170 1292
1171 $child->set_parent ($self); 1293 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1173 1295
1174 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1175} 1303}
1176 1304
1177# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1178sub clear { 1306sub clear {
1179 my ($self) = @_; 1307 my ($self) = @_;
… …
1184 for (@children) { 1312 for (@children) {
1185 delete $_->{parent}; 1313 delete $_->{parent};
1186 $_->hide; 1314 $_->hide;
1187 } 1315 }
1188 1316
1189 $self->check_size (1); 1317 $self->realloc;
1190 $self->update;
1191} 1318}
1192 1319
1193sub get_wh { 1320sub get_wh {
1194 my ($self) = @_; 1321 my ($self) = @_;
1195 1322
… …
1291 } 1418 }
1292} 1419}
1293 1420
1294############################################################################# 1421#############################################################################
1295 1422
1296package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1424
1300our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1301 1426
1302sub size_request { 1427sub size_request {
1303 my ($self) = @_; 1428 my ($self) = @_;
1304 1429
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1306 1431 ? (
1307 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1434 )
1310 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1311} 1439}
1312 1440
1313sub size_allocate { 1441sub size_allocate {
1314 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1315 1443
1316 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1445 my $children = $self->{children};
1319 1446
1320 my @h = map $_->{req_w}, @$children; 1447 my @req;
1321 1448
1322 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1323 1450 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1465 }
1338 } 1466 }
1339 1467
1340 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1341 1469
1342 my $y = 0; 1470 my $pos = 0;
1343 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1474
1348 $y += $h; 1475 $pos += $alloc;
1349 } 1476 }
1350 1477
1351 1 1478 1
1352} 1479}
1353 1480
1354############################################################################# 1481#############################################################################
1355 1482
1483package CFClient::UI::HBox;
1484
1485our @ISA = CFClient::UI::Box::;
1486
1487sub new {
1488 my $class = shift;
1489
1490 $class->SUPER::new (
1491 vertical => 0,
1492 @_,
1493 )
1494}
1495
1496#############################################################################
1497
1356package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1357 1499
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1361 1501
1362sub size_request { 1502sub new {
1363 my ($self) = @_; 1503 my $class = shift;
1364 1504
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1366 1506 vertical => 1,
1367 ( 1507 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1508 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1509}
1411 1510
1412############################################################################# 1511#############################################################################
1413 1512
1414package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1530 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1433 fontsize => 1, 1532 fontsize => 1,
1434 align => -1, 1533 align => -1,
1435 valign => -1, 1534 valign => -1,
1436 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1437 can_events => 0, 1537 can_events => 0,
1438 %arg 1538 %arg
1439 ); 1539 );
1440 1540
1441 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1468 1568
1469 delete $self->{texture}; 1569 delete $self->{texture};
1470 $self->SUPER::update; 1570 $self->SUPER::update;
1471} 1571}
1472 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1473sub set_text { 1580sub set_text {
1474 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1475 1582
1476 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1478 1585
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1481 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1482 $self->update; 1591 $self->update;
1483 $self->check_size;
1484} 1592}
1485 1593
1486sub set_markup { 1594sub set_markup {
1487 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1488 1596
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1601
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1495 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1496 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1497 $self->update; 1607 $self->update;
1498 $self->check_size;
1499} 1608}
1500 1609
1501sub size_request { 1610sub size_request {
1502 my ($self) = @_; 1611 my ($self) = @_;
1503 1612
1613 $self->{size_req} ||= do {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1619
1510 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1511 1621
1512 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1625
1516 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1517 1627
1518 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1520 } 1633 };
1521 1634
1522 ( 1635 @{ $self->{size_req} }
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1636}
1527 1637
1528sub size_allocate { 1638sub size_allocate {
1529 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1530 1640
1641 delete $self->{ox};
1642
1531 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1645}
1533 1646
1534sub set_fontsize { 1647sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1536 1649
1537 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1651 delete $self->{texture};
1539 1652
1540 $self->update; 1653 $self->realloc;
1541 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1542} 1662}
1543 1663
1544sub _draw { 1664sub _draw {
1545 my ($self) = @_; 1665 my ($self) = @_;
1546 1666
… …
1552 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1676
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1558 1679
1680 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1562 1684
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1688 };
1569 1689
1570 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1572 1694
1573 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1574 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1576 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1578 } 1702 }
1579 1703
1580 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1581} 1705}
1582 1706
… …
1599 can_hover => 1, 1723 can_hover => 1,
1600 can_focus => 1, 1724 can_focus => 1,
1601 valign => 0, 1725 valign => 0,
1602 can_events => 1, 1726 can_events => 1,
1603 #text => ... 1727 #text => ...
1728 #hidden => "*",
1604 @_ 1729 @_
1605 ) 1730 )
1606} 1731}
1607 1732
1608sub _set_text { 1733sub _set_text {
… …
1610 1735
1611 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1612 1737
1613 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1614 1739
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1741 $self->{text} = $text;
1619 1742
1620 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1622 1746
1623 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1624} 1751}
1625 1752
1626sub set_text { 1753sub set_text {
1627 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1628 1755
1629 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1757 $self->_set_text ($text);
1631 $self->update;
1632 $self->check_size;
1633} 1758}
1634 1759
1635sub get_text { 1760sub get_text {
1636 $_[0]{text} 1761 $_[0]{text}
1637} 1762}
… …
1667 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1670 } elsif ($uni) { 1795 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1672 } 1799 }
1673 1800
1674 $self->_set_text ($text); 1801 $self->_set_text ($text);
1675 $self->update; 1802
1676 $self->check_size; 1803 $self->realloc;
1804
1805 1
1677} 1806}
1678 1807
1679sub focus_in { 1808sub focus_in {
1680 my ($self) = @_; 1809 my ($self) = @_;
1681 1810
… …
1696 utf8::encode $text; 1825 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1698 1827
1699 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1700 $self->update; 1829 $self->update;
1830
1831 1
1701} 1832}
1702 1833
1703sub mouse_motion { 1834sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1705# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1706} 1839}
1707 1840
1708sub _draw { 1841sub _draw {
1709 my ($self) = @_; 1842 my ($self) = @_;
1710 1843
1711 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1712 1845
1713 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1716 } else { 1849 } else {
1717 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1718 } 1851 }
1719 1852
1720 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1856 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1787 } else { 1920 } else {
1788 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1789 } 1922 }
1790 1923
1791 } else { 1924 } else {
1792 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1793 } 1928 1
1794
1795} 1929}
1796 1930
1797############################################################################# 1931#############################################################################
1798 1932
1799package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1808 1942
1809sub new { 1943sub new {
1810 my $class = shift; 1944 my $class = shift;
1811 1945
1812 $class->SUPER::new ( 1946 $class->SUPER::new (
1813 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1814 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1816 can_hover => 1, 1951 can_hover => 1,
1817 align => 0, 1952 align => 0,
1818 valign => 0, 1953 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1828 1963
1829 $self->emit ("activate") 1964 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1832} 1969}
1833 1970
1834sub _draw { 1971sub _draw {
1835 my ($self) = @_; 1972 my ($self) = @_;
1836 1973
1837 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1838
1839 if ($GRAB == $self) {
1840 $self->{fg} = $self->{active_fg};
1841 }
1842 1975
1843 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1845 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1846 1979
… …
1851 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1852} 1985}
1853 1986
1854############################################################################# 1987#############################################################################
1855 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1856package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1857 2028
1858our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1859 2030
1860my @tex = 2031my @tex =
… …
1865 2036
1866sub new { 2037sub new {
1867 my $class = shift; 2038 my $class = shift;
1868 2039
1869 $class->SUPER::new ( 2040 $class->SUPER::new (
1870 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1871 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 2047 state => 0,
… …
1879} 2051}
1880 2052
1881sub size_request { 2053sub size_request {
1882 my ($self) = @_; 2054 my ($self) = @_;
1883 2055
1884 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1885} 2057}
1886 2058
1887sub button_down { 2059sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1889 2061
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1894 } 2070 1
1895} 2071}
1896 2072
1897sub _draw { 2073sub _draw {
1898 my ($self) = @_; 2074 my ($self) = @_;
1899 2075
1900 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1901 2077
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 2079
1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905 2083
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 2085
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 2087
… …
2064 2242
2065 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2067 2245
2068 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2251
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2181 vertical => 0, 2360 vertical => 0,
2182 can_hover => 1, 2361 can_hover => 1,
2183 inner_pad => 0.02, 2362 inner_pad => 0.02,
2184 @_ 2363 @_
2185 ); 2364 );
… …
2188 $self->update; 2367 $self->update;
2189 2368
2190 $self 2369 $self
2191} 2370}
2192 2371
2372sub changed { }
2373
2193sub set_range { 2374sub set_range {
2194 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2195 2376
2196 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2197 2378
2198 $self->update
2199 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2200} 2383}
2201 2384
2202sub set_value { 2385sub set_value {
2203 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2204 2387
… …
2223} 2406}
2224 2407
2225sub size_request { 2408sub size_request {
2226 my ($self) = @_; 2409 my ($self) = @_;
2227 2410
2228 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2412}
2233 2413
2234sub button_down { 2414sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2236 2416
2237 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2238 2418
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2420
2241 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2242} 2422}
2243 2423
2244sub mouse_motion { 2424sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2246 2426
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2431
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2433
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2255 } 2439 1
2256} 2440}
2257 2441
2258sub update { 2442sub update {
2259 my ($self) = @_; 2443 my ($self) = @_;
2260 2444
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2263 2454
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2266 2457
… …
2272 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2274 2465
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2277 }); 2468 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2469
2285 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2286 2471
2287 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2288 2473
… …
2349sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2351 2536
2352############################################################################# 2537#############################################################################
2353 2538
2354package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2355 2540
2356our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2357 2542
2358use CFClient::OpenGL; 2543use CFClient::OpenGL;
2359 2544
… …
2361 my $class = shift; 2546 my $class = shift;
2362 2547
2363 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2364 fontsize => 1, 2549 fontsize => 1,
2365 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2366 #font => default_font 2552 #font => default_font
2367 @_, 2553 @_,
2368 2554
2369 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2370 par => [], 2556 par => [],
… …
2393 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2394 2580
2395 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 2585
2399 $self->reflow; 2586 $self->reflow;
2400} 2587}
2401 2588
2402sub text_size { 2589sub text_size {
… …
2404 2591
2405 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2406 2593
2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2408 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2409 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2410 2598
2411 $layout->size 2599 $layout->size
2412} 2600}
2413 2601
… …
2452 2640
2453 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2454 2642
2455 delete $self->{texture}; 2643 delete $self->{texture};
2456 2644
2457 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459 2647
2460 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2461 my $height = 0; 2649 my $height = 0;
2462 2650
… …
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466 2654
2467 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2470 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h; 2662 $_->[1] = $h;
2474 } 2663 }
… …
2477 } 2666 }
2478 2667
2479 $self->{height} = $height; 2668 $self->{height} = $height;
2480 2669
2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2482 2671
2483 delete $self->{texture}; 2672 delete $self->{texture};
2484 } 2673 }
2485 2674
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2489 2678
2490 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2491 2680
2492 my $y0 = $top; 2681 my $y0 = $top;
… …
2506 my $h = $par->[1]; 2695 my $h = $par->[1];
2507 2696
2508 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2512 2702
2513 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2514 2704
2515 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2527sub _draw { 2717sub _draw {
2528 my ($self) = @_; 2718 my ($self) = @_;
2529 2719
2530 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2535 2725
2536 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2537 2727
2538} 2728}
… …
2592 state => 0, 2782 state => 0,
2593 on_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2594 @_ 2784 @_
2595 ); 2785 );
2596 2786
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2787 $self
2603} 2788}
2604 2789
2605sub toggle_flopper { 2790sub toggle_flopper {
2606 my ($self) = @_; 2791 my ($self) = @_;
2607 2792
2608 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2794}
2620 2795
2621############################################################################# 2796#############################################################################
2622 2797
2623package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2636} 2811}
2637 2812
2638sub set_tooltip_from { 2813sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2640 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2641 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2831 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2833 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2845
2659sub size_allocate { 2846sub size_allocate {
2660 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2661 2848
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2663} 2868}
2664 2869
2665sub _draw { 2870sub _draw {
2666 my ($self) = @_; 2871 my ($self) = @_;
2667 2872
… …
2684 glVertex $w, $h; 2889 glVertex $w, $h;
2685 glVertex $w, 0; 2890 glVertex $w, 0;
2686 glEnd; 2891 glEnd;
2687 2892
2688 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2689 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2690} 2896}
2691 2897
2692############################################################################# 2898#############################################################################
2693 2899
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2959
2754 if ($tex) { 2960 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2760 } 2966 }
2761} 2967}
2762 2968
2763sub DESTROY { 2969sub destroy {
2764 my ($self) = @_; 2970 my ($self) = @_;
2765 2971
2766 $self->{timer}->cancel 2972 $self->{timer}->cancel
2767 if $self->{timer}; 2973 if $self->{timer};
2768 2974
2769 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2770} 2976}
2771 2977
2772############################################################################# 2978#############################################################################
2773 2979
2774package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2775 2981
2776our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2777 2983
2778sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2985
2819############################################################################# 2986#############################################################################
2820 2987
2821package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2822 2989
… …
2834 ); 3001 );
2835 3002
2836 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2837 3004
2838 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2839 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2840 3007
2841 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2842 if (!ref $widget) { 3009 if (!ref $widget) {
2843 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2844 can_hover => 1, 3011 can_hover => 1,
2845 can_events => 1, 3012 can_events => 1,
2846 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2847 } 3015 }
2848 3016
2849 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2850 3018
2851 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2863 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 3032 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2866 3034
2867 $self->show; 3035 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869} 3037}
2870 3038
2871sub mouse_motion { 3039sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2873 3041
2874 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2877} 3047}
2878 3048
2879sub button_up { 3049sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2881 3051
… …
2883 undef $GRAB; 3053 undef $GRAB;
2884 $self->hide; 3054 $self->hide;
2885 3055
2886 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2888 } 3062 1
2889} 3063}
2890 3064
2891############################################################################# 3065#############################################################################
2892 3066
2893package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2894 3068
2895our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2896 3070
2897sub new { 3071sub new {
2898 my $class = shift; 3072 my $class = shift;
2899 3073
2900 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2901 fontsize => 0.8, 3239 fontsize => 0.8,
2902 @_, 3240 @_,
2903 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2904} 3248}
2905 3249
2906sub reorder { 3250sub reorder {
2907 my ($self) = @_; 3251 my ($self) = @_;
2908 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2909 3258
2910 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 } 3261 }
2913 3262
… …
2916 my @items = sort { 3265 my @items = sort {
2917 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2920 3269
3270 $self->{timer}->interval (1);
3271
2921 my $count = 10 + 1; 3272 my $count = 10 + 1;
2922 for my $item (@items) { 3273 for my $item (@items) {
2923 last unless --$count; 3274 last unless --$count;
2924 3275
2925 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2926 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2927 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2928 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2929 : $item->{text}; 3280 : $item->{text};
2930 3281
… …
2938 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2939 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2944 can_events => 1, 3295 can_events => 1,
2945 can_hover => 1 3296 can_hover => 1
2946 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2947 } 3310 }
2948 3311
2949 $self->clear; 3312 $self->clear;
2950 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2951} 3314}
… …
2956 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2958 3321
2959 return unless $text; 3322 return unless $text;
2960 3323
2961 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2962 3325
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964 3327
2965 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2967 $item->{count}++; 3330 $item->{count}++;
2968 } else { 3331 } else {
2969 $item->{count} = 1; 3332 $item->{count} = 1;
2970 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2971 } 3334 }
2972 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2973 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2974 delete $item->{label}; 3337 delete $item->{label};
2975 } else { 3338 } else {
2976 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2977 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2996 3359
2997 $self->reorder; 3360 $self->reorder;
2998 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2999} 3362}
3000 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
3001############################################################################# 3372#############################################################################
3002 3373
3003package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
3004 3375
3005our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3377
3009sub new { 3378sub new {
3010 my $class = shift; 3379 my $class = shift;
3011 3380
3012 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
3013 visible => 1, 3748 visible => 1,
3014 @_, 3749 @_,
3015 ) 3750 );
3016}
3017 3751
3018sub configure { 3752 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3753
3021 $self->{w} = $w; 3754 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3755}
3031 3756
3032sub size_request { 3757sub size_request {
3033 my ($self) = @_; 3758 my ($self) = @_;
3034 3759
3035 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
3036} 3775}
3037 3776
3038sub size_allocate { 3777sub size_allocate {
3039 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
3040 3779
3041 for my $child ($self->children) { 3780 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3782
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3046 3785
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3788
3056 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3057 } 3790 }
3058} 3791}
3059 3792
… …
3070} 3803}
3071 3804
3072sub update { 3805sub update {
3073 my ($self) = @_; 3806 my ($self) = @_;
3074 3807
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3077} 3809}
3078 3810
3079sub add { 3811sub add {
3080 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3081 3813
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3814 $_->{is_toplevel} = 1
3090 3815 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3816
3096 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3097} 3818}
3098 3819
3099sub remove { 3820sub remove {
3100 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3101 3822
3102 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3103 3827
3104 while (@children) { 3828 while (@children) {
3105 my $w = pop @children; 3829 my $w = pop @children;
3106 push @children, $w->children; 3830 push @children, $w->children;
3107 $w->set_invisible; 3831 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3127 $_->() 3851 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3129 } 3853 }
3130 3854
3131 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3856 my %queue;
3132 my @queue; 3857 my @queue;
3858 my $widget;
3133 3859
3134 for (;;) { 3860 outer:
3135 if ($self->{check_size}) { 3861 while () {
3136 #TODO use array-of-depth approach 3862 if (my $realloc = delete $self->{realloc}) {
3863 for $widget (values %$realloc) {
3864 $widget->{visible} or next; # do not resize invisible widgets
3137 3865
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3140 } 3870 }
3141 3871
3872 while () {
3873 @queue or last outer;
3874
3142 my $widget = pop @queue || last; 3875 $widget = pop @{ $queue[-1] || [] }
3143 3876 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3156 3898
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3158 3900
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3161 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3162 } 3911 }
3163 } 3912 }
3164 3913
3165 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3922
3169 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3171 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3172 $widget->{w} = $w; 3933 $widget->{w} = $w;
3173 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3174 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3175 } 3938 }
3176 } 3939 }
3177 3940
3178 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3179 $_->() 3942 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3181 } 3944 }
3945
3182 3946
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3186 3950
… …
3188 glLoadIdentity; 3952 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3955 glLoadIdentity;
3192 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3193 $self->_draw; 3964 $self->_draw;
3194} 3965}
3195 3966
3196############################################################################# 3967#############################################################################
3197 3968

Diff Legend

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