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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines