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

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

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

Diff Legend

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