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.163 by root, Mon Apr 24 06:40:29 2006 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

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

Diff Legend

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