ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

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

Diff Legend

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