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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 2007 UTC

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

Diff Legend

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