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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

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

Diff Legend

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