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

Diff Legend

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