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

Diff Legend

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