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

Diff Legend

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