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

Diff Legend

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