ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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