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

Diff Legend

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