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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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