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.233 by root, Thu May 25 03:42:40 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 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
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
275} 338}
276 339
340sub baseline_shift {
341 0
342}
343
277sub configure { 344sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
279 346
280 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
283 352
284 # use alignment to adjust x, y 353 # use alignment to adjust x, y
285 354
286 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 357 }
291 358
292 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 360 $self->{x} = $x;
294 $self->{y} = $y; 361 $self->{y} = $y;
295 $self->update; 362 $self->update;
296 } 363 }
297 364
298 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
300 }
301}
302 367
303sub size_allocate { 368 $self->{alloc_w} = $w;
304 # nothing to be done 369 $self->{alloc_h} = $h;
305}
306 370
307sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 372 }
309
310 $self->check_size (1);
311 $self->update;
312} 373}
313 374
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
327 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
328 401
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
332 } 405 }
333} 406}
334 407
335# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
336sub coord2local { 409sub coord2local {
… …
344 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
345 418
346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
347} 420}
348 421
349sub focus_in { 422sub invoke_focus_in {
350 my ($self) = @_; 423 my ($self) = @_;
351 424
352 return if $FOCUS == $self; 425 return if $FOCUS == $self;
353 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
354 427
355 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
356 429
357 $self->_emit (focus_in => $focus);
358
359 $focus->update if $focus; 430 $focus->update if $focus;
360 $FOCUS->update; 431 $FOCUS->update;
361}
362 432
433 0
434}
435
363sub focus_out { 436sub invoke_focus_out {
364 my ($self) = @_; 437 my ($self) = @_;
365 438
366 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
367 440
368 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
369 442
370 $self->_emit (focus_out => $focus);
371
372 $focus->update if $focus; #? 443 $focus->update if $focus; #?
373 444
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
375 unless $FOCUS; 446 unless $FOCUS;
376}
377 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
378sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
379sub button_up { } 458sub invoke_button_up { 1 }
380sub key_down { } 459sub invoke_key_down { 1 }
381sub key_up { } 460sub invoke_key_up { 1 }
382 461
383sub button_down { 462sub invoke_button_down {
384 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
385 464
386 $self->focus_in; 465 $self->grab_focus;
387}
388 466
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
393sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
394 535
395sub draw { 536sub draw {
396 my ($self) = @_; 537 my ($self) = @_;
397 538
398 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
399 548
400 glPushMatrix; 549 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw;
403 glPopMatrix;
404 551
405 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
406 my ($x, $y) = @$self{qw(x y)};
407
408 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
409 glEnable GL_BLEND; 554 glEnable GL_BLEND;
410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
411 glBegin GL_QUADS; 556 glBegin GL_QUADS;
412 glVertex $x , $y;
413 glVertex $x + $self->{w}, $y;
414 glVertex $x + $self->{w}, $y + $self->{h};
415 glVertex $x , $y + $self->{h};
416 glEnd;
417 glDisable GL_BLEND;
418 }
419
420 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix;
422 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 557 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
427 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
428 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
429 glEnd; 561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
430 glPopMatrix; 575 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
433} 581}
434 582
435sub _draw { 583sub _draw {
436 my ($self) = @_; 584 my ($self) = @_;
437 585
438 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
439} 587}
440 588
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub DESTROY { 589sub DESTROY {
499 my ($self) = @_; 590 my ($self) = @_;
500 591
501 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
502 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
503} 596}
504 597
505############################################################################# 598#############################################################################
506 599
507package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
532 625
533 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
534 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
535 628
536 glEnable GL_BLEND; 629 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glColor @$color; 631 glColor_premultiply @$color;
539 632
540 glBegin GL_QUADS; 633 glBegin GL_QUADS;
541 glVertex 0 , 0; 634 glVertex 0 , 0;
542 glVertex 0 , $h; 635 glVertex 0 , $h;
543 glVertex $w, $h; 636 glVertex $w, $h;
… …
558 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
560} 653}
561 654
562sub size_request { 655sub size_request {
563 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
564} 659}
565 660
566sub draw { } 661sub draw { }
567 662
568############################################################################# 663#############################################################################
… …
572our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
573 668
574sub new { 669sub new {
575 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
576 671
577 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
578 673
579 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
580 children => [], 675 children => [],
581 can_events => 0, 676 can_events => 0,
582 %arg, 677 %arg,
583 ); 678 );
679
584 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
585 682
586 $self 683 $self
587} 684}
588 685
589sub add { 686sub add {
… …
597 $self->{children} = [ 694 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
600 ]; 697 ];
601 698
602 $self->check_size (1); 699 $self->realloc;
603 $self->update;
604} 700}
605 701
606sub children { 702sub children {
607 @{ $_[0]{children} } 703 @{ $_[0]{children} }
608} 704}
… …
613 delete $child->{parent}; 709 delete $child->{parent};
614 $child->hide; 710 $child->hide;
615 711
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 713
618 $self->check_size; 714 $self->realloc;
619 $self->update;
620} 715}
621 716
622sub clear { 717sub clear {
623 my ($self) = @_; 718 my ($self) = @_;
624 719
… …
628 for (@$children) { 723 for (@$children) {
629 delete $_->{parent}; 724 delete $_->{parent};
630 $_->hide; 725 $_->hide;
631 } 726 }
632 727
633 $self->check_size; 728 $self->realloc;
634 $self->update;
635} 729}
636 730
637sub find_widget { 731sub find_widget {
638 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
639 733
640 $x -= $self->{x}; 734 $x -= $self->{x};
641 $y -= $self->{y}; 735 $y -= $self->{y};
642 736
643 my $res; 737 my $res;
644 738
645 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
646 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
647 and return $res; 741 and return $res;
648 } 742 }
649 743
650 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
671} 765}
672 766
673sub add { 767sub add {
674 my ($self, $child) = @_; 768 my ($self, $child) = @_;
675 769
676 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
677
678 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
679} 772}
680 773
681sub remove { 774sub remove {
682 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
691 784
692sub size_request { 785sub size_request {
693 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
694} 787}
695 788
696sub size_allocate { 789sub invoke_size_allocate {
697 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
698 791
699 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
700} 795}
701 796
702############################################################################# 797#############################################################################
798
799# back-buffered drawing area
703 800
704package CFClient::UI::Window; 801package CFClient::UI::Window;
705 802
706our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
707 804
… …
718 815
719 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
720 $self->SUPER::update; 817 $self->SUPER::update;
721} 818}
722 819
723sub size_allocate { 820sub invoke_size_allocate {
724 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
725 822
726 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
728} 826}
729 827
730sub _render { 828sub _render {
829 my ($self) = @_;
830
731 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
732} 832}
733 833
734sub render_child { 834sub render_child {
735 my ($self) = @_; 835 my ($self) = @_;
736 836
737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
740 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
741 $self->_render; 848 $self->_render;
742 }; 849 };
743} 850}
744 851
745sub _draw { 852sub _draw {
746 my ($self) = @_; 853 my ($self) = @_;
747 854
748 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
749 856
750 my $tex = $self->{texture} 857 my $tex = $self->{texture}
751 or return; 858 or return;
752 859
753 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
755 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
756 863
757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
758 865
759 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
760} 867}
… …
763 870
764package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
765 872
766our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
767 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
768sub size_request { 885sub size_request {
769 my ($self) = @_; 886 my ($self) = @_;
770 887
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 889
773 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
774} 891 $h = 10 if $self->{scroll_y};
775 892
893 ($w, $h)
894}
895
776sub size_allocate { 896sub invoke_size_allocate {
777 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
778 898
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
780# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
781 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
782 $self->update; 905 $self->update;
906
907 1
783} 908}
784 909
785sub set_offset { 910sub set_offset {
786 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
787 912
… …
820} 945}
821 946
822sub _render { 947sub _render {
823 my ($self) = @_; 948 my ($self) = @_;
824 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
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 954
827 $self->SUPER::_render; 955 $self->SUPER::_render;
828} 956}
829 957
… …
832package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
833 961
834our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
835 963
836sub new { 964sub new {
837 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
838 968
839 my $self; 969 my $self;
840 970
841 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
842 vertical => 1, 972 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 974 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
846 }, 976 },
847 ; 977 ;
848 978
849 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 981 slider => $slider,
852 @_, 982 %arg,
853 ); 983 );
854 984
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
858 987
859 $self 988 $self
860} 989}
861 990
862sub size_allocate { 991sub add {
863 my ($self, $w, $h) = @_; 992 my ($self, $widget) = @_;
864 993
865 $self->SUPER::size_allocate ($w, $h); 994 $self->{vp}->add ($self->{child} = $widget);
995}
866 996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
867 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
869} 1014}
870 1015
871#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
872# update viewport offset on scroll 1017# update viewport offset on scroll
873 1018
… …
893 1038
894 if ($self->{bg}) { 1039 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
896 1041
897 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
899 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
900 1045
901 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
902 glVertex 0 , 0; 1047 glVertex 0 , 0;
903 glVertex 0 , $h; 1048 glVertex 0 , $h;
904 glVertex $w, $h; 1049 glVertex $w, $h;
… …
917 1062
918our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
919 1064
920use CFClient::OpenGL; 1065use CFClient::OpenGL;
921 1066
922my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 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);
925 1074
926sub new { 1075sub new {
927 my $class = shift; 1076 my ($class, %arg) = @_;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1077
931 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1081 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1082 can_events => 1,
937 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
938 ); 1086 );
939 1087
940 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
941 align => 0, 1089 align => 0,
942 valign => 1, 1090 valign => 1,
943 text => $self->{title}, 1091 text => $self->{title},
944 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
945 1103
946 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
947} 1113}
948 1114
949sub border { 1115sub border {
950 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
951} 1117}
952 1118
953sub size_request { 1119sub size_request {
954 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
955 1127
956 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
957 1129
958 ( 1130 (
959 $w + $self->border * 2, 1131 $w + $self->border * 2,
960 $h + $self->border * 2, 1132 $h + $self->border * 2,
961 ) 1133 )
962} 1134}
963 1135
964sub size_allocate { 1136sub invoke_size_allocate {
965 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
966 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
967 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
969 1149
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971 if $self->{title};
972
973 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
974}
975 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
976sub button_down { 1158sub invoke_button_down {
977 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
978 1160
979 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
980 my $border = $self->border; 1162 my $border = $self->border;
981 1163
… …
994 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
995 1177
996 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
998 1180
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1183
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size; 1185 $self->realloc;
1003 }; 1186 };
1004 1187
1005 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1192 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1011 1194
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1196
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update; 1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1016 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1017 } 1205 1
1018} 1206}
1019 1207
1020sub button_up { 1208sub invoke_button_up {
1021 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1022 1210
1023 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1024} 1212}
1025 1213
1026sub mouse_motion { 1214sub invoke_mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1028 1216
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1030} 1220}
1031 1221
1032sub _draw { 1222sub _draw {
1033 my ($self) = @_; 1223 my ($self) = @_;
1034 1224
1225 my $child = $self->{children}[0];
1226
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1229
1038 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1232
1041 my $border = $self->border; 1233 my $border = $self->border;
1042 1234
1043 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1240
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
1051 1243
1052 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1247 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1249 }
1063 1250
1064 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1065 1252
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1069} 1264}
1070 1265
1071############################################################################# 1266#############################################################################
1072 1267
1073package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1081sub new { 1276sub new {
1082 my $class = shift; 1277 my $class = shift;
1083 1278
1084 $class->SUPER::new ( 1279 $class->SUPER::new (
1085 col_expand => [], 1280 col_expand => [],
1086 @_ 1281 @_,
1087 ) 1282 )
1283}
1284
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1287}
1089 1288
1090sub add { 1289sub add {
1091 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1092 1291
1093 $child->set_parent ($self); 1292 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1095 1294
1096 $child->check_size; 1295 $self->realloc;
1097} 1296}
1098 1297
1099sub children { 1298sub remove {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1299 my ($self, $child) = @_;
1101}
1102 1300
1301 # TODO: not yet implemented
1302}
1303
1103# TODO: move to container class maybe? send childs a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1305sub clear {
1105 my ($self) = @_; 1306 my ($self) = @_;
1106 1307
1107 my @children = $self->children; 1308 my @children = $self->children;
1108 delete $self->{children}; 1309 delete $self->{children};
… …
1110 for (@children) { 1311 for (@children) {
1111 delete $_->{parent}; 1312 delete $_->{parent};
1112 $_->hide; 1313 $_->hide;
1113 } 1314 }
1114 1315
1115 $self->update; 1316 $self->realloc;
1116} 1317}
1117 1318
1118sub get_wh { 1319sub get_wh {
1119 my ($self) = @_; 1320 my ($self) = @_;
1120 1321
… …
1146 (sum @$ws), 1347 (sum @$ws),
1147 (sum @$hs), 1348 (sum @$hs),
1148 ) 1349 )
1149} 1350}
1150 1351
1151sub size_allocate { 1352sub invoke_size_allocate {
1152 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1153 1354
1154 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1155 1356
1156 my $req_w = sum @$ws; 1357 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1358 my $req_h = (sum @$hs) || 1;
1158 1359
1159 # TODO: nicer code && do row_expand 1360 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1361 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1362 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1363 my $col_expand = (sum @col_expand) || 1;
… …
1188 } 1389 }
1189 1390
1190 $y += $row_h; 1391 $y += $row_h;
1191 } 1392 }
1192 1393
1394 1
1193} 1395}
1194 1396
1195sub find_widget { 1397sub find_widget {
1196 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1197 1399
… …
1216 } 1418 }
1217} 1419}
1218 1420
1219############################################################################# 1421#############################################################################
1220 1422
1423package CFClient::UI::Box;
1424
1425our @ISA = CFClient::UI::Container::;
1426
1427sub size_request {
1428 my ($self) = @_;
1429
1430 $self->{vertical}
1431 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1434 )
1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1439}
1440
1441sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_;
1443
1444 my $space = $self->{vertical} ? $h : $w;
1445 my @children = $self->visible_children;
1446
1447 my @req;
1448
1449 if ($self->{homogeneous}) {
1450 @req = ($space / (@children || 1)) x @children;
1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children;
1465 }
1466 }
1467
1468 CFClient::UI::harmonize \@req;
1469
1470 my $pos = 0;
1471 for (0 .. $#children) {
1472 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474
1475 $pos += $alloc;
1476 }
1477
1478 1
1479}
1480
1481#############################################################################
1482
1221package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1222 1484
1223# TODO: wrap into common Box base class
1224
1225our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1226 1486
1227sub size_request { 1487sub new {
1228 my ($self) = @_; 1488 my $class = shift;
1229 1489
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1231 1491 vertical => 0,
1232 ( 1492 @_,
1233 (List::Util::sum map $_->[0], @alloc),
1234 (List::Util::max map $_->[1], @alloc),
1235 ) 1493 )
1236} 1494}
1237 1495
1238sub size_allocate {
1239 my ($self, $w, $h) = @_;
1240
1241 ($h, $w) = ($w, $h);
1242
1243 my $children = $self->{children};
1244
1245 my @h = map $_->{req_w}, @$children;
1246
1247 my $req_h = List::Util::sum @h;
1248
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children;
1254 $exp ||= 1;
1255
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure ($y, 0, $h, $w);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1496#############################################################################
1280 1497
1281package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1282 1499
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1286 1501
1287sub size_request { 1502sub new {
1288 my ($self) = @_; 1503 my $class = shift;
1289 1504
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1291 1506 vertical => 1,
1292 ( 1507 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1508 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1509}
1336 1510
1337############################################################################# 1511#############################################################################
1338 1512
1339package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1530 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1358 fontsize => 1, 1532 fontsize => 1,
1359 align => -1, 1533 align => -1,
1360 valign => -1, 1534 valign => -1,
1361 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1362 can_events => 0, 1537 can_events => 0,
1363 %arg 1538 %arg
1364 ); 1539 );
1365 1540
1366 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1393 1568
1394 delete $self->{texture}; 1569 delete $self->{texture};
1395 $self->SUPER::update; 1570 $self->SUPER::update;
1396} 1571}
1397 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1398sub set_text { 1580sub set_text {
1399 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1400 1582
1401 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1402 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1403 1585
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1406 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1407 $self->update; 1591 $self->update;
1408 $self->check_size;
1409} 1592}
1410 1593
1411sub set_markup { 1594sub set_markup {
1412 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1413 1596
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1601
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1421 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1422 $self->update; 1607 $self->update;
1423 $self->check_size;
1424} 1608}
1425 1609
1426sub size_request { 1610sub size_request {
1427 my ($self) = @_; 1611 my ($self) = @_;
1428 1612
1613 $self->{size_req} ||= do {
1429 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1430 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1434 1619
1435 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1436 1621
1437 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1438 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1439 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1440 1625
1441 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1442 1627
1443 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1445 } 1633 };
1446 1634
1447 ( 1635 @{ $self->{size_req} }
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1636}
1452 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1453sub size_allocate { 1642sub invoke_size_allocate {
1454 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1455 1644
1645 delete $self->{ox};
1646
1456 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1457} 1651}
1458 1652
1459sub set_fontsize { 1653sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1461 1655
1462 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1657 delete $self->{texture};
1464 1658
1465 $self->update; 1659 $self->realloc;
1466 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1467} 1668}
1468 1669
1469sub _draw { 1670sub _draw {
1470 my ($self) = @_; 1671 my ($self) = @_;
1471 1672
… …
1477 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1682
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1483 1685
1686 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1487 1690
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1694 };
1494 1695
1495 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1497 1700
1498 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1499 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1501 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1503 } 1708 }
1504 1709
1505 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1506} 1711}
1507 1712
… …
1524 can_hover => 1, 1729 can_hover => 1,
1525 can_focus => 1, 1730 can_focus => 1,
1526 valign => 0, 1731 valign => 0,
1527 can_events => 1, 1732 can_events => 1,
1528 #text => ... 1733 #text => ...
1734 #hidden => "*",
1529 @_ 1735 @_
1530 ) 1736 )
1531} 1737}
1532 1738
1533sub _set_text { 1739sub _set_text {
… …
1535 1741
1536 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1537 1743
1538 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1539 1745
1540 delete $self->{texture};
1541
1542 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1543 $self->{text} = $text; 1747 $self->{text} = $text;
1544 1748
1545 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1546 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1547 1752
1548 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1549} 1757}
1550 1758
1551sub set_text { 1759sub set_text {
1552 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1553 1761
1554 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1763 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558} 1764}
1559 1765
1560sub get_text { 1766sub get_text {
1561 $_[0]{text} 1767 $_[0]{text}
1562} 1768}
… …
1567 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1568 1774
1569 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1570} 1776}
1571 1777
1572sub key_down { 1778sub invoke_key_down {
1573 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1574 1780
1575 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1576 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1577 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1589 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1590 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1591 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1592 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1800 $self->emit ('escape');
1595 } elsif ($uni) { 1801 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1597 } 1805 }
1598 1806
1599 $self->_set_text ($text); 1807 $self->_set_text ($text);
1600 $self->update;
1601 $self->check_size;
1602}
1603 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1604sub focus_in { 1814sub invoke_focus_in {
1605 my ($self) = @_; 1815 my ($self) = @_;
1606 1816
1607 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1608 1818
1609 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1610} 1820}
1611 1821
1612sub button_down { 1822sub invoke_button_down {
1613 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1614 1824
1615 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1616 1826
1617 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1618 1828
1619 # byte-index to char-index 1829 # byte-index to char-index
1620 my $text = $self->{text}; 1830 my $text = $self->{text};
1621 utf8::encode $text; 1831 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1623 1833
1624 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1625 $self->update; 1835 $self->update;
1836
1837 1
1626} 1838}
1627 1839
1628sub mouse_motion { 1840sub invoke_mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1630# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1631} 1845}
1632 1846
1633sub _draw { 1847sub _draw {
1634 my ($self) = @_; 1848 my ($self) = @_;
1635 1849
1636 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1637 1851
1638 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1639 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1640 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1641 } else { 1855 } else {
1642 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1643 } 1857 }
1644 1858
1645 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1647 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1648 glVertex 0 , 0; 1862 glVertex 0 , 0;
1649 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1650 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1651 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1676 1890
1677our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1678 1892
1679use CFClient::OpenGL; 1893use CFClient::OpenGL;
1680 1894
1681sub key_down { 1895sub invoke_key_down {
1682 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1683 1897
1684 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1685 1899
1686 if ($sym == 13) { 1900 if ($sym == 13) {
1687 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1688 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1689 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1690 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1691 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1692 $self->update; 1907 $self->update;
1693 1908
1694 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1695 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1696 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1712 } else { 1927 } else {
1713 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1714 } 1929 }
1715 1930
1716 } else { 1931 } else {
1717 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1718 } 1935 1
1719
1720} 1936}
1721 1937
1722############################################################################# 1938#############################################################################
1723 1939
1724package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1733 1949
1734sub new { 1950sub new {
1735 my $class = shift; 1951 my $class = shift;
1736 1952
1737 $class->SUPER::new ( 1953 $class->SUPER::new (
1738 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1739 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1741 can_hover => 1, 1958 can_hover => 1,
1742 align => 0, 1959 align => 0,
1743 valign => 0, 1960 valign => 0,
1744 can_events => 1, 1961 can_events => 1,
1745 @_ 1962 @_
1746 ) 1963 )
1747} 1964}
1748 1965
1749sub activate { }
1750
1751sub button_up { 1966sub invoke_button_up {
1752 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1753 1968
1754 $self->emit ("activate") 1969 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1757} 1974}
1758 1975
1759sub _draw { 1976sub _draw {
1760 my ($self) = @_; 1977 my ($self) = @_;
1761 1978
1762 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1763
1764 if ($GRAB == $self) {
1765 $self->{fg} = $self->{active_fg};
1766 }
1767 1980
1768 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1771 1984
… …
1776 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1777} 1990}
1778 1991
1779############################################################################# 1992#############################################################################
1780 1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
2026}
2027
2028#############################################################################
2029
1781package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1782 2031
1783our @ISA = CFClient::UI::DrawBG::; 2032our @ISA = CFClient::UI::DrawBG::;
1784 2033
1785my @tex = 2034my @tex =
… …
1790 2039
1791sub new { 2040sub new {
1792 my $class = shift; 2041 my $class = shift;
1793 2042
1794 $class->SUPER::new ( 2043 $class->SUPER::new (
1795 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1796 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 2047 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 2048 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 2049 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 2050 state => 0,
… …
1804} 2054}
1805 2055
1806sub size_request { 2056sub size_request {
1807 my ($self) = @_; 2057 my ($self) = @_;
1808 2058
1809 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1810} 2060}
1811 2061
1812sub button_down { 2062sub invoke_button_down {
1813 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1814 2064
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1819 } 2073 1
1820} 2074}
1821 2075
1822sub _draw { 2076sub _draw {
1823 my ($self) = @_; 2077 my ($self) = @_;
1824 2078
1825 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1826 2080
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 2082
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 2086
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 2088
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 2090
… …
1842package CFClient::UI::Image; 2098package CFClient::UI::Image;
1843 2099
1844our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1845 2101
1846use CFClient::OpenGL; 2102use CFClient::OpenGL;
1847use Carp qw/confess/;
1848 2103
1849our %loaded_images; 2104our %texture_cache;
1850 2105
1851sub new { 2106sub new {
1852 my $class = shift; 2107 my $class = shift;
1853 2108
1854 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1855 2113
1856 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1857 2116
1858 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1859 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1860 2119
1861 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1862 2121
1863 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1864
1865 $self->{aspect} = $tex->{w} / $tex->{h};
1866 2123
1867 $self 2124 $self
1868} 2125}
1869 2126
1870sub size_request { 2127sub size_request {
1871 my ($self) = @_; 2128 my ($self) = @_;
1872 2129
1873 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1874} 2131}
1875 2132
1876sub _draw { 2133sub _draw {
1877 my ($self) = @_; 2134 my ($self) = @_;
1878 2135
… …
1989 2246
1990 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
1991 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
1992 2249
1993 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
1994 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 2255
1998 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
1999 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2099 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2358 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2359 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2360 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2361 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2106 vertical => 0, 2364 vertical => 0,
2107 can_hover => 1, 2365 can_hover => 1,
2108 inner_pad => 0.02, 2366 inner_pad => 0.02,
2109 @_ 2367 @_
2110 ); 2368 );
… …
2116} 2374}
2117 2375
2118sub set_range { 2376sub set_range {
2119 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2120 2378
2121 $self->{range} = $range; 2379 ($range, $self->{range}) = ($self->{range}, $range);
2122 2380
2381 if ("@$range" ne "@{$self->{range}}") {
2123 $self->update; 2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2124} 2385}
2125 2386
2126sub set_value { 2387sub set_value {
2127 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2128 2389
… …
2139 if $unit; 2400 if $unit;
2140 2401
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142 2403
2143 if ($value != $old_value) { 2404 if ($value != $old_value) {
2144 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2145 $self->update; 2406 $self->update;
2146 } 2407 }
2147} 2408}
2148 2409
2149sub size_request { 2410sub size_request {
2150 my ($self) = @_; 2411 my ($self) = @_;
2151 2412
2152 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2414}
2157 2415
2158sub button_down { 2416sub invoke_button_down {
2159 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2160 2418
2161 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2162 2420
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2422
2165 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2166} 2424}
2167 2425
2168sub mouse_motion { 2426sub invoke_mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2170 2428
2171 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173 2431
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2433
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2435
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2179 } 2441 1
2180} 2442}
2181 2443
2182sub update { 2444sub update {
2183 my ($self) = @_; 2445 my ($self) = @_;
2184 2446
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2186 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2187 2456
2188 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2190 2459
… …
2196 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2197 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2198 2467
2199 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2200 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2201 }); 2470 }
2202
2203 $self->SUPER::update;
2204}
2205
2206sub _draw {
2207 my ($self) = @_;
2208 2471
2209 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2210 2473
2211 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2212 2475
… …
2273sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2275 2538
2276############################################################################# 2539#############################################################################
2277 2540
2278package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2279 2542
2280our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2281 2544
2282use CFClient::OpenGL; 2545use CFClient::OpenGL;
2283 2546
… …
2285 my $class = shift; 2548 my $class = shift;
2286 2549
2287 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2288 fontsize => 1, 2551 fontsize => 1,
2289 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2290 #font => default_font 2554 #font => default_font
2291 @_, 2555 @_,
2292 2556
2293 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2294 par => [], 2558 par => [],
… …
2309 2573
2310 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2311 $self->reflow; 2575 $self->reflow;
2312} 2576}
2313 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2314sub size_allocate { 2587sub invoke_size_allocate {
2315 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2316 2589
2317 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2318 2592
2319 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2320 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2322 2597
2323 $self->reflow; 2598 $self->reflow;
2324}
2325 2599
2326sub text_size { 2600 local $self->{children} = [$empty, $slider];
2327 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2328 2606
2329 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2330 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2333 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2334 2620 );
2621
2335 $layout->size 2622 $layout
2336} 2623}
2337 2624
2338sub reflow { 2625sub reflow {
2339 my ($self) = @_; 2626 my ($self) = @_;
2340 2627
… …
2349 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2350} 2637}
2351 2638
2352sub clear { 2639sub clear {
2353 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2354 2644
2355 $self->{par} = []; 2645 $self->{par} = [];
2356 $self->{height} = 0; 2646 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358} 2648}
2359 2649
2360sub add_paragraph { 2650sub add_paragraph {
2361 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2362 2652
2363 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2364 my ($w, $h) = $self->text_size ($line); 2654
2365 $self->{height} += $h; 2655 $para = {
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2367 } 2662 };
2368 2663
2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2370} 2676}
2371 2677
2372sub update { 2678sub update {
2373 my ($self) = @_; 2679 my ($self) = @_;
2374 2680
… …
2376 2682
2377 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2378 2684
2379 delete $self->{texture}; 2685 delete $self->{texture};
2380 2686
2381 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383 2689
2384 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2385 my $height = 0; 2691 my $height = 0;
2386 2692
2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2391 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2393 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3]; 2697
2397 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2398 } 2701 }
2399 2702
2400 $height += $_->[1]; 2703 $height += $para->{h};
2401 } 2704 }
2402 2705
2403 $self->{height} = $height; 2706 $self->{height} = $height;
2404 2707
2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2406 2709
2407 delete $self->{texture}; 2710 delete $self->{texture};
2408 } 2711 }
2409 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2411 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2412 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2413 2720
2414 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2415 2722
2416 my $y0 = $top; 2723 my $y0 = $top;
2417 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2418 2725
2419 my $y = 0; 2726 my $y = 0;
2420
2421 my $layout = $self->{layout};
2422
2423 $layout->set_font ($self->{font}) if $self->{font};
2424 2727
2425 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2428 2731
2429 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2430 my $h = $par->[1]; 2733 my $h = $para->{h};
2431 2734
2432 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2433 $layout->set_foreground (@{ $par->[2] }); 2736
2434 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2435 $layout->set_markup ($par->[4]);
2436 2738
2437 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2438 2740
2439 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2441 } 2756 }
2442 2757
2443 $y += $h; 2758 $y += $h;
2444 } 2759 }
2445 2760
2446 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2447 }; 2762 };
2448 }); 2763 });
2449} 2764}
2450 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2451sub _draw { 2775sub _draw {
2452 my ($self) = @_; 2776 my ($self) = @_;
2453 2777
2454 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2456 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2458 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2459 2783
2460 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2461
2462} 2785}
2463 2786
2464############################################################################# 2787#############################################################################
2465 2788
2466package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2511 2834
2512sub new { 2835sub new {
2513 my $class = shift; 2836 my $class = shift;
2514 2837
2515 my $self = $class->SUPER::new ( 2838 my $self = $class->SUPER::new (
2516 state => 0, 2839 state => 0,
2517 connect_activate => \&toggle_flopper, 2840 on_activate => \&toggle_flopper,
2518 @_ 2841 @_
2519 ); 2842 );
2520 2843
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2844 $self
2527} 2845}
2528 2846
2529sub toggle_flopper { 2847sub toggle_flopper {
2530 my ($self) = @_; 2848 my ($self) = @_;
2531 2849
2532 # TODO: use animation 2850 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2851}
2544 2852
2545############################################################################# 2853#############################################################################
2546 2854
2547package CFClient::UI::Tooltip; 2855package CFClient::UI::Tooltip;
… …
2560} 2868}
2561 2869
2562sub set_tooltip_from { 2870sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2564 2872
2873 my $tooltip = $widget->{tooltip};
2874
2875 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}";
2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2884
2565 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2888 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2890 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2579 2899
2580 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2581} 2901}
2582 2902
2583sub size_allocate { 2903sub invoke_size_allocate {
2584 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2585 2905
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2907}
2908
2909sub invoke_visibility_change {
2910 my ($self, $visible) = @_;
2911
2912 return unless $visible;
2913
2914 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner}
2916 or return;
2917
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w};
2922
2923 $self->move_abs ($x, $y);
2924 });
2587} 2925}
2588 2926
2589sub _draw { 2927sub _draw {
2590 my ($self) = @_; 2928 my ($self) = @_;
2591 2929
… …
2608 glVertex $w, $h; 2946 glVertex $w, $h;
2609 glVertex $w, 0; 2947 glVertex $w, 0;
2610 glEnd; 2948 glEnd;
2611 2949
2612 glTranslate 2 - 0.375, 2 - 0.375; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2951
2613 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2614} 2953}
2615 2954
2616############################################################################# 2955#############################################################################
2617 2956
… …
2623 2962
2624sub new { 2963sub new {
2625 my $class = shift; 2964 my $class = shift;
2626 2965
2627 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2628 aspect => 1, 2967 aspect => 1,
2968 can_events => 0,
2629 @_, 2969 @_,
2630 ); 2970 );
2631 2971
2632 if ($self->{anim} && $self->{animspeed}) { 2972 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2973 Scalar::Util::weaken (my $widget = $self);
… …
2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2676 3016
2677 if ($tex) { 3017 if ($tex) {
2678 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2680 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2682 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2683 } 3023 }
2684} 3024}
2685 3025
2686sub DESTROY { 3026sub destroy {
2687 my ($self) = @_; 3027 my ($self) = @_;
2688 3028
2689 $self->{timer}->cancel 3029 $self->{timer}->cancel
2690 if $self->{timer}; 3030 if $self->{timer};
2691 3031
2692 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2693} 3033}
2694 3034
2695############################################################################# 3035#############################################################################
2696 3036
2697package CFClient::UI::InventoryItem; 3037package CFClient::UI::Buttonbar;
2698 3038
2699our @ISA = CFClient::UI::HBox::; 3039our @ISA = CFClient::UI::HBox::;
2700 3040
2701sub _item_to_desc { 3041# TODO: should actualyl wrap buttons and other goodies.
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857 3042
2858############################################################################# 3043#############################################################################
2859 3044
2860package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2861 3046
… …
2873 ); 3058 );
2874 3059
2875 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2876 3061
2877 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2878 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2879 3064
2880 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2881 if (!ref $widget) { 3066 if (!ref $widget) {
2882 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2883 can_hover => 1, 3068 can_hover => 1,
2884 can_events => 1, 3069 can_events => 1,
2885 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2886 } 3072 }
2887 3073
2888 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2889 3075
2890 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2895 3081
2896# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
2897sub popup { 3083sub popup {
2898 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2899 3085
2900 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2901 3087
2902 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 3089 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2905 3091
2906 $self->show; 3092 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 3094}
2909 3095
2910sub mouse_motion { 3096sub invoke_mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2912 3098
2913 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2916}
2917 3102
3103 0
3104}
3105
2918sub button_up { 3106sub invoke_button_up {
2919 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2920 3108
2921 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2922 undef $GRAB; 3110 undef $GRAB;
2923 $self->hide; 3111 $self->hide;
2924 3112
2925 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2927 } 3119 1
2928} 3120}
2929 3121
2930############################################################################# 3122#############################################################################
2931 3123
2932package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2933 3125
2934our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2935 3127
2936sub new { 3128sub new {
2937 my $class = shift; 3129 my $class = shift;
2938 3130
2939 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
2940 fontsize => 0.8, 3298 fontsize => 0.8,
2941 @_, 3299 @_,
2942 ) 3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
2943} 3307}
2944 3308
2945sub reorder { 3309sub reorder {
2946 my ($self) = @_; 3310 my ($self) = @_;
2947 my $NOW = time; 3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
2948 3317
2949 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 } 3320 }
2952 3321
… …
2955 my @items = sort { 3324 my @items = sort {
2956 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2959 3328
3329 $self->{timer}->interval (1);
3330
2960 my $count = 10 + 1; 3331 my $count = 10 + 1;
2961 for my $item (@items) { 3332 for my $item (@items) {
2962 last unless --$count; 3333 last unless --$count;
2963 3334
2964 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text}; 3339 : $item->{text};
2969 3340
… …
2977 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2983 can_events => 1, 3354 can_events => 1,
2984 can_hover => 1 3355 can_hover => 1
2985 }; 3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
2986 } 3369 }
2987 3370
2988 $self->clear; 3371 $self->clear;
2989 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2990} 3373}
… …
2995 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2997 3380
2998 return unless $text; 3381 return unless $text;
2999 3382
3000 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3001 3384
3002 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3003 3386
3004 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
3005 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
3006 $item->{count}++; 3389 $item->{count}++;
3007 } else { 3390 } else {
3008 $item->{count} = 1; 3391 $item->{count} = 1;
3009 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
3010 } 3393 }
3011 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
3012 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
3013 delete $item->{label}; 3396 delete $item->{label};
3014 } else { 3397 } else {
3015 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
3016 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
3035 3418
3036 $self->reorder; 3419 $self->reorder;
3037 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
3038} 3421}
3039 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3040############################################################################# 3431#############################################################################
3041 3432
3042package CFClient::UI::Root; 3433package CFClient::UI::Inventory;
3043 3434
3044our @ISA = CFClient::UI::Container::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
3045
3046use CFClient::OpenGL;
3047 3436
3048sub new { 3437sub new {
3049 my $class = shift; 3438 my $class = shift;
3050 3439
3051 $class->SUPER::new ( 3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3052 @_, 3693 @_,
3053 ) 3694 )
3054} 3695}
3055 3696
3056sub configure { 3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3057 my ($self, $x, $y, $w, $h) = @_;
3058 3698
3059 $self->{w} = $w; 3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3060 $self->{h} = $h; 3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3061} 3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3062 3709
3063sub check_size { 3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3064 my ($self) = @_; 3783 my ($self, $spell) = @_;
3065 3784
3066 $self->size_allocate ($self->{w}, $self->{h}) 3785 $self->{spell}->{$spell->{name}} = $spell;
3067 if $self->{w}; 3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root;
3806
3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3810
3811use CFClient::OpenGL;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
3817 visible => 1,
3818 @_,
3819 );
3820
3821 Scalar::Util::weaken ($self->{root} = $self);
3822
3823 $self
3068} 3824}
3069 3825
3070sub size_request { 3826sub size_request {
3071 my ($self) = @_; 3827 my ($self) = @_;
3072 3828
3073 ($self->{w}, $self->{h}) 3829 ($self->{w}, $self->{h})
3074} 3830}
3075 3831
3832sub _to_pixel {
3833 my ($coord, $size, $max) = @_;
3834
3835 $coord =
3836 $coord eq "center" ? ($max - $size) * 0.5
3837 : $coord eq "max" ? $max
3838 : $coord;
3839
3840 $coord = 0 if $coord < 0;
3841 $coord = $max - $size if $coord > $max - $size;
3842
3843 int $coord + 0.5
3844}
3845
3076sub size_allocate { 3846sub invoke_size_allocate {
3077 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3078 3848
3079 for my $child ($self->children) { 3849 for my $child ($self->children) {
3080 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3081 3851
3082 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3852 $X = $child->{force_x} if exists $child->{force_x};
3083 if exists $child->{req_x}; 3853 $Y = $child->{force_y} if exists $child->{force_y};
3084 3854
3085 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3855 $X = _to_pixel $X, $W, $self->{w};
3086 if exists $child->{req_y}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3087
3088 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3089 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3090 3857
3091 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3092 } 3859 }
3860
3861 1
3093} 3862}
3094 3863
3095sub coord2local { 3864sub coord2local {
3096 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3097 3866
… …
3105} 3874}
3106 3875
3107sub update { 3876sub update {
3108 my ($self) = @_; 3877 my ($self) = @_;
3109 3878
3110 $self->check_size;
3111 $::WANT_REFRESH++; 3879 $::WANT_REFRESH++;
3112} 3880}
3113 3881
3114sub add { 3882sub add {
3115 my ($self, @children) = @_; 3883 my ($self, @children) = @_;
3116 3884
3117 for (my @widgets = @children; my $w = pop @widgets; ) {
3118 push @widgets, $w->children;
3119 $w->{root} = $self;
3120 $w->{visible} = 1;
3121 }
3122
3123 for my $child (@children) {
3124 $child->{is_toplevel} = 1; 3885 $_->{is_toplevel} = 1
3125 3886 for @children;
3126 # integerise window positions
3127 $child->{x} = int $child->{x};
3128 $child->{y} = int $child->{y};
3129 }
3130 3887
3131 $self->SUPER::add (@children); 3888 $self->SUPER::add (@children);
3132} 3889}
3133 3890
3134sub remove { 3891sub remove {
3135 my ($self, @children) = @_; 3892 my ($self, @children) = @_;
3136 3893
3137 $self->SUPER::remove (@children); 3894 $self->SUPER::remove (@children);
3895
3896 delete $self->{is_toplevel}
3897 for @children;
3138 3898
3139 while (@children) { 3899 while (@children) {
3140 my $w = pop @children; 3900 my $w = pop @children;
3141 push @children, $w->children; 3901 push @children, $w->children;
3142 $w->set_invisible; 3902 $w->set_invisible;
… …
3161 while ($self->{refresh_hook}) { 3921 while ($self->{refresh_hook}) {
3162 $_->() 3922 $_->()
3163 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
3164 } 3924 }
3165 3925
3166 if ($self->{check_size}) { 3926 if ($self->{realloc}) {
3167 my @queue = ([], []); 3927 my %queue;
3928 my @queue;
3929 my $widget;
3168 3930
3169 for (;;) { 3931 outer:
3170 if ($self->{check_size}) { 3932 while () {
3171 # heuristic: check containers last 3933 if (my $realloc = delete $self->{realloc}) {
3172 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3934 for $widget (values %$realloc) {
3173 for values %{delete $self->{check_size}} 3935 $widget->{visible} or next; # do not resize invisible widgets
3936
3937 $queue{$widget+0}++ and next; # duplicates are common
3938
3939 push @{ $queue[$widget->{visible}] }, $widget;
3940 }
3174 } 3941 }
3175 3942
3176 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3943 while () {
3944 @queue or last outer;
3177 3945
3178 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3946 $widget = pop @{ $queue[-1] || [] }
3179 ? @$widget{qw(user_w user_h)} 3947 and last;
3180 : $widget->size_request;
3181
3182 if (delete $widget->{force_alloc}
3183 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3184 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3185 3948
3949 pop @queue;
3950 }
3951
3952 delete $queue{$widget+0};
3953
3954 my ($w, $h) = $widget->size_request;
3955
3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3962 $w = $widget->{force_w} if exists $widget->{force_w};
3963 $h = $widget->{force_h} if exists $widget->{force_h};
3964
3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3966 || delete $widget->{force_realloc}) {
3186 $widget->{req_w} = $w; 3967 $widget->{req_w} = $w;
3187 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
3188 3969
3189 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3970 $self->{size_alloc}{$widget+0} = $widget;
3190 3971
3191 $widget->{parent}->check_size
3192 if $widget->{parent}; 3972 if (my $parent = $widget->{parent}) {
3973 $self->{realloc}{$parent+0} = $parent
3974 unless $queue{$parent+0};
3975
3976 $parent->{force_size_alloc} = 1;
3977 $self->{size_alloc}{$parent+0} = $parent;
3978 }
3193 } 3979 }
3980
3981 delete $self->{realloc}{$widget+0};
3194 } 3982 }
3195 } 3983 }
3196 3984
3197 while ($self->{size_alloc}) { 3985 while (my $size_alloc = delete $self->{size_alloc}) {
3198 for (values %{delete $self->{size_alloc}}) { 3986 my @queue = sort { $b->{visible} <=> $a->{visible} }
3199 my ($widget, $w, $h) = @$_; 3987 values %$size_alloc;
3988
3989 while () {
3990 my $widget = pop @queue || last;
3991
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3200 3993
3201 $w = 0 if $w < 0; 3994 $w = 0 if $w < 0;
3202 $h = 0 if $h < 0; 3995 $h = 0 if $h < 0;
3203 3996
3997 $w = int $w + 0.5;
3998 $h = int $h + 0.5;
3999
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h};
4003
3204 $widget->{w} = $w; 4004 $widget->{w} = $w;
3205 $widget->{h} = $h; 4005 $widget->{h} = $h;
4006
3206 $widget->emit (size_allocate => $w, $h); 4007 $widget->emit (size_allocate => $w, $h);
4008 }
3207 } 4009 }
3208 } 4010 }
3209 4011
3210 while ($self->{post_alloc_hook}) { 4012 while ($self->{post_alloc_hook}) {
3211 $_->() 4013 $_->()
3212 for values %{delete $self->{post_alloc_hook}}; 4014 for values %{delete $self->{post_alloc_hook}};
3213 } 4015 }
4016
3214 4017
3215 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4018 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3216 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3217 glClear GL_COLOR_BUFFER_BIT; 4020 glClear GL_COLOR_BUFFER_BIT;
3218 4021
… …
3220 glLoadIdentity; 4023 glLoadIdentity;
3221 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3222 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
3223 glLoadIdentity; 4026 glLoadIdentity;
3224 4027
4028 {
4029 package CFClient::UI::Base;
4030
4031 ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h});
4033 }
4034
3225 $self->_draw; 4035 $self->_draw;
3226} 4036}
3227 4037
3228############################################################################# 4038#############################################################################
3229 4039

Diff Legend

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