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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 151 }
136} 152}
137 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
189 }
190 }
191
192 reconfigure_widgets;
193}
194
138############################################################################# 195#############################################################################
139 196
140package CFClient::UI::Base; 197package CFClient::UI::Base;
141 198
142use strict; 199use strict;
… …
145 202
146sub new { 203sub new {
147 my $class = shift; 204 my $class = shift;
148 205
149 my $self = bless { 206 my $self = bless {
150 x => 0, 207 x => "center",
151 y => 0, 208 y => "center",
152 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
153 can_events => 1, 212 can_events => 1,
154 @_ 213 @_
155 }, $class; 214 }, $class;
156 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
157 for (keys %$self) { 218 for (keys %$self) {
158 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
160 } 221 }
161 } 222 }
162 223
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
235
163 $self 236 $self
164} 237}
165 238
166sub destroy { 239sub destroy {
167 my ($self) = @_; 240 my ($self) = @_;
… …
176 return if $self->{parent}; 249 return if $self->{parent};
177 250
178 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
179} 252}
180 253
181sub hide { 254sub set_visible {
182 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
183 278
184 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
186 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
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;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
214 339
215sub configure { 340sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
217 342
218 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
221 348
222 # use alignment to adjust x, y 349 # use alignment to adjust x, y
223 350
224 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 353 }
229 354
230 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 356 $self->{x} = $x;
232 $self->{y} = $y; 357 $self->{y} = $y;
233 $self->update; 358 $self->update;
234 } 359 }
235 360
236 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
238 } 368 }
239} 369}
240 370
241sub size_allocate { 371sub size_allocate {
242 # nothing to be done 372 # nothing to be done
243} 373}
244 374
245sub children { 375sub children {
246} 376}
247 377
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258}
259
260sub set_max_size { 378sub set_max_size {
261 my ($self, $w, $h) = @_; 379 my ($self, $w, $h) = @_;
262 380
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 381 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 382 delete $self->{max_h}; $self->{max_h} = $h if $h;
383}
384
385sub set_tooltip {
386 my ($self, $tooltip) = @_;
387
388 $tooltip =~ s/^\s+//;
389 $tooltip =~ s/\s+$//;
390
391 return if $self->{tooltip} eq $tooltip;
392
393 $self->{tooltip} = $tooltip;
394
395 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396 delete $CFClient::UI::TOOLTIP->{owner};
397 CFClient::UI::check_tooltip;
398 }
265} 399}
266 400
267# translate global coordinates to local coordinate system 401# translate global coordinates to local coordinate system
268sub coord2local { 402sub coord2local {
269 my ($self, $x, $y) = @_; 403 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 418 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 419 return unless $self->{can_focus};
286 420
287 my $focus = $FOCUS; $FOCUS = $self; 421 my $focus = $FOCUS; $FOCUS = $self;
288 422
289 $self->emit (focus_in => $focus); 423 $self->_emit (focus_in => $focus);
290 424
291 $focus->update if $focus; 425 $focus->update if $focus;
292 $FOCUS->update; 426 $FOCUS->update;
293} 427}
294 428
… …
297 431
298 return unless $FOCUS == $self; 432 return unless $FOCUS == $self;
299 433
300 my $focus = $FOCUS; undef $FOCUS; 434 my $focus = $FOCUS; undef $FOCUS;
301 435
302 $self->emit (focus_out => $focus); 436 $self->_emit (focus_out => $focus);
303 437
304 $focus->update if $focus; #? 438 $focus->update if $focus; #?
439
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS;
305} 442}
306 443
307sub mouse_motion { } 444sub mouse_motion { }
308sub button_up { } 445sub button_up { }
309sub key_down { } 446sub key_down { }
310sub key_up { } 447sub key_up { }
311 448
312sub button_down { 449sub button_down {
313 my ($self, $ev, $x, $y) = @_; 450 my ($self, $ev, $x, $y) = @_;
314 451
315 $self->focus_in; 452 $self->focus_in;
316} 453}
317 454
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 455sub find_widget {
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 456 my ($self, $x, $y) = @_;
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 457
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 458 return () unless $self->{can_events};
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 459
460 return $self
461 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464 ()
465}
466
467sub set_parent {
468 my ($self, $parent) = @_;
469
470 Scalar::Util::weaken ($self->{parent} = $parent);
471 $self->set_visible if $parent->{visible};
472}
473
474sub connect {
475 my ($self, $signal, $cb) = @_;
476
477 push @{ $self->{signal_cb}{$signal} }, $cb;
478}
479
480sub _emit {
481 my ($self, $signal, @args) = @_;
482
483 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484}
485
486sub emit {
487 my ($self, $signal, @args) = @_;
488
489 $self->_emit ($signal, @args)
490 || $self->$signal (@args);
491}
492
493sub visibility_change {
494 #my ($self, $visible) = @_;
495}
496
497sub realloc {
498 my ($self) = @_;
499
500 if ($self->{visible}) {
501 return if $self->{root}{realloc}{$self+0};
502
503 $self->{root}{realloc}{$self+0} = $self;
504 $self->{root}->update;
505 } else {
506 delete $self->{req_w};
507 delete $self->{req_h};
508 }
509}
510
511sub update {
512 my ($self) = @_;
513
514 $self->{parent}->update
515 if $self->{parent};
516}
517
518sub reconfigure {
519 my ($self) = @_;
520
521 $self->realloc;
522 $self->update;
523}
524
525# using global variables seems a bit hacky, but passing through all drawing
526# functions seems pointless.
527our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
323 528
324sub draw { 529sub draw {
325 my ($self) = @_; 530 my ($self) = @_;
326 531
327 return unless $self->{h} && $self->{w}; 532 return unless $self->{h} && $self->{w};
533
534 # update screen rectangle
535 local $draw_x = $draw_x + $self->{x};
536 local $draw_y = $draw_y + $self->{y};
537 local $draw_w = $draw_x + $self->{w};
538 local $draw_h = $draw_y + $self->{h};
539
540 # skip widgets that are entirely outside the drawing area
541 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
328 543
329 glPushMatrix; 544 glPushMatrix;
330 glTranslate $self->{x}, $self->{y}, 0; 545 glTranslate $self->{x}, $self->{y}, 0;
331 $self->_draw; 546 $self->_draw;
332 glPopMatrix; 547 glPopMatrix;
… …
344 glVertex $x , $y + $self->{h}; 559 glVertex $x , $y + $self->{h};
345 glEnd; 560 glEnd;
346 glDisable GL_BLEND; 561 glDisable GL_BLEND;
347 } 562 }
348 563
349 if ($ENV{PCLIENT_DEBUG}) { 564 if ($ENV{CFPLUS_DEBUG} & 1) {
350 glPushMatrix; 565 glPushMatrix;
351 glColor 1, 1, 0, 1; 566 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 567 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 568 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 569 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 570 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 571 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 572 glVertex 0 , $self->{h} - 1;
358 glEnd; 573 glEnd;
359 glPopMatrix; 574 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 575 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 576 }
362} 577}
363 578
364sub _draw { 579sub _draw {
365 my ($self) = @_; 580 my ($self) = @_;
366 581
367 warn "no draw defined for $self\n"; 582 warn "no draw defined for $self\n";
368} 583}
369 584
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
389}
390
391sub check_size {
392 my ($self) = @_;
393
394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395}
396
397sub update {
398 my ($self) = @_;
399
400 $self->{parent}->update
401 if $self->{parent};
402}
403
404sub connect {
405 my ($self, $signal, $cb) = @_;
406
407 push @{ $self->{signal_cb}{$signal} }, $cb;
408}
409
410sub emit {
411 my ($self, $signal, @args) = @_;
412
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
414}
415
416sub DESTROY { 585sub DESTROY {
417 my ($self) = @_; 586 my ($self) = @_;
418 587
588 delete $WIDGET{$self+0};
419 #$self->deactivate; 589 #$self->deactivate;
420} 590}
421 591
422############################################################################# 592#############################################################################
423 593
… …
432 my $class = shift; 602 my $class = shift;
433 603
434 # range [value, low, high, page] 604 # range [value, low, high, page]
435 605
436 $class->SUPER::new ( 606 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 607 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 608 #active_bg => [1, 1, 1, 0.5],
439 @_ 609 @_
440 ) 610 )
441} 611}
442 612
443sub _draw { 613sub _draw {
444 my ($self) = @_; 614 my ($self) = @_;
445 615
616 my $color = $FOCUS == $self && $self->{active_bg}
617 ? $self->{active_bg}
618 : $self->{bg};
619
620 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 621 my ($w, $h) = @$self{qw(w h)};
447 622
448 glEnable GL_BLEND; 623 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 624 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 625 glColor @$color;
451 626
452 glBegin GL_QUADS; 627 glBegin GL_QUADS;
453 glVertex 0 , 0; 628 glVertex 0 , 0;
454 glVertex 0 , $h; 629 glVertex 0 , $h;
455 glVertex $w, $h; 630 glVertex $w, $h;
456 glVertex $w, 0; 631 glVertex $w, 0;
457 glEnd; 632 glEnd;
458 633
459 glDisable GL_BLEND; 634 glDisable GL_BLEND;
635 }
460} 636}
461 637
462############################################################################# 638#############################################################################
463 639
464package CFClient::UI::Empty; 640package CFClient::UI::Empty;
… …
469 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg); 646 $class->SUPER::new (can_events => 0, %arg);
471} 647}
472 648
473sub size_request { 649sub size_request {
474 (0, 0) 650 my ($self) = @_;
651
652 ($self->{w} + 0, $self->{h} + 0)
475} 653}
476 654
477sub draw { } 655sub draw { }
478 656
479############################################################################# 657#############################################################################
… …
508 $self->{children} = [ 686 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 687 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 688 @{$self->{children}}, @widgets
511 ]; 689 ];
512 690
513 $self->check_size; 691 $self->realloc;
514 $self->update;
515} 692}
516 693
517sub children { 694sub children {
518 @{ $_[0]{children} } 695 @{ $_[0]{children} }
519} 696}
… …
524 delete $child->{parent}; 701 delete $child->{parent};
525 $child->hide; 702 $child->hide;
526 703
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 704 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 705
529 $self->check_size; 706 $self->realloc;
530 $self->update;
531} 707}
532 708
533sub clear { 709sub clear {
534 my ($self) = @_; 710 my ($self) = @_;
535 711
… …
539 for (@$children) { 715 for (@$children) {
540 delete $_->{parent}; 716 delete $_->{parent};
541 $_->hide; 717 $_->hide;
542 } 718 }
543 719
544 $self->check_size; 720 $self->realloc;
545 $self->update;
546} 721}
547 722
548sub find_widget { 723sub find_widget {
549 my ($self, $x, $y) = @_; 724 my ($self, $x, $y) = @_;
550 725
… …
625} 800}
626 801
627sub update { 802sub update {
628 my ($self) = @_; 803 my ($self) = @_;
629 804
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 805 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 806 $self->SUPER::update;
632} 807}
633 808
634sub size_allocate { 809sub size_allocate {
635 my ($self, $w, $h) = @_; 810 my ($self, $w, $h) = @_;
… …
637 $self->SUPER::size_allocate ($w, $h); 812 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 813 $self->update;
639} 814}
640 815
641sub _render { 816sub _render {
817 my ($self) = @_;
818
642 $_[0]{children}[0]->draw; 819 $self->{children}[0]->draw;
643} 820}
644 821
645sub render_child { 822sub render_child {
646 my ($self) = @_; 823 my ($self) = @_;
647 824
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 825 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 826 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 827 glClear GL_COLOR_BUFFER_BIT;
651 828
829 {
830 package CFClient::UI::Base;
831
832 ($draw_x, $draw_y, $draw_w, $draw_h) =
833 (0, 0, $self->{w}, $self->{h});
834 }
835
652 $self->_render; 836 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 837 };
661} 838}
662 839
663sub _draw { 840sub _draw {
664 my ($self) = @_; 841 my ($self) = @_;
665 842
666 my ($w, $h) = ($self->w, $self->h); 843 my ($w, $h) = @$self{qw(w h)};
667 844
668 my $tex = $self->{texture} 845 my $tex = $self->{texture}
669 or return; 846 or return;
670 847
671 glEnable GL_TEXTURE_2D; 848 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673 glColor 0, 0, 0, 1; 850 glColor 1, 1, 1, 1;
674 851
675 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 852 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676 853
677 glDisable GL_TEXTURE_2D; 854 glDisable GL_TEXTURE_2D;
678} 855}
… …
681 858
682package CFClient::UI::ViewPort; 859package CFClient::UI::ViewPort;
683 860
684our @ISA = CFClient::UI::Window::; 861our @ISA = CFClient::UI::Window::;
685 862
863sub new {
864 my $class = shift;
865
866 $class->SUPER::new (
867 scroll_x => 0,
868 scroll_y => 1,
869 @_,
870 )
871}
872
686sub size_request { 873sub size_request {
687 my ($self) = @_; 874 my ($self) = @_;
688 875
689 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 876 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
691 877
692 @$self{qw(child_w child_h)} 878 $w = 10 if $self->{scroll_x};
879 $h = 10 if $self->{scroll_y};
880
881 ($w, $h)
693} 882}
694 883
695sub size_allocate { 884sub size_allocate {
696 my ($self, $w, $h) = @_; 885 my ($self, $w, $h) = @_;
697 886
887 my $child = $self->child;
888
889 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891
892 $self->child->configure (0, 0, $w, $h);
698 $self->update; 893 $self->update;
699} 894}
700 895
701sub set_offset { 896sub set_offset {
702 my ($self, $x, $y) = @_; 897 my ($self, $x, $y) = @_;
… …
736} 931}
737 932
738sub _render { 933sub _render {
739 my ($self) = @_; 934 my ($self) = @_;
740 935
936 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
937 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
938
741 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 939 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
742 940
743 $self->SUPER::_render; 941 $self->SUPER::_render;
744} 942}
745 943
… …
753 my $class = shift; 951 my $class = shift;
754 952
755 my $self; 953 my $self;
756 954
757 my $slider = new CFClient::UI::Slider 955 my $slider = new CFClient::UI::Slider
758 vertical => 1, 956 vertical => 1,
759 range => [0, 0, 1, 0.01], # HACK fix 957 range => [0, 0, 1, 0.01], # HACK fix
760 connect_changed => sub { 958 on_changed => sub {
761 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 959 $self->{vp}->set_offset (0, $_[1]);
762 }, 960 },
763 ; 961 ;
764 962
765 $self = $class->SUPER::new ( 963 $self = $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 964 vp => (new CFClient::UI::ViewPort expand => 1),
767 slider => $slider, 965 slider => $slider,
768 @_, 966 @_,
769 ); 967 );
770 968
771 $self->{vp}->add ($self->{scrolled}); 969 $self->{vp}->add ($self->{scrolled});
… …
773 $self->add ($self->{slider}); 971 $self->add ($self->{slider});
774 972
775 $self 973 $self
776} 974}
777 975
976sub update {
977 my ($self) = @_;
978
979 $self->SUPER::update;
980
981 # todo: overwrite size_allocate of child
982 my $child = $self->{vp}->child;
983 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984}
985
986sub size_allocate {
987 my ($self, $w, $h) = @_;
988
989 $self->SUPER::size_allocate ($w, $h);
990
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993}
994
778#TODO# update range on size_allocate depeneing on child 995#TODO# update range on size_allocate depending on child
779# update viewport offset on scroll 996# update viewport offset on scroll
780 997
781############################################################################# 998#############################################################################
782 999
783package CFClient::UI::Frame; 1000package CFClient::UI::Frame;
… …
787use CFClient::OpenGL; 1004use CFClient::OpenGL;
788 1005
789sub new { 1006sub new {
790 my $class = shift; 1007 my $class = shift;
791 1008
1009 $class->SUPER::new (
1010 bg => undef,
1011 @_,
1012 )
1013}
1014
1015sub _draw {
1016 my ($self) = @_;
1017
1018 if ($self->{bg}) {
1019 my ($w, $h) = @$self{qw(w h)};
1020
1021 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1023 glColor @{ $self->{bg} };
1024
1025 glBegin GL_QUADS;
1026 glVertex 0 , 0;
1027 glVertex 0 , $h;
1028 glVertex $w, $h;
1029 glVertex $w, 0;
1030 glEnd;
1031
1032 glDisable GL_BLEND;
1033 }
1034
1035 $self->SUPER::_draw;
1036}
1037
1038#############################################################################
1039
1040package CFClient::UI::FancyFrame;
1041
1042our @ISA = CFClient::UI::Bin::;
1043
1044use CFClient::OpenGL;
1045
1046my $bg =
1047 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048 mipmap => 1, wrap => 1;
1049
1050my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053
1054sub new {
1055 my ($class, %arg) = @_;
1056
1057 my $title = delete $arg{title};
1058
792 my $self = $class->SUPER::new ( 1059 my $self = $class->SUPER::new (
793 bg => [1, 1, 1, 1], 1060 bg => [1, 1, 1, 1],
794 border_bg => [1, 1, 1, 1], 1061 border_bg => [1, 1, 1, 1],
795 border => 0.8, 1062 border => 0.6,
796 @_ 1063 can_events => 1,
1064 min_w => 16,
1065 min_h => 16,
1066 %arg,
797 ); 1067 );
798 1068
799 $self
800}
801
802sub _draw {
803 my ($self) = @_;
804
805 my ($w, $h) = ($self->{w}, $self->{h});
806
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811
812# glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0;
815# glVertex 0 , $h;
816# glVertex $w, $h;
817# glVertex $w, 0;
818# glEnd;
819
820
821 $self->child->draw;
822 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D;
824}
825
826#############################################################################
827
828package CFClient::UI::FancyFrame;
829
830our @ISA = CFClient::UI::Bin::;
831
832use CFClient::OpenGL;
833
834my @tex =
835 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
836 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
837
838sub new {
839 my $class = shift;
840
841 # TODO: user_x, user_y, overwrite moveto?
842
843 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1],
846 border => 0.6,
847 can_events => 1,
848 @_
849 );
850
851 $self->{title} &&= new CFClient::UI::Label 1069 $self->{title} = new CFClient::UI::Label
852 align => 0, 1070 align => 0,
853 valign => 1, 1071 valign => 1,
854 text => $self->{title}, 1072 text => $title,
855 fontsize => $self->{border}; 1073 fontsize => $self->{border}
1074 if defined $title;
856 1075
857 $self 1076 $self
1077}
1078
1079sub add {
1080 my ($self, @widgets) = @_;
1081
1082 $self->SUPER::add (@widgets);
1083 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
858} 1084}
859 1085
860sub border { 1086sub border {
861 int $_[0]{border} * $::FONTSIZE 1087 int $_[0]{border} * $::FONTSIZE
862} 1088}
863 1089
864sub size_request { 1090sub size_request {
865 my ($self) = @_; 1091 my ($self) = @_;
1092
1093 $self->{title}->size_request
1094 if $self->{title};
866 1095
867 my ($w, $h) = $self->SUPER::size_request; 1096 my ($w, $h) = $self->SUPER::size_request;
868 1097
869 ( 1098 (
870 $w + $self->border * 2, 1099 $w + $self->border * 2,
… …
873} 1102}
874 1103
875sub size_allocate { 1104sub size_allocate {
876 my ($self, $w, $h) = @_; 1105 my ($self, $w, $h) = @_;
877 1106
1107 if ($self->{title}) {
1108 $self->{title}{w} = $w;
1109 $self->{title}{h} = $h;
1110 $self->{title}->size_allocate ($w, $h);
1111 }
1112
1113 my $border = $self->border;
1114
878 $h -= List::Util::max 0, $self->border * 2; 1115 $h -= List::Util::max 0, $border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 1116 $w -= List::Util::max 0, $border * 2;
880 1117
881 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
882 if $self->{title};
883
884 $self->child->configure ($self->border, $self->border, $w, $h); 1118 $self->child->configure ($border, $border, $w, $h);
885} 1119}
886 1120
887sub button_down { 1121sub button_down {
888 my ($self, $ev, $x, $y) = @_; 1122 my ($self, $ev, $x, $y) = @_;
889 1123
… …
905 my ($ev, $x, $y) = @_; 1139 my ($ev, $x, $y) = @_;
906 1140
907 my $dx = $ev->{x} - $ox; 1141 my $dx = $ev->{x} - $ox;
908 my $dy = $ev->{y} - $oy; 1142 my $dy = $ev->{y} - $oy;
909 1143
910 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1144 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
911 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1145 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146
1147 $self->realloc;
912 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1148 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
913 $self->check_size;
914 }; 1149 };
915 1150
916 } elsif ($lr ^ $td) { 1151 } elsif ($lr ^ $td) {
917 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1152 my ($ox, $oy) = ($ev->{x}, $ev->{y});
918 my ($bx, $by) = ($self->{x}, $self->{y}); 1153 my ($bx, $by) = ($self->{x}, $self->{y});
… …
920 $self->{motion} = sub { 1155 $self->{motion} = sub {
921 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
922 1157
923 ($x, $y) = ($ev->{x}, $ev->{y}); 1158 ($x, $y) = ($ev->{x}, $ev->{y});
924 1159
925 $self->move ($bx + $x - $ox, $by + $y - $oy); 1160 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
926 $self->update;
927 }; 1161 };
928 } 1162 }
929} 1163}
930 1164
931sub button_up { 1165sub button_up {
… …
941} 1175}
942 1176
943sub _draw { 1177sub _draw {
944 my ($self) = @_; 1178 my ($self) = @_;
945 1179
1180 my $child = $self->{children}[0];
1181
946 my ($w, $h ) = ($self->{w}, $self->{h}); 1182 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1183 my ($cw, $ch) = ($child->{w}, $child->{h});
948 1184
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 1185 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1186 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 1187
954 my $border = $self->border; 1188 my $border = $self->border;
955 1189
956 glColor @{ $self->{border_bg} }; 1190 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 1191 $border[0]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 1192 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1193 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1194 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
961 1195
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1196 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1197 glColor @{ $self->{bg} };
964 1198
965 # TODO: repeat texture not scale 1199 # TODO: repeat texture not scale
1200 # solve this better(?)
966 my $rep_x = $cw / $bg->{w}; 1201 $bg->{s} = $cw / $bg->{w};
967 my $rep_y = $ch / $bg->{h}; 1202 $bg->{t} = $ch / $bg->{h};
968
969 glColor @{ $self->{bg} };
970
971 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1203 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1204 }
975 1205
976 glDisable GL_TEXTURE_2D; 1206 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1207
980 $self->{title}->draw if $self->{title};
981
982 $self->child->draw; 1208 $child->draw;
1209
1210 if ($self->{title}) {
1211 glTranslate 0, $border - $self->{h};
1212 $self->{title}->_draw;
1213 }
983} 1214}
984 1215
985############################################################################# 1216#############################################################################
986 1217
987package CFClient::UI::Table; 1218package CFClient::UI::Table;
… …
995sub new { 1226sub new {
996 my $class = shift; 1227 my $class = shift;
997 1228
998 $class->SUPER::new ( 1229 $class->SUPER::new (
999 col_expand => [], 1230 col_expand => [],
1000 @_ 1231 @_,
1001 ) 1232 )
1233}
1234
1235sub children {
1236 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1002} 1237}
1003 1238
1004sub add { 1239sub add {
1005 my ($self, $x, $y, $child) = @_; 1240 my ($self, $x, $y, $child) = @_;
1006 1241
1007 $child->set_parent ($self); 1242 $child->set_parent ($self);
1008 $self->{children}[$y][$x] = $child; 1243 $self->{children}[$y][$x] = $child;
1009 1244
1010 $child->check_size; 1245 $self->realloc;
1011} 1246}
1012 1247
1013sub children {
1014 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1015}
1016
1017# TODO: move to container class maybe? send childs a signal on removal? 1248# TODO: move to container class maybe? send children a signal on removal?
1018sub clear { 1249sub clear {
1019 my ($self) = @_; 1250 my ($self) = @_;
1020 1251
1021 my @children = $self->children; 1252 my @children = $self->children;
1022 delete $self->{children}; 1253 delete $self->{children};
… …
1024 for (@children) { 1255 for (@children) {
1025 delete $_->{parent}; 1256 delete $_->{parent};
1026 $_->hide; 1257 $_->hide;
1027 } 1258 }
1028 1259
1029 $self->update; 1260 $self->realloc;
1030} 1261}
1031 1262
1032sub get_wh { 1263sub get_wh {
1033 my ($self) = @_; 1264 my ($self) = @_;
1034 1265
… …
1065sub size_allocate { 1296sub size_allocate {
1066 my ($self, $w, $h) = @_; 1297 my ($self, $w, $h) = @_;
1067 1298
1068 my ($ws, $hs) = $self->get_wh; 1299 my ($ws, $hs) = $self->get_wh;
1069 1300
1070 my $req_w = sum @$ws; 1301 my $req_w = (sum @$ws) || 1;
1071 my $req_h = sum @$hs; 1302 my $req_h = (sum @$hs) || 1;
1072 1303
1073 # TODO: nicer code && do row_expand 1304 # TODO: nicer code && do row_expand
1074 my @col_expand = @{$self->{col_expand}}; 1305 my @col_expand = @{$self->{col_expand}};
1075 @col_expand = (1) x @$ws unless @col_expand; 1306 @col_expand = (1) x @$ws unless @col_expand;
1076 my $col_expand = (sum @col_expand) || 1; 1307 my $col_expand = (sum @col_expand) || 1;
… …
1130 } 1361 }
1131} 1362}
1132 1363
1133############################################################################# 1364#############################################################################
1134 1365
1135package CFClient::UI::HBox; 1366package CFClient::UI::Box;
1136
1137# TODO: wrap into common Box base class
1138 1367
1139our @ISA = CFClient::UI::Container::; 1368our @ISA = CFClient::UI::Container::;
1140 1369
1141sub size_request { 1370sub size_request {
1142 my ($self) = @_; 1371 my ($self) = @_;
1143 1372
1144 my @alloc = map [$_->size_request], @{$self->{children}}; 1373 $self->{vertical}
1145 1374 ? (
1146 ( 1375 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1147 (List::Util::sum map $_->[0], @alloc), 1376 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1148 (List::Util::max map $_->[1], @alloc), 1377 )
1149 ) 1378 : (
1379 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1381 )
1150} 1382}
1151 1383
1152sub size_allocate { 1384sub size_allocate {
1153 my ($self, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1154 1386
1155 ($h, $w) = ($w, $h); 1387 my $space = $self->{vertical} ? $h : $w;
1156
1157 my $children = $self->{children}; 1388 my $children = $self->{children};
1158 1389
1159 my @h = map $_->{req_w}, @$children; 1390 my @req;
1160 1391
1161 my $req_h = List::Util::sum @h; 1392 if ($self->{homogeneous}) {
1162 1393 @req = ($space / (@$children || 1)) x @$children;
1163 if ($req_h > $h) {
1164 # ah well, not enough space
1165 $_ *= $h / $req_h for @h;
1166 } else { 1394 } else {
1395 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1396 my $req = List::Util::sum @req;
1397
1398 if ($req > $space) {
1399 # ah well, not enough space
1400 $_ *= $space / $req for @req;
1401 } else {
1167 my $exp = List::Util::sum map $_->{expand}, @$children; 1402 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1168 $exp ||= 1;
1169 1403
1404 $space = ($space - $req) / $expand; # remaining space to give away
1405
1406 $req[$_] += $space * $children->[$_]{expand}
1170 for (0 .. $#$children) { 1407 for 0 .. $#$children;
1171 my $child = $children->[$_];
1172
1173 my $alloc_h = $h[$_];
1174 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1175 $h[$_] = $alloc_h;
1176 } 1408 }
1177 } 1409 }
1178 1410
1179 CFClient::UI::harmonize \@h; 1411 CFClient::UI::harmonize \@req;
1180 1412
1181 my $y = 0; 1413 my $pos = 0;
1182 for (0 .. $#$children) { 1414 for (0 .. $#$children) {
1183 my $child = $children->[$_];
1184 my $h = $h[$_]; 1415 my $alloc = $req[$_];
1185 $child->configure ($y, 0, $h, $w); 1416 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1186 1417
1187 $y += $h; 1418 $pos += $alloc;
1188 } 1419 }
1189 1420
1190 1 1421 1
1191} 1422}
1192 1423
1193############################################################################# 1424#############################################################################
1194 1425
1426package CFClient::UI::HBox;
1427
1428our @ISA = CFClient::UI::Box::;
1429
1430sub new {
1431 my $class = shift;
1432
1433 $class->SUPER::new (
1434 vertical => 0,
1435 @_,
1436 )
1437}
1438
1439#############################################################################
1440
1195package CFClient::UI::VBox; 1441package CFClient::UI::VBox;
1196 1442
1197# TODO: wrap into common Box base class
1198
1199our @ISA = CFClient::UI::Container::; 1443our @ISA = CFClient::UI::Box::;
1200 1444
1201sub size_request { 1445sub new {
1202 my ($self) = @_; 1446 my $class = shift;
1203 1447
1204 my @alloc = map [$_->size_request], @{$self->{children}}; 1448 $class->SUPER::new (
1205 1449 vertical => 1,
1206 ( 1450 @_,
1207 (List::Util::max map $_->[0], @alloc),
1208 (List::Util::sum map $_->[1], @alloc),
1209 ) 1451 )
1210} 1452}
1211 1453
1212sub size_allocate {
1213 my ($self, $w, $h) = @_;
1214
1215 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1216
1217 my $children = $self->{children};
1218
1219 my @h = map $_->{req_h}, @$children;
1220
1221 my $req_h = List::Util::sum @h;
1222
1223 if ($req_h > $h) {
1224 # ah well, not enough space
1225 $_ *= $h / $req_h for @h;
1226 } else {
1227 my $exp = List::Util::sum map $_->{expand}, @$children;
1228 $exp ||= 1;
1229
1230 for (0 .. $#$children) {
1231 my $child = $children->[$_];
1232
1233 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1234 }
1235 }
1236
1237 CFClient::UI::harmonize \@h;
1238
1239 my $y = 0;
1240 for (0 .. $#$children) {
1241 my $child = $children->[$_];
1242 my $h = $h[$_];
1243 $child->configure (0, $y, $w, $h);
1244
1245 $y += $h;
1246 }
1247
1248 1
1249}
1250
1251############################################################################# 1454#############################################################################
1252 1455
1253package CFClient::UI::Label; 1456package CFClient::UI::Label;
1254 1457
1255our @ISA = CFClient::UI::Base::; 1458our @ISA = CFClient::UI::DrawBG::;
1256 1459
1257use CFClient::OpenGL; 1460use CFClient::OpenGL;
1258 1461
1259sub new { 1462sub new {
1260 my ($class, %arg) = @_; 1463 my ($class, %arg) = @_;
1261 1464
1262 my $self = $class->SUPER::new ( 1465 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1466 fg => [1, 1, 1],
1467 #bg => none
1468 #active_bg => none
1264 #font => default_font 1469 #font => default_font
1265 #text => initial text 1470 #text => initial text
1266 #markup => initial narkup 1471 #markup => initial narkup
1472 #max_w => maximum pixel width
1473 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1474 layout => (new CFClient::Layout),
1268 fontsize => 1, 1475 fontsize => 1,
1269 align => -1, 1476 align => -1,
1270 valign => -1, 1477 valign => -1,
1271 padding => 2, 1478 padding_x => 2,
1479 padding_y => 2,
1272 can_events => 0, 1480 can_events => 0,
1273 %arg 1481 %arg
1274 ); 1482 );
1275 1483
1276 if (exists $self->{template}) { 1484 if (exists $self->{template}) {
… …
1286 } 1494 }
1287 1495
1288 $self 1496 $self
1289} 1497}
1290 1498
1291sub escape { 1499sub escape($) {
1292 local $_ = $_[1]; 1500 local $_ = $_[0];
1293 1501
1294 s/&/&amp;/g; 1502 s/&/&amp;/g;
1295 s/>/&gt;/g; 1503 s/>/&gt;/g;
1296 s/</&lt;/g; 1504 s/</&lt;/g;
1297 1505
1298 $_[1] 1506 $_
1299} 1507}
1300 1508
1301sub update { 1509sub update {
1302 my ($self) = @_; 1510 my ($self) = @_;
1303 1511
… …
1312 $self->{text} = "T$text"; 1520 $self->{text} = "T$text";
1313 1521
1314 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1522 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1315 $self->{layout}->set_text ($text); 1523 $self->{layout}->set_text ($text);
1316 1524
1525 $self->realloc;
1317 $self->update; 1526 $self->update;
1318 $self->check_size;
1319} 1527}
1320 1528
1321sub set_markup { 1529sub set_markup {
1322 my ($self, $markup) = @_; 1530 my ($self, $markup) = @_;
1323 1531
… …
1327 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1535 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1328 1536
1329 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1537 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1330 $self->{layout}->set_markup ($markup); 1538 $self->{layout}->set_markup ($markup);
1331 1539
1540 $self->realloc;
1332 $self->update; 1541 $self->update;
1333 $self->check_size;
1334} 1542}
1335 1543
1336sub size_request { 1544sub size_request {
1337 my ($self) = @_; 1545 my ($self) = @_;
1338 1546
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1547 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $self->{layout}->set_width ($self->{max_w} || -1); 1548 $self->{layout}->set_width ($self->{max_w} || -1);
1549 $self->{layout}->set_ellipsise ($self->{ellipsise});
1550 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1551 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1552
1343 my ($w, $h) = $self->{layout}->size; 1553 my ($w, $h) = $self->{layout}->size;
1344 1554
1345 if (exists $self->{template}) { 1555 if (exists $self->{template}) {
… …
1350 1560
1351 $w = List::Util::max $w, $w2; 1561 $w = List::Util::max $w, $w2;
1352 $h = List::Util::max $h, $h2; 1562 $h = List::Util::max $h, $h2;
1353 } 1563 }
1354 1564
1355 ( 1565 ($w, $h)
1356 $w + $self->{padding} * 2,
1357 $h + $self->{padding} * 2,
1358 )
1359} 1566}
1360 1567
1361sub size_allocate { 1568sub size_allocate {
1362 my ($self, $w, $h) = @_; 1569 my ($self, $w, $h) = @_;
1363 1570
1571 delete $self->{ox};
1572
1364 delete $self->{texture}; 1573 delete $self->{texture}
1574 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1365} 1575}
1366 1576
1367sub set_fontsize { 1577sub set_fontsize {
1368 my ($self, $fontsize) = @_; 1578 my ($self, $fontsize) = @_;
1369 1579
1370 $self->{fontsize} = $fontsize; 1580 $self->{fontsize} = $fontsize;
1371 delete $self->{texture}; 1581 delete $self->{texture};
1372 1582
1373 $self->update; 1583 $self->realloc;
1374 $self->check_size;
1375} 1584}
1376 1585
1377sub _draw { 1586sub _draw {
1378 my ($self) = @_; 1587 my ($self) = @_;
1588
1589 $self->SUPER::_draw; # draw background, if applicable
1379 1590
1380 my $tex = $self->{texture} ||= do { 1591 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1592 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1593 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $self->{layout}->set_width ($self->{w}); 1594 $self->{layout}->set_width ($self->{w});
1595 $self->{layout}->set_ellipsise ($self->{ellipsise});
1596 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1598
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1599 new_from_layout CFClient::Texture $self->{layout}
1600 };
1387 1601
1602 unless (exists $self->{ox}) {
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1603 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1604 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1390 : ($self->{w} - $tex->{w}) * 0.5; 1605 : ($self->{w} - $tex->{w}) * 0.5);
1391 1606
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1607 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1608 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1394 : ($self->{h} - $tex->{h}) * 0.5; 1609 : ($self->{h} - $tex->{h}) * 0.5);
1395
1396 $tex
1397 }; 1610 };
1398 1611
1399 glEnable GL_TEXTURE_2D; 1612 glEnable GL_TEXTURE_2D;
1400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1613 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1401 1614
… …
1427 active_fg => [0, 0, 0], 1640 active_fg => [0, 0, 0],
1428 can_hover => 1, 1641 can_hover => 1,
1429 can_focus => 1, 1642 can_focus => 1,
1430 valign => 0, 1643 valign => 0,
1431 can_events => 1, 1644 can_events => 1,
1645 #text => ...
1432 @_ 1646 @_
1433 ) 1647 )
1434} 1648}
1435 1649
1436sub _set_text { 1650sub _set_text {
… …
1446 $self->{text} = $text; 1660 $self->{text} = $text;
1447 1661
1448 $text =~ s/./*/g if $self->{hidden}; 1662 $text =~ s/./*/g if $self->{hidden};
1449 $self->{layout}->set_text ("$text "); 1663 $self->{layout}->set_text ("$text ");
1450 1664
1451 $self->emit (changed => $self->{text}); 1665 $self->_emit (changed => $self->{text});
1452} 1666}
1453 1667
1454sub set_text { 1668sub set_text {
1455 my ($self, $text) = @_; 1669 my ($self, $text) = @_;
1456 1670
1457 $self->{cursor} = length $text; 1671 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1672 $self->_set_text ($text);
1459 $self->check_size; 1673
1460 $self->update; 1674 $self->realloc;
1461} 1675}
1462 1676
1463sub get_text { 1677sub get_text {
1464 $_[0]{text} 1678 $_[0]{text}
1465} 1679}
… …
1468 my ($self) = @_; 1682 my ($self) = @_;
1469 1683
1470 my ($w, $h) = $self->SUPER::size_request; 1684 my ($w, $h) = $self->SUPER::size_request;
1471 1685
1472 ($w + 1, $h) # add 1 for cursor 1686 ($w + 1, $h) # add 1 for cursor
1473}
1474
1475sub size_allocate {
1476 my ($self, $w, $h) = @_;
1477
1478 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1479} 1687}
1480 1688
1481sub key_down { 1689sub key_down {
1482 my ($self, $ev) = @_; 1690 my ($self, $ev) = @_;
1483 1691
… …
1485 my $sym = $ev->{sym}; 1693 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1694 my $uni = $ev->{unicode};
1487 1695
1488 my $text = $self->get_text; 1696 my $text = $self->get_text;
1489 1697
1490 if ($sym == 8) { 1698 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1699 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1700 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1701 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1702 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1703 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1704 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1705 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1706 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1707 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1708 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1709 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1710 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1711 $self->_emit ('escape');
1504 } elsif ($uni) { 1712 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1713 substr $text, $self->{cursor}++, 0, chr $uni;
1506 } 1714 }
1507 1715
1508 $self->_set_text ($text); 1716 $self->_set_text ($text);
1509 $self->update; 1717
1718 $self->realloc;
1510} 1719}
1511 1720
1512sub focus_in { 1721sub focus_in {
1513 my ($self) = @_; 1722 my ($self) = @_;
1514 1723
… …
1594 if ($sym == 13) { 1803 if ($sym == 13) {
1595 unshift @{$self->{history}}, 1804 unshift @{$self->{history}},
1596 my $txt = $self->get_text; 1805 my $txt = $self->get_text;
1597 $self->{history_pointer} = -1; 1806 $self->{history_pointer} = -1;
1598 $self->{history_saveback} = ''; 1807 $self->{history_saveback} = '';
1599 $self->emit (activate => $txt); 1808 $self->_emit (activate => $txt);
1600 $self->update; 1809 $self->update;
1601 1810
1602 } elsif ($sym == CFClient::SDLK_UP) { 1811 } elsif ($sym == CFClient::SDLK_UP) {
1603 if ($self->{history_pointer} < 0) { 1812 if ($self->{history_pointer} < 0) {
1604 $self->{history_saveback} = $self->get_text; 1813 $self->{history_saveback} = $self->get_text;
… …
1641 1850
1642sub new { 1851sub new {
1643 my $class = shift; 1852 my $class = shift;
1644 1853
1645 $class->SUPER::new ( 1854 $class->SUPER::new (
1646 padding => 4, 1855 padding_x => 4,
1856 padding_y => 4,
1647 fg => [1, 1, 1], 1857 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1858 active_fg => [0, 0, 1],
1650 can_hover => 1, 1859 can_hover => 1,
1651 align => 0, 1860 align => 0,
1652 valign => 0, 1861 valign => 0,
1653 can_events => 1, 1862 can_events => 1,
1654 @_ 1863 @_
1655 ) 1864 )
1656} 1865}
1657 1866
1867sub activate { }
1868
1658sub button_up { 1869sub button_up {
1659 my ($self, $ev, $x, $y) = @_; 1870 my ($self, $ev, $x, $y) = @_;
1660 1871
1872 $self->emit ("activate")
1661 if ($x >= 0 && $x < $self->{w} 1873 if $x >= 0 && $x < $self->{w}
1662 && $y >= 0 && $y < $self->{h}) { 1874 && $y >= 0 && $y < $self->{h};
1663 $self->emit ("activate");
1664 }
1665} 1875}
1666 1876
1667sub _draw { 1877sub _draw {
1668 my ($self) = @_; 1878 my ($self) = @_;
1669 1879
… …
1698 1908
1699sub new { 1909sub new {
1700 my $class = shift; 1910 my $class = shift;
1701 1911
1702 $class->SUPER::new ( 1912 $class->SUPER::new (
1703 padding => 2, 1913 padding_x => 2,
1914 padding_y => 2,
1704 fg => [1, 1, 1], 1915 fg => [1, 1, 1],
1705 active_fg => [1, 1, 0], 1916 active_fg => [1, 1, 0],
1917 bg => [0, 0, 0, 0.2],
1918 active_bg => [1, 1, 1, 0.5],
1706 state => 0, 1919 state => 0,
1707 can_hover => 1, 1920 can_hover => 1,
1708 @_ 1921 @_
1709 ) 1922 )
1710} 1923}
1711 1924
1712sub size_request { 1925sub size_request {
1713 my ($self) = @_; 1926 my ($self) = @_;
1714 1927
1715 ($self->{padding} * 2 + 6) x 2 1928 (6) x 2
1716} 1929}
1717 1930
1718sub button_down { 1931sub button_down {
1719 my ($self, $ev, $x, $y) = @_; 1932 my ($self, $ev, $x, $y) = @_;
1720 1933
1721 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1934 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1722 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1935 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1723 $self->{state} = !$self->{state}; 1936 $self->{state} = !$self->{state};
1724 $self->emit (changed => $self->{state}); 1937 $self->_emit (changed => $self->{state});
1725 } 1938 }
1726} 1939}
1727 1940
1728sub _draw { 1941sub _draw {
1729 my ($self) = @_; 1942 my ($self) = @_;
1730 1943
1731 $self->SUPER::_draw; 1944 $self->SUPER::_draw;
1732 1945
1733 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1946 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1734 1947
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1948 my ($w, $h) = @$self{qw(w h)};
1949
1950 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1736 1951
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1952 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 1953
1954 my $tex = $self->{state} ? $tex[1] : $tex[0];
1955
1739 glEnable GL_TEXTURE_2D; 1956 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 1957 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 1958 glDisable GL_TEXTURE_2D;
1746} 1959}
1747 1960
1748############################################################################# 1961#############################################################################
1749 1962
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2209 qw(s1_slider.png s1_slider_bg.png);
1997 2210
1998sub new { 2211sub new {
1999 my $class = shift; 2212 my $class = shift;
2000 2213
2001 # range [value, low, high, page] 2214 # range [value, low, high, page, unit]
2002 2215
2003 # TODO: 0-width page 2216 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2217 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2218 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2219 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2220 fg => [1, 1, 1],
2008 active_fg => [0, 0, 0], 2221 active_fg => [0, 0, 0],
2222 bg => [0, 0, 0, 0.2],
2223 active_bg => [1, 1, 1, 0.5],
2009 range => [0, 0, 100, 10], 2224 range => [0, 0, 100, 10, 0],
2010 req_w => $::WIDTH / 80, 2225 min_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2226 min_h => $::WIDTH / 80,
2012 vertical => 0, 2227 vertical => 0,
2013 can_hover => 1, 2228 can_hover => 1,
2014 inner_pad => 5, 2229 inner_pad => 0.02,
2015 @_ 2230 @_
2016 ); 2231 );
2017 2232
2233 $self->set_value ($self->{range}[0]);
2234 $self->update;
2235
2018 $self 2236 $self
2019} 2237}
2020 2238
2239sub changed { }
2240
2241sub set_range {
2242 my ($self, $range) = @_;
2243
2244 ($range, $self->{range}) = ($self->{range}, $range);
2245
2246 $self->update
2247 if "@$range" ne "@{$self->{range}}";
2248}
2249
2250sub set_value {
2251 my ($self, $value) = @_;
2252
2253 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2254
2255 $hi = $lo + 1 if $hi <= $lo;
2256
2257 $page = $hi - $lo if $page > $hi - $lo;
2258
2259 $value = $lo if $value < $lo;
2260 $value = $hi - $page if $value > $hi - $page;
2261
2262 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2263 if $unit;
2264
2265 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266
2267 if ($value != $old_value) {
2268 $self->_emit (changed => $value);
2269 $self->update;
2270 }
2271}
2272
2021sub size_request { 2273sub size_request {
2022 my ($self) = @_; 2274 my ($self) = @_;
2023 2275
2024 my $w = $self->{req_w}; 2276 ($self->{req_w}, $self->{req_h})
2025 my $h = $self->{req_h};
2026
2027 $self->{vertical} ? ($h, $w) : ($w, $h)
2028} 2277}
2029 2278
2030sub button_down { 2279sub button_down {
2031 my ($self, $ev, $x, $y) = @_; 2280 my ($self, $ev, $x, $y) = @_;
2032 2281
2033 $self->SUPER::button_down ($ev, $x, $y); 2282 $self->SUPER::button_down ($ev, $x, $y);
2283
2284 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285
2034 $self->mouse_motion ($ev, $x, $y); 2286 $self->mouse_motion ($ev, $x, $y);
2035} 2287}
2036 2288
2037sub mouse_motion { 2289sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2290 my ($self, $ev, $x, $y) = @_;
2039 2291
2040 if ($GRAB == $self) { 2292 if ($GRAB == $self) {
2293 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294
2295 my (undef, $lo, $hi, $page) = @{$self->{range}};
2296
2297 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298
2299 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2300 }
2301}
2302
2303sub update {
2304 my ($self) = @_;
2305
2306 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2307 $self->set_value ($self->{range}[0]);
2308
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2309 my ($value, $lo, $hi, $page) = @{$self->{range}};
2310 my $range = ($hi - $page - $lo) || 1e-100;
2042 2311
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2312 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2044 2313
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2314 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2315 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2047 2316
2048 $x -= $inner_pad_px; # substract the padding 2317 $value = ($value - $lo) / $range;
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2318 $value = $value * $self->{scale} + $self->{offset};
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2319
2054 $self->emit (changed => $x); 2320 $self->{knob_x} = $value - $knob_w * 0.5;
2055 $self->update; 2321 $self->{knob_w} = $knob_w;
2056 } 2322 });
2057}
2058 2323
2059# the inner_* stuff is for generating a padding for the slider handle, 2324 $self->SUPER::update;
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065} 2325}
2066 2326
2067sub _draw { 2327sub _draw {
2068 my ($self) = @_; 2328 my ($self) = @_;
2069 2329
2070 $self->SUPER::_draw (); 2330 $self->SUPER::_draw ();
2071 2331
2072 my ($w, $h) = @$self{qw(w h)}; 2332 glScale $self->{w}, $self->{h};
2073 2333
2074 if ($self->{vertical}) { 2334 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2335 # draw a vertical slider like a rotated horizontal slider
2076 2336
2337 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2338 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2339 }
2082 2340
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2341 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2342 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2343
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2344 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2346
2107 # draw background 2347 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2348 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2349
2110 # draw handle 2350 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2351 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2352
2113 glDisable GL_TEXTURE_2D; 2353 glDisable GL_TEXTURE_2D;
2114} 2354}
2355
2356#############################################################################
2357
2358package CFClient::UI::ValSlider;
2359
2360our @ISA = CFClient::UI::HBox::;
2361
2362sub new {
2363 my ($class, %arg) = @_;
2364
2365 my $range = delete $arg{range};
2366
2367 my $self = $class->SUPER::new (
2368 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2369 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2370 to_value => sub { shift },
2371 from_value => sub { shift },
2372 %arg,
2373 );
2374
2375 $self->{slider}->connect (changed => sub {
2376 my ($self, $value) = @_;
2377 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2378 $self->{parent}->emit (changed => $value);
2379 });
2380
2381# $self->{entry}->connect (changed => sub {
2382# my ($self, $value) = @_;
2383# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2384# $self->{parent}->emit (changed => $value);
2385# });
2386
2387 $self->add ($self->{slider}, $self->{entry});
2388
2389 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2390
2391 $self
2392}
2393
2394sub set_range { shift->{slider}->set_range (@_) }
2395sub set_value { shift->{slider}->set_value (@_) }
2115 2396
2116############################################################################# 2397#############################################################################
2117 2398
2118package CFClient::UI::TextView; 2399package CFClient::UI::TextView;
2119 2400
… …
2149 2430
2150 $self->{fontsize} = $fontsize; 2431 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2432 $self->reflow;
2152} 2433}
2153 2434
2154sub text_height {
2155 my ($self, $text) = @_;
2156
2157 my $layout = $self->{layout};
2158
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w});
2161 $layout->set_markup ($text);
2162
2163 ($layout->size)[1]
2164}
2165
2166sub reflow {
2167 my ($self) = @_;
2168
2169 $self->{need_reflow}++;
2170 $self->update;
2171}
2172
2173sub size_allocate { 2435sub size_allocate {
2174 my ($self, $w, $h) = @_; 2436 my ($self, $w, $h) = @_;
2175 2437
2176 $self->SUPER::size_allocate ($w, $h); 2438 $self->SUPER::size_allocate ($w, $h);
2177 2439
… …
2180 $self->{layout}->set_width ($self->{children}[0]{w}); 2442 $self->{layout}->set_width ($self->{children}[0]{w});
2181 2443
2182 $self->reflow; 2444 $self->reflow;
2183} 2445}
2184 2446
2447sub text_size {
2448 my ($self, $text, $indent) = @_;
2449
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453 $layout->set_width ($self->{children}[0]{w} - $indent);
2454 $layout->set_markup ($text);
2455
2456 $layout->size
2457}
2458
2459sub reflow {
2460 my ($self) = @_;
2461
2462 $self->{need_reflow}++;
2463 $self->update;
2464}
2465
2466sub set_offset {
2467 my ($self, $offset) = @_;
2468
2469 # todo: base offset on lines or so, not on pixels
2470 $self->{children}[1]->set_value ($offset);
2471}
2472
2473sub clear {
2474 my ($self) = @_;
2475
2476 $self->{par} = [];
2477 $self->{height} = 0;
2478 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479}
2480
2185sub add_paragraph { 2481sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2482 my ($self, $color, $text, $indent) = @_;
2187 2483
2188 #TODO: intelligently "reformat" paragraph 2484 for my $line (split /\n/, $text) {
2189 2485 my ($w, $h) = $self->text_size ($line);
2190 my $height = $self->text_height ($text);
2191
2192 $self->{height} += $height; 2486 $self->{height} += $h;
2487 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2488 }
2193 2489
2194 push @{$self->{par}}, [$height, $color, $text];
2195
2196 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2490 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2197 $self->{children}[1]->update;
2198} 2491}
2199 2492
2200sub update { 2493sub update {
2201 my ($self) = @_; 2494 my ($self) = @_;
2202 2495
… …
2204 2497
2205 return unless $self->{h} > 0; 2498 return unless $self->{h} > 0;
2206 2499
2207 delete $self->{texture}; 2500 delete $self->{texture};
2208 2501
2209 $ROOT->on_refresh ($self, sub { 2502 $ROOT->on_post_alloc ($self, sub {
2503 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504
2210 if (delete $self->{need_reflow}) { 2505 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2506 my $height = 0;
2212 2507
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2508 my $layout = $self->{layout};
2509
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2214 for @{$self->{par}}; 2512 for (@{$self->{par}}) {
2513 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514 $layout->set_width ($W - $_->[3]);
2515 $layout->set_markup ($_->[4]);
2516 my ($w, $h) = $layout->size;
2517 $_->[0] = $w + $_->[3];
2518 $_->[1] = $h;
2519 }
2520
2521 $height += $_->[1];
2522 }
2215 2523
2216 $self->{height} = $height; 2524 $self->{height} = $height;
2217 2525
2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2526 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2219 2527
2220 delete $self->{texture}; 2528 delete $self->{texture};
2221 } 2529 }
2222 2530
2223 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2531 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2224 glClearColor 0, 0, 0, 0; 2532 glClearColor 0.5, 0.5, 0.5, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2533 glClear GL_COLOR_BUFFER_BIT;
2226 2534
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229
2230 my $top = int $self->{children}[1]{range}[0]; 2535 my $top = int $self->{children}[1]{range}[0];
2231 2536
2232 my $y0 = $top; 2537 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2538 my $y1 = $top + $H;
2234 2539
2235 my $y = 0; 2540 my $y = 0;
2236 2541
2237 my $layout = $self->{layout}; 2542 my $layout = $self->{layout};
2238 2543
2239 $layout->set_font ($self->{font}) if $self->{font}; 2544 $layout->set_font ($self->{font}) if $self->{font};
2240 2545
2546 glEnable GL_BLEND;
2547 #TODO# not correct in windows where rgba is forced off
2548 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2241 for my $par (@{$self->{par}}) { 2550 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2551 my $h = $par->[1];
2243 2552
2244 if ($y0 < $y + $h && $y < $y1) { 2553 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2554 $layout->set_foreground (@{ $par->[2] });
2555 $layout->set_width ($W - $par->[3]);
2246 $layout->set_markup ($par->[2]); 2556 $layout->set_markup ($par->[4]);
2247 2557
2248 my ($W, $H) = $layout->size; 2558 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2559
2560 glRasterPos $par->[3], $y - $y0;
2561 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250 } 2562 }
2251 2563
2252 $y += $h; 2564 $y += $h;
2253 } 2565 }
2254 2566
2255 glDisable GL_TEXTURE_2D; 2567 glDisable GL_BLEND;
2256 }; 2568 };
2257 }); 2569 });
2258} 2570}
2259 2571
2260sub _draw { 2572sub _draw {
2261 my ($self) = @_; 2573 my ($self) = @_;
2262 2574
2263 glEnable GL_TEXTURE_2D; 2575 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2576 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2577 glColor 1, 1, 1, 1;
2266 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2578 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2267 glDisable GL_TEXTURE_2D; 2579 glDisable GL_TEXTURE_2D;
2268 2580
2269 $self->{children}[1]->draw; 2581 $self->{children}[1]->draw;
2270 2582
2271} 2583}
… …
2320 2632
2321sub new { 2633sub new {
2322 my $class = shift; 2634 my $class = shift;
2323 2635
2324 my $self = $class->SUPER::new ( 2636 my $self = $class->SUPER::new (
2325 state => 0, 2637 state => 0,
2326 connect_activate => \&toggle_flopper, 2638 on_activate => \&toggle_flopper,
2327 @_ 2639 @_
2328 ); 2640 );
2329 2641
2330 if ($self->{state}) {
2331 $self->{state} = 0;
2332 $self->toggle_flopper;
2333 }
2334
2335 $self 2642 $self
2336} 2643}
2337 2644
2338sub toggle_flopper { 2645sub toggle_flopper {
2339 my ($self) = @_; 2646 my ($self) = @_;
2340 2647
2341 # TODO: use animation 2648 $self->{other}->toggle_visibility;
2342 if ($self->{state} = !$self->{state}) {
2343 $CFClient::UI::ROOT->add ($self->{other});
2344 $self->{other}->move ($self->coord2global (0, $self->{h}));
2345 $self->emit ("open");
2346 } else {
2347 $CFClient::UI::ROOT->remove ($self->{other});
2348 $self->emit ("close");
2349 }
2350
2351 $self->emit (changed => $self->{state});
2352} 2649}
2353 2650
2354############################################################################# 2651#############################################################################
2355 2652
2356package CFClient::UI::Tooltip; 2653package CFClient::UI::Tooltip;
… …
2369} 2666}
2370 2667
2371sub set_tooltip_from { 2668sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2669 my ($self, $widget) = @_;
2373 2670
2671 my $tooltip = $widget->{tooltip};
2672
2673 if ($ENV{CFPLUS_DEBUG} & 2) {
2674 $tooltip .= "\n\n" . (ref $widget) . "\n"
2675 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676 . "req $widget->{req_w} $widget->{req_h}\n"
2677 . "visible $widget->{visible}";
2678 }
2679
2374 $self->{label} = new CFClient::UI::Label 2680 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2681 markup => $tooltip,
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2682 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2683 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2684 fg => [0, 0, 0, 1],
2685 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2686 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2687 );
2381 $self->add ($self->{label});
2382} 2688}
2383 2689
2384sub size_request { 2690sub size_request {
2385 my ($self) = @_; 2691 my ($self) = @_;
2386 2692
… …
2393 my ($self, $w, $h) = @_; 2699 my ($self, $w, $h) = @_;
2394 2700
2395 $self->SUPER::size_allocate ($w - 4, $h - 4); 2701 $self->SUPER::size_allocate ($w - 4, $h - 4);
2396} 2702}
2397 2703
2704sub visibility_change {
2705 my ($self, $visible) = @_;
2706
2707 return unless $visible;
2708
2709 $self->{root}->on_post_alloc ("move_$self" => sub {
2710 my $widget = $self->{owner}
2711 or return;
2712
2713 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714
2715 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716 if $x + $self->{w} > $::WIDTH;
2717
2718 $self->move_abs ($x, $y);
2719 });
2720}
2721
2398sub _draw { 2722sub _draw {
2399 my ($self) = @_; 2723 my ($self) = @_;
2400 2724
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2725 glTranslate 0.375, 0.375;
2403 2726
2404 my ($w, $h) = @$self{qw(w h)}; 2727 my ($w, $h) = @$self{qw(w h)};
2405 2728
2406 glColor 1, 0.8, 0.4; 2729 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2740 glVertex 0 , $h;
2418 glVertex $w, $h; 2741 glVertex $w, $h;
2419 glVertex $w, 0; 2742 glVertex $w, 0;
2420 glEnd; 2743 glEnd;
2421 2744
2422 glPopMatrix; 2745 glTranslate 2 - 0.375, 2 - 0.375;
2423 2746
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2747 $self->SUPER::_draw;
2426} 2748}
2427 2749
2428############################################################################# 2750#############################################################################
2429 2751
… …
2434use CFClient::OpenGL; 2756use CFClient::OpenGL;
2435 2757
2436sub new { 2758sub new {
2437 my $class = shift; 2759 my $class = shift;
2438 2760
2439 $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2440 aspect => 1, 2762 aspect => 1,
2763 can_events => 0,
2441 @_, 2764 @_,
2442 ) 2765 );
2766
2767 if ($self->{anim} && $self->{animspeed}) {
2768 Scalar::Util::weaken (my $widget = $self);
2769
2770 $self->{timer} = Event->timer (
2771 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772 hard => 1,
2773 interval => $self->{animspeed},
2774 cb => sub {
2775 ++$widget->{frame};
2776 $widget->update;
2777 },
2778 );
2779 }
2780
2781 $self
2443} 2782}
2444 2783
2445sub size_request { 2784sub size_request {
2446 (32, 8) 2785 (32, 8)
2447} 2786}
2448 2787
2788sub update {
2789 my ($self) = @_;
2790
2791 return unless $self->{visible};
2792
2793 $self->SUPER::update;
2794}
2795
2449sub _draw { 2796sub _draw {
2450 my ($self) = @_; 2797 my ($self) = @_;
2451 2798
2452 return unless $::CONN;#d# manage and cache textures differently 2799 return unless $::CONN;
2800
2801 my $face;
2802
2803 if ($self->{frame}) {
2804 my $anim = $::CONN->{anim}[$self->{anim}];
2805
2806 $face = $anim->[ $self->{frame} % @$anim ]
2807 if $anim && @$anim;
2808 }
2809
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2810 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2811
2455 # TODO animation
2456 if ($tex) { 2812 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2813 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2815 glColor 1, 1, 1, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2816 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2817 glDisable GL_TEXTURE_2D;
2462 } 2818 }
2463} 2819}
2464 2820
2465############################################################################# 2821sub DESTROY {
2466
2467package CFClient::UI::InventoryItem;
2468
2469our @ISA = CFClient::UI::HBox::;
2470
2471sub new {
2472 my $class = shift;
2473
2474 my %args = @_;
2475
2476 my $item = delete $args{item};
2477
2478 my $desc = $item->{nrof} < 2
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482
2483 my $self = $class->SUPER::new (
2484 can_hover => 1,
2485 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_;
2490
2491 # todo: maybe put examine on 1? but should just be a tooltip :(
2492 if ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507 ],
2508 )->popup ($ev);
2509 }
2510
2511 1
2512 },
2513 %args
2514 );
2515
2516 $self->add (new CFClient::UI::Face
2517 can_events => 0,
2518 face => $item->{face},
2519 anim => $item->{anim},
2520 animspeed => $item->{animspeed},
2521 );
2522
2523 $self->add (new CFClient::UI::Label
2524 can_events => 0,
2525 text => $desc,
2526 );
2527
2528 $self
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Inventory;
2534
2535our @ISA = CFClient::UI::ScrolledWindow::;
2536
2537sub new {
2538 my $class = shift;
2539
2540 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox),
2542 @_,
2543 );
2544
2545 $self
2546}
2547
2548sub set_items {
2549 my ($self, $items) = @_; 2822 my ($self) = @_;
2550 2823
2551 $self->{scrolled}->clear; 2824 $self->{timer}->cancel
2552 return unless $items; 2825 if $self->{timer};
2553 2826
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2827 $self->SUPER::DESTROY;
2555
2556 $self->{real_items} = \@items;
2557
2558 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2564 }
2565
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571 ($self->{req_w}, $self->{req_h});
2572} 2828}
2573 2829
2574############################################################################# 2830#############################################################################
2575 2831
2576package CFClient::UI::Menu; 2832package CFClient::UI::Menu;
… …
2611 2867
2612# popup given the event (must be a mouse button down event currently) 2868# popup given the event (must be a mouse button down event currently)
2613sub popup { 2869sub popup {
2614 my ($self, $ev) = @_; 2870 my ($self, $ev) = @_;
2615 2871
2616 $self->emit ("popdown"); 2872 $self->_emit ("popdown");
2617 2873
2618 # maybe save $GRAB? must be careful about events... 2874 # maybe save $GRAB? must be careful about events...
2619 $GRAB = $self; 2875 $GRAB = $self;
2620 $self->{button} = $ev->{button}; 2876 $self->{button} = $ev->{button};
2621 2877
2622 $self->show; 2878 $self->show;
2623 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2879 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2624} 2880}
2625 2881
2626sub mouse_motion { 2882sub mouse_motion {
2627 my ($self, $ev, $x, $y) = @_; 2883 my ($self, $ev, $x, $y) = @_;
2628 2884
… …
2636 2892
2637 if ($ev->{button} == $self->{button}) { 2893 if ($ev->{button} == $self->{button}) {
2638 undef $GRAB; 2894 undef $GRAB;
2639 $self->hide; 2895 $self->hide;
2640 2896
2641 $self->emit ("popdown"); 2897 $self->_emit ("popdown");
2642 $self->{hover}[1]->() if $self->{hover}; 2898 $self->{hover}[1]->() if $self->{hover};
2643 } 2899 }
2644} 2900}
2645 2901
2646############################################################################# 2902#############################################################################
2647 2903
2648package CFClient::UI::Statusbox; 2904package CFClient::UI::Statusbox;
2649 2905
2650our @ISA = CFClient::UI::VBox::; 2906our @ISA = CFClient::UI::VBox::;
2907
2908sub new {
2909 my $class = shift;
2910
2911 $class->SUPER::new (
2912 fontsize => 0.8,
2913 @_,
2914 )
2915}
2651 2916
2652sub reorder { 2917sub reorder {
2653 my ($self) = @_; 2918 my ($self) = @_;
2654 my $NOW = time; 2919 my $NOW = time;
2655 2920
2656 while (my ($k, $v) = each %{ $self->{item} }) { 2921 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 2922 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 2923 }
2659 2924
2660 my @widgets; 2925 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 2926
2927 my @items = sort {
2928 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} };
2931
2662 my $count = 10 + 1; 2932 my $count = 10 + 1;
2663 for my $item (@items) { 2933 for my $item (@items) {
2664 last unless --$count; 2934 last unless --$count;
2665 2935
2666 push @widgets, $item->{label} ||= do { 2936 push @widgets, $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 2937 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 2938 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text};
2941
2669 for ($short) { 2942 for ($short) {
2670 s/^\s+//; 2943 s/^\s+//;
2671 s/\012.*//s; 2944 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 2945 }
2675 2946
2676 new CFClient::UI::Label 2947 new CFClient::UI::Label
2677 markup => $short, 2948 markup => $short,
2678 tooltip => delete $item->{tooltip}, 2949 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 2950 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 2951 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 2952 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 2953 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg},
2683 can_events => 1, 2955 can_events => 1,
2684 can_hover => 1, 2956 can_hover => 1
2685 }; 2957 };
2686 } 2958 }
2687 2959
2688 $self->clear; 2960 $self->clear;
2689 $self->SUPER::add (@widgets); 2961 $self->SUPER::add (reverse @widgets);
2690} 2962}
2691 2963
2692sub add { 2964sub add {
2693 my ($self, $text, %arg) = @_; 2965 my ($self, $text, %arg) = @_;
2694 2966
2695 my $item = { 2967 $text =~ s/^\s+//;
2696 time => time, 2968 $text =~ s/\s+$//;
2969
2970 return unless $text;
2971
2972 my $timeout = time + ((delete $arg{timeout}) || 60);
2973
2974 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975
2976 if (my $item = $self->{item}{$group}) {
2977 if ($item->{text} eq $text) {
2978 $item->{count}++;
2979 } else {
2980 $item->{count} = 1;
2981 $item->{text} = $item->{tooltip} = $text;
2982 }
2983 $item->{id} = ++$self->{id};
2984 $item->{timeout} = $timeout;
2985 delete $item->{label};
2986 } else {
2987 $self->{item}{$group} = {
2988 id => ++$self->{id},
2697 text => $text, 2989 text => $text,
2698 timeout => 60, 2990 timeout => $timeout,
2699 tooltip => $text, 2991 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 2992 fg => [0.8, 0.8, 0.8, 0.8],
2993 pri => 0,
2994 count => 1,
2702 %arg, 2995 %arg,
2996 };
2703 }; 2997 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 2998
2710 $self->reorder; 2999 $self->reorder;
2711} 3000}
2712 3001
3002sub reconfigure {
3003 my ($self) = @_;
3004
3005 delete $_->{label}
3006 for values %{ $self->{item} || {} };
3007
3008 $self->reorder;
3009 $self->SUPER::reconfigure;
3010}
3011
2713############################################################################# 3012#############################################################################
2714 3013
2715package CFClient::UI::Root; 3014package CFClient::UI::Inventory;
2716 3015
2717our @ISA = CFClient::UI::Container::; 3016our @ISA = CFClient::UI::ScrolledWindow::;
2718
2719use CFClient::OpenGL;
2720 3017
2721sub new { 3018sub new {
2722 my $class = shift; 3019 my $class = shift;
2723 3020
2724 $class->SUPER::new ( 3021 my $self = $class->SUPER::new (
3022 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2725 @_, 3023 @_,
2726 ) 3024 );
2727}
2728 3025
2729sub configure { 3026 $self
3027}
3028
3029sub set_items {
3030 my ($self, $items) = @_;
3031
3032 $self->{scrolled}->clear;
3033 return unless $items;
3034
3035 my @items = sort {
3036 ($a->{type} <=> $b->{type})
3037 or ($a->{name} cmp $b->{name})
3038 } @$items;
3039
3040 $self->{real_items} = \@items;
3041
3042 my $row = 0;
3043 for my $item (@items) {
3044 CFClient::Item::update_widgets $item;
3045
3046 $self->{scrolled}->add (0, $row, $item->{face_widget});
3047 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3048 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050 $row++;
3051 }
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::BindEditor;
3057
3058our @ISA = CFClient::UI::FancyFrame::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065 $self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069 text => "start recording",
3070 tooltip => "Start/Stops recording of actions."
3071 ."All subsequent actions after the recording started will be captured."
3072 ."The actions are displayed after the record was stopped."
3073 ."To bind the action you have to click on the 'Bind' button",
3074 on_activate => sub {
3075 unless ($self->{recording}) {
3076 $self->start;
3077 } else {
3078 $self->stop;
3079 }
3080 });
3081
3082 $vb->add (new CFClient::UI::Label text => "Actions:");
3083 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3086 $vb->add (my $hb = new CFClient::UI::HBox);
3087 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088 $hb->add (new CFClient::UI::Button
3089 text => "bind",
3090 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091 on_activate => sub {
3092 $self->ask_for_bind;
3093 });
3094
3095 $vb->add (my $hb = new CFClient::UI::HBox);
3096 $hb->add (new CFClient::UI::Button
3097 text => "ok",
3098 expand => 1,
3099 tooltip => "This closes the binding editor and saves the binding",
3100 on_activate => sub {
3101 $self->hide;
3102 $self->commit;
3103 });
3104
3105 $hb->add (new CFClient::UI::Button
3106 text => "cancel",
3107 expand => 1,
3108 tooltip => "This closes the binding editor without saving",
3109 on_activate => sub {
3110 $self->hide;
3111 $self->{binding_cancel}->()
3112 if $self->{binding_cancel};
3113 });
3114
3115 $self->update_binding_widgets;
3116
3117 $self
3118}
3119
3120sub commit {
3121 my ($self) = @_;
3122 my ($mod, $sym, $cmds) = $self->get_binding;
3123 if ($sym != 0 && @$cmds > 0) {
3124 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125 ."'. Don't forget 'Save Config'!");
3126 $self->{binding_change}->($mod, $sym, $cmds)
3127 if $self->{binding_change};
3128 } else {
3129 $::STATUSBOX->add ("No action bound, no key or action specified!");
3130 $self->{binding_cancel}->()
3131 if $self->{binding_cancel};
3132 }
3133}
3134
3135sub start {
3136 my ($self) = @_;
3137
3138 $self->{rec_btn}->set_text ("stop recording");
3139 $self->{recording} = 1;
3140 $self->clear_command_list;
3141 $::CONN->start_record if $::CONN;
3142}
3143
3144sub stop {
3145 my ($self) = @_;
3146
3147 $self->{rec_btn}->set_text ("start recording");
3148 $self->{recording} = 0;
3149
3150 my $rec;
3151 $rec = $::CONN->stop_record if $::CONN;
3152 return unless ref $rec eq 'ARRAY';
3153 $self->set_command_list ($rec);
3154}
3155
3156# if $commit is true, the binding will be set after the user entered a key combo
3157sub ask_for_bind {
3158 my ($self, $commit) = @_;
3159
3160 CFClient::Binder::open_binding_dialog (sub {
3161 my ($mod, $sym) = @_;
3162 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163 $self->update_binding_widgets;
3164 $self->commit if $commit;
3165 });
3166}
3167
3168# $mod and $sym are the modifiers and key symbol
3169# $cmds is a array ref of strings (the commands)
3170# $cb is the callback that is executed on OK
3171# $ccb is the callback that is executed on CANCEL and
3172# when the binding was unsuccessful on OK
3173sub set_binding {
2730 my ($self, $x, $y, $w, $h) = @_; 3174 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2731 3175
2732 $self->{w} = $w; 3176 $self->clear_command_list;
2733 $self->{h} = $h; 3177 $self->{recording} = 0;
2734} 3178 $self->{rec_btn}->set_text ("start recording");
2735 3179
2736sub check_size { 3180 $self->{binding} = [$mod, $sym];
3181 $self->{commands} = $cmds;
3182
3183 $self->{binding_change} = $cb;
3184 $self->{binding_cancel} = $ccb;
3185
3186 $self->update_binding_widgets;
3187}
3188
3189# this is a shortcut method that asks for a binding
3190# and then just binds it.
3191sub do_quick_binding {
2737 my ($self) = @_; 3192 my ($self, $cmds) = @_;
3193 $self->set_binding (undef, undef, $cmds, sub {
3194 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195 });
3196 $self->ask_for_bind (1);
3197}
2738 3198
2739 $self->size_allocate ($self->{w}, $self->{h}) 3199sub update_binding_widgets {
2740 if $self->{w}; 3200 my ($self) = @_;
3201 my ($mod, $sym, $cmds) = $self->get_binding;
3202 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203 $self->set_command_list ($cmds);
3204}
3205
3206sub get_binding {
3207 my ($self) = @_;
3208 return (
3209 $self->{binding}->[0],
3210 $self->{binding}->[1],
3211 [ grep { defined $_ } @{$self->{commands}} ]
3212 );
3213}
3214
3215sub clear_command_list {
3216 my ($self) = @_;
3217 $self->{cmdbox}->clear ();
3218}
3219
3220sub set_command_list {
3221 my ($self, $cmds) = @_;
3222
3223 $self->{cmdbox}->clear ();
3224 $self->{commands} = $cmds;
3225
3226 my $idx = 0;
3227
3228 for (@$cmds) {
3229 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231 my $i = $idx;
3232 $hb->add (new CFClient::UI::Label text => $_);
3233 $hb->add (new CFClient::UI::Button
3234 text => "delete",
3235 tooltip => "Deletes the action from the record",
3236 on_activate => sub {
3237 $self->{cmdbox}->remove ($hb);
3238 $cmds->[$i] = undef;
3239 });
3240
3241
3242 $idx++
3243 }
3244}
3245
3246#############################################################################
3247
3248package CFClient::UI::SpellList;
3249
3250our @ISA = CFClient::UI::FancyFrame::;
3251
3252sub new {
3253 my $class = shift;
3254
3255 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257 $self->add (new CFClient::UI::ScrolledWindow
3258 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260 $self;
3261}
3262
3263# XXX: Do sorting? Argl...
3264sub add_spell {
3265 my ($self, $spell) = @_;
3266 $self->{spells}->{$spell->{name}} = $spell;
3267
3268 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269 face => $spell->{face},
3270 can_hover => 1,
3271 can_events => 1,
3272 tooltip => $spell->{message});
3273
3274 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275 text => $spell->{name},
3276 can_hover => 1,
3277 can_events => 1,
3278 tooltip => $spell->{message},
3279 expand => 1);
3280
3281 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284 expand => 1);
3285
3286 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287 text => "bind to key",
3288 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289}
3290
3291sub rebuild_spell_list {
3292 my ($self) = @_;
3293 $self->{tbl_idx} = 0;
3294 $self->add_spell ($_) for values %{$self->{spells}};
3295}
3296
3297sub remove_spell {
3298 my ($self, $spell) = @_;
3299 delete $self->{spells}->{$spell->{name}};
3300 $self->rebuild_spell_list;
3301}
3302
3303#############################################################################
3304
3305package CFClient::UI::Root;
3306
3307our @ISA = CFClient::UI::Container::;
3308
3309use CFClient::OpenGL;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3315 visible => 1,
3316 @_,
3317 );
3318
3319 Scalar::Util::weaken ($self->{root} = $self);
3320
3321 $self
2741} 3322}
2742 3323
2743sub size_request { 3324sub size_request {
2744 my ($self) = @_; 3325 my ($self) = @_;
2745 3326
2746 ($self->{w}, $self->{h}) 3327 ($self->{w}, $self->{h})
3328}
3329
3330sub _to_pixel {
3331 my ($coord, $size, $max) = @_;
3332
3333 $coord =
3334 $coord eq "center" ? ($max - $size) * 0.5
3335 : $coord eq "max" ? $max
3336 : $coord;
3337
3338 $coord = 0 if $coord < 0;
3339 $coord = $max - $size if $coord > $max - $size;
3340
3341 int $coord + 0.5
2747} 3342}
2748 3343
2749sub size_allocate { 3344sub size_allocate {
2750 my ($self, $w, $h) = @_; 3345 my ($self, $w, $h) = @_;
2751 3346
2752 my $old_w = $self->{old_w};
2753 my $old_h = $self->{old_h};
2754
2755 if ($old_w && $old_h) {
2756 for my $child ($self->children) {
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767
2768 for my $child ($self->children) { 3347 for my $child ($self->children) {
2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770 3349
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3350 $X = $child->{force_x} if exists $child->{force_x};
2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3351 $Y = $child->{force_y} if exists $child->{force_y};
3352
3353 $X = _to_pixel $X, $W, $self->{w};
3354 $Y = _to_pixel $Y, $H, $self->{h};
3355
2773 $child->configure ($X, $Y, $W, $H); 3356 $child->configure ($X, $Y, $W, $H);
2774 } 3357 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 3358}
2779 3359
2780sub coord2local { 3360sub coord2local {
2781 my ($self, $x, $y) = @_; 3361 my ($self, $x, $y) = @_;
2782 3362
… …
2790} 3370}
2791 3371
2792sub update { 3372sub update {
2793 my ($self) = @_; 3373 my ($self) = @_;
2794 3374
2795 $self->check_size;
2796 $::WANT_REFRESH++; 3375 $::WANT_REFRESH++;
2797} 3376}
2798 3377
2799sub add { 3378sub add {
2800 my ($self, $child) = @_; 3379 my ($self, @children) = @_;
2801 3380
2802 # integerise window positions 3381 $_->{is_toplevel} = 1
2803 $child->{x} = int $child->{x}; 3382 for @children;
2804 $child->{y} = int $child->{y};
2805 3383
2806 $self->SUPER::add ($child); 3384 $self->SUPER::add (@children);
3385}
3386
3387sub remove {
3388 my ($self, @children) = @_;
3389
3390 $self->SUPER::remove (@children);
3391
3392 delete $self->{is_toplevel}
3393 for @children;
3394
3395 while (@children) {
3396 my $w = pop @children;
3397 push @children, $w->children;
3398 $w->set_invisible;
3399 }
2807} 3400}
2808 3401
2809sub on_refresh { 3402sub on_refresh {
2810 my ($self, $id, $cb) = @_; 3403 my ($self, $id, $cb) = @_;
2811 3404
2812 $self->{refresh_hook}{$id} = $cb; 3405 $self->{refresh_hook}{$id} = $cb;
2813} 3406}
2814 3407
3408sub on_post_alloc {
3409 my ($self, $id, $cb) = @_;
3410
3411 $self->{post_alloc_hook}{$id} = $cb;
3412}
3413
2815sub draw { 3414sub draw {
2816 my ($self) = @_; 3415 my ($self) = @_;
2817
2818 if ($self->{check_size}) {
2819 my @queue = ([], []);
2820
2821 for (;;) {
2822 if ($self->{check_size}) {
2823 # heuristic: check containers last
2824 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2825 for values %{delete $self->{check_size}}
2826 }
2827
2828 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2829
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request;
2833
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836
2837 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h;
2839
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2841
2842 $widget->{parent}->check_size
2843 if $widget->{parent};
2844 }
2845 }
2846 }
2847
2848 while ($self->{size_alloc}) {
2849 for (values %{delete $self->{size_alloc}}) {
2850 my ($widget, $w, $h) = @$_;
2851
2852 $w = 0 if $w < 0;
2853 $h = 0 if $h < 0;
2854
2855 $widget->{w} = $w;
2856 $widget->{h} = $h;
2857 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h);
2859 }
2860 }
2861 3416
2862 while ($self->{refresh_hook}) { 3417 while ($self->{refresh_hook}) {
2863 $_->() 3418 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3419 for values %{delete $self->{refresh_hook}};
2865 } 3420 }
2866 3421
3422 if ($self->{realloc}) {
3423 my %queue;
3424 my @queue;
3425 my $widget;
3426
3427 outer:
3428 while () {
3429 if (my $realloc = delete $self->{realloc}) {
3430 for $widget (values %$realloc) {
3431 $widget->{visible} or next; # do not resize invisible widgets
3432
3433 $queue{$widget+0}++ and next; # duplicates are common
3434
3435 push @{ $queue[$widget->{visible}] }, $widget;
3436 }
3437 }
3438
3439 while () {
3440 @queue or last outer;
3441
3442 $widget = pop @{ $queue[-1] || [] }
3443 and last;
3444
3445 pop @queue;
3446 }
3447
3448 delete $queue{$widget+0};
3449
3450 my ($w, $h) = $widget->size_request;
3451
3452 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3454
3455 $w = $widget->{force_w} if exists $widget->{force_w};
3456 $h = $widget->{force_h} if exists $widget->{force_h};
3457
3458 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3459 || delete $widget->{force_realloc}) {
3460 $widget->{req_w} = $w;
3461 $widget->{req_h} = $h;
3462
3463 $self->{size_alloc}{$widget+0} = $widget;
3464
3465 if (my $parent = $widget->{parent}) {
3466 $self->{realloc}{$parent+0} = $parent
3467 unless $queue{$parent+0};
3468
3469 $parent->{force_size_alloc} = 1;
3470 $self->{size_alloc}{$parent+0} = $parent;
3471 }
3472 }
3473
3474 delete $self->{realloc}{$widget+0};
3475 }
3476 }
3477
3478 while (my $size_alloc = delete $self->{size_alloc}) {
3479 my @queue = sort { $b->{visible} <=> $a->{visible} }
3480 values %$size_alloc;
3481
3482 while () {
3483 my $widget = pop @queue || last;
3484
3485 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3486
3487 $w = 0 if $w < 0;
3488 $h = 0 if $h < 0;
3489
3490 $w = int $w + 0.5;
3491 $h = int $h + 0.5;
3492
3493 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3494 $widget->{old_w} = $widget->{w};
3495 $widget->{old_h} = $widget->{h};
3496
3497 $widget->{w} = $w;
3498 $widget->{h} = $h;
3499
3500 $widget->emit (size_allocate => $w, $h);
3501 }
3502 }
3503 }
3504
3505 while ($self->{post_alloc_hook}) {
3506 $_->()
3507 for values %{delete $self->{post_alloc_hook}};
3508 }
3509
3510
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3511 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3512 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3513 glClear GL_COLOR_BUFFER_BIT;
2870 3514
2871 glMatrixMode GL_PROJECTION; 3515 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3516 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3517 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3518 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3519 glLoadIdentity;
2876 3520
3521 {
3522 package CFClient::UI::Base;
3523
3524 ($draw_x, $draw_y, $draw_w, $draw_h) =
3525 (0, 0, $self->{w}, $self->{h});
3526 }
3527
2877 $self->_draw; 3528 $self->_draw;
2878} 3529}
2879 3530
2880############################################################################# 3531#############################################################################
2881 3532
2882package CFClient::UI; 3533package CFClient::UI;
2883 3534
2884$ROOT = new CFClient::UI::Root; 3535$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3536$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3537
28871 35381
2888 3539

Diff Legend

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