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.302 by root, Mon Jun 12 13:26:14 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};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
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} 592}
437 593
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}
494
495sub DESTROY { 594sub DESTROY {
496 my ($self) = @_; 595 my ($self) = @_;
497 596
498 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
499 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
500} 601}
501 602
502############################################################################# 603#############################################################################
503 604
504package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
529 630
530 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
532 633
533 glEnable GL_BLEND; 634 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 636 glColor_premultiply @$color;
536 637
537 glBegin GL_QUADS; 638 glBegin GL_QUADS;
538 glVertex 0 , 0; 639 glVertex 0 , 0;
539 glVertex 0 , $h; 640 glVertex 0 , $h;
540 glVertex $w, $h; 641 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
557} 658}
558 659
559sub size_request { 660sub size_request {
560 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
561} 664}
562 665
563sub draw { } 666sub draw { }
564 667
565############################################################################# 668#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
570 673
571sub new { 674sub new {
572 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
573 676
574 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
575 678
576 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
577 children => [], 680 children => [],
578 can_events => 0, 681 can_events => 0,
579 %arg, 682 %arg,
580 ); 683 );
684
581 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
582 687
583 $self 688 $self
584} 689}
585 690
586sub add { 691sub add {
… …
594 $self->{children} = [ 699 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
597 ]; 702 ];
598 703
599 $self->check_size (1); 704 $self->realloc;
600 $self->update;
601} 705}
602 706
603sub children { 707sub children {
604 @{ $_[0]{children} } 708 @{ $_[0]{children} }
605} 709}
… …
610 delete $child->{parent}; 714 delete $child->{parent};
611 $child->hide; 715 $child->hide;
612 716
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 718
615 $self->check_size; 719 $self->realloc;
616 $self->update;
617} 720}
618 721
619sub clear { 722sub clear {
620 my ($self) = @_; 723 my ($self) = @_;
621 724
… …
625 for (@$children) { 728 for (@$children) {
626 delete $_->{parent}; 729 delete $_->{parent};
627 $_->hide; 730 $_->hide;
628 } 731 }
629 732
630 $self->check_size; 733 $self->realloc;
631 $self->update;
632} 734}
633 735
634sub find_widget { 736sub find_widget {
635 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
636 738
637 $x -= $self->{x}; 739 $x -= $self->{x};
638 $y -= $self->{y}; 740 $y -= $self->{y};
639 741
640 my $res; 742 my $res;
641 743
642 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
644 and return $res; 746 and return $res;
645 } 747 }
646 748
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
668} 770}
669 771
670sub add { 772sub add {
671 my ($self, $child) = @_; 773 my ($self, $child) = @_;
672 774
673 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
674
675 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
676} 777}
677 778
678sub remove { 779sub remove {
679 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
697} 798}
698 799
699############################################################################# 800#############################################################################
700 801
802# back-buffered drawing area
803
701package CFClient::UI::Window; 804package CFClient::UI::Window;
702 805
703our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
704 807
705use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 827 $self->update;
725} 828}
726 829
727sub _render { 830sub _render {
831 my ($self) = @_;
832
728 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
729} 834}
730 835
731sub render_child { 836sub render_child {
732 my ($self) = @_; 837 my ($self) = @_;
733 838
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
737 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
738 $self->_render; 850 $self->_render;
739 }; 851 };
740} 852}
741 853
742sub _draw { 854sub _draw {
743 my ($self) = @_; 855 my ($self) = @_;
744 856
745 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
746 858
747 my $tex = $self->{texture} 859 my $tex = $self->{texture}
748 or return; 860 or return;
749 861
750 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
753 865
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
755 867
756 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
757} 869}
… …
760 872
761package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
762 874
763our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
764 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
765sub size_request { 887sub size_request {
766 my ($self) = @_; 888 my ($self) = @_;
767 889
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 891
770 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
771} 896}
772 897
773sub size_allocate { 898sub size_allocate {
774 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
775 900
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 901 my $child = $self->child;
777# $w = $self->{w}; 902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
778 $self->child->configure (0, 0, $cw, $ch); 906 $self->child->configure (0, 0, $w, $h);
779 $self->update; 907 $self->update;
780} 908}
781 909
782sub set_offset { 910sub set_offset {
783 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
… …
817} 945}
818 946
819sub _render { 947sub _render {
820 my ($self) = @_; 948 my ($self) = @_;
821 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 954
824 $self->SUPER::_render; 955 $self->SUPER::_render;
825} 956}
826 957
… …
829package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
830 961
831our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
832 963
833sub new { 964sub new {
834 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
835 968
836 my $self; 969 my $self;
837 970
838 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
839 vertical => 1, 972 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 974 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
843 }, 976 },
844 ; 977 ;
845 978
846 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 981 slider => $slider,
849 @_, 982 %arg,
850 ); 983 );
851 984
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
855 987
856 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1005}
858 1006
859sub size_allocate { 1007sub size_allocate {
860 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
861 1009
… …
890 1038
891 if ($self->{bg}) { 1039 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
893 1041
894 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
897 1045
898 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
899 glVertex 0 , 0; 1047 glVertex 0 , 0;
900 glVertex 0 , $h; 1048 glVertex 0 , $h;
901 glVertex $w, $h; 1049 glVertex $w, $h;
… …
914 1062
915our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
916 1064
917use CFClient::OpenGL; 1065use CFClient::OpenGL;
918 1066
919my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1074
923sub new { 1075sub new {
924 my $class = shift; 1076 my ($class, %arg) = @_;
925
926 # TODO: user_x, user_y, overwrite moveto?
927 1077
928 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1081 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1082 can_events => 1,
934 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
935 ); 1086 );
936 1087
937 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
938 align => 0, 1089 align => 0,
939 valign => 1, 1090 valign => 1,
940 text => $self->{title}, 1091 text => $self->{title},
941 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
942 1094
943 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
944} 1103}
945 1104
946sub border { 1105sub border {
947 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
948} 1107}
949 1108
950sub size_request { 1109sub size_request {
951 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
952 1114
953 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
954 1116
955 ( 1117 (
956 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
959} 1121}
960 1122
961sub size_allocate { 1123sub size_allocate {
962 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
963 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
964 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
966 1136
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); 1137 $self->child->configure ($border, $border, $w, $h);
971} 1138}
972 1139
973sub button_down { 1140sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
975 1142
… …
991 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
992 1159
993 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
995 1162
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1167 $self->realloc;
1000 }; 1168 };
1001 1169
1002 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1174 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1008 1176
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1178
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1014 } 1187 1
1015} 1188}
1016 1189
1017sub button_up { 1190sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1019 1192
1020 delete $self->{motion}; 1193 !!delete $self->{motion}
1021} 1194}
1022 1195
1023sub mouse_motion { 1196sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1025 1198
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1027} 1202}
1028 1203
1029sub _draw { 1204sub _draw {
1030 my ($self) = @_; 1205 my ($self) = @_;
1031 1206
1207 my $child = $self->{children}[0];
1208
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1211
1035 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1214
1038 my $border = $self->border; 1215 my $border = $self->border;
1039 1216
1040 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1222
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1048 1225
1049 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1229 $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); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1231 }
1060 1232
1061 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1062 1234
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1066} 1241}
1067 1242
1068############################################################################# 1243#############################################################################
1069 1244
1070package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1078sub new { 1253sub new {
1079 my $class = shift; 1254 my $class = shift;
1080 1255
1081 $class->SUPER::new ( 1256 $class->SUPER::new (
1082 col_expand => [], 1257 col_expand => [],
1083 @_ 1258 @_,
1084 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1264}
1086 1265
1087sub add { 1266sub add {
1088 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1089 1268
1090 $child->set_parent ($self); 1269 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1092 1271
1093 $child->check_size; 1272 $self->realloc;
1094} 1273}
1095 1274
1096sub children { 1275sub remove {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1276 my ($self, $child) = @_;
1098}
1099 1277
1278 # TODO: not yet implemented
1279}
1280
1100# TODO: move to container class maybe? send childs a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1282sub clear {
1102 my ($self) = @_; 1283 my ($self) = @_;
1103 1284
1104 my @children = $self->children; 1285 my @children = $self->children;
1105 delete $self->{children}; 1286 delete $self->{children};
… …
1107 for (@children) { 1288 for (@children) {
1108 delete $_->{parent}; 1289 delete $_->{parent};
1109 $_->hide; 1290 $_->hide;
1110 } 1291 }
1111 1292
1112 $self->update; 1293 $self->realloc;
1113} 1294}
1114 1295
1115sub get_wh { 1296sub get_wh {
1116 my ($self) = @_; 1297 my ($self) = @_;
1117 1298
… …
1148sub size_allocate { 1329sub size_allocate {
1149 my ($self, $w, $h) = @_; 1330 my ($self, $w, $h) = @_;
1150 1331
1151 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1152 1333
1153 my $req_w = sum @$ws; 1334 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1335 my $req_h = (sum @$hs) || 1;
1155 1336
1156 # TODO: nicer code && do row_expand 1337 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1338 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1339 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1340 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1394 }
1214} 1395}
1215 1396
1216############################################################################# 1397#############################################################################
1217 1398
1218package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1400
1222our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1223 1402
1224sub size_request { 1403sub size_request {
1225 my ($self) = @_; 1404 my ($self) = @_;
1226 1405
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1228 1407 ? (
1229 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1410 )
1232 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1233} 1415}
1234 1416
1235sub size_allocate { 1417sub size_allocate {
1236 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1237 1419
1238 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1421 my $children = $self->{children};
1241 1422
1242 my @h = map $_->{req_w}, @$children; 1423 my @req;
1243 1424
1244 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1245 1426 @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 { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1440 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 } 1441 }
1260 } 1442 }
1261 1443
1262 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1263 1445
1264 my $y = 0; 1446 my $pos = 0;
1265 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1450
1270 $y += $h; 1451 $pos += $alloc;
1271 } 1452 }
1272 1453
1273 1 1454 1
1274} 1455}
1275 1456
1276############################################################################# 1457#############################################################################
1277 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1278package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1279 1475
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1283 1477
1284sub size_request { 1478sub new {
1285 my ($self) = @_; 1479 my $class = shift;
1286 1480
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1288 1482 vertical => 1,
1289 ( 1483 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1484 )
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} 1485}
1333 1486
1334############################################################################# 1487#############################################################################
1335 1488
1336package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1506 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1355 fontsize => 1, 1508 fontsize => 1,
1356 align => -1, 1509 align => -1,
1357 valign => -1, 1510 valign => -1,
1358 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1359 can_events => 0, 1513 can_events => 0,
1360 %arg 1514 %arg
1361 ); 1515 );
1362 1516
1363 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1390 1544
1391 delete $self->{texture}; 1545 delete $self->{texture};
1392 $self->SUPER::update; 1546 $self->SUPER::update;
1393} 1547}
1394 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1395sub set_text { 1556sub set_text {
1396 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1397 1558
1398 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1399 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1400 1561
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1403 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1404 $self->update; 1567 $self->update;
1405 $self->check_size;
1406} 1568}
1407 1569
1408sub set_markup { 1570sub set_markup {
1409 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1410 1572
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1577
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1418 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1419 $self->update; 1583 $self->update;
1420 $self->check_size;
1421} 1584}
1422 1585
1423sub size_request { 1586sub size_request {
1424 my ($self) = @_; 1587 my ($self) = @_;
1425 1588
1589 $self->{size_req} ||= do {
1426 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1427 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1595
1432 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1433 1597
1434 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1435 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1436 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1437 1601
1438 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1439 1603
1440 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1442 } 1609 };
1443 1610
1444 ( 1611 @{ $self->{size_req} }
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1612}
1449 1613
1450sub size_allocate { 1614sub size_allocate {
1451 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1452 1616
1617 delete $self->{ox};
1618
1453 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1621}
1455 1622
1456sub set_fontsize { 1623sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1458 1625
1459 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1627 delete $self->{texture};
1461 1628
1462 $self->update; 1629 $self->realloc;
1463 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1464} 1638}
1465 1639
1466sub _draw { 1640sub _draw {
1467 my ($self) = @_; 1641 my ($self) = @_;
1468 1642
… …
1474 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1652
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1480 1655
1656 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1484 1660
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1664 };
1491 1665
1492 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1494 1670
1495 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1498 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1500 } 1678 }
1501 1679
1502 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1503} 1681}
1504 1682
… …
1521 can_hover => 1, 1699 can_hover => 1,
1522 can_focus => 1, 1700 can_focus => 1,
1523 valign => 0, 1701 valign => 0,
1524 can_events => 1, 1702 can_events => 1,
1525 #text => ... 1703 #text => ...
1704 #hidden => "*",
1526 @_ 1705 @_
1527 ) 1706 )
1528} 1707}
1529 1708
1530sub _set_text { 1709sub _set_text {
… …
1532 1711
1533 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1534 1713
1535 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1536 1715
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1717 $self->{text} = $text;
1541 1718
1542 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1544 1722
1545 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1546} 1727}
1547 1728
1548sub set_text { 1729sub set_text {
1549 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1550 1731
1551 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1733 $self->_set_text ($text);
1553 $self->update;
1554 $self->check_size;
1555} 1734}
1556 1735
1557sub get_text { 1736sub get_text {
1558 $_[0]{text} 1737 $_[0]{text}
1559} 1738}
… …
1562 my ($self) = @_; 1741 my ($self) = @_;
1563 1742
1564 my ($w, $h) = $self->SUPER::size_request; 1743 my ($w, $h) = $self->SUPER::size_request;
1565 1744
1566 ($w + 1, $h) # add 1 for cursor 1745 ($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} 1746}
1574 1747
1575sub key_down { 1748sub key_down {
1576 my ($self, $ev) = @_; 1749 my ($self, $ev) = @_;
1577 1750
… …
1595 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1598 } elsif ($uni) { 1771 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1600 } 1775 }
1601 1776
1602 $self->_set_text ($text); 1777 $self->_set_text ($text);
1603 $self->update; 1778
1604 $self->check_size; 1779 $self->realloc;
1780
1781 1
1605} 1782}
1606 1783
1607sub focus_in { 1784sub focus_in {
1608 my ($self) = @_; 1785 my ($self) = @_;
1609 1786
… …
1624 utf8::encode $text; 1801 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1626 1803
1627 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1628 $self->update; 1805 $self->update;
1806
1807 1
1629} 1808}
1630 1809
1631sub mouse_motion { 1810sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1634} 1815}
1635 1816
1636sub _draw { 1817sub _draw {
1637 my ($self) = @_; 1818 my ($self) = @_;
1638 1819
1639 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1640 1821
1641 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1644 } else { 1825 } else {
1645 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1646 } 1827 }
1647 1828
1648 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1832 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1715 } else { 1896 } else {
1716 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1717 } 1898 }
1718 1899
1719 } else { 1900 } else {
1720 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1721 } 1904 1
1722
1723} 1905}
1724 1906
1725############################################################################# 1907#############################################################################
1726 1908
1727package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1736 1918
1737sub new { 1919sub new {
1738 my $class = shift; 1920 my $class = shift;
1739 1921
1740 $class->SUPER::new ( 1922 $class->SUPER::new (
1741 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1742 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1744 can_hover => 1, 1927 can_hover => 1,
1745 align => 0, 1928 align => 0,
1746 valign => 0, 1929 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1756 1939
1757 $self->emit ("activate") 1940 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1760} 1945}
1761 1946
1762sub _draw { 1947sub _draw {
1763 my ($self) = @_; 1948 my ($self) = @_;
1764 1949
1765 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1951
1771 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1774 1955
… …
1793 1974
1794sub new { 1975sub new {
1795 my $class = shift; 1976 my $class = shift;
1796 1977
1797 $class->SUPER::new ( 1978 $class->SUPER::new (
1798 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1799 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1985 state => 0,
… …
1807} 1989}
1808 1990
1809sub size_request { 1991sub size_request {
1810 my ($self) = @_; 1992 my ($self) = @_;
1811 1993
1812 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1813} 1995}
1814 1996
1815sub button_down { 1997sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1817 1999
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1822 } 2008 1
1823} 2009}
1824 2010
1825sub _draw { 2011sub _draw {
1826 my ($self) = @_; 2012 my ($self) = @_;
1827 2013
1828 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1829 2015
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 2017
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 2021
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 2023
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 2025
… …
1992 2180
1993 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
1995 2183
1996 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2189
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2109 vertical => 0, 2298 vertical => 0,
2110 can_hover => 1, 2299 can_hover => 1,
2111 inner_pad => 0.02, 2300 inner_pad => 0.02,
2112 @_ 2301 @_
2113 ); 2302 );
… …
2116 $self->update; 2305 $self->update;
2117 2306
2118 $self 2307 $self
2119} 2308}
2120 2309
2310sub changed { }
2311
2121sub set_range { 2312sub set_range {
2122 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2123 2314
2124 $self->{range} = $range; 2315 ($range, $self->{range}) = ($self->{range}, $range);
2125 2316
2317 if ("@$range" ne "@{$self->{range}}") {
2126 $self->update; 2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2127} 2321}
2128 2322
2129sub set_value { 2323sub set_value {
2130 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2131 2325
… …
2150} 2344}
2151 2345
2152sub size_request { 2346sub size_request {
2153 my ($self) = @_; 2347 my ($self) = @_;
2154 2348
2155 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2350}
2160 2351
2161sub button_down { 2352sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2163 2354
2164 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2165 2356
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2358
2168 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2169} 2360}
2170 2361
2171sub mouse_motion { 2362sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2173 2364
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2369
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2371
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2182 } 2377 1
2183} 2378}
2184 2379
2185sub update { 2380sub update {
2186 my ($self) = @_; 2381 my ($self) = @_;
2187 2382
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2190 2392
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2193 2395
… …
2199 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2201 2403
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2204 }); 2406 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2407
2212 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2213 2409
2214 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2215 2411
… …
2276sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2277sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2278 2474
2279############################################################################# 2475#############################################################################
2280 2476
2281package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2282 2478
2283our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2284 2480
2285use CFClient::OpenGL; 2481use CFClient::OpenGL;
2286 2482
… …
2288 my $class = shift; 2484 my $class = shift;
2289 2485
2290 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2291 fontsize => 1, 2487 fontsize => 1,
2292 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2293 #font => default_font 2490 #font => default_font
2294 @_, 2491 @_,
2295 2492
2296 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2297 par => [], 2494 par => [],
… …
2320 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2321 2518
2322 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2323 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2325 2523
2326 $self->reflow; 2524 $self->reflow;
2327} 2525}
2328 2526
2329sub text_size { 2527sub text_size {
… …
2331 2529
2332 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2333 2531
2334 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2335 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2336 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2337 2536
2338 $layout->size 2537 $layout->size
2339} 2538}
2340 2539
… …
2379 2578
2380 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2381 2580
2382 delete $self->{texture}; 2581 delete $self->{texture};
2383 2582
2384 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2385 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2386 2585
2387 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2388 my $height = 0; 2587 my $height = 0;
2389 2588
… …
2392 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2393 2592
2394 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2395 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2396 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2398 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2399 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2400 $_->[1] = $h; 2600 $_->[1] = $h;
2401 } 2601 }
… …
2404 } 2604 }
2405 2605
2406 $self->{height} = $height; 2606 $self->{height} = $height;
2407 2607
2408 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2409 2609
2410 delete $self->{texture}; 2610 delete $self->{texture};
2411 } 2611 }
2412 2612
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2416 2616
2417 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2418 2618
2419 my $y0 = $top; 2619 my $y0 = $top;
… …
2433 my $h = $par->[1]; 2633 my $h = $par->[1];
2434 2634
2435 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2436 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2437 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2438 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2439 2640
2440 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2441 2642
2442 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2454sub _draw { 2655sub _draw {
2455 my ($self) = @_; 2656 my ($self) = @_;
2456 2657
2457 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2461 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2462 2663
2463 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2464 2665
2465} 2666}
… …
2514 2715
2515sub new { 2716sub new {
2516 my $class = shift; 2717 my $class = shift;
2517 2718
2518 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2519 state => 0, 2720 state => 0,
2520 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2521 @_ 2722 @_
2522 ); 2723 );
2523 2724
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2725 $self
2530} 2726}
2531 2727
2532sub toggle_flopper { 2728sub toggle_flopper {
2533 my ($self) = @_; 2729 my ($self) = @_;
2534 2730
2535 # TODO: use animation 2731 $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} 2732}
2547 2733
2548############################################################################# 2734#############################################################################
2549 2735
2550package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2563} 2749}
2564 2750
2565sub set_tooltip_from { 2751sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2567 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2568 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2769 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2771 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2783
2586sub size_allocate { 2784sub size_allocate {
2587 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2588 2786
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2590} 2806}
2591 2807
2592sub _draw { 2808sub _draw {
2593 my ($self) = @_; 2809 my ($self) = @_;
2594 2810
… …
2611 glVertex $w, $h; 2827 glVertex $w, $h;
2612 glVertex $w, 0; 2828 glVertex $w, 0;
2613 glEnd; 2829 glEnd;
2614 2830
2615 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2616 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2617} 2834}
2618 2835
2619############################################################################# 2836#############################################################################
2620 2837
… …
2626 2843
2627sub new { 2844sub new {
2628 my $class = shift; 2845 my $class = shift;
2629 2846
2630 my $self = $class->SUPER::new ( 2847 my $self = $class->SUPER::new (
2631 aspect => 1, 2848 aspect => 1,
2849 can_events => 0,
2632 @_, 2850 @_,
2633 ); 2851 );
2634 2852
2635 if ($self->{anim} && $self->{animspeed}) { 2853 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2854 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2897
2680 if ($tex) { 2898 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2686 } 2904 }
2687} 2905}
2688 2906
2689sub DESTROY { 2907sub destroy {
2690 my ($self) = @_; 2908 my ($self) = @_;
2691 2909
2692 $self->{timer}->cancel 2910 $self->{timer}->cancel
2693 if $self->{timer}; 2911 if $self->{timer};
2694 2912
2695 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2696} 2914}
2697 2915
2698############################################################################# 2916#############################################################################
2699 2917
2700package CFClient::UI::InventoryItem; 2918package CFClient::UI::Buttonbar;
2701 2919
2702our @ISA = CFClient::UI::HBox::; 2920our @ISA = CFClient::UI::HBox::;
2703 2921
2704sub _item_to_desc { 2922# 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 2923
2861############################################################################# 2924#############################################################################
2862 2925
2863package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2864 2927
… …
2876 ); 2939 );
2877 2940
2878 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2879 2942
2880 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2881 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2882 2945
2883 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2884 if (!ref $widget) { 2947 if (!ref $widget) {
2885 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2886 can_hover => 1, 2949 can_hover => 1,
2887 can_events => 1, 2950 can_events => 1,
2888 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2889 } 2953 }
2890 2954
2891 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2892 2956
2893 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2905 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2970 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2908 2972
2909 $self->show; 2973 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2975}
2912 2976
2913sub mouse_motion { 2977sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2915 2979
2916 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2919} 2985}
2920 2986
2921sub button_up { 2987sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2923 2989
… …
2925 undef $GRAB; 2991 undef $GRAB;
2926 $self->hide; 2992 $self->hide;
2927 2993
2928 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2930 } 3000 1
2931} 3001}
2932 3002
2933############################################################################# 3003#############################################################################
2934 3004
2935package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2936 3006
2937our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2938 3008
2939sub new { 3009sub new {
2940 my $class = shift; 3010 my $class = shift;
2941 3011
2942 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2943 fontsize => 0.8, 3177 fontsize => 0.8,
2944 @_, 3178 @_,
2945 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2946} 3186}
2947 3187
2948sub reorder { 3188sub reorder {
2949 my ($self) = @_; 3189 my ($self) = @_;
2950 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2951 3196
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3199 }
2955 3200
… …
2958 my @items = sort { 3203 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2962 3207
3208 $self->{timer}->interval (1);
3209
2963 my $count = 10 + 1; 3210 my $count = 10 + 1;
2964 for my $item (@items) { 3211 for my $item (@items) {
2965 last unless --$count; 3212 last unless --$count;
2966 3213
2967 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text}; 3218 : $item->{text};
2972 3219
… …
2980 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2986 can_events => 1, 3233 can_events => 1,
2987 can_hover => 1 3234 can_hover => 1
2988 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2989 } 3248 }
2990 3249
2991 $self->clear; 3250 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2993} 3252}
… …
2996 my ($self, $text, %arg) = @_; 3255 my ($self, $text, %arg) = @_;
2997 3256
2998 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
3000 3259
3260 return unless $text;
3261
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3263
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3265
3005 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
3007 $item->{count}++; 3268 $item->{count}++;
3008 } else { 3269 } else {
3009 $item->{count} = 1; 3270 $item->{count} = 1;
3010 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
3011 } 3272 }
3012 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
3013 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
3014 delete $item->{label}; 3275 delete $item->{label};
3015 } else { 3276 } else {
3016 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3017 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
3036 3297
3037 $self->reorder; 3298 $self->reorder;
3038 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3039} 3300}
3040 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
3041############################################################################# 3310#############################################################################
3042 3311
3043package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
3044 3313
3045our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3315
3049sub new { 3316sub new {
3050 my $class = shift; 3317 my $class = shift;
3051 3318
3052 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3053 @_, 3561 @_,
3054 ) 3562 )
3055} 3563}
3056 3564
3057sub configure { 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3058 my ($self, $x, $y, $w, $h) = @_;
3059 3566
3060 $self->{w} = $w; 3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3061 $self->{h} = $h; 3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3062} 3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3063 3577
3064sub check_size { 3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3065 my ($self) = @_; 3651 my ($self, $spell) = @_;
3066 3652
3067 $self->size_allocate ($self->{w}, $self->{h}) 3653 $self->{spell}->{$spell->{name}} = $spell;
3068 if $self->{w}; 3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
3685 visible => 1,
3686 @_,
3687 );
3688
3689 Scalar::Util::weaken ($self->{root} = $self);
3690
3691 $self
3069} 3692}
3070 3693
3071sub size_request { 3694sub size_request {
3072 my ($self) = @_; 3695 my ($self) = @_;
3073 3696
3074 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3075} 3712}
3076 3713
3077sub size_allocate { 3714sub size_allocate {
3078 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
3079 3716
3080 for my $child ($self->children) { 3717 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3719
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3085 3722
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3724 $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 3725
3092 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3093 } 3727 }
3094} 3728}
3095 3729
… …
3106} 3740}
3107 3741
3108sub update { 3742sub update {
3109 my ($self) = @_; 3743 my ($self) = @_;
3110 3744
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3113} 3746}
3114 3747
3115sub add { 3748sub add {
3116 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3117 3750
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; 3751 $_->{is_toplevel} = 1
3126 3752 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3753
3132 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3133} 3755}
3134 3756
3135sub remove { 3757sub remove {
3136 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3137 3759
3138 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3139 3764
3140 while (@children) { 3765 while (@children) {
3141 my $w = pop @children; 3766 my $w = pop @children;
3142 push @children, $w->children; 3767 push @children, $w->children;
3143 $w->set_invisible; 3768 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3163 $_->() 3788 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3165 } 3790 }
3166 3791
3167 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3168 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
3169 3796
3170 for (;;) { 3797 outer:
3171 if ($self->{check_size}) { 3798 while () {
3172 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3801 $widget->{visible} or next; # do not resize invisible widgets
3802
3803 $queue{$widget+0}++ and next; # duplicates are common
3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3175 } 3807 }
3176 3808
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
3178 3811
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3813 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 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3189 3835
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3191 3837
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3194 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3195 } 3848 }
3196 } 3849 }
3197 3850
3198 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3859
3202 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3204 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3205 $widget->{w} = $w; 3870 $widget->{w} = $w;
3206 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3207 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3208 } 3875 }
3209 } 3876 }
3210 3877
3211 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3212 $_->() 3879 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3214 } 3881 }
3882
3215 3883
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3219 3887
… …
3221 glLoadIdentity; 3889 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3892 glLoadIdentity;
3225 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3226 $self->_draw; 3901 $self->_draw;
3227} 3902}
3228 3903
3229############################################################################# 3904#############################################################################
3230 3905

Diff Legend

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