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.193 by root, Wed May 10 21:12:26 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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