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

Diff Legend

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