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.195 by root, Thu May 11 23:54:31 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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