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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1166 $self->realloc;
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; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
982 } 1186 1
983} 1187}
984 1188
985sub button_up { 1189sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
987 1191
988 delete $self->{motion}; 1192 !!delete $self->{motion}
989} 1193}
990 1194
991sub mouse_motion { 1195sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
993 1197
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
995} 1201}
996 1202
997sub _draw { 1203sub _draw {
998 my ($self) = @_; 1204 my ($self) = @_;
999 1205
1206 my $child = $self->{children}[0];
1207
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1210
1003 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1213
1006 my $border = $self->border; 1214 my $border = $self->border;
1007 1215
1008 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1221
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1016 1224
1017 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1228 $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); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1230 }
1028 1231
1029 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1030 1233
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1034} 1240}
1035 1241
1036############################################################################# 1242#############################################################################
1037 1243
1038package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1046sub new { 1252sub new {
1047 my $class = shift; 1253 my $class = shift;
1048 1254
1049 $class->SUPER::new ( 1255 $class->SUPER::new (
1050 col_expand => [], 1256 col_expand => [],
1051 @_ 1257 @_,
1052 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1263}
1054 1264
1055sub add { 1265sub add {
1056 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1057 1267
1058 $child->set_parent ($self); 1268 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1060 1270
1061 $child->check_size; 1271 $self->realloc;
1062} 1272}
1063 1273
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1275sub clear {
1070 my ($self) = @_; 1276 my ($self) = @_;
1071 1277
1072 my @children = $self->children; 1278 my @children = $self->children;
1073 delete $self->{children}; 1279 delete $self->{children};
… …
1075 for (@children) { 1281 for (@children) {
1076 delete $_->{parent}; 1282 delete $_->{parent};
1077 $_->hide; 1283 $_->hide;
1078 } 1284 }
1079 1285
1080 $self->update; 1286 $self->realloc;
1081} 1287}
1082 1288
1083sub get_wh { 1289sub get_wh {
1084 my ($self) = @_; 1290 my ($self) = @_;
1085 1291
… …
1116sub size_allocate { 1322sub size_allocate {
1117 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1118 1324
1119 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1120 1326
1121 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1123 1329
1124 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1387 }
1182} 1388}
1183 1389
1184############################################################################# 1390#############################################################################
1185 1391
1186package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1393
1190our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1191 1395
1192sub size_request { 1396sub size_request {
1193 my ($self) = @_; 1397 my ($self) = @_;
1194 1398
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1196 1400 ? (
1197 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1403 )
1200 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1201} 1408}
1202 1409
1203sub size_allocate { 1410sub size_allocate {
1204 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1205 1412
1206 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1414 my $children = $self->{children};
1209 1415
1210 my @h = map $_->{req_w}, @$children; 1416 my @req;
1211 1417
1212 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1213 1419 @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 { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1433 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 } 1434 }
1228 } 1435 }
1229 1436
1230 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1231 1438
1232 my $y = 0; 1439 my $pos = 0;
1233 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1443
1238 $y += $h; 1444 $pos += $alloc;
1239 } 1445 }
1240 1446
1241 1 1447 1
1242} 1448}
1243 1449
1244############################################################################# 1450#############################################################################
1245 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1246package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1247 1468
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1251 1470
1252sub size_request { 1471sub new {
1253 my ($self) = @_; 1472 my $class = shift;
1254 1473
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1256 1475 vertical => 1,
1257 ( 1476 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1477 )
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} 1478}
1301 1479
1302############################################################################# 1480#############################################################################
1303 1481
1304package CFClient::UI::Label; 1482package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1499 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1323 fontsize => 1, 1501 fontsize => 1,
1324 align => -1, 1502 align => -1,
1325 valign => -1, 1503 valign => -1,
1326 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1327 can_events => 0, 1506 can_events => 0,
1328 %arg 1507 %arg
1329 ); 1508 );
1330 1509
1331 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1367 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1368 1547
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1371 1550
1551 $self->realloc;
1372 $self->update; 1552 $self->update;
1373 $self->check_size;
1374} 1553}
1375 1554
1376sub set_markup { 1555sub set_markup {
1377 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1378 1557
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1562
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1386 1565
1566 $self->realloc;
1387 $self->update; 1567 $self->update;
1388 $self->check_size;
1389} 1568}
1390 1569
1391sub size_request { 1570sub size_request {
1392 my ($self) = @_; 1571 my ($self) = @_;
1393 1572
… …
1407 1586
1408 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1410 } 1589 }
1411 1590
1412 ( 1591 ($w, $h)
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1592}
1417 1593
1418sub size_allocate { 1594sub size_allocate {
1419 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1420 1596
1597 delete $self->{ox};
1598
1421 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1601}
1423 1602
1424sub set_fontsize { 1603sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1426 1605
1427 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1607 delete $self->{texture};
1429 1608
1430 $self->update; 1609 $self->realloc;
1431 $self->check_size;
1432} 1610}
1433 1611
1434sub _draw { 1612sub _draw {
1435 my ($self) = @_; 1613 my ($self) = @_;
1436 1614
… …
1442 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1624
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1448 1627
1628 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1452 1632
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1636 };
1459 1637
1460 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1640
… …
1488 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1489 can_hover => 1, 1667 can_hover => 1,
1490 can_focus => 1, 1668 can_focus => 1,
1491 valign => 0, 1669 valign => 0,
1492 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1493 @_ 1672 @_
1494 ) 1673 )
1495} 1674}
1496 1675
1497sub _set_text { 1676sub _set_text {
… …
1499 1678
1500 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1501 1680
1502 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1503 1682
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1684 $self->{text} = $text;
1508 1685
1509 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1511 1688
1512 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1513} 1691}
1514 1692
1515sub set_text { 1693sub set_text {
1516 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1517 1695
1518 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1697 $self->_set_text ($text);
1520 $self->update; 1698
1521 $self->check_size; 1699 $self->realloc;
1522} 1700}
1523 1701
1524sub get_text { 1702sub get_text {
1525 $_[0]{text} 1703 $_[0]{text}
1526} 1704}
… …
1529 my ($self) = @_; 1707 my ($self) = @_;
1530 1708
1531 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1532 1710
1533 ($w + 1, $h) # add 1 for cursor 1711 ($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} 1712}
1541 1713
1542sub key_down { 1714sub key_down {
1543 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1544 1716
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1736 $self->_emit ('escape');
1565 } elsif ($uni) { 1737 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1567 } 1741 }
1568 1742
1569 $self->_set_text ($text); 1743 $self->_set_text ($text);
1570 $self->update; 1744
1571 $self->check_size; 1745 $self->realloc;
1746
1747 1
1572} 1748}
1573 1749
1574sub focus_in { 1750sub focus_in {
1575 my ($self) = @_; 1751 my ($self) = @_;
1576 1752
… …
1591 utf8::encode $text; 1767 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1593 1769
1594 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1595 $self->update; 1771 $self->update;
1772
1773 1
1596} 1774}
1597 1775
1598sub mouse_motion { 1776sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1601} 1781}
1602 1782
1603sub _draw { 1783sub _draw {
1604 my ($self) = @_; 1784 my ($self) = @_;
1605 1785
… …
1656 if ($sym == 13) { 1836 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1662 $self->update; 1842 $self->update;
1663 1843
1664 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1862 } else {
1683 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1684 } 1864 }
1685 1865
1686 } else { 1866 } else {
1687 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1688 } 1870 1
1689
1690} 1871}
1691 1872
1692############################################################################# 1873#############################################################################
1693 1874
1694package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1703 1884
1704sub new { 1885sub new {
1705 my $class = shift; 1886 my $class = shift;
1706 1887
1707 $class->SUPER::new ( 1888 $class->SUPER::new (
1708 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1709 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1711 can_hover => 1, 1893 can_hover => 1,
1712 align => 0, 1894 align => 0,
1713 valign => 0, 1895 valign => 0,
1714 can_events => 1, 1896 can_events => 1,
1715 @_ 1897 @_
1716 ) 1898 )
1717} 1899}
1718 1900
1901sub activate { }
1902
1719sub button_up { 1903sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1721 1905
1906 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1909
1725 } 1910 1
1726} 1911}
1727 1912
1728sub _draw { 1913sub _draw {
1729 my ($self) = @_; 1914 my ($self) = @_;
1730 1915
… …
1759 1944
1760sub new { 1945sub new {
1761 my $class = shift; 1946 my $class = shift;
1762 1947
1763 $class->SUPER::new ( 1948 $class->SUPER::new (
1764 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1765 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1955 state => 0,
… …
1773} 1959}
1774 1960
1775sub size_request { 1961sub size_request {
1776 my ($self) = @_; 1962 my ($self) = @_;
1777 1963
1778 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1779} 1965}
1780 1966
1781sub button_down { 1967sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1783 1969
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1788 } 1978 1
1789} 1979}
1790 1980
1791sub _draw { 1981sub _draw {
1792 my ($self) = @_; 1982 my ($self) = @_;
1793 1983
1794 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1795 1985
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 1987
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 1991
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 1993
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 1995
… …
2067 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2075 vertical => 0, 2267 vertical => 0,
2076 can_hover => 1, 2268 can_hover => 1,
2077 inner_pad => 0.02, 2269 inner_pad => 0.02,
2078 @_ 2270 @_
2079 ); 2271 );
… …
2082 $self->update; 2274 $self->update;
2083 2275
2084 $self 2276 $self
2085} 2277}
2086 2278
2279sub changed { }
2280
2281sub set_range {
2282 my ($self, $range) = @_;
2283
2284 ($range, $self->{range}) = ($self->{range}, $range);
2285
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2288}
2289
2087sub set_value { 2290sub set_value {
2088 my ($self, $value) = @_; 2291 my ($self, $value) = @_;
2089 2292
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2293 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2294
2092 $hi = $lo + 1 if $hi <= $lo; 2295 $hi = $lo + 1 if $hi <= $lo;
2093 2296
2297 $page = $hi - $lo if $page > $hi - $lo;
2298
2094 $value = $lo if $value < $lo; 2299 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2300 $value = $hi - $page if $value > $hi - $page;
2096 2301
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2302 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2303 if $unit;
2099 2304
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2306
2104 if ($value != $old_value) { 2307 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2308 $self->_emit (changed => $value);
2106 $self->update; 2309 $self->update;
2107 } 2310 }
2108} 2311}
2109 2312
2110sub size_request { 2313sub size_request {
2111 my ($self) = @_; 2314 my ($self) = @_;
2112 2315
2113 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2317}
2118 2318
2119sub button_down { 2319sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2121 2321
2122 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2323
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325
2123 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2124} 2327}
2125 2328
2126sub mouse_motion { 2329sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2128 2331
2129 if ($GRAB == $self) { 2332 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2334
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2336
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2338
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2137 } 2344 1
2138} 2345}
2139 2346
2140sub update { 2347sub update {
2141 my ($self) = @_; 2348 my ($self) = @_;
2142 2349
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2144 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2145 2359
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
2147 2362
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2364
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2365 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2367
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2368 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2369 $value = $value * $self->{scale} + $self->{offset};
2154 2370
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; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2372 $self->{knob_w} = $knob_w;
2162 }); 2373 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2374
2170 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2171 2376
2172 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2173 2378
… …
2190 # draw handle 2395 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2396 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2397
2193 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
2194} 2399}
2400
2401#############################################################################
2402
2403package CFClient::UI::ValSlider;
2404
2405our @ISA = CFClient::UI::HBox::;
2406
2407sub new {
2408 my ($class, %arg) = @_;
2409
2410 my $range = delete $arg{range};
2411
2412 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift },
2416 from_value => sub { shift },
2417 %arg,
2418 );
2419
2420 $self->{slider}->connect (changed => sub {
2421 my ($self, $value) = @_;
2422 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2423 $self->{parent}->emit (changed => $value);
2424 });
2425
2426# $self->{entry}->connect (changed => sub {
2427# my ($self, $value) = @_;
2428# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2429# $self->{parent}->emit (changed => $value);
2430# });
2431
2432 $self->add ($self->{slider}, $self->{entry});
2433
2434 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2435
2436 $self
2437}
2438
2439sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) }
2195 2441
2196############################################################################# 2442#############################################################################
2197 2443
2198package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
2199 2445
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2488
2243 $self->reflow; 2489 $self->reflow;
2244} 2490}
2245 2491
2246sub text_height { 2492sub text_size {
2247 my ($self, $text, $indent) = @_; 2493 my ($self, $text, $indent) = @_;
2248 2494
2249 my $layout = $self->{layout}; 2495 my $layout = $self->{layout};
2250 2496
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2498 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2499 $layout->set_markup ($text);
2254 2500
2255 ($layout->size)[1] 2501 $layout->size
2256} 2502}
2257 2503
2258sub reflow { 2504sub reflow {
2259 my ($self) = @_; 2505 my ($self) = @_;
2260 2506
2261 $self->{need_reflow}++; 2507 $self->{need_reflow}++;
2262 $self->update; 2508 $self->update;
2263} 2509}
2264 2510
2511sub set_offset {
2512 my ($self, $offset) = @_;
2513
2514 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset);
2516}
2517
2518sub clear {
2519 my ($self) = @_;
2520
2521 $self->{par} = [];
2522 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524}
2525
2265sub add_paragraph { 2526sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2527 my ($self, $color, $text, $indent) = @_;
2267 2528
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2529 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2530 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2531 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2533 }
2275 2534
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2536}
2279 2537
2280sub update { 2538sub update {
2281 my ($self) = @_; 2539 my ($self) = @_;
2282 2540
… …
2285 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
2286 2544
2287 delete $self->{texture}; 2545 delete $self->{texture};
2288 2546
2289 $ROOT->on_post_alloc ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
2290 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2551 my $height = 0;
2292 2552
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2294 for @{$self->{par}}; 2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2295 2568
2296 $self->{height} = $height; 2569 $self->{height} = $height;
2297 2570
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2572
2301 delete $self->{texture}; 2573 delete $self->{texture};
2302 } 2574 }
2303 2575
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2577 glClearColor 0.5, 0.5, 0.5, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
2307 2579
2308 my $top = int $self->{children}[1]{range}[0]; 2580 my $top = int $self->{children}[1]{range}[0];
2309 2581
2310 my $y0 = $top; 2582 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2583 my $y1 = $top + $H;
2312 2584
2313 my $y = 0; 2585 my $y = 0;
2314 2586
2315 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2316 2588
2317 $layout->set_font ($self->{font}) if $self->{font}; 2589 $layout->set_font ($self->{font}) if $self->{font};
2318 2590
2319 glEnable GL_BLEND; 2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2594
2322 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2596 my $h = $par->[1];
2324 2597
2325 if ($y0 < $y + $h && $y < $y1) { 2598 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2599 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2600 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2601 $layout->set_markup ($par->[4]);
2329 2602
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2604
2332 glRasterPos $par->[2], $y - $y0; 2605 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2607 }
2335 2608
2336 $y += $h; 2609 $y += $h;
2337 } 2610 }
… …
2404 2677
2405sub new { 2678sub new {
2406 my $class = shift; 2679 my $class = shift;
2407 2680
2408 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2409 state => 0, 2682 state => 0,
2410 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2411 @_ 2684 @_
2412 ); 2685 );
2413 2686
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2687 $self
2420} 2688}
2421 2689
2422sub toggle_flopper { 2690sub toggle_flopper {
2423 my ($self) = @_; 2691 my ($self) = @_;
2424 2692
2425 # TODO: use animation 2693 $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} 2694}
2437 2695
2438############################################################################# 2696#############################################################################
2439 2697
2440package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2453} 2711}
2454 2712
2455sub set_tooltip_from { 2713sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2457 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2458 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2728 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2730 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2742
2476sub size_allocate { 2743sub size_allocate {
2477 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2478 2745
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2480} 2765}
2481 2766
2482sub _draw { 2767sub _draw {
2483 my ($self) = @_; 2768 my ($self) = @_;
2484 2769
… …
2501 glVertex $w, $h; 2786 glVertex $w, $h;
2502 glVertex $w, 0; 2787 glVertex $w, 0;
2503 glEnd; 2788 glEnd;
2504 2789
2505 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2506 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2507} 2793}
2508 2794
2509############################################################################# 2795#############################################################################
2510 2796
… …
2516 2802
2517sub new { 2803sub new {
2518 my $class = shift; 2804 my $class = shift;
2519 2805
2520 my $self = $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2521 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2522 @_, 2809 @_,
2523 ); 2810 );
2524 2811
2525 if ($self->{anim} && $self->{animspeed}) { 2812 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2813 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2839}
2553 2840
2554sub _draw { 2841sub _draw {
2555 my ($self) = @_; 2842 my ($self) = @_;
2556 2843
2557 return unless $::CONN;#d# manage and cache textures differently 2844 return unless $::CONN;
2558 2845
2559 my $face; 2846 my $face;
2560 2847
2561 if ($self->{frame}) { 2848 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2849 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2585 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2586} 2873}
2587 2874
2588############################################################################# 2875#############################################################################
2589 2876
2590package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2591 2878
2592our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2593 2880
2594sub _item_to_desc { 2881# 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 - examine\nshift+leftclick - move/pickup/drop\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->{mod} & CFClient::KMOD_SHIFT) && $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} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750 2882
2751############################################################################# 2883#############################################################################
2752 2884
2753package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2754 2886
… …
2788 2920
2789# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2790sub popup { 2922sub popup {
2791 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2792 2924
2793 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2794 2926
2795 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 2928 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2798 2930
2799 $self->show; 2931 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801} 2933}
2802 2934
2803sub mouse_motion { 2935sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2805 2937
2806 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2809} 2943}
2810 2944
2811sub button_up { 2945sub button_up {
2812 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2813 2947
2814 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 2949 undef $GRAB;
2816 $self->hide; 2950 $self->hide;
2817 2951
2818 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2820 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2821} 3067}
2822 3068
2823############################################################################# 3069#############################################################################
2824 3070
2825package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2885sub add { 3131sub add {
2886 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2887 3133
2888 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2890 3138
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2892 3140
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3142
… …
2928 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
2929} 3177}
2930 3178
2931############################################################################# 3179#############################################################################
2932 3180
2933package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
2934 3182
2935our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 3184
2939sub new { 3185sub new {
2940 my $class = shift; 3186 my $class = shift;
2941 3187
2942 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
2943 @_, 3430 @_,
2944 ) 3431 )
2945} 3432}
2946 3433
2947sub configure { 3434# XXX: Do sorting? Argl...
2948 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
2949
2950 $self->{w} = $w;
2951 $self->{h} = $h;
2952}
2953
2954sub check_size {
2955 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
2956 3438
2957 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2958 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
2959} 3493}
2960 3494
2961sub size_request { 3495sub size_request {
2962 my ($self) = @_; 3496 my ($self) = @_;
2963 3497
2964 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
2965} 3513}
2966 3514
2967sub size_allocate { 3515sub size_allocate {
2968 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2969 3517
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3518 for my $child ($self->children) {
2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978 3520
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
2981 3523
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3525 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3526
2988 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
2989 } 3528 }
2990} 3529}
2991 3530
… …
3002} 3541}
3003 3542
3004sub update { 3543sub update {
3005 my ($self) = @_; 3544 my ($self) = @_;
3006 3545
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
3009} 3547}
3010 3548
3011sub add { 3549sub add {
3012 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
3013 3551
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3552 $_->{is_toplevel} = 1
3016 3553 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3554
3022 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3023 3565
3024 while (@children) { 3566 while (@children) {
3025 my $w = pop @children; 3567 my $w = pop @children;
3026 push @children, $w->children; 3568 push @children, $w->children;
3027 $w->{visible} = 1; 3569 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3570 }
3041} 3571}
3042 3572
3043sub on_refresh { 3573sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
3059 $_->() 3589 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3061 } 3591 }
3062 3592
3063 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
3064 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
3065 3597
3066 for (;;) { 3598 outer:
3067 if ($self->{check_size}) { 3599 while () {
3068 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
3070 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3071 } 3608 }
3072 3609
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
3074 3612
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3614 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3083 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3085 3633
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
3087 3635
3088 $widget->{parent}->check_size
3089 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3090 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3091 } 3646 }
3092 } 3647 }
3093 3648
3094 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3097 3657
3098 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3100 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3101 $widget->{w} = $w; 3668 $widget->{w} = $w;
3102 $widget->{h} = $h; 3669 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3670
3104 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3105 } 3673 }
3106 } 3674 }
3107 3675
3108 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3109 $_->() 3677 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3111 } 3679 }
3680
3112 3681
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3116 3685
… …
3118 glLoadIdentity; 3687 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3690 glLoadIdentity;
3122 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3123 $self->_draw; 3699 $self->_draw;
3124} 3700}
3125 3701
3126############################################################################# 3702#############################################################################
3127 3703

Diff Legend

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