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

Diff Legend

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