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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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