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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines