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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

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

Diff Legend

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