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

Diff Legend

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