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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $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
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 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 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
232 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
233 delete $self->{visible}; 278 delete $self->{visible};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
238 $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;
239} 306}
240 307
241sub hide { 308sub hide {
242 my ($self) = @_; 309 my ($self) = @_;
243 310
… …
245 312
246 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
247 if $self->{parent}; 314 if $self->{parent};
248} 315}
249 316
250sub move { 317sub move_abs {
251 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
252 319
253 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
254 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
255 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
256 323
257 $self->update; 324 $self->update;
258} 325}
259 326
260sub set_size { 327sub set_size {
261 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
262 329
263 $self->{user_w} = $w; 330 $self->{force_w} = $w;
264 $self->{user_h} = $h; 331 $self->{force_h} = $h;
265 332
266 $self->check_size; 333 $self->realloc;
267} 334}
268 335
269sub size_request { 336sub size_request {
270 require Carp; 337 require Carp;
271 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
273 340
274sub configure { 341sub configure {
275 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
276 343
277 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
278 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
279 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
280 349
281 # use alignment to adjust x, y 350 # use alignment to adjust x, y
282 351
283 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
284 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
285
286 ($w, $h) = ($w2, $h2);
287 } 354 }
288 355
289 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
290 $self->{x} = $x; 357 $self->{x} = $x;
291 $self->{y} = $y; 358 $self->{y} = $y;
292 $self->update; 359 $self->update;
293 } 360 }
294 361
295 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296 $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;
297 } 369 }
298} 370}
299 371
300sub size_allocate { 372sub size_allocate {
301 # nothing to be done 373 # nothing to be done
302} 374}
303 375
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
312} 382}
313 383
314sub set_max_size { 384sub set_max_size {
315 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
316 386
317 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
319} 391}
320 392
321sub set_tooltip { 393sub set_tooltip {
322 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
323 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
324 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
325 402
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
329 } 406 }
330} 407}
331 408
332# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
333sub coord2local { 410sub coord2local {
… …
370 447
371 $::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
372 unless $FOCUS; 449 unless $FOCUS;
373} 450}
374 451
375sub mouse_motion { } 452sub mouse_motion { 0 }
376sub button_up { } 453sub button_up { 0 }
377sub key_down { } 454sub key_down { 0 }
378sub key_up { } 455sub key_up { 0 }
379 456
380sub button_down { 457sub button_down {
381 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
382 459
383 $self->focus_in; 460 $self->focus_in;
384}
385 461
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
390sub 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
391 538
392sub draw { 539sub draw {
393 my ($self) = @_; 540 my ($self) = @_;
394 541
395 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);
396 553
397 glPushMatrix; 554 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw;
400 glPopMatrix;
401 556
402 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
403 my ($x, $y) = @$self{qw(x y)};
404
405 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
406 glEnable GL_BLEND; 559 glEnable GL_BLEND;
407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
408 glBegin GL_QUADS; 561 glBegin GL_QUADS;
409 glVertex $x , $y;
410 glVertex $x + $self->{w}, $y;
411 glVertex $x + $self->{w}, $y + $self->{h};
412 glVertex $x , $y + $self->{h};
413 glEnd;
414 glDisable GL_BLEND;
415 }
416
417 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix;
419 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 562 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
424 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
425 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
426 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
427 glPopMatrix; 580 glPopMatrix;
428 #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;
429 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
430} 586}
431 587
432sub _draw { 588sub _draw {
433 my ($self) = @_; 589 my ($self) = @_;
434 590
435 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
436}
437
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493} 592}
494 593
495sub DESTROY { 594sub DESTROY {
496 my ($self) = @_; 595 my ($self) = @_;
497 596
… …
529 628
530 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
532 631
533 glEnable GL_BLEND; 632 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 634 glColor_premultiply @$color;
536 635
537 glBegin GL_QUADS; 636 glBegin GL_QUADS;
538 glVertex 0 , 0; 637 glVertex 0 , 0;
539 glVertex 0 , $h; 638 glVertex 0 , $h;
540 glVertex $w, $h; 639 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
557} 656}
558 657
559sub size_request { 658sub size_request {
560 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
561} 662}
562 663
563sub draw { } 664sub draw { }
564 665
565############################################################################# 666#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
570 671
571sub new { 672sub new {
572 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
573 674
574 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
575 676
576 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
577 children => [], 678 children => [],
578 can_events => 0, 679 can_events => 0,
579 %arg, 680 %arg,
580 ); 681 );
682
581 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
582 685
583 $self 686 $self
584} 687}
585 688
586sub add { 689sub add {
… …
594 $self->{children} = [ 697 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
597 ]; 700 ];
598 701
599 $self->check_size (1); 702 $self->realloc;
600 $self->update;
601} 703}
602 704
603sub children { 705sub children {
604 @{ $_[0]{children} } 706 @{ $_[0]{children} }
605} 707}
… …
610 delete $child->{parent}; 712 delete $child->{parent};
611 $child->hide; 713 $child->hide;
612 714
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 716
615 $self->check_size; 717 $self->realloc;
616 $self->update;
617} 718}
618 719
619sub clear { 720sub clear {
620 my ($self) = @_; 721 my ($self) = @_;
621 722
… …
625 for (@$children) { 726 for (@$children) {
626 delete $_->{parent}; 727 delete $_->{parent};
627 $_->hide; 728 $_->hide;
628 } 729 }
629 730
630 $self->check_size; 731 $self->realloc;
631 $self->update;
632} 732}
633 733
634sub find_widget { 734sub find_widget {
635 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
636 736
637 $x -= $self->{x}; 737 $x -= $self->{x};
638 $y -= $self->{y}; 738 $y -= $self->{y};
639 739
640 my $res; 740 my $res;
641 741
642 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
644 and return $res; 744 and return $res;
645 } 745 }
646 746
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
697} 797}
698 798
699############################################################################# 799#############################################################################
700 800
801# back-buffered drawing area
802
701package CFClient::UI::Window; 803package CFClient::UI::Window;
702 804
703our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
704 806
705use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 826 $self->update;
725} 827}
726 828
727sub _render { 829sub _render {
830 my ($self) = @_;
831
728 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
729} 833}
730 834
731sub render_child { 835sub render_child {
732 my ($self) = @_; 836 my ($self) = @_;
733 837
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
737 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
738 $self->_render; 849 $self->_render;
739 }; 850 };
740} 851}
741 852
742sub _draw { 853sub _draw {
743 my ($self) = @_; 854 my ($self) = @_;
744 855
745 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
746 857
747 my $tex = $self->{texture} 858 my $tex = $self->{texture}
748 or return; 859 or return;
749 860
750 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
753 864
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
755 866
756 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
757} 868}
… …
760 871
761package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
762 873
763our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
764 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
765sub size_request { 886sub size_request {
766 my ($self) = @_; 887 my ($self) = @_;
767 888
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 890
770 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
771} 895}
772 896
773sub size_allocate { 897sub size_allocate {
774 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
775 899
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
777# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
778 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
779 $self->update; 906 $self->update;
780} 907}
781 908
782sub set_offset { 909sub set_offset {
783 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
817} 944}
818 945
819sub _render { 946sub _render {
820 my ($self) = @_; 947 my ($self) = @_;
821 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 953
824 $self->SUPER::_render; 954 $self->SUPER::_render;
825} 955}
826 956
… …
829package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
830 960
831our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
832 962
833sub new { 963sub new {
834 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
835 967
836 my $self; 968 my $self;
837 969
838 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
839 vertical => 1, 971 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 973 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
843 }, 975 },
844 ; 976 ;
845 977
846 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 980 slider => $slider,
849 @_, 981 %arg,
850 ); 982 );
851 983
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
855 986
856 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1004}
858 1005
859sub size_allocate { 1006sub size_allocate {
860 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
861 1008
… …
890 1037
891 if ($self->{bg}) { 1038 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
893 1040
894 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
897 1044
898 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
899 glVertex 0 , 0; 1046 glVertex 0 , 0;
900 glVertex 0 , $h; 1047 glVertex 0 , $h;
901 glVertex $w, $h; 1048 glVertex $w, $h;
… …
914 1061
915our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
916 1063
917use CFClient::OpenGL; 1064use CFClient::OpenGL;
918 1065
919my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1073
923sub new { 1074sub new {
924 my $class = shift; 1075 my ($class, %arg) = @_;
925 1076
926 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
927 1078
928 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1082 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1083 can_events => 1,
934 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
935 ); 1087 );
936 1088
937 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
938 align => 0, 1090 align => 0,
939 valign => 1, 1091 valign => 1,
940 text => $self->{title}, 1092 text => $title,
941 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
942 1095
943 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944} 1104}
945 1105
946sub border { 1106sub border {
947 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
948} 1108}
949 1109
950sub size_request { 1110sub size_request {
951 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
952 1115
953 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
954 1117
955 ( 1118 (
956 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
959} 1122}
960 1123
961sub size_allocate { 1124sub size_allocate {
962 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
963 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
964 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
966 1137
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968 if $self->{title};
969
970 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
971} 1139}
972 1140
973sub button_down { 1141sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
975 1143
… …
991 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
992 1160
993 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
995 1163
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1168 $self->realloc;
1000 }; 1169 };
1001 1170
1002 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1175 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1008 1177
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1179
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1014 } 1188 1
1015} 1189}
1016 1190
1017sub button_up { 1191sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1019 1193
1020 delete $self->{motion}; 1194 !!delete $self->{motion}
1021} 1195}
1022 1196
1023sub mouse_motion { 1197sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1025 1199
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1027} 1203}
1028 1204
1029sub _draw { 1205sub _draw {
1030 my ($self) = @_; 1206 my ($self) = @_;
1031 1207
1208 my $child = $self->{children}[0];
1209
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1212
1035 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1215
1038 my $border = $self->border; 1216 my $border = $self->border;
1039 1217
1040 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1223
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1048 1226
1049 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1052
1053 glColor @{ $self->{bg} };
1054
1055 $bg->{s} = $rep_x;
1056 $bg->{t} = $rep_y;
1057 $bg->{wrap_mode} = 1;
1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1232 }
1060 1233
1061 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1062 1235
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1066} 1242}
1067 1243
1068############################################################################# 1244#############################################################################
1069 1245
1070package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1078sub new { 1254sub new {
1079 my $class = shift; 1255 my $class = shift;
1080 1256
1081 $class->SUPER::new ( 1257 $class->SUPER::new (
1082 col_expand => [], 1258 col_expand => [],
1083 @_ 1259 @_,
1084 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1265}
1086 1266
1087sub add { 1267sub add {
1088 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1089 1269
1090 $child->set_parent ($self); 1270 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1092 1272
1093 $child->check_size; 1273 $self->realloc;
1094} 1274}
1095 1275
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1277sub clear {
1102 my ($self) = @_; 1278 my ($self) = @_;
1103 1279
1104 my @children = $self->children; 1280 my @children = $self->children;
1105 delete $self->{children}; 1281 delete $self->{children};
… …
1107 for (@children) { 1283 for (@children) {
1108 delete $_->{parent}; 1284 delete $_->{parent};
1109 $_->hide; 1285 $_->hide;
1110 } 1286 }
1111 1287
1112 $self->update; 1288 $self->realloc;
1113} 1289}
1114 1290
1115sub get_wh { 1291sub get_wh {
1116 my ($self) = @_; 1292 my ($self) = @_;
1117 1293
… …
1148sub size_allocate { 1324sub size_allocate {
1149 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1150 1326
1151 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1152 1328
1153 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1155 1331
1156 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1389 }
1214} 1390}
1215 1391
1216############################################################################# 1392#############################################################################
1217 1393
1218package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1395
1222our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1223 1397
1224sub size_request { 1398sub size_request {
1225 my ($self) = @_; 1399 my ($self) = @_;
1226 1400
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1228 1402 ? (
1229 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1405 )
1232 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1233} 1410}
1234 1411
1235sub size_allocate { 1412sub size_allocate {
1236 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1237 1414
1238 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1416 my $children = $self->{children};
1241 1417
1242 my @h = map $_->{req_w}, @$children; 1418 my @req;
1243 1419
1244 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1245 1421 @req = ($space / (@$children || 1)) x @$children;
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 } 1436 }
1260 } 1437 }
1261 1438
1262 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1263 1440
1264 my $y = 0; 1441 my $pos = 0;
1265 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1445
1270 $y += $h; 1446 $pos += $alloc;
1271 } 1447 }
1272 1448
1273 1 1449 1
1274} 1450}
1275 1451
1276############################################################################# 1452#############################################################################
1277 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1278package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1279 1470
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1283 1472
1284sub size_request { 1473sub new {
1285 my ($self) = @_; 1474 my $class = shift;
1286 1475
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1288 1477 vertical => 1,
1289 ( 1478 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1479 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1480}
1333 1481
1334############################################################################# 1482#############################################################################
1335 1483
1336package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1501 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1355 fontsize => 1, 1503 fontsize => 1,
1356 align => -1, 1504 align => -1,
1357 valign => -1, 1505 valign => -1,
1358 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1359 can_events => 0, 1508 can_events => 0,
1360 %arg 1509 %arg
1361 ); 1510 );
1362 1511
1363 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1390 1539
1391 delete $self->{texture}; 1540 delete $self->{texture};
1392 $self->SUPER::update; 1541 $self->SUPER::update;
1393} 1542}
1394 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1395sub set_text { 1551sub set_text {
1396 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1397 1553
1398 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1399 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1400 1556
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1403 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1404 $self->update; 1562 $self->update;
1405 $self->check_size;
1406} 1563}
1407 1564
1408sub set_markup { 1565sub set_markup {
1409 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1410 1567
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1572
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1418 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1419 $self->update; 1578 $self->update;
1420 $self->check_size;
1421} 1579}
1422 1580
1423sub size_request { 1581sub size_request {
1424 my ($self) = @_; 1582 my ($self) = @_;
1425 1583
1584 $self->{size_req} ||= do {
1426 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1427 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1590
1432 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1433 1592
1434 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1435 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1436 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1437 1596
1438 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1439 1598
1440 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1442 } 1604 };
1443 1605
1444 ( 1606 @{ $self->{size_req} }
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1607}
1449 1608
1450sub size_allocate { 1609sub size_allocate {
1451 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1452 1611
1612 delete $self->{ox};
1613
1453 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1616}
1455 1617
1456sub set_fontsize { 1618sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1458 1620
1459 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1622 delete $self->{texture};
1461 1623
1462 $self->update; 1624 $self->realloc;
1463 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1464} 1633}
1465 1634
1466sub _draw { 1635sub _draw {
1467 my ($self) = @_; 1636 my ($self) = @_;
1468 1637
… …
1474 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1647
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1480 1650
1651 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1484 1655
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1659 };
1491 1660
1492 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1494 1665
1495 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1498 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1500 } 1673 }
1501 1674
1502 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1503} 1676}
1504 1677
… …
1521 can_hover => 1, 1694 can_hover => 1,
1522 can_focus => 1, 1695 can_focus => 1,
1523 valign => 0, 1696 valign => 0,
1524 can_events => 1, 1697 can_events => 1,
1525 #text => ... 1698 #text => ...
1699 #hidden => "*",
1526 @_ 1700 @_
1527 ) 1701 )
1528} 1702}
1529 1703
1530sub _set_text { 1704sub _set_text {
… …
1532 1706
1533 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1534 1708
1535 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1536 1710
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1712 $self->{text} = $text;
1541 1713
1542 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1544 1717
1545 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1546} 1722}
1547 1723
1548sub set_text { 1724sub set_text {
1549 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1550 1726
1551 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1728 $self->_set_text ($text);
1553 $self->update;
1554 $self->check_size;
1555} 1729}
1556 1730
1557sub get_text { 1731sub get_text {
1558 $_[0]{text} 1732 $_[0]{text}
1559} 1733}
… …
1562 my ($self) = @_; 1736 my ($self) = @_;
1563 1737
1564 my ($w, $h) = $self->SUPER::size_request; 1738 my ($w, $h) = $self->SUPER::size_request;
1565 1739
1566 ($w + 1, $h) # add 1 for cursor 1740 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1741}
1574 1742
1575sub key_down { 1743sub key_down {
1576 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1577 1745
… …
1595 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1598 } elsif ($uni) { 1766 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1600 } 1770 }
1601 1771
1602 $self->_set_text ($text); 1772 $self->_set_text ($text);
1603 $self->update; 1773
1604 $self->check_size; 1774 $self->realloc;
1775
1776 1
1605} 1777}
1606 1778
1607sub focus_in { 1779sub focus_in {
1608 my ($self) = @_; 1780 my ($self) = @_;
1609 1781
… …
1624 utf8::encode $text; 1796 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1626 1798
1627 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1628 $self->update; 1800 $self->update;
1801
1802 1
1629} 1803}
1630 1804
1631sub mouse_motion { 1805sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1634} 1810}
1635 1811
1636sub _draw { 1812sub _draw {
1637 my ($self) = @_; 1813 my ($self) = @_;
1638 1814
1639 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1640 1816
1641 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1644 } else { 1820 } else {
1645 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1646 } 1822 }
1647 1823
1648 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1827 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1715 } else { 1891 } else {
1716 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1717 } 1893 }
1718 1894
1719 } else { 1895 } else {
1720 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1721 } 1899 1
1722
1723} 1900}
1724 1901
1725############################################################################# 1902#############################################################################
1726 1903
1727package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1736 1913
1737sub new { 1914sub new {
1738 my $class = shift; 1915 my $class = shift;
1739 1916
1740 $class->SUPER::new ( 1917 $class->SUPER::new (
1741 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1742 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1744 can_hover => 1, 1922 can_hover => 1,
1745 align => 0, 1923 align => 0,
1746 valign => 0, 1924 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1756 1934
1757 $self->emit ("activate") 1935 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1760} 1940}
1761 1941
1762sub _draw { 1942sub _draw {
1763 my ($self) = @_; 1943 my ($self) = @_;
1764 1944
1765 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1946
1771 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1774 1950
… …
1793 1969
1794sub new { 1970sub new {
1795 my $class = shift; 1971 my $class = shift;
1796 1972
1797 $class->SUPER::new ( 1973 $class->SUPER::new (
1798 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1799 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1980 state => 0,
… …
1807} 1984}
1808 1985
1809sub size_request { 1986sub size_request {
1810 my ($self) = @_; 1987 my ($self) = @_;
1811 1988
1812 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1813} 1990}
1814 1991
1815sub button_down { 1992sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1817 1994
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1822 } 2003 1
1823} 2004}
1824 2005
1825sub _draw { 2006sub _draw {
1826 my ($self) = @_; 2007 my ($self) = @_;
1827 2008
1828 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1829 2010
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 2012
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 2016
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 2018
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 2020
… …
1992 2175
1993 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
1995 2178
1996 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2184
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2109 vertical => 0, 2293 vertical => 0,
2110 can_hover => 1, 2294 can_hover => 1,
2111 inner_pad => 0.02, 2295 inner_pad => 0.02,
2112 @_ 2296 @_
2113 ); 2297 );
… …
2116 $self->update; 2300 $self->update;
2117 2301
2118 $self 2302 $self
2119} 2303}
2120 2304
2305sub changed { }
2306
2121sub set_range { 2307sub set_range {
2122 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2123 2309
2124 $self->{range} = $range; 2310 ($range, $self->{range}) = ($self->{range}, $range);
2125 2311
2312 if ("@$range" ne "@{$self->{range}}") {
2126 $self->update; 2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2127} 2316}
2128 2317
2129sub set_value { 2318sub set_value {
2130 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2131 2320
… …
2150} 2339}
2151 2340
2152sub size_request { 2341sub size_request {
2153 my ($self) = @_; 2342 my ($self) = @_;
2154 2343
2155 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2345}
2160 2346
2161sub button_down { 2347sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2163 2349
2164 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2165 2351
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2353
2168 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2169} 2355}
2170 2356
2171sub mouse_motion { 2357sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2173 2359
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2364
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2366
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2182 } 2372 1
2183} 2373}
2184 2374
2185sub update { 2375sub update {
2186 my ($self) = @_; 2376 my ($self) = @_;
2187 2377
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2190 2387
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2193 2390
… …
2199 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2201 2398
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2204 }); 2401 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2402
2212 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2213 2404
2214 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2215 2406
… …
2288 my $class = shift; 2479 my $class = shift;
2289 2480
2290 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2291 fontsize => 1, 2482 fontsize => 1,
2292 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2293 #font => default_font 2485 #font => default_font
2294 @_, 2486 @_,
2295 2487
2296 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2297 par => [], 2489 par => [],
… …
2320 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2321 2513
2322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2323 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2325 2518
2326 $self->reflow; 2519 $self->reflow;
2327} 2520}
2328 2521
2329sub text_size { 2522sub text_size {
… …
2331 2524
2332 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2333 2526
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2336 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2337 2531
2338 $layout->size 2532 $layout->size
2339} 2533}
2340 2534
… …
2379 2573
2380 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2381 2575
2382 delete $self->{texture}; 2576 delete $self->{texture};
2383 2577
2384 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386 2580
2387 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2388 my $height = 0; 2582 my $height = 0;
2389 2583
… …
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393 2587
2394 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h; 2595 $_->[1] = $h;
2401 } 2596 }
… …
2404 } 2599 }
2405 2600
2406 $self->{height} = $height; 2601 $self->{height} = $height;
2407 2602
2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2409 2604
2410 delete $self->{texture}; 2605 delete $self->{texture};
2411 } 2606 }
2412 2607
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2416 2611
2417 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2418 2613
2419 my $y0 = $top; 2614 my $y0 = $top;
… …
2433 my $h = $par->[1]; 2628 my $h = $par->[1];
2434 2629
2435 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2436 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2438 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2439 2635
2440 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2441 2637
2442 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2454sub _draw { 2650sub _draw {
2455 my ($self) = @_; 2651 my ($self) = @_;
2456 2652
2457 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2461 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2462 2658
2463 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2464 2660
2465} 2661}
… …
2514 2710
2515sub new { 2711sub new {
2516 my $class = shift; 2712 my $class = shift;
2517 2713
2518 my $self = $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2519 state => 0, 2715 state => 0,
2520 connect_activate => \&toggle_flopper, 2716 on_activate => \&toggle_flopper,
2521 @_ 2717 @_
2522 ); 2718 );
2523 2719
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2720 $self
2530} 2721}
2531 2722
2532sub toggle_flopper { 2723sub toggle_flopper {
2533 my ($self) = @_; 2724 my ($self) = @_;
2534 2725
2535 # TODO: use animation 2726 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2727}
2547 2728
2548############################################################################# 2729#############################################################################
2549 2730
2550package CFClient::UI::Tooltip; 2731package CFClient::UI::Tooltip;
… …
2563} 2744}
2564 2745
2565sub set_tooltip_from { 2746sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2567 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2568 $self->add (new CFClient::UI::Label 2758 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2759 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2761 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2762 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2763 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2764 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2775
2586sub size_allocate { 2776sub size_allocate {
2587 my ($self, $w, $h) = @_; 2777 my ($self, $w, $h) = @_;
2588 2778
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2779 $self->SUPER::size_allocate ($w - 4, $h - 4);
2780}
2781
2782sub visibility_change {
2783 my ($self, $visible) = @_;
2784
2785 return unless $visible;
2786
2787 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner}
2789 or return;
2790
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w};
2795
2796 $self->move_abs ($x, $y);
2797 });
2590} 2798}
2591 2799
2592sub _draw { 2800sub _draw {
2593 my ($self) = @_; 2801 my ($self) = @_;
2594 2802
… …
2611 glVertex $w, $h; 2819 glVertex $w, $h;
2612 glVertex $w, 0; 2820 glVertex $w, 0;
2613 glEnd; 2821 glEnd;
2614 2822
2615 glTranslate 2 - 0.375, 2 - 0.375; 2823 glTranslate 2 - 0.375, 2 - 0.375;
2824
2616 $self->SUPER::_draw; 2825 $self->SUPER::_draw;
2617} 2826}
2618 2827
2619############################################################################# 2828#############################################################################
2620 2829
… …
2626 2835
2627sub new { 2836sub new {
2628 my $class = shift; 2837 my $class = shift;
2629 2838
2630 my $self = $class->SUPER::new ( 2839 my $self = $class->SUPER::new (
2631 aspect => 1, 2840 aspect => 1,
2841 can_events => 0,
2632 @_, 2842 @_,
2633 ); 2843 );
2634 2844
2635 if ($self->{anim} && $self->{animspeed}) { 2845 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2846 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2889
2680 if ($tex) { 2890 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2891 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2893 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2895 glDisable GL_TEXTURE_2D;
2686 } 2896 }
2687} 2897}
2688 2898
… …
2695 $self->SUPER::DESTROY; 2905 $self->SUPER::DESTROY;
2696} 2906}
2697 2907
2698############################################################################# 2908#############################################################################
2699 2909
2700package CFClient::UI::InventoryItem; 2910package CFClient::UI::Buttonbar;
2701 2911
2702our @ISA = CFClient::UI::HBox::; 2912our @ISA = CFClient::UI::HBox::;
2703 2913
2704sub _item_to_desc { 2914# TODO: should actualyl wrap buttons and other goodies.
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859}
2860 2915
2861############################################################################# 2916#############################################################################
2862 2917
2863package CFClient::UI::Menu; 2918package CFClient::UI::Menu;
2864 2919
… …
2876 ); 2931 );
2877 2932
2878 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2879 2934
2880 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2881 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2882 2937
2883 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2884 if (!ref $widget) { 2939 if (!ref $widget) {
2885 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2886 can_hover => 1, 2941 can_hover => 1,
2887 can_events => 1, 2942 can_events => 1,
2888 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2889 } 2945 }
2890 2946
2891 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2892 2948
2893 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
2905 # maybe save $GRAB? must be careful about events... 2961 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2962 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2963 $self->{button} = $ev->{button};
2908 2964
2909 $self->show; 2965 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2967}
2912 2968
2913sub mouse_motion { 2969sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2915 2971
2916 # TODO: should use vbox->find_widget or so 2972 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2974 $self->{hover} = $self->{item}{$HOVER};
2975
2976 0
2919} 2977}
2920 2978
2921sub button_up { 2979sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2980 my ($self, $ev, $x, $y) = @_;
2923 2981
… …
2925 undef $GRAB; 2983 undef $GRAB;
2926 $self->hide; 2984 $self->hide;
2927 2985
2928 $self->_emit ("popdown"); 2986 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2987 $self->{hover}[1]->() if $self->{hover};
2988 } else {
2989 return 0
2990 }
2991
2930 } 2992 1
2931} 2993}
2932 2994
2933############################################################################# 2995#############################################################################
2934 2996
2935package CFClient::UI::Statusbox; 2997package CFClient::UI::Multiplexer;
2936 2998
2937our @ISA = CFClient::UI::VBox::; 2999our @ISA = CFClient::UI::Container::;
2938 3000
2939sub new { 3001sub new {
2940 my $class = shift; 3002 my $class = shift;
2941 3003
2942 $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
3005 @_,
3006 );
3007
3008 $self->{current} = $self->{children}[0]
3009 if @{ $self->{children} };
3010
3011 $self
3012}
3013
3014sub add {
3015 my ($self, @widgets) = @_;
3016
3017 $self->SUPER::add (@widgets);
3018
3019 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} };
3021}
3022
3023sub set_current_page {
3024 my ($self, $page_or_widget) = @_;
3025
3026 my $widget = ref $page_or_widget
3027 ? $page_or_widget
3028 : $self->{children}[$page_or_widget];
3029
3030 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032
3033 $self->_emit (page_changed => $self->{current});
3034
3035 $self->realloc;
3036}
3037
3038sub visible_children {
3039 $_[0]{current}
3040}
3041
3042sub size_request {
3043 my ($self) = @_;
3044
3045 $self->{current}->size_request
3046}
3047
3048sub size_allocate {
3049 my ($self, $w, $h) = @_;
3050
3051 $self->{current}->configure (0, 0, $w, $h);
3052}
3053
3054sub _draw {
3055 my ($self) = @_;
3056
3057 $self->{current}->draw;
3058}
3059
3060#############################################################################
3061
3062package CFClient::UI::Notebook;
3063
3064our @ISA = CFClient::UI::VBox::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self
3073 @_,
3074 );
3075
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078
3079 $self
3080}
3081
3082sub add {
3083 my ($self, $title, $widget, $tooltip) = @_;
3084
3085 Scalar::Util::weaken $self;
3086
3087 $self->{buttonbar}->add (new CFClient::UI::Button
3088 markup => $title,
3089 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) },
3091 );
3092
3093 $self->{multiplexer}->add ($widget);
3094}
3095
3096sub set_current_page {
3097 my ($self, $page) = @_;
3098
3099 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[1];
3146 $self->set_markup ("$item->[0] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3157}
3158
3159#############################################################################
3160
3161package CFClient::UI::Statusbox;
3162
3163our @ISA = CFClient::UI::VBox::;
3164
3165sub new {
3166 my $class = shift;
3167
3168 my $self = $class->SUPER::new (
2943 fontsize => 0.8, 3169 fontsize => 0.8,
2944 @_, 3170 @_,
2945 ) 3171 );
3172
3173 Scalar::Util::weaken (my $this = $self);
3174
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176
3177 $self
2946} 3178}
2947 3179
2948sub reorder { 3180sub reorder {
2949 my ($self) = @_; 3181 my ($self) = @_;
2950 my $NOW = time; 3182 my $NOW = Time::HiRes::time;
3183
3184 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} };
2951 3188
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3189 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3190 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3191 }
2955 3192
… …
2958 my @items = sort { 3195 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3196 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3197 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3198 } values %{ $self->{item} };
2962 3199
3200 $self->{timer}->interval (1);
3201
2963 my $count = 10 + 1; 3202 my $count = 10 + 1;
2964 for my $item (@items) { 3203 for my $item (@items) {
2965 last unless --$count; 3204 last unless --$count;
2966 3205
2967 push @widgets, $item->{label} ||= do { 3206 my $label = $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all) 3207 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1 3208 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}" 3209 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text}; 3210 : $item->{text};
2972 3211
… …
2980 tooltip => $item->{tooltip}, 3219 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP, 3220 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3221 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3222 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3223 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3224 fg => [@{ $item->{fg} }],
2986 can_events => 1, 3225 can_events => 1,
2987 can_hover => 1 3226 can_hover => 1
2988 }; 3227 };
3228
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1;
3234 $self->{timer}->interval (1/30);
3235 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 }
3238
3239 push @widgets, $label;
2989 } 3240 }
2990 3241
2991 $self->clear; 3242 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3243 $self->SUPER::add (reverse @widgets);
2993} 3244}
… …
2996 my ($self, $text, %arg) = @_; 3247 my ($self, $text, %arg) = @_;
2997 3248
2998 $text =~ s/^\s+//; 3249 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3250 $text =~ s/\s+$//;
3000 3251
3252 return unless $text;
3253
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3254 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3255
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3256 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3257
3005 if (my $item = $self->{item}{$group}) { 3258 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3259 if ($item->{text} eq $text) {
… …
3036 3289
3037 $self->reorder; 3290 $self->reorder;
3038 $self->SUPER::reconfigure; 3291 $self->SUPER::reconfigure;
3039} 3292}
3040 3293
3294sub DESTROY {
3295 my ($self) = @_;
3296
3297 $self->{timer}->cancel;
3298
3299 $self->SUPER::DESTROY;
3300}
3301
3041############################################################################# 3302#############################################################################
3042 3303
3043package CFClient::UI::Root; 3304package CFClient::UI::Inventory;
3044 3305
3045our @ISA = CFClient::UI::Container::; 3306our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3307
3049sub new { 3308sub new {
3050 my $class = shift; 3309 my $class = shift;
3051 3310
3052 $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
3053 @_, 3553 @_,
3054 ) 3554 )
3055} 3555}
3056 3556
3057sub configure { 3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3058 my ($self, $x, $y, $w, $h) = @_; 3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3059 3563
3060 $self->{w} = $w; 3564sub rebuild_spell_list {
3061 $self->{h} = $h; 3565 my ($self) = @_;
3062}
3063 3566
3064sub check_size { 3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
3065 my ($self) = @_; 3612 my ($self, $spell) = @_;
3066 3613
3067 $self->size_allocate ($self->{w}, $self->{h}) 3614 $self->{spell}->{$spell->{name}} = $spell;
3068 if $self->{w}; 3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root;
3628
3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3632
3633use CFClient::OpenGL;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 visible => 1,
3640 @_,
3641 );
3642
3643 Scalar::Util::weaken ($self->{root} = $self);
3644
3645 $self
3069} 3646}
3070 3647
3071sub size_request { 3648sub size_request {
3072 my ($self) = @_; 3649 my ($self) = @_;
3073 3650
3074 ($self->{w}, $self->{h}) 3651 ($self->{w}, $self->{h})
3652}
3653
3654sub _to_pixel {
3655 my ($coord, $size, $max) = @_;
3656
3657 $coord =
3658 $coord eq "center" ? ($max - $size) * 0.5
3659 : $coord eq "max" ? $max
3660 : $coord;
3661
3662 $coord = 0 if $coord < 0;
3663 $coord = $max - $size if $coord > $max - $size;
3664
3665 int $coord + 0.5
3075} 3666}
3076 3667
3077sub size_allocate { 3668sub size_allocate {
3078 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3079 3670
3080 for my $child ($self->children) { 3671 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3673
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3674 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3675 $Y = $child->{force_y} if exists $child->{force_y};
3085 3676
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3677 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3088
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3679
3092 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3093 } 3681 }
3094} 3682}
3095 3683
… …
3106} 3694}
3107 3695
3108sub update { 3696sub update {
3109 my ($self) = @_; 3697 my ($self) = @_;
3110 3698
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3699 $::WANT_REFRESH++;
3113} 3700}
3114 3701
3115sub add { 3702sub add {
3116 my ($self, @children) = @_; 3703 my ($self, @children) = @_;
3117 3704
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3705 $_->{is_toplevel} = 1
3126 3706 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3707
3132 $self->SUPER::add (@children); 3708 $self->SUPER::add (@children);
3133} 3709}
3134 3710
3135sub remove { 3711sub remove {
3136 my ($self, @children) = @_; 3712 my ($self, @children) = @_;
3137 3713
3138 $self->SUPER::remove (@children); 3714 $self->SUPER::remove (@children);
3715
3716 delete $self->{is_toplevel}
3717 for @children;
3139 3718
3140 while (@children) { 3719 while (@children) {
3141 my $w = pop @children; 3720 my $w = pop @children;
3142 push @children, $w->children; 3721 push @children, $w->children;
3143 $w->set_invisible; 3722 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3741 while ($self->{refresh_hook}) {
3163 $_->() 3742 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3743 for values %{delete $self->{refresh_hook}};
3165 } 3744 }
3166 3745
3167 if ($self->{check_size}) { 3746 if ($self->{realloc}) {
3168 my @queue = ([], []); 3747 my %queue;
3748 my @queue;
3749 my $widget;
3169 3750
3170 for (;;) { 3751 outer:
3171 if ($self->{check_size}) { 3752 while () {
3172 # heuristic: check containers last 3753 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3754 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3755 $widget->{visible} or next; # do not resize invisible widgets
3756
3757 $queue{$widget+0}++ and next; # duplicates are common
3758
3759 push @{ $queue[$widget->{visible}] }, $widget;
3760 }
3175 } 3761 }
3176 3762
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3763 while () {
3764 @queue or last outer;
3178 3765
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3766 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3767 and last;
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3768
3769 pop @queue;
3770 }
3771
3772 delete $queue{$widget+0};
3773
3774 my ($w, $h) = $widget->size_request;
3775
3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3778
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3781
3782 $w = $widget->{force_w} if exists $widget->{force_w};
3783 $h = $widget->{force_h} if exists $widget->{force_h};
3784
3785 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3786 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3787 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3788 $widget->{req_h} = $h;
3189 3789
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3790 $self->{size_alloc}{$widget+0} = $widget;
3191 3791
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3792 if (my $parent = $widget->{parent}) {
3793 $self->{realloc}{$parent+0} = $parent
3794 unless $queue{$parent+0};
3795
3796 $parent->{force_size_alloc} = 1;
3797 $self->{size_alloc}{$parent+0} = $parent;
3798 }
3194 } 3799 }
3800
3801 delete $self->{realloc}{$widget+0};
3195 } 3802 }
3196 } 3803 }
3197 3804
3198 while ($self->{size_alloc}) { 3805 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3806 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3807 values %$size_alloc;
3808
3809 while () {
3810 my $widget = pop @queue || last;
3811
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3813
3202 $w = 0 if $w < 0; 3814 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3815 $h = 0 if $h < 0;
3204 3816
3817 $w = int $w + 0.5;
3818 $h = int $h + 0.5;
3819
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w};
3822 $widget->{old_h} = $widget->{h};
3823
3205 $widget->{w} = $w; 3824 $widget->{w} = $w;
3206 $widget->{h} = $h; 3825 $widget->{h} = $h;
3826
3207 $widget->emit (size_allocate => $w, $h); 3827 $widget->emit (size_allocate => $w, $h);
3828 }
3208 } 3829 }
3209 } 3830 }
3210 3831
3211 while ($self->{post_alloc_hook}) { 3832 while ($self->{post_alloc_hook}) {
3212 $_->() 3833 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3834 for values %{delete $self->{post_alloc_hook}};
3214 } 3835 }
3836
3215 3837
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3838 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3840 glClear GL_COLOR_BUFFER_BIT;
3219 3841
… …
3221 glLoadIdentity; 3843 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3845 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3846 glLoadIdentity;
3225 3847
3848 {
3849 package CFClient::UI::Base;
3850
3851 ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h});
3853 }
3854
3226 $self->_draw; 3855 $self->_draw;
3227} 3856}
3228 3857
3229############################################################################# 3858#############################################################################
3230 3859

Diff Legend

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