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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

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

Diff Legend

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