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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 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 # broken show/hide model 273 return unless $self->{visible};
259 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
260 delete $self->{root}; 278 delete $self->{root};
261 delete $self->{visible};
262 279
263 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
265 282
266 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
268 285
269 $self->focus_out; 286 $self->focus_out;
287
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;
270} 306}
271 307
272sub hide { 308sub hide {
273 my ($self) = @_; 309 my ($self) = @_;
274 310
… …
276 312
277 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
278 if $self->{parent}; 314 if $self->{parent};
279} 315}
280 316
281sub move { 317sub move_abs {
282 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
283 319
284 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
285 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
286 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
287 323
288 $self->update; 324 $self->update;
289} 325}
290 326
291sub set_size { 327sub set_size {
292 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
293 329
294 $self->{user_w} = $w; 330 $self->{force_w} = $w;
295 $self->{user_h} = $h; 331 $self->{force_h} = $h;
296 332
297 $self->check_size; 333 $self->realloc;
298} 334}
299 335
300sub size_request { 336sub size_request {
301 require Carp; 337 require Carp;
302 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
304 340
305sub configure { 341sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
307 343
308 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
311 349
312 # use alignment to adjust x, y 350 # use alignment to adjust x, y
313 351
314 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 354 }
319 355
320 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 357 $self->{x} = $x;
322 $self->{y} = $y; 358 $self->{y} = $y;
323 $self->update; 359 $self->update;
324 } 360 }
325 361
326 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 369 }
329} 370}
330 371
331sub size_allocate { 372sub size_allocate {
332 # nothing to be done 373 # nothing to be done
333} 374}
334 375
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
343} 382}
344 383
345sub set_max_size { 384sub set_max_size {
346 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
347 386
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
350} 391}
351 392
352sub set_tooltip { 393sub set_tooltip {
353 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
354 395
… …
359 400
360 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
361 402
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
365 } 406 }
366} 407}
367 408
368# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
369sub coord2local { 410sub coord2local {
… …
406 447
407 $::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
408 unless $FOCUS; 449 unless $FOCUS;
409} 450}
410 451
411sub mouse_motion { } 452sub mouse_motion { 0 }
412sub button_up { } 453sub button_up { 0 }
413sub key_down { } 454sub key_down { 0 }
414sub key_up { } 455sub key_up { 0 }
415 456
416sub button_down { 457sub button_down {
417 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
418 459
419 $self->focus_in; 460 $self->focus_in;
420}
421 461
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
426sub 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
427 538
428sub draw { 539sub draw {
429 my ($self) = @_; 540 my ($self) = @_;
430 541
431 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);
432 553
433 glPushMatrix; 554 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 556
438 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 559 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 561 glBegin GL_QUADS;
445 glVertex $x , $y; 562 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
449 glEnd; 566 glEnd;
450 glDisable GL_BLEND; 567 glDisable GL_BLEND;
451 } 568 }
452 569
453 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 571 glPushMatrix;
455 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 575 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
462 glEnd; 579 glEnd;
463 glPopMatrix; 580 glPopMatrix;
464 #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;
465 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
466} 586}
467 587
468sub _draw { 588sub _draw {
469 my ($self) = @_; 589 my ($self) = @_;
470 590
471 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
472} 592}
473 593
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 594sub DESTROY {
535 my ($self) = @_; 595 my ($self) = @_;
536 596
537 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
538 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
539} 601}
540 602
541############################################################################# 603#############################################################################
542 604
543package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
568 630
569 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
571 633
572 glEnable GL_BLEND; 634 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 636 glColor_premultiply @$color;
575 637
576 glBegin GL_QUADS; 638 glBegin GL_QUADS;
577 glVertex 0 , 0; 639 glVertex 0 , 0;
578 glVertex 0 , $h; 640 glVertex 0 , $h;
579 glVertex $w, $h; 641 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
596} 658}
597 659
598sub size_request { 660sub size_request {
599 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
600} 664}
601 665
602sub draw { } 666sub draw { }
603 667
604############################################################################# 668#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
609 673
610sub new { 674sub new {
611 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
612 676
613 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
614 678
615 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
616 children => [], 680 children => [],
617 can_events => 0, 681 can_events => 0,
618 %arg, 682 %arg,
619 ); 683 );
684
620 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
621 687
622 $self 688 $self
623} 689}
624 690
625sub add { 691sub add {
… …
633 $self->{children} = [ 699 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
636 ]; 702 ];
637 703
638 $self->check_size (1); 704 $self->realloc;
639 $self->update;
640} 705}
641 706
642sub children { 707sub children {
643 @{ $_[0]{children} } 708 @{ $_[0]{children} }
644} 709}
… …
649 delete $child->{parent}; 714 delete $child->{parent};
650 $child->hide; 715 $child->hide;
651 716
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 718
654 $self->check_size (1); 719 $self->realloc;
655 $self->update;
656} 720}
657 721
658sub clear { 722sub clear {
659 my ($self) = @_; 723 my ($self) = @_;
660 724
… …
664 for (@$children) { 728 for (@$children) {
665 delete $_->{parent}; 729 delete $_->{parent};
666 $_->hide; 730 $_->hide;
667 } 731 }
668 732
669 $self->check_size; 733 $self->realloc;
670 $self->update;
671} 734}
672 735
673sub find_widget { 736sub find_widget {
674 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
675 738
676 $x -= $self->{x}; 739 $x -= $self->{x};
677 $y -= $self->{y}; 740 $y -= $self->{y};
678 741
679 my $res; 742 my $res;
680 743
681 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
683 and return $res; 746 and return $res;
684 } 747 }
685 748
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707} 770}
708 771
709sub add { 772sub add {
710 my ($self, $child) = @_; 773 my ($self, $child) = @_;
711 774
712 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
713
714 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
715} 777}
716 778
717sub remove { 779sub remove {
718 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
736} 798}
737 799
738############################################################################# 800#############################################################################
739 801
802# back-buffered drawing area
803
740package CFClient::UI::Window; 804package CFClient::UI::Window;
741 805
742our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
743 807
744use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 827 $self->update;
764} 828}
765 829
766sub _render { 830sub _render {
831 my ($self) = @_;
832
767 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
768} 834}
769 835
770sub render_child { 836sub render_child {
771 my ($self) = @_; 837 my ($self) = @_;
772 838
773 $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 {
774 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
776 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
777 $self->_render; 850 $self->_render;
778 }; 851 };
779} 852}
780 853
781sub _draw { 854sub _draw {
782 my ($self) = @_; 855 my ($self) = @_;
783 856
784 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
785 858
786 my $tex = $self->{texture} 859 my $tex = $self->{texture}
787 or return; 860 or return;
788 861
789 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
792 865
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 867
795 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
796} 869}
… …
812} 885}
813 886
814sub size_request { 887sub size_request {
815 my ($self) = @_; 888 my ($self) = @_;
816 889
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 891
819 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
820} 896}
821 897
822sub size_allocate { 898sub size_allocate {
823 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
824 900
901 my $child = $self->child;
902
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 905
828 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
829 $self->update; 907 $self->update;
830} 908}
831 909
… …
867} 945}
868 946
869sub _render { 947sub _render {
870 my ($self) = @_; 948 my ($self) = @_;
871 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
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 954
874 $self->SUPER::_render; 955 $self->SUPER::_render;
875} 956}
876 957
… …
879package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
880 961
881our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
882 963
883sub new { 964sub new {
884 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
885 968
886 my $self; 969 my $self;
887 970
888 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
889 vertical => 1, 972 vertical => 1,
… …
894 ; 977 ;
895 978
896 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 981 slider => $slider,
899 @_, 982 %arg,
900 ); 983 );
901 984
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
905 987
906 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
907} 995}
908 996
909sub update { 997sub update {
910 my ($self) = @_; 998 my ($self) = @_;
911 999
… …
950 1038
951 if ($self->{bg}) { 1039 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
953 1041
954 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
957 1045
958 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
959 glVertex 0 , 0; 1047 glVertex 0 , 0;
960 glVertex 0 , $h; 1048 glVertex 0 , $h;
961 glVertex $w, $h; 1049 glVertex $w, $h;
… …
974 1062
975our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
976 1064
977use CFClient::OpenGL; 1065use CFClient::OpenGL;
978 1066
979my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1074
983sub new { 1075sub new {
984 my $class = shift; 1076 my ($class, %arg) = @_;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1077
988 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1081 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1082 can_events => 1,
994 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
995 ); 1086 );
996 1087
997 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
998 align => 0, 1089 align => 0,
999 valign => 1, 1090 valign => 1,
1000 text => $self->{title}, 1091 text => $self->{title},
1001 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 }
1002 1103
1003 $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};
1004} 1113}
1005 1114
1006sub border { 1115sub border {
1007 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1008} 1117}
1009 1118
1010sub size_request { 1119sub size_request {
1011 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};
1012 1127
1013 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1014 1129
1015 ( 1130 (
1016 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1019} 1134}
1020 1135
1021sub size_allocate { 1136sub size_allocate {
1022 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1023 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
1024 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1026 1149
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $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};
1031} 1154}
1032 1155
1033sub button_down { 1156sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1035 1158
… …
1051 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1052 1175
1053 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1055 1178
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1181
1061 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1062 }; 1184 };
1063 1185
1064 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1190 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1070 1192
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1194
1073 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1078 } 1203 1
1079} 1204}
1080 1205
1081sub button_up { 1206sub button_up {
1082 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1083 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1084 delete $self->{motion}; 1212 !!delete $self->{motion}
1085} 1213}
1086 1214
1087sub mouse_motion { 1215sub mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1089 1217
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1091} 1221}
1092 1222
1093sub _draw { 1223sub _draw {
1094 my ($self) = @_; 1224 my ($self) = @_;
1095 1225
1226 my $child = $self->{children}[0];
1227
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1230
1099 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1233
1102 my $border = $self->border; 1234 my $border = $self->border;
1103 1235
1104 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1241
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1112 1244
1113 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1250 }
1124 1251
1125 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1126 1253
1127 $self->{title}->draw if $self->{title};
1128
1129 $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};
1130} 1265}
1131 1266
1132############################################################################# 1267#############################################################################
1133 1268
1134package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1157 1292
1158 $child->set_parent ($self); 1293 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1160 1295
1161 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1162} 1303}
1163 1304
1164# 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?
1165sub clear { 1306sub clear {
1166 my ($self) = @_; 1307 my ($self) = @_;
… …
1171 for (@children) { 1312 for (@children) {
1172 delete $_->{parent}; 1313 delete $_->{parent};
1173 $_->hide; 1314 $_->hide;
1174 } 1315 }
1175 1316
1176 $self->check_size (1); 1317 $self->realloc;
1177 $self->update;
1178} 1318}
1179 1319
1180sub get_wh { 1320sub get_wh {
1181 my ($self) = @_; 1321 my ($self) = @_;
1182 1322
… …
1278 } 1418 }
1279} 1419}
1280 1420
1281############################################################################# 1421#############################################################################
1282 1422
1283package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1424
1287our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1288 1426
1289sub size_request { 1427sub size_request {
1290 my ($self) = @_; 1428 my ($self) = @_;
1291 1429
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1293 1431 ? (
1294 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1434 )
1297 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1298} 1439}
1299 1440
1300sub size_allocate { 1441sub size_allocate {
1301 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1302 1443
1303 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1445 my $children = $self->{children};
1306 1446
1307 my @h = map $_->{req_w}, @$children; 1447 my @req;
1308 1448
1309 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1310 1450 @req = ($space / (@$children || 1)) x @$children;
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } 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 {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 } 1465 }
1325 } 1466 }
1326 1467
1327 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1328 1469
1329 my $y = 0; 1470 my $pos = 0;
1330 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1474
1335 $y += $h; 1475 $pos += $alloc;
1336 } 1476 }
1337 1477
1338 1 1478 1
1339} 1479}
1340 1480
1341############################################################################# 1481#############################################################################
1342 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
1343package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1344 1499
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1348 1501
1349sub size_request { 1502sub new {
1350 my ($self) = @_; 1503 my $class = shift;
1351 1504
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1353 1506 vertical => 1,
1354 ( 1507 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1508 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1509}
1398 1510
1399############################################################################# 1511#############################################################################
1400 1512
1401package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1530 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1420 fontsize => 1, 1532 fontsize => 1,
1421 align => -1, 1533 align => -1,
1422 valign => -1, 1534 valign => -1,
1423 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1424 can_events => 0, 1537 can_events => 0,
1425 %arg 1538 %arg
1426 ); 1539 );
1427 1540
1428 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1455 1568
1456 delete $self->{texture}; 1569 delete $self->{texture};
1457 $self->SUPER::update; 1570 $self->SUPER::update;
1458} 1571}
1459 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1460sub set_text { 1580sub set_text {
1461 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1462 1582
1463 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1465 1585
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1468 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1469 $self->update; 1591 $self->update;
1470 $self->check_size;
1471} 1592}
1472 1593
1473sub set_markup { 1594sub set_markup {
1474 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1475 1596
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1601
1481 $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;
1482 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1483 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1484 $self->update; 1607 $self->update;
1485 $self->check_size;
1486} 1608}
1487 1609
1488sub size_request { 1610sub size_request {
1489 my ($self) = @_; 1611 my ($self) = @_;
1490 1612
1613 $self->{size_req} ||= do {
1491 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496 1619
1497 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1498 1621
1499 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502 1625
1503 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1504 1627
1505 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1507 } 1633 };
1508 1634
1509 ( 1635 @{ $self->{size_req} }
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1636}
1514 1637
1515sub size_allocate { 1638sub size_allocate {
1516 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1517 1640
1641 delete $self->{ox};
1642
1518 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519} 1645}
1520 1646
1521sub set_fontsize { 1647sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1523 1649
1524 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1651 delete $self->{texture};
1526 1652
1527 $self->update; 1653 $self->realloc;
1528 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1529} 1662}
1530 1663
1531sub _draw { 1664sub _draw {
1532 my ($self) = @_; 1665 my ($self) = @_;
1533 1666
… …
1539 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1676
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1545 1679
1680 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1549 1684
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1688 };
1556 1689
1557 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1558 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};
1559 1694
1560 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1561 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1563 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1565 } 1702 }
1566 1703
1567 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1568} 1705}
1569 1706
… …
1586 can_hover => 1, 1723 can_hover => 1,
1587 can_focus => 1, 1724 can_focus => 1,
1588 valign => 0, 1725 valign => 0,
1589 can_events => 1, 1726 can_events => 1,
1590 #text => ... 1727 #text => ...
1728 #hidden => "*",
1591 @_ 1729 @_
1592 ) 1730 )
1593} 1731}
1594 1732
1595sub _set_text { 1733sub _set_text {
… …
1597 1735
1598 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1599 1737
1600 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1601 1739
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1741 $self->{text} = $text;
1606 1742
1607 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1609 1746
1610 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1611} 1751}
1612 1752
1613sub set_text { 1753sub set_text {
1614 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1615 1755
1616 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1757 $self->_set_text ($text);
1618 $self->update;
1619 $self->check_size;
1620} 1758}
1621 1759
1622sub get_text { 1760sub get_text {
1623 $_[0]{text} 1761 $_[0]{text}
1624} 1762}
… …
1654 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1657 } elsif ($uni) { 1795 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1659 } 1799 }
1660 1800
1661 $self->_set_text ($text); 1801 $self->_set_text ($text);
1662 $self->update; 1802
1663 $self->check_size; 1803 $self->realloc;
1804
1805 1
1664} 1806}
1665 1807
1666sub focus_in { 1808sub focus_in {
1667 my ($self) = @_; 1809 my ($self) = @_;
1668 1810
… …
1683 utf8::encode $text; 1825 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1685 1827
1686 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1687 $self->update; 1829 $self->update;
1830
1831 1
1688} 1832}
1689 1833
1690sub mouse_motion { 1834sub mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1692# 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
1693} 1839}
1694 1840
1695sub _draw { 1841sub _draw {
1696 my ($self) = @_; 1842 my ($self) = @_;
1697 1843
1698 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1699 1845
1700 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1703 } else { 1849 } else {
1704 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1705 } 1851 }
1706 1852
1707 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1856 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1774 } else { 1920 } else {
1775 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1776 } 1922 }
1777 1923
1778 } else { 1924 } else {
1779 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1780 } 1928 1
1781
1782} 1929}
1783 1930
1784############################################################################# 1931#############################################################################
1785 1932
1786package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1795 1942
1796sub new { 1943sub new {
1797 my $class = shift; 1944 my $class = shift;
1798 1945
1799 $class->SUPER::new ( 1946 $class->SUPER::new (
1800 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1801 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1803 can_hover => 1, 1951 can_hover => 1,
1804 align => 0, 1952 align => 0,
1805 valign => 0, 1953 valign => 0,
… …
1814 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1815 1963
1816 $self->emit ("activate") 1964 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1819} 1969}
1820 1970
1821sub _draw { 1971sub _draw {
1822 my ($self) = @_; 1972 my ($self) = @_;
1823 1973
1824 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1975
1830 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1833 1979
… …
1838 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1839} 1985}
1840 1986
1841############################################################################# 1987#############################################################################
1842 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
1843package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1844 2028
1845our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1846 2030
1847my @tex = 2031my @tex =
… …
1852 2036
1853sub new { 2037sub new {
1854 my $class = shift; 2038 my $class = shift;
1855 2039
1856 $class->SUPER::new ( 2040 $class->SUPER::new (
1857 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1858 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 2047 state => 0,
… …
1866} 2051}
1867 2052
1868sub size_request { 2053sub size_request {
1869 my ($self) = @_; 2054 my ($self) = @_;
1870 2055
1871 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1872} 2057}
1873 2058
1874sub button_down { 2059sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1876 2061
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1881 } 2070 1
1882} 2071}
1883 2072
1884sub _draw { 2073sub _draw {
1885 my ($self) = @_; 2074 my ($self) = @_;
1886 2075
1887 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1888 2077
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 2079
1891 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;
1892 2083
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 2085
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 2087
… …
2051 2242
2052 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2054 2245
2055 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2056 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;
2057 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2251
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2161 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2168 vertical => 0, 2360 vertical => 0,
2169 can_hover => 1, 2361 can_hover => 1,
2170 inner_pad => 0.02, 2362 inner_pad => 0.02,
2171 @_ 2363 @_
2172 ); 2364 );
… …
2175 $self->update; 2367 $self->update;
2176 2368
2177 $self 2369 $self
2178} 2370}
2179 2371
2372sub changed { }
2373
2180sub set_range { 2374sub set_range {
2181 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2182 2376
2183 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2184 2378
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2187} 2383}
2188 2384
2189sub set_value { 2385sub set_value {
2190 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2191 2387
… …
2210} 2406}
2211 2407
2212sub size_request { 2408sub size_request {
2213 my ($self) = @_; 2409 my ($self) = @_;
2214 2410
2215 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2412}
2220 2413
2221sub button_down { 2414sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2223 2416
2224 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2225 2418
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2420
2228 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2229} 2422}
2230 2423
2231sub mouse_motion { 2424sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2233 2426
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2431
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2433
2241 $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
2242 } 2439 1
2243} 2440}
2244 2441
2245sub update { 2442sub update {
2246 my ($self) = @_; 2443 my ($self) = @_;
2247 2444
2248 $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}) {
2249 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2250 2454
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2253 2457
… …
2259 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2261 2465
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2264 }); 2468 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2469
2272 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2273 2471
2274 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2275 2473
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2338 2536
2339############################################################################# 2537#############################################################################
2340 2538
2341package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2342 2540
2343our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2344 2542
2345use CFClient::OpenGL; 2543use CFClient::OpenGL;
2346 2544
… …
2348 my $class = shift; 2546 my $class = shift;
2349 2547
2350 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2351 fontsize => 1, 2549 fontsize => 1,
2352 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2353 #font => default_font 2552 #font => default_font
2354 @_, 2553 @_,
2355 2554
2356 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2357 par => [], 2556 par => [],
… …
2380 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2381 2580
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $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});
2385 2585
2386 $self->reflow; 2586 $self->reflow;
2387} 2587}
2388 2588
2389sub text_size { 2589sub text_size {
… …
2391 2591
2392 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2393 2593
2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $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});
2396 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2397 2598
2398 $layout->size 2599 $layout->size
2399} 2600}
2400 2601
… …
2439 2640
2440 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2441 2642
2442 delete $self->{texture}; 2643 delete $self->{texture};
2443 2644
2444 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446 2647
2447 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2448 my $height = 0; 2649 my $height = 0;
2449 2650
… …
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 2654
2454 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2456 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2457 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2460 $_->[1] = $h; 2662 $_->[1] = $h;
2461 } 2663 }
… …
2464 } 2666 }
2465 2667
2466 $self->{height} = $height; 2668 $self->{height} = $height;
2467 2669
2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2469 2671
2470 delete $self->{texture}; 2672 delete $self->{texture};
2471 } 2673 }
2472 2674
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2476 2678
2477 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2478 2680
2479 my $y0 = $top; 2681 my $y0 = $top;
… …
2493 my $h = $par->[1]; 2695 my $h = $par->[1];
2494 2696
2495 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2499 2702
2500 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2501 2704
2502 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2514sub _draw { 2717sub _draw {
2515 my ($self) = @_; 2718 my ($self) = @_;
2516 2719
2517 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2520 $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});
2521 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2522 2725
2523 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2524 2727
2525} 2728}
… …
2579 state => 0, 2782 state => 0,
2580 on_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2581 @_ 2784 @_
2582 ); 2785 );
2583 2786
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2787 $self
2590} 2788}
2591 2789
2592sub toggle_flopper { 2790sub toggle_flopper {
2593 my ($self) = @_; 2791 my ($self) = @_;
2594 2792
2595 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2794}
2607 2795
2608############################################################################# 2796#############################################################################
2609 2797
2610package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2623} 2811}
2624 2812
2625sub set_tooltip_from { 2813sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2627 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
2628 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2831 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2833 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2645 2845
2646sub size_allocate { 2846sub size_allocate {
2647 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2648 2848
2649 $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 });
2650} 2868}
2651 2869
2652sub _draw { 2870sub _draw {
2653 my ($self) = @_; 2871 my ($self) = @_;
2654 2872
… …
2671 glVertex $w, $h; 2889 glVertex $w, $h;
2672 glVertex $w, 0; 2890 glVertex $w, 0;
2673 glEnd; 2891 glEnd;
2674 2892
2675 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2676 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2677} 2896}
2678 2897
2679############################################################################# 2898#############################################################################
2680 2899
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 2959
2741 if ($tex) { 2960 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2747 } 2966 }
2748} 2967}
2749 2968
2750sub DESTROY { 2969sub destroy {
2751 my ($self) = @_; 2970 my ($self) = @_;
2752 2971
2753 $self->{timer}->cancel 2972 $self->{timer}->cancel
2754 if $self->{timer}; 2973 if $self->{timer};
2755 2974
2756 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2757} 2976}
2758 2977
2759############################################################################# 2978#############################################################################
2760 2979
2761package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2762 2981
2763our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2764 2983
2765sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805 2985
2806############################################################################# 2986#############################################################################
2807 2987
2808package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2809 2989
… …
2821 ); 3001 );
2822 3002
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824 3004
2825 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2827 3007
2828 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2829 if (!ref $widget) { 3009 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2831 can_hover => 1, 3011 can_hover => 1,
2832 can_events => 1, 3012 can_events => 1,
2833 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2834 } 3015 }
2835 3016
2836 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2837 3018
2838 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2850 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 3032 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2853 3034
2854 $self->show; 3035 $self->show;
2855 $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);
2856} 3037}
2857 3038
2858sub mouse_motion { 3039sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2860 3041
2861 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2864} 3047}
2865 3048
2866sub button_up { 3049sub button_up {
2867 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2868 3051
… …
2870 undef $GRAB; 3053 undef $GRAB;
2871 $self->hide; 3054 $self->hide;
2872 3055
2873 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2875 } 3062 1
2876} 3063}
2877 3064
2878############################################################################# 3065#############################################################################
2879 3066
2880package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2881 3068
2882our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2883 3070
2884sub new { 3071sub new {
2885 my $class = shift; 3072 my $class = shift;
2886 3073
2887 $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 (
2888 fontsize => 0.8, 3239 fontsize => 0.8,
2889 @_, 3240 @_,
2890 ) 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
2891} 3248}
2892 3249
2893sub reorder { 3250sub reorder {
2894 my ($self) = @_; 3251 my ($self) = @_;
2895 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} };
2896 3258
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3261 }
2900 3262
… …
2903 my @items = sort { 3265 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2907 3269
3270 $self->{timer}->interval (1);
3271
2908 my $count = 10 + 1; 3272 my $count = 10 + 1;
2909 for my $item (@items) { 3273 for my $item (@items) {
2910 last unless --$count; 3274 last unless --$count;
2911 3275
2912 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3280 : $item->{text};
2917 3281
… …
2925 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3295 can_events => 1,
2932 can_hover => 1 3296 can_hover => 1
2933 }; 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;
2934 } 3310 }
2935 3311
2936 $self->clear; 3312 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2938} 3314}
… …
2943 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2945 3321
2946 return unless $text; 3322 return unless $text;
2947 3323
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3325
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3327
2952 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2954 $item->{count}++; 3330 $item->{count}++;
2955 } else { 3331 } else {
2956 $item->{count} = 1; 3332 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2958 } 3334 }
2959 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2960 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2961 delete $item->{label}; 3337 delete $item->{label};
2962 } else { 3338 } else {
2963 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2964 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2983 3359
2984 $self->reorder; 3360 $self->reorder;
2985 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2986} 3362}
2987 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2988############################################################################# 3372#############################################################################
2989 3373
2990package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2991 3375
2992our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994use CFClient::OpenGL;
2995 3377
2996sub new { 3378sub new {
2997 my $class = shift; 3379 my $class = shift;
2998 3380
2999 $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) = @_;
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 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
3623 @_,
3624 )
3625}
3626
3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3713 my ($self, $spell) = @_;
3714
3715 $self->{spell}->{$spell->{name}} = $spell;
3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root;
3736
3737our @ISA = CFClient::UI::Container::;
3738
3739use List::Util qw(min max);
3740
3741use CFClient::OpenGL;
3742
3743sub new {
3744 my $class = shift;
3745
3746 my $self = $class->SUPER::new (
3000 visible => 1, 3747 visible => 1,
3001 @_, 3748 @_,
3002 ) 3749 );
3003}
3004 3750
3005sub configure { 3751 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3752
3008 $self->{w} = $w; 3753 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3754}
3018 3755
3019sub size_request { 3756sub size_request {
3020 my ($self) = @_; 3757 my ($self) = @_;
3021 3758
3022 ($self->{w}, $self->{h}) 3759 ($self->{w}, $self->{h})
3760}
3761
3762sub _to_pixel {
3763 my ($coord, $size, $max) = @_;
3764
3765 $coord =
3766 $coord eq "center" ? ($max - $size) * 0.5
3767 : $coord eq "max" ? $max
3768 : $coord;
3769
3770 $coord = 0 if $coord < 0;
3771 $coord = $max - $size if $coord > $max - $size;
3772
3773 int $coord + 0.5
3023} 3774}
3024 3775
3025sub size_allocate { 3776sub size_allocate {
3026 my ($self, $w, $h) = @_; 3777 my ($self, $w, $h) = @_;
3027 3778
3028 for my $child ($self->children) { 3779 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3781
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3782 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3783 $Y = $child->{force_y} if exists $child->{force_y};
3033 3784
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3785 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3786 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3787
3040 $child->configure ($X, $Y, $W, $H); 3788 $child->configure ($X, $Y, $W, $H);
3041 } 3789 }
3042} 3790}
3043 3791
… …
3054} 3802}
3055 3803
3056sub update { 3804sub update {
3057 my ($self) = @_; 3805 my ($self) = @_;
3058 3806
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3807 $::WANT_REFRESH++;
3061} 3808}
3062 3809
3063sub add { 3810sub add {
3064 my ($self, @children) = @_; 3811 my ($self, @children) = @_;
3065 3812
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3813 $_->{is_toplevel} = 1
3074 3814 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3815
3080 $self->SUPER::add (@children); 3816 $self->SUPER::add (@children);
3081} 3817}
3082 3818
3083sub remove { 3819sub remove {
3084 my ($self, @children) = @_; 3820 my ($self, @children) = @_;
3085 3821
3086 $self->SUPER::remove (@children); 3822 $self->SUPER::remove (@children);
3823
3824 delete $self->{is_toplevel}
3825 for @children;
3087 3826
3088 while (@children) { 3827 while (@children) {
3089 my $w = pop @children; 3828 my $w = pop @children;
3090 push @children, $w->children; 3829 push @children, $w->children;
3091 $w->set_invisible; 3830 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3849 while ($self->{refresh_hook}) {
3111 $_->() 3850 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3113 } 3852 }
3114 3853
3115 if ($self->{check_size}) { 3854 if ($self->{realloc}) {
3855 my %queue;
3116 my @queue; 3856 my @queue;
3857 my $widget;
3117 3858
3118 for (;;) { 3859 outer:
3119 if ($self->{check_size}) { 3860 while () {
3120 #TODO use array-of-depth approach 3861 if (my $realloc = delete $self->{realloc}) {
3862 for $widget (values %$realloc) {
3863 $widget->{visible} or next; # do not resize invisible widgets
3121 3864
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3865 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3124 } 3869 }
3125 3870
3871 while () {
3872 @queue or last outer;
3873
3126 my $widget = pop @queue || last; 3874 $widget = pop @{ $queue[-1] || [] }
3127 3875 and last;
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 3876
3877 pop @queue;
3878 }
3879
3880 delete $queue{$widget+0};
3881
3882 my ($w, $h) = $widget->size_request;
3883
3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3889
3890 $w = $widget->{force_w} if exists $widget->{force_w};
3891 $h = $widget->{force_h} if exists $widget->{force_h};
3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3138 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3140 3897
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3142 3899
3143 $widget->{parent}->check_size
3144 if $widget->{parent}; 3900 if (my $parent = $widget->{parent}) {
3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3145 } 3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3146 } 3910 }
3147 } 3911 }
3148 3912
3149 while ($self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 my ($widget, $w, $h) = @$_; 3915 values %$size_alloc;
3916
3917 while () {
3918 my $widget = pop @queue || last;
3919
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152 3921
3153 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3155 3924
3925 $w = int $w + 0.5;
3926 $h = int $h + 0.5;
3927
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3931
3156 $widget->{w} = $w; 3932 $widget->{w} = $w;
3157 $widget->{h} = $h; 3933 $widget->{h} = $h;
3934
3158 $widget->emit (size_allocate => $w, $h); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3159 } 3937 }
3160 } 3938 }
3161 3939
3162 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3163 $_->() 3941 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3165 } 3943 }
3944
3166 3945
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3170 3949
… …
3172 glLoadIdentity; 3951 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 3954 glLoadIdentity;
3176 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3177 $self->_draw; 3963 $self->_draw;
3178} 3964}
3179 3965
3180############################################################################# 3966#############################################################################
3181 3967

Diff Legend

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