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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 2006 UTC

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

Diff Legend

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