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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.415 by elmex, Mon Jul 23 18:13:33 2007 UTC

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

Diff Legend

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