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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 2007 UTC

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

Diff Legend

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