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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

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

Diff Legend

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