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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 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;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
233 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
234 delete $self->{root}; 278 delete $self->{root};
235 delete $self->{visible};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
240 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
242 285
243 $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;
244} 306}
245 307
246sub hide { 308sub hide {
247 my ($self) = @_; 309 my ($self) = @_;
248 310
… …
250 312
251 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
252 if $self->{parent}; 314 if $self->{parent};
253} 315}
254 316
255sub move { 317sub move_abs {
256 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
257 319
258 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
259 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
260 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
261 323
262 $self->update; 324 $self->update;
263} 325}
264 326
265sub set_size { 327sub set_size {
266 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
267 329
268 $self->{user_w} = $w; 330 $self->{force_w} = $w;
269 $self->{user_h} = $h; 331 $self->{force_h} = $h;
270 332
271 $self->check_size; 333 $self->realloc;
272} 334}
273 335
274sub size_request { 336sub size_request {
275 require Carp; 337 require Carp;
276 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
278 340
279sub configure { 341sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
281 343
282 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
285 349
286 # use alignment to adjust x, y 350 # use alignment to adjust x, y
287 351
288 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 354 }
293 355
294 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 357 $self->{x} = $x;
296 $self->{y} = $y; 358 $self->{y} = $y;
297 $self->update; 359 $self->update;
298 } 360 }
299 361
300 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $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;
302 } 369 }
303} 370}
304 371
305sub size_allocate { 372sub size_allocate {
306 # nothing to be done 373 # nothing to be done
307} 374}
308 375
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
316sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
317} 382}
318 383
319sub set_max_size { 384sub set_max_size {
320 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
321 386
322 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
323 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
324} 391}
325 392
326sub set_tooltip { 393sub set_tooltip {
327 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
328 395
… …
333 400
334 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
335 402
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
339 } 406 }
340} 407}
341 408
342# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
343sub coord2local { 410sub coord2local {
… …
380 447
381 $::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
382 unless $FOCUS; 449 unless $FOCUS;
383} 450}
384 451
385sub mouse_motion { } 452sub mouse_motion { 0 }
386sub button_up { } 453sub button_up { 0 }
387sub key_down { } 454sub key_down { 0 }
388sub key_up { } 455sub key_up { 0 }
389 456
390sub button_down { 457sub button_down {
391 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
392 459
393 $self->focus_in; 460 $self->focus_in;
394}
395 461
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
400sub 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
401 538
402sub draw { 539sub draw {
403 my ($self) = @_; 540 my ($self) = @_;
404 541
405 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);
406 553
407 glPushMatrix; 554 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw;
410 glPopMatrix;
411 556
412 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
413 my ($x, $y) = @$self{qw(x y)};
414
415 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
416 glEnable GL_BLEND; 559 glEnable GL_BLEND;
417 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
418 glBegin GL_QUADS; 561 glBegin GL_QUADS;
419 glVertex $x , $y; 562 glVertex 0 , 0;
420 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
421 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
422 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
423 glEnd; 566 glEnd;
424 glDisable GL_BLEND; 567 glDisable GL_BLEND;
425 } 568 }
426 569
427 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 571 glPushMatrix;
429 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
431 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 575 glVertex 0 , 0;
433 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
434 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
435 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
436 glEnd; 579 glEnd;
437 glPopMatrix; 580 glPopMatrix;
438 #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;
439 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
440} 586}
441 587
442sub _draw { 588sub _draw {
443 my ($self) = @_; 589 my ($self) = @_;
444 590
445 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
446} 592}
447 593
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506}
507
508sub DESTROY { 594sub DESTROY {
509 my ($self) = @_; 595 my ($self) = @_;
510 596
511 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
512 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
513} 601}
514 602
515############################################################################# 603#############################################################################
516 604
517package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
542 630
543 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
544 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
545 633
546 glEnable GL_BLEND; 634 glEnable GL_BLEND;
547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548 glColor @$color; 636 glColor_premultiply @$color;
549 637
550 glBegin GL_QUADS; 638 glBegin GL_QUADS;
551 glVertex 0 , 0; 639 glVertex 0 , 0;
552 glVertex 0 , $h; 640 glVertex 0 , $h;
553 glVertex $w, $h; 641 glVertex $w, $h;
… …
568 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
570} 658}
571 659
572sub size_request { 660sub size_request {
573 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
574} 664}
575 665
576sub draw { } 666sub draw { }
577 667
578############################################################################# 668#############################################################################
… …
582our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
583 673
584sub new { 674sub new {
585 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
586 676
587 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
588 678
589 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
590 children => [], 680 children => [],
591 can_events => 0, 681 can_events => 0,
592 %arg, 682 %arg,
593 ); 683 );
684
594 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
595 687
596 $self 688 $self
597} 689}
598 690
599sub add { 691sub add {
… …
607 $self->{children} = [ 699 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
610 ]; 702 ];
611 703
612 $self->check_size (1); 704 $self->realloc;
613 $self->update;
614} 705}
615 706
616sub children { 707sub children {
617 @{ $_[0]{children} } 708 @{ $_[0]{children} }
618} 709}
… …
623 delete $child->{parent}; 714 delete $child->{parent};
624 $child->hide; 715 $child->hide;
625 716
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 718
628 $self->check_size (1); 719 $self->realloc;
629 $self->update;
630} 720}
631 721
632sub clear { 722sub clear {
633 my ($self) = @_; 723 my ($self) = @_;
634 724
… …
638 for (@$children) { 728 for (@$children) {
639 delete $_->{parent}; 729 delete $_->{parent};
640 $_->hide; 730 $_->hide;
641 } 731 }
642 732
643 $self->check_size; 733 $self->realloc;
644 $self->update;
645} 734}
646 735
647sub find_widget { 736sub find_widget {
648 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
649 738
650 $x -= $self->{x}; 739 $x -= $self->{x};
651 $y -= $self->{y}; 740 $y -= $self->{y};
652 741
653 my $res; 742 my $res;
654 743
655 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
657 and return $res; 746 and return $res;
658 } 747 }
659 748
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
681} 770}
682 771
683sub add { 772sub add {
684 my ($self, $child) = @_; 773 my ($self, $child) = @_;
685 774
686 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
687
688 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
689} 777}
690 778
691sub remove { 779sub remove {
692 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
709 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
710} 798}
711 799
712############################################################################# 800#############################################################################
713 801
802# back-buffered drawing area
803
714package CFClient::UI::Window; 804package CFClient::UI::Window;
715 805
716our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
717 807
718use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
736 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 827 $self->update;
738} 828}
739 829
740sub _render { 830sub _render {
831 my ($self) = @_;
832
741 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
742} 834}
743 835
744sub render_child { 836sub render_child {
745 my ($self) = @_; 837 my ($self) = @_;
746 838
747 $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 {
748 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
750 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
751 $self->_render; 850 $self->_render;
752 }; 851 };
753} 852}
754 853
755sub _draw { 854sub _draw {
756 my ($self) = @_; 855 my ($self) = @_;
757 856
758 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
759 858
760 my $tex = $self->{texture} 859 my $tex = $self->{texture}
761 or return; 860 or return;
762 861
763 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
765 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
766 865
767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
768 867
769 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
770} 869}
… …
786} 885}
787 886
788sub size_request { 887sub size_request {
789 my ($self) = @_; 888 my ($self) = @_;
790 889
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 891
793 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
794} 896}
795 897
796sub size_allocate { 898sub size_allocate {
797 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
798 900
901 my $child = $self->child;
902
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 905
802 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
803 $self->update; 907 $self->update;
804} 908}
805 909
… …
841} 945}
842 946
843sub _render { 947sub _render {
844 my ($self) = @_; 948 my ($self) = @_;
845 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
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 954
848 $self->SUPER::_render; 955 $self->SUPER::_render;
849} 956}
850 957
… …
853package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
854 961
855our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
856 963
857sub new { 964sub new {
858 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
859 968
860 my $self; 969 my $self;
861 970
862 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
863 vertical => 1, 972 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 974 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
867 }, 976 },
868 ; 977 ;
869 978
870 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 981 slider => $slider,
873 @_, 982 %arg,
874 ); 983 );
875 984
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
879 987
880 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
881} 995}
882 996
883sub update { 997sub update {
884 my ($self) = @_; 998 my ($self) = @_;
885 999
… …
924 1038
925 if ($self->{bg}) { 1039 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
927 1041
928 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
931 1045
932 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
933 glVertex 0 , 0; 1047 glVertex 0 , 0;
934 glVertex 0 , $h; 1048 glVertex 0 , $h;
935 glVertex $w, $h; 1049 glVertex $w, $h;
… …
948 1062
949our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
950 1064
951use CFClient::OpenGL; 1065use CFClient::OpenGL;
952 1066
953my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 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);
956 1074
957sub new { 1075sub new {
958 my $class = shift; 1076 my ($class, %arg) = @_;
959
960 # TODO: user_x, user_y, overwrite moveto?
961 1077
962 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1081 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1082 can_events => 1,
968 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
969 ); 1086 );
970 1087
971 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
972 align => 0, 1089 align => 0,
973 valign => 1, 1090 valign => 1,
974 text => $self->{title}, 1091 text => $self->{title},
975 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 }
976 1103
977 $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};
978} 1113}
979 1114
980sub border { 1115sub border {
981 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
982} 1117}
983 1118
984sub size_request { 1119sub size_request {
985 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};
986 1127
987 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
988 1129
989 ( 1130 (
990 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
993} 1134}
994 1135
995sub size_allocate { 1136sub size_allocate {
996 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
997 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
998 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1000 1149
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $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};
1005} 1154}
1006 1155
1007sub button_down { 1156sub button_down {
1008 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1009 1158
… …
1025 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1026 1175
1027 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1029 1178
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1183 $self->realloc;
1034 }; 1184 };
1035 1185
1036 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1190 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1042 1192
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1194
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1048 } 1203 1
1049} 1204}
1050 1205
1051sub button_up { 1206sub button_up {
1052 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1053 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1054 delete $self->{motion}; 1212 !!delete $self->{motion}
1055} 1213}
1056 1214
1057sub mouse_motion { 1215sub mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1059 1217
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1061} 1221}
1062 1222
1063sub _draw { 1223sub _draw {
1064 my ($self) = @_; 1224 my ($self) = @_;
1065 1225
1226 my $child = $self->{children}[0];
1227
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1230
1069 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1233
1072 my $border = $self->border; 1234 my $border = $self->border;
1073 1235
1074 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1241
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1082 1244
1083 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1250 }
1094 1251
1095 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1096 1253
1097 $self->{title}->draw if $self->{title};
1098
1099 $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};
1100} 1265}
1101 1266
1102############################################################################# 1267#############################################################################
1103 1268
1104package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1126 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1127 1292
1128 $child->set_parent ($self); 1293 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1130 1295
1131 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1132} 1303}
1133 1304
1134# 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?
1135sub clear { 1306sub clear {
1136 my ($self) = @_; 1307 my ($self) = @_;
… …
1141 for (@children) { 1312 for (@children) {
1142 delete $_->{parent}; 1313 delete $_->{parent};
1143 $_->hide; 1314 $_->hide;
1144 } 1315 }
1145 1316
1146 $self->check_size (1); 1317 $self->realloc;
1147 $self->update;
1148} 1318}
1149 1319
1150sub get_wh { 1320sub get_wh {
1151 my ($self) = @_; 1321 my ($self) = @_;
1152 1322
… …
1248 } 1418 }
1249} 1419}
1250 1420
1251############################################################################# 1421#############################################################################
1252 1422
1253package CFClient::UI::HBox; 1423package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1424
1257our @ISA = CFClient::UI::Container::; 1425our @ISA = CFClient::UI::Container::;
1258 1426
1259sub size_request { 1427sub size_request {
1260 my ($self) = @_; 1428 my ($self) = @_;
1261 1429
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1430 $self->{vertical}
1263 1431 ? (
1264 ( 1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1434 )
1267 ) 1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1268} 1439}
1269 1440
1270sub size_allocate { 1441sub size_allocate {
1271 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1272 1443
1273 ($h, $w) = ($w, $h); 1444 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1445 my $children = $self->{children};
1276 1446
1277 my @h = map $_->{req_w}, @$children; 1447 my @req;
1278 1448
1279 my $req_h = List::Util::sum @h; 1449 if ($self->{homogeneous}) {
1280 1450 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } 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 {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1464 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1465 }
1295 } 1466 }
1296 1467
1297 CFClient::UI::harmonize \@h; 1468 CFClient::UI::harmonize \@req;
1298 1469
1299 my $y = 0; 1470 my $pos = 0;
1300 for (0 .. $#$children) { 1471 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1472 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1474
1305 $y += $h; 1475 $pos += $alloc;
1306 } 1476 }
1307 1477
1308 1 1478 1
1309} 1479}
1310 1480
1311############################################################################# 1481#############################################################################
1312 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
1313package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1314 1499
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1318 1501
1319sub size_request { 1502sub new {
1320 my ($self) = @_; 1503 my $class = shift;
1321 1504
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1323 1506 vertical => 1,
1324 ( 1507 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1508 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1509}
1368 1510
1369############################################################################# 1511#############################################################################
1370 1512
1371package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1388 ellipsise => 3, # end 1530 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1390 fontsize => 1, 1532 fontsize => 1,
1391 align => -1, 1533 align => -1,
1392 valign => -1, 1534 valign => -1,
1393 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1394 can_events => 0, 1537 can_events => 0,
1395 %arg 1538 %arg
1396 ); 1539 );
1397 1540
1398 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1425 1568
1426 delete $self->{texture}; 1569 delete $self->{texture};
1427 $self->SUPER::update; 1570 $self->SUPER::update;
1428} 1571}
1429 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1430sub set_text { 1580sub set_text {
1431 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1432 1582
1433 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1434 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1435 1585
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1438 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1439 $self->update; 1591 $self->update;
1440 $self->check_size;
1441} 1592}
1442 1593
1443sub set_markup { 1594sub set_markup {
1444 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1445 1596
… …
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1601
1451 $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;
1452 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1453 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1454 $self->update; 1607 $self->update;
1455 $self->check_size;
1456} 1608}
1457 1609
1458sub size_request { 1610sub size_request {
1459 my ($self) = @_; 1611 my ($self) = @_;
1460 1612
1613 $self->{size_req} ||= do {
1461 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1462 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1466 1619
1467 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1468 1621
1469 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1470 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1471 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1472 1625
1473 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1474 1627
1475 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1477 } 1633 };
1478 1634
1479 ( 1635 @{ $self->{size_req} }
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1636}
1484 1637
1485sub size_allocate { 1638sub size_allocate {
1486 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1487 1640
1641 delete $self->{ox};
1642
1488 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489} 1645}
1490 1646
1491sub set_fontsize { 1647sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1493 1649
1494 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1651 delete $self->{texture};
1496 1652
1497 $self->update; 1653 $self->realloc;
1498 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1499} 1662}
1500 1663
1501sub _draw { 1664sub _draw {
1502 my ($self) = @_; 1665 my ($self) = @_;
1503 1666
… …
1509 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1676
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1515 1679
1680 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1519 1684
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1688 };
1526 1689
1527 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1528 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};
1529 1694
1530 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1533 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1535 } 1702 }
1536 1703
1537 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1538} 1705}
1539 1706
… …
1556 can_hover => 1, 1723 can_hover => 1,
1557 can_focus => 1, 1724 can_focus => 1,
1558 valign => 0, 1725 valign => 0,
1559 can_events => 1, 1726 can_events => 1,
1560 #text => ... 1727 #text => ...
1728 #hidden => "*",
1561 @_ 1729 @_
1562 ) 1730 )
1563} 1731}
1564 1732
1565sub _set_text { 1733sub _set_text {
… …
1567 1735
1568 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1569 1737
1570 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1571 1739
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 1741 $self->{text} = $text;
1576 1742
1577 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1579 1746
1580 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1581} 1751}
1582 1752
1583sub set_text { 1753sub set_text {
1584 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1585 1755
1586 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1757 $self->_set_text ($text);
1588 $self->update;
1589 $self->check_size;
1590} 1758}
1591 1759
1592sub get_text { 1760sub get_text {
1593 $_[0]{text} 1761 $_[0]{text}
1594} 1762}
… …
1624 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1627 } elsif ($uni) { 1795 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1629 } 1799 }
1630 1800
1631 $self->_set_text ($text); 1801 $self->_set_text ($text);
1632 $self->update; 1802
1633 $self->check_size; 1803 $self->realloc;
1804
1805 1
1634} 1806}
1635 1807
1636sub focus_in { 1808sub focus_in {
1637 my ($self) = @_; 1809 my ($self) = @_;
1638 1810
… …
1653 utf8::encode $text; 1825 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1655 1827
1656 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1657 $self->update; 1829 $self->update;
1830
1831 1
1658} 1832}
1659 1833
1660sub mouse_motion { 1834sub mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1662# 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
1663} 1839}
1664 1840
1665sub _draw { 1841sub _draw {
1666 my ($self) = @_; 1842 my ($self) = @_;
1667 1843
1668 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1669 1845
1670 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1673 } else { 1849 } else {
1674 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1675 } 1851 }
1676 1852
1677 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1680 glVertex 0 , 0; 1856 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1744 } else { 1920 } else {
1745 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1746 } 1922 }
1747 1923
1748 } else { 1924 } else {
1749 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1750 } 1928 1
1751
1752} 1929}
1753 1930
1754############################################################################# 1931#############################################################################
1755 1932
1756package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1765 1942
1766sub new { 1943sub new {
1767 my $class = shift; 1944 my $class = shift;
1768 1945
1769 $class->SUPER::new ( 1946 $class->SUPER::new (
1770 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1771 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1773 can_hover => 1, 1951 can_hover => 1,
1774 align => 0, 1952 align => 0,
1775 valign => 0, 1953 valign => 0,
… …
1784 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1785 1963
1786 $self->emit ("activate") 1964 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1789} 1969}
1790 1970
1791sub _draw { 1971sub _draw {
1792 my ($self) = @_; 1972 my ($self) = @_;
1793 1973
1794 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 1975
1800 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1803 1979
… …
1808 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1809} 1985}
1810 1986
1811############################################################################# 1987#############################################################################
1812 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
1813package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1814 2028
1815our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1816 2030
1817my @tex = 2031my @tex =
… …
1822 2036
1823sub new { 2037sub new {
1824 my $class = shift; 2038 my $class = shift;
1825 2039
1826 $class->SUPER::new ( 2040 $class->SUPER::new (
1827 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1828 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 2047 state => 0,
… …
1836} 2051}
1837 2052
1838sub size_request { 2053sub size_request {
1839 my ($self) = @_; 2054 my ($self) = @_;
1840 2055
1841 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1842} 2057}
1843 2058
1844sub button_down { 2059sub button_down {
1845 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1846 2061
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1851 } 2070 1
1852} 2071}
1853 2072
1854sub _draw { 2073sub _draw {
1855 my ($self) = @_; 2074 my ($self) = @_;
1856 2075
1857 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1858 2077
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 2079
1861 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;
1862 2083
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 2085
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 2087
… …
2021 2242
2022 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2024 2245
2025 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2026 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;
2027 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2251
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2131 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2138 vertical => 0, 2360 vertical => 0,
2139 can_hover => 1, 2361 can_hover => 1,
2140 inner_pad => 0.02, 2362 inner_pad => 0.02,
2141 @_ 2363 @_
2142 ); 2364 );
… …
2145 $self->update; 2367 $self->update;
2146 2368
2147 $self 2369 $self
2148} 2370}
2149 2371
2372sub changed { }
2373
2150sub set_range { 2374sub set_range {
2151 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2152 2376
2153 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2154 2378
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2157} 2383}
2158 2384
2159sub set_value { 2385sub set_value {
2160 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2161 2387
… …
2180} 2406}
2181 2407
2182sub size_request { 2408sub size_request {
2183 my ($self) = @_; 2409 my ($self) = @_;
2184 2410
2185 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2412}
2190 2413
2191sub button_down { 2414sub button_down {
2192 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2193 2416
2194 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2195 2418
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2420
2198 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2199} 2422}
2200 2423
2201sub mouse_motion { 2424sub mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2203 2426
… …
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2431
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2433
2211 $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
2212 } 2439 1
2213} 2440}
2214 2441
2215sub update { 2442sub update {
2216 my ($self) = @_; 2443 my ($self) = @_;
2217 2444
2218 $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}) {
2219 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2220 2454
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2223 2457
… …
2229 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2231 2465
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2234 }); 2468 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2469
2242 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2243 2471
2244 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2245 2473
… …
2306sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2308 2536
2309############################################################################# 2537#############################################################################
2310 2538
2311package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2312 2540
2313our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2314 2542
2315use CFClient::OpenGL; 2543use CFClient::OpenGL;
2316 2544
… …
2318 my $class = shift; 2546 my $class = shift;
2319 2547
2320 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2321 fontsize => 1, 2549 fontsize => 1,
2322 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2323 #font => default_font 2552 #font => default_font
2324 @_, 2553 @_,
2325 2554
2326 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2327 par => [], 2556 par => [],
… …
2350 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2351 2580
2352 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2353 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2354 $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});
2355 2585
2356 $self->reflow; 2586 $self->reflow;
2357} 2587}
2358 2588
2359sub text_size { 2589sub text_size {
… …
2361 2591
2362 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2363 2593
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $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});
2366 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2367 2598
2368 $layout->size 2599 $layout->size
2369} 2600}
2370 2601
… …
2409 2640
2410 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2411 2642
2412 delete $self->{texture}; 2643 delete $self->{texture};
2413 2644
2414 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416 2647
2417 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2418 my $height = 0; 2649 my $height = 0;
2419 2650
… …
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423 2654
2424 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h; 2662 $_->[1] = $h;
2431 } 2663 }
… …
2434 } 2666 }
2435 2667
2436 $self->{height} = $height; 2668 $self->{height} = $height;
2437 2669
2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2439 2671
2440 delete $self->{texture}; 2672 delete $self->{texture};
2441 } 2673 }
2442 2674
2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2446 2678
2447 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2448 2680
2449 my $y0 = $top; 2681 my $y0 = $top;
… …
2463 my $h = $par->[1]; 2695 my $h = $par->[1];
2464 2696
2465 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2466 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2468 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2469 2702
2470 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2471 2704
2472 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2484sub _draw { 2717sub _draw {
2485 my ($self) = @_; 2718 my ($self) = @_;
2486 2719
2487 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2490 $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});
2491 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2492 2725
2493 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2494 2727
2495} 2728}
… …
2544 2777
2545sub new { 2778sub new {
2546 my $class = shift; 2779 my $class = shift;
2547 2780
2548 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2549 state => 0, 2782 state => 0,
2550 connect_activate => \&toggle_flopper, 2783 on_activate => \&toggle_flopper,
2551 @_ 2784 @_
2552 ); 2785 );
2553 2786
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2787 $self
2560} 2788}
2561 2789
2562sub toggle_flopper { 2790sub toggle_flopper {
2563 my ($self) = @_; 2791 my ($self) = @_;
2564 2792
2565 # TODO: use animation 2793 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2794}
2577 2795
2578############################################################################# 2796#############################################################################
2579 2797
2580package CFClient::UI::Tooltip; 2798package CFClient::UI::Tooltip;
… …
2593} 2811}
2594 2812
2595sub set_tooltip_from { 2813sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2597 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
2598 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2831 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2833 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2615 2845
2616sub size_allocate { 2846sub size_allocate {
2617 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2618 2848
2619 $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 });
2620} 2868}
2621 2869
2622sub _draw { 2870sub _draw {
2623 my ($self) = @_; 2871 my ($self) = @_;
2624 2872
… …
2641 glVertex $w, $h; 2889 glVertex $w, $h;
2642 glVertex $w, 0; 2890 glVertex $w, 0;
2643 glEnd; 2891 glEnd;
2644 2892
2645 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2646 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2647} 2896}
2648 2897
2649############################################################################# 2898#############################################################################
2650 2899
… …
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2710 2959
2711 if ($tex) { 2960 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2717 } 2966 }
2718} 2967}
2719 2968
2720sub DESTROY { 2969sub destroy {
2721 my ($self) = @_; 2970 my ($self) = @_;
2722 2971
2723 $self->{timer}->cancel 2972 $self->{timer}->cancel
2724 if $self->{timer}; 2973 if $self->{timer};
2725 2974
2726 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2727} 2976}
2728 2977
2729############################################################################# 2978#############################################################################
2730 2979
2731package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2732 2981
2733our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2734 2983
2735sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 2985
2776############################################################################# 2986#############################################################################
2777 2987
2778package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2779 2989
… …
2791 ); 3001 );
2792 3002
2793 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2794 3004
2795 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2796 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2797 3007
2798 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2799 if (!ref $widget) { 3009 if (!ref $widget) {
2800 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2801 can_hover => 1, 3011 can_hover => 1,
2802 can_events => 1, 3012 can_events => 1,
2803 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2804 } 3015 }
2805 3016
2806 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2807 3018
2808 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2820 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 3032 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2823 3034
2824 $self->show; 3035 $self->show;
2825 $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);
2826} 3037}
2827 3038
2828sub mouse_motion { 3039sub mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2830 3041
2831 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2834} 3047}
2835 3048
2836sub button_up { 3049sub button_up {
2837 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2838 3051
… …
2840 undef $GRAB; 3053 undef $GRAB;
2841 $self->hide; 3054 $self->hide;
2842 3055
2843 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2845 } 3062 1
2846} 3063}
2847 3064
2848############################################################################# 3065#############################################################################
2849 3066
2850package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2851 3068
2852our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2853 3070
2854sub new { 3071sub new {
2855 my $class = shift; 3072 my $class = shift;
2856 3073
2857 $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 (
2858 fontsize => 0.8, 3239 fontsize => 0.8,
2859 @_, 3240 @_,
2860 ) 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
2861} 3248}
2862 3249
2863sub reorder { 3250sub reorder {
2864 my ($self) = @_; 3251 my ($self) = @_;
2865 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} };
2866 3258
2867 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 } 3261 }
2870 3262
… …
2873 my @items = sort { 3265 my @items = sort {
2874 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2877 3269
3270 $self->{timer}->interval (1);
3271
2878 my $count = 10 + 1; 3272 my $count = 10 + 1;
2879 for my $item (@items) { 3273 for my $item (@items) {
2880 last unless --$count; 3274 last unless --$count;
2881 3275
2882 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text}; 3280 : $item->{text};
2887 3281
… …
2895 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2901 can_events => 1, 3295 can_events => 1,
2902 can_hover => 1 3296 can_hover => 1
2903 }; 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;
2904 } 3310 }
2905 3311
2906 $self->clear; 3312 $self->clear;
2907 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2908} 3314}
… …
2913 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2915 3321
2916 return unless $text; 3322 return unless $text;
2917 3323
2918 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2919 3325
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921 3327
2922 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2924 $item->{count}++; 3330 $item->{count}++;
2925 } else { 3331 } else {
2926 $item->{count} = 1; 3332 $item->{count} = 1;
2927 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2928 } 3334 }
2929 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2930 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2931 delete $item->{label}; 3337 delete $item->{label};
2932 } else { 3338 } else {
2933 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2934 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2953 3359
2954 $self->reorder; 3360 $self->reorder;
2955 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2956} 3362}
2957 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2958############################################################################# 3372#############################################################################
2959 3373
2960package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2961 3375
2962our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3377
2966sub new { 3378sub new {
2967 my $class = shift; 3379 my $class = shift;
2968 3380
2969 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
2970 visible => 1, 3748 visible => 1,
2971 @_, 3749 @_,
2972 ) 3750 );
2973}
2974 3751
2975sub configure { 3752 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3753
2978 $self->{w} = $w; 3754 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3755}
2988 3756
2989sub size_request { 3757sub size_request {
2990 my ($self) = @_; 3758 my ($self) = @_;
2991 3759
2992 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
2993} 3775}
2994 3776
2995sub size_allocate { 3777sub size_allocate {
2996 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
2997 3779
2998 for my $child ($self->children) { 3780 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 3782
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3003 3785
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3788
3010 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3011 } 3790 }
3012} 3791}
3013 3792
… …
3024} 3803}
3025 3804
3026sub update { 3805sub update {
3027 my ($self) = @_; 3806 my ($self) = @_;
3028 3807
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3031} 3809}
3032 3810
3033sub add { 3811sub add {
3034 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3035 3813
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3814 $_->{is_toplevel} = 1
3044 3815 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3816
3050 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3051} 3818}
3052 3819
3053sub remove { 3820sub remove {
3054 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3055 3822
3056 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3057 3827
3058 while (@children) { 3828 while (@children) {
3059 my $w = pop @children; 3829 my $w = pop @children;
3060 push @children, $w->children; 3830 push @children, $w->children;
3061 $w->set_invisible; 3831 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3081 $_->() 3851 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3083 } 3853 }
3084 3854
3085 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3086 my @queue = ([], []); 3856 my %queue;
3857 my @queue;
3858 my $widget;
3087 3859
3088 for (;;) { 3860 outer:
3089 if ($self->{check_size}) { 3861 while () {
3090 # heuristic: check containers last 3862 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3863 for $widget (values %$realloc) {
3092 for values %{delete $self->{check_size}} 3864 $widget->{visible} or next; # do not resize invisible widgets
3865
3866 $queue{$widget+0}++ and next; # duplicates are common
3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3093 } 3870 }
3094 3871
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3872 while () {
3873 @queue or last outer;
3096 3874
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3875 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3876 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3105 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3107 3898
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3109 3900
3110 $widget->{parent}->check_size
3111 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3112 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3113 } 3911 }
3114 } 3912 }
3115 3913
3116 while ($self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 my ($widget, $w, $h) = @$_; 3916 values %$size_alloc;
3917
3918 while () {
3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3119 3922
3120 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3122 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3123 $widget->{w} = $w; 3933 $widget->{w} = $w;
3124 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3125 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3126 } 3938 }
3127 } 3939 }
3128 3940
3129 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3130 $_->() 3942 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3132 } 3944 }
3945
3133 3946
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3137 3950
… …
3139 glLoadIdentity; 3952 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 3955 glLoadIdentity;
3143 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3144 $self->_draw; 3964 $self->_draw;
3145} 3965}
3146 3966
3147############################################################################# 3967#############################################################################
3148 3968

Diff Legend

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