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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 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;
923 }
696 }; 924 };
697} 925}
698 926
699sub _draw { 927sub _draw {
700 my ($self) = @_; 928 my ($self) = @_;
701
702 my ($w, $h) = ($self->w, $self->h);
703 929
704 my $tex = $self->{texture} 930 my $tex = $self->{texture}
705 or return; 931 or return;
706 932
707 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1; 935 glColor 0, 0, 0, 1;
710 936
711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
712 938
713 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
714} 940}
715 941
716############################################################################# 942#############################################################################
717 943
718package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
719 945
946use List::Util qw(min max);
947
720our @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}
721 959
722sub size_request { 960sub size_request {
723 my ($self) = @_; 961 my ($self) = @_;
724 962
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 964
728 @$self{qw(child_w child_h)} 965 $w = 1 if $self->{scroll_x};
729} 966 $h = 1 if $self->{scroll_y};
730 967
968 ($w, $h)
969}
970
731sub size_allocate { 971sub invoke_size_allocate {
732 my ($self, $w, $h) = @_; 972 my ($self, $w, $h) = @_;
733 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);
734 $self->update; 980 $self->update;
981
982 1
735} 983}
736 984
737sub set_offset { 985sub set_offset {
738 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
739 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}) {
740 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
741 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
742 994
995 $self->emit (changed => $x, $y);
743 $self->update; 996 $self->update;
997 }
744} 998}
745 999
746# 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
747sub coord2local { 1001sub coord2local {
748 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
763 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
764 1018
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) { 1021 ) {
768 $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})
769 } else { 1023 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
771 } 1025 }
772} 1026}
773 1027
774sub _render { 1028sub _render {
775 my ($self) = @_; 1029 my ($self) = @_;
776 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
777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
778 1035
779 $self->SUPER::_render; 1036 $self->SUPER::_render;
780} 1037}
781 1038
782############################################################################# 1039#############################################################################
783 1040
784package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
785 1042
786our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
787 1044
788sub new { 1045sub new {
789 my $class = shift; 1046 my ($class, %arg) = @_;
1047
1048 my $child = delete $arg{child};
790 1049
791 my $self; 1050 my $self;
792 1051
793 my $slider = new CFClient::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
794 vertical => 1, 1055 vertical => 0,
795 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub { 1057 on_changed => sub {
797 $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});
798 }, 1060 },
799 ; 1061 ;
800 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
801 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
803 slider => $slider, 1078 hslider => $hslider,
804 @_, 1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1082 %arg,
805 ); 1083 );
806 1084
807 $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
808 $self->add ($self->{vp}); 1106 $self->SUPER::add ($self->{vp});
809 $self->add ($self->{slider}); 1107
1108 $self->add ($child) if $child;
810 1109
811 $self 1110 $self
812} 1111}
813 1112
814#TODO# update range on size_allocate depending on child 1113sub add {
815# 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}
816 1214
817############################################################################# 1215#############################################################################
818 1216
819package CFClient::UI::Frame; 1217package CFPlus::UI::Frame;
820 1218
821our @ISA = CFClient::UI::Bin::; 1219our @ISA = CFPlus::UI::Bin::;
822 1220
823use CFClient::OpenGL; 1221use CFPlus::OpenGL;
824 1222
825sub new { 1223sub new {
826 my $class = shift; 1224 my $class = shift;
827 1225
828 $class->SUPER::new ( 1226 $class->SUPER::new (
… …
836 1234
837 if ($self->{bg}) { 1235 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)}; 1236 my ($w, $h) = @$self{qw(w h)};
839 1237
840 glEnable GL_BLEND; 1238 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} }; 1240 glColor_premultiply @{ $self->{bg} };
843 1241
844 glBegin GL_QUADS; 1242 glBegin GL_QUADS;
845 glVertex 0 , 0; 1243 glVertex 0 , 0;
846 glVertex 0 , $h; 1244 glVertex 0 , $h;
847 glVertex $w, $h; 1245 glVertex $w, $h;
… …
854 $self->SUPER::_draw; 1252 $self->SUPER::_draw;
855} 1253}
856 1254
857############################################################################# 1255#############################################################################
858 1256
859package CFClient::UI::FancyFrame; 1257package CFPlus::UI::FancyFrame;
860 1258
861our @ISA = CFClient::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
862 1260
863use CFClient::OpenGL; 1261use CFPlus::OpenGL;
864
865my @tex =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868 1262
869sub new { 1263sub new {
870 my $class = shift; 1264 my ($class, %arg) = @_;
871 1265
872 # 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 }
873 1273
874 my $self = $class->SUPER::new ( 1274 my $self = $class->SUPER::new (
1275 # label => "",
875 bg => [1, 1, 1, 1], 1276 fg => [0.6, 0.3, 0.1],
876 border_bg => [1, 1, 1, 1],
877 border => 0.6, 1277 border => 0.8,
878 toplevel => 1, 1278 style => 'single',
879 can_events => 1, 1279 %arg,
880 @_
881 ); 1280 );
882 1281
883 $self->{title} &&= new CFClient::UI::Label
884 align => 0,
885 valign => 1,
886 text => $self->{title},
887 fontsize => $self->{border};
888
889 $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};
890} 1290}
891 1291
892sub border { 1292sub border {
893 int $_[0]{border} * $::FONTSIZE 1293 int $_[0]{border} * $::FONTSIZE
894} 1294}
895 1295
896sub size_request { 1296sub size_request {
897 my ($self) = @_; 1297 my ($self) = @_;
1298
1299 ($self->{label_w}, undef) = $self->{label}->size_request
1300 if $self->{label};
898 1301
899 my ($w, $h) = $self->SUPER::size_request; 1302 my ($w, $h) = $self->SUPER::size_request;
900 1303
901 ( 1304 (
902 $w + $self->border * 2, 1305 $w + $self->border * 2,
903 $h + $self->border * 2, 1306 $h + $self->border * 2,
904 ) 1307 )
905} 1308}
906 1309
907sub size_allocate { 1310sub invoke_size_allocate {
908 my ($self, $w, $h) = @_; 1311 my ($self, $w, $h) = @_;
909 1312
910 $h -= List::Util::max 0, $self->border * 2; 1313 my $border = $self->border;
1314
911 $w -= List::Util::max 0, $self->border * 2; 1315 $w -= List::Util::max 0, $border * 2;
1316 $h -= List::Util::max 0, $border * 2;
912 1317
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1318 if (my $label = $self->{label}) {
914 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 }
915 1323
916 $self->child->configure ($self->border, $self->border, $w, $h); 1324 $self->child->configure ($border, $border, $w, $h);
917}
918 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
919sub button_down { 1466sub invoke_button_down {
920 my ($self, $ev, $x, $y) = @_; 1467 my ($self, $ev, $x, $y) = @_;
921 1468
922 my ($w, $h) = @$self{qw(w h)}; 1469 my ($w, $h) = @$self{qw(w h)};
923 my $border = $self->border; 1470 my $border = $self->border;
924 1471
… …
937 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
938 1485
939 my $dx = $ev->{x} - $ox; 1486 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy; 1487 my $dy = $ev->{y} - $oy;
941 1488
942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1489 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1490 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1491
944 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1492 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size; 1493 $self->realloc;
946 }; 1494 };
947 1495
948 } elsif ($lr ^ $td) { 1496 } elsif ($lr ^ $td) {
949 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1497 my ($ox, $oy) = ($ev->{x}, $ev->{y});
950 my ($bx, $by) = ($self->{x}, $self->{y}); 1498 my ($bx, $by) = ($self->{x}, $self->{y});
… …
952 $self->{motion} = sub { 1500 $self->{motion} = sub {
953 my ($ev, $x, $y) = @_; 1501 my ($ev, $x, $y) = @_;
954 1502
955 ($x, $y) = ($ev->{x}, $ev->{y}); 1503 ($x, $y) = ($ev->{x}, $ev->{y});
956 1504
957 $self->move ($bx + $x - $ox, $by + $y - $oy); 1505 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
958 $self->update; 1506 # HACK: the next line is required to enforce placement
1507 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
959 }; 1508 };
1509 } else {
1510 return 0;
1511 }
1512
960 } 1513 1
961} 1514}
962 1515
963sub button_up { 1516sub invoke_button_up {
964 my ($self, $ev, $x, $y) = @_; 1517 my ($self, $ev, $x, $y) = @_;
965 1518
966 delete $self->{motion}; 1519 ! ! delete $self->{motion}
967} 1520}
968 1521
969sub mouse_motion { 1522sub invoke_mouse_motion {
970 my ($self, $ev, $x, $y) = @_; 1523 my ($self, $ev, $x, $y) = @_;
971 1524
972 $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
973} 1536}
974 1537
975sub _draw { 1538sub _draw {
976 my ($self) = @_; 1539 my ($self) = @_;
977 1540
1541 my $child = $self->{children}[0];
1542
978 my ($w, $h ) = ($self->{w}, $self->{h}); 1543 my ($w, $h ) = ($self->{w}, $self->{h});
979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1544 my ($cw, $ch) = ($child->{w}, $child->{h});
980 1545
981 glEnable GL_TEXTURE_2D; 1546 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1548
984 my $border = $self->border; 1549 my $border = $self->border;
985 1550
986 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $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);
991 1570
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1572 glColor @{ $self->{bg} };
994 1573
995 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
1575 # solve this better(?)
996 my $rep_x = $cw / $bg->{w}; 1576 $bg->{s} = $cw / $bg->{w};
997 my $rep_y = $ch / $bg->{h}; 1577 $bg->{t} = $ch / $bg->{h};
998
999 glColor @{ $self->{bg} };
1000
1001 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1578 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 } 1579 }
1006 1580
1007 glDisable GL_TEXTURE_2D; 1581 glDisable GL_TEXTURE_2D;
1008 1582
1009 $self->{title}->draw if $self->{title};
1010
1011 $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};
1012} 1594}
1013 1595
1014############################################################################# 1596#############################################################################
1015 1597
1016package CFClient::UI::Table; 1598package CFPlus::UI::Table;
1017 1599
1018our @ISA = CFClient::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1019 1601
1020use List::Util qw(max sum); 1602use List::Util qw(max sum);
1021 1603
1022use CFClient::OpenGL; 1604use CFPlus::OpenGL;
1023 1605
1024sub new { 1606sub new {
1025 my $class = shift; 1607 my $class = shift;
1026 1608
1027 $class->SUPER::new ( 1609 $class->SUPER::new (
1028 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1029 @_ 1612 @_,
1030 ) 1613 )
1031} 1614}
1032 1615
1033sub add { 1616sub add {
1034 my ($self, $x, $y, $child) = @_;
1035
1036 $child->set_parent ($self);
1037 $self->{children}[$y][$x] = $child;
1038
1039 $child->check_size;
1040}
1041
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1044}
1045
1046# TODO: move to container class maybe? send childs a signal on removal?
1047sub clear {
1048 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);
1049 1648
1050 my @children = $self->children; 1649 my @children = $self->children;
1051 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 }
1052 1660 }
1053 for (@children) {
1054 delete $_->{parent};
1055 $_->hide;
1056 }
1057 1661
1058 $self->update; 1662 # second pass, rows
1059} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1060
1061sub get_wh {
1062 my ($self) = @_;
1063
1064 my (@w, @h);
1065
1066 for my $y (0 .. $#{$self->{children}}) {
1067 my $row = $self->{children}[$y]
1068 or next;
1069
1070 for my $x (0 .. $#$row) {
1071 my $widget = $row->[$x]
1072 or next;
1073 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1074 1665
1075 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1076 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1077 } 1670 }
1078 } 1671 }
1079 1672
1080 (\@w, \@h) 1673 (\@w, \@h)
1081} 1674}
… …
1089 (sum @$ws), 1682 (sum @$ws),
1090 (sum @$hs), 1683 (sum @$hs),
1091 ) 1684 )
1092} 1685}
1093 1686
1094sub size_allocate { 1687sub invoke_size_allocate {
1095 my ($self, $w, $h) = @_; 1688 my ($self, $w, $h) = @_;
1096 1689
1097 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1098 1691
1099 my $req_w = sum @$ws; 1692 my $req_w = (sum @$ws) || 1;
1100 my $req_h = sum @$hs; 1693 my $req_h = (sum @$hs) || 1;
1101 1694
1102 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1103 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1104 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1105 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1106 1699
1107 # linearly scale sizes
1108 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1109 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1110 1701
1111 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
1112 CFClient::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1113 1711
1114 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1115 1714
1116 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1117 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1118 or next;
1119 1717
1120 my $x = 0; 1718 $widget->configure (
1121 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1122 1721 );
1123 for my $c (0 .. $#$row) { 1722 }
1124 my $col_w = $ws->[$c];
1125 1723
1126 if (my $widget = $row->[$c]) { 1724 1
1127 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1128 }
1129 1726
1130 $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;
1131 } 1765 }
1132
1133 $y += $row_h;
1134 } 1766 }
1135 1767
1136} 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1137 1770
1138sub 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 {
1139 my ($self, $x, $y) = @_; 1793 my ($self, $W, $H) = @_;
1140 1794
1141 $x -= $self->{x}; 1795 for my $child ($self->visible_children) {
1142 $y -= $self->{y}; 1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1143 1797
1144 my $res; 1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $child->{req_w};
1801 $h = _scale $size, $h, $child->{req_h};
1145 1802
1146 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1803 $child->configure ($x, $y, $w, $h);
1147 $res = $_->find_widget ($x, $y) 1804 }
1148 and return $res; 1805
1149 } 1806 1
1150
1151 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1152}
1153
1154sub _draw {
1155 my ($self) = @_;
1156
1157 for (grep $_, @{$self->{children}}) {
1158 $_->draw for grep $_, @$_;
1159 }
1160} 1807}
1161 1808
1162############################################################################# 1809#############################################################################
1163 1810
1164package CFClient::UI::HBox; 1811package CFPlus::UI::Box;
1165 1812
1166# TODO: wrap into common Box base class
1167
1168our @ISA = CFClient::UI::Container::; 1813our @ISA = CFPlus::UI::Container::;
1169 1814
1170sub size_request { 1815sub size_request {
1171 my ($self) = @_; 1816 my ($self) = @_;
1172 1817
1173 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}
1174 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 }
1175 ( 1854 }
1176 (List::Util::sum map $_->[0], @alloc), 1855
1177 (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 @_,
1178 ) 1881 )
1179} 1882}
1180 1883
1181sub size_allocate {
1182 my ($self, $w, $h) = @_;
1183
1184 ($h, $w) = ($w, $h);
1185
1186 my $children = $self->{children};
1187
1188 my @h = map $_->{req_w}, @$children;
1189
1190 my $req_h = List::Util::sum @h;
1191
1192 if ($req_h > $h) {
1193 # ah well, not enough space
1194 $_ *= $h / $req_h for @h;
1195 } else {
1196 my $exp = List::Util::sum map $_->{expand}, @$children;
1197 $exp ||= 1;
1198
1199 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201
1202 my $alloc_h = $h[$_];
1203 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1204 $h[$_] = $alloc_h;
1205 }
1206 }
1207
1208 CFClient::UI::harmonize \@h;
1209
1210 my $y = 0;
1211 for (0 .. $#$children) {
1212 my $child = $children->[$_];
1213 my $h = $h[$_];
1214 $child->configure ($y, 0, $h, $w);
1215
1216 $y += $h;
1217 }
1218
1219 1
1220}
1221
1222############################################################################# 1884#############################################################################
1223 1885
1224package CFClient::UI::VBox; 1886package CFPlus::UI::VBox;
1225 1887
1226# TODO: wrap into common Box base class 1888our @ISA = CFPlus::UI::Box::;
1227 1889
1228our @ISA = CFClient::UI::Container::; 1890sub new {
1891 my $class = shift;
1229 1892
1230sub size_request { 1893 $class->SUPER::new (
1231 my ($self) = @_; 1894 vertical => 1,
1232 1895 @_,
1233 my @alloc = map [$_->size_request], @{$self->{children}};
1234
1235 (
1236 (List::Util::max map $_->[0], @alloc),
1237 (List::Util::sum map $_->[1], @alloc),
1238 ) 1896 )
1239} 1897}
1240 1898
1241sub size_allocate {
1242 my ($self, $w, $h) = @_;
1243
1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1245
1246 my $children = $self->{children};
1247
1248 my @h = map $_->{req_h}, @$children;
1249
1250 my $req_h = List::Util::sum @h;
1251
1252 if ($req_h > $h) {
1253 # ah well, not enough space
1254 $_ *= $h / $req_h for @h;
1255 } else {
1256 my $exp = List::Util::sum map $_->{expand}, @$children;
1257 $exp ||= 1;
1258
1259 for (0 .. $#$children) {
1260 my $child = $children->[$_];
1261
1262 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1263 }
1264 }
1265
1266 CFClient::UI::harmonize \@h;
1267
1268 my $y = 0;
1269 for (0 .. $#$children) {
1270 my $child = $children->[$_];
1271 my $h = $h[$_];
1272 $child->configure (0, $y, $w, $h);
1273
1274 $y += $h;
1275 }
1276
1277 1
1278}
1279
1280############################################################################# 1899#############################################################################
1281 1900
1282package CFClient::UI::Label; 1901package CFPlus::UI::Label;
1283 1902
1284our @ISA = CFClient::UI::DrawBG::; 1903our @ISA = CFPlus::UI::DrawBG::;
1285 1904
1286use CFClient::OpenGL; 1905use CFPlus::OpenGL;
1287 1906
1288sub new { 1907sub new {
1289 my ($class, %arg) = @_; 1908 my ($class, %arg) = @_;
1290 1909
1291 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
… …
1294 #active_bg => none 1913 #active_bg => none
1295 #font => default_font 1914 #font => default_font
1296 #text => initial text 1915 #text => initial text
1297 #markup => initial narkup 1916 #markup => initial narkup
1298 #max_w => maximum pixel width 1917 #max_w => maximum pixel width
1918 #style => 0, # render flags
1299 ellipsise => 3, # end 1919 ellipsise => 3, # end
1300 layout => (new CFClient::Layout), 1920 layout => (new CFPlus::Layout),
1301 fontsize => 1, 1921 fontsize => 1,
1302 align => -1, 1922 align => -1,
1303 valign => -1, 1923 valign => -1,
1304 padding => 2, 1924 padding_x => 2,
1925 padding_y => 2,
1305 can_events => 0, 1926 can_events => 0,
1306 %arg 1927 %arg
1307 ); 1928 );
1308 1929
1309 if (exists $self->{template}) { 1930 if (exists $self->{template}) {
1310 my $layout = new CFClient::Layout; 1931 my $layout = new CFPlus::Layout;
1311 $layout->set_text (delete $self->{template}); 1932 $layout->set_text (delete $self->{template});
1312 $self->{template} = $layout; 1933 $self->{template} = $layout;
1313 } 1934 }
1314 1935
1315 if (exists $self->{markup}) { 1936 if (exists $self->{markup}) {
… …
1319 } 1940 }
1320 1941
1321 $self 1942 $self
1322} 1943}
1323 1944
1324sub escape($) {
1325 local $_ = $_[0];
1326
1327 s/&/&amp;/g;
1328 s/>/&gt;/g;
1329 s/</&lt;/g;
1330
1331 $_
1332}
1333
1334sub update { 1945sub update {
1335 my ($self) = @_; 1946 my ($self) = @_;
1336 1947
1337 delete $self->{texture}; 1948 delete $self->{texture};
1338 $self->SUPER::update; 1949 $self->SUPER::update;
1339} 1950}
1340 1951
1952sub realloc {
1953 my ($self) = @_;
1954
1955 delete $self->{ox};
1956 $self->SUPER::realloc;
1957}
1958
1341sub set_text { 1959sub set_text {
1342 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1343 1961
1344 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1346 1964
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1348 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1349 1966
1967 delete $self->{size_req};
1968 $self->realloc;
1350 $self->update; 1969 $self->update;
1351 $self->check_size;
1352} 1970}
1353 1971
1354sub set_markup { 1972sub set_markup {
1355 my ($self, $markup) = @_; 1973 my ($self, $markup) = @_;
1356 1974
1357 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1359 1977
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361 1979
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1363 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1364 1981
1982 delete $self->{size_req};
1983 $self->realloc;
1365 $self->update; 1984 $self->update;
1366 $self->check_size;
1367} 1985}
1368 1986
1369sub size_request { 1987sub size_request {
1370 my ($self) = @_; 1988 my ($self) = @_;
1371 1989
1990 $self->{size_req} ||= do {
1372 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1991 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1); 1992 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1993 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1994 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1995 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1996
1378 my ($w, $h) = $self->{layout}->size; 1997 my ($w, $h) = $self->{layout}->size;
1379 1998
1380 if (exists $self->{template}) { 1999 if (exists $self->{template}) {
1381 $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);
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 2003
1384 my ($w2, $h2) = $self->{template}->size; 2004 my ($w2, $h2) = $self->{template}->size;
1385 2005
1386 $w = List::Util::max $w, $w2; 2006 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 2007 $h = List::Util::max $h, $h2;
2008 }
2009
2010 [$w, $h]
1388 } 2011 };
1389 2012
1390 ( 2013 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 2014}
1395 2015
2016sub baseline_shift {
2017 $_[0]{layout}->descent
2018}
2019
1396sub size_allocate { 2020sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 2021 my ($self, $w, $h) = @_;
1398 2022
2023 delete $self->{ox};
2024
1399 delete $self->{texture}; 2025 delete $self->{texture}
2026 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2027
2028 1
1400} 2029}
1401 2030
1402sub set_fontsize { 2031sub set_fontsize {
1403 my ($self, $fontsize) = @_; 2032 my ($self, $fontsize) = @_;
1404 2033
1405 $self->{fontsize} = $fontsize; 2034 $self->{fontsize} = $fontsize;
2035 delete $self->{size_req};
1406 delete $self->{texture}; 2036 delete $self->{texture};
1407 2037
1408 $self->update; 2038 $self->realloc;
1409 $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;
1410} 2048}
1411 2049
1412sub _draw { 2050sub _draw {
1413 my ($self) = @_; 2051 my ($self) = @_;
1414 2052
1415 $self->SUPER::_draw; # draw background, if applicable 2053 $self->SUPER::_draw; # draw background, if applicable
1416 2054
1417 my $tex = $self->{texture} ||= do { 2055 my $size = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 2056 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2057 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 2058 $self->{layout}->set_width ($self->{w});
1421 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2059 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2060 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2061 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424 2062
1425 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2063 [$self->{layout}->size]
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1436 }; 2064 };
1437 2065
1438 glEnable GL_TEXTURE_2D; 2066 unless (exists $self->{ox}) {
1439 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);
1440 2070
1441 if ($tex->{format} == GL_ALPHA) { 2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1442 glColor @{$self->{fg}}; 2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2073 : ($self->{h} - $size->[1]) * 0.5);
1444 } else {
1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1446 } 2074 };
1447 2075
1448 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});
1449} 2080}
1450 2081
1451############################################################################# 2082#############################################################################
1452 2083
1453package CFClient::UI::EntryBase; 2084package CFPlus::UI::EntryBase;
1454 2085
1455our @ISA = CFClient::UI::Label::; 2086our @ISA = CFPlus::UI::Label::;
1456 2087
1457use CFClient::OpenGL; 2088use CFPlus::OpenGL;
1458 2089
1459sub new { 2090sub new {
1460 my $class = shift; 2091 my $class = shift;
1461 2092
1462 $class->SUPER::new ( 2093 $class->SUPER::new (
… …
1466 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1467 can_hover => 1, 2098 can_hover => 1,
1468 can_focus => 1, 2099 can_focus => 1,
1469 valign => 0, 2100 valign => 0,
1470 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
2103 #text => ...
2104 #hidden => "*",
1471 @_ 2105 @_
1472 ) 2106 )
1473} 2107}
1474 2108
1475sub _set_text { 2109sub _set_text {
… …
1477 2111
1478 delete $self->{cur_h}; 2112 delete $self->{cur_h};
1479 2113
1480 return if $self->{text} eq $text; 2114 return if $self->{text} eq $text;
1481 2115
1482 delete $self->{texture};
1483
1484 $self->{last_activity} = $::NOW; 2116 $self->{last_activity} = $::NOW;
1485 $self->{text} = $text; 2117 $self->{text} = $text;
1486 2118
1487 $text =~ s/./*/g if $self->{hidden}; 2119 $text =~ s/./*/g if $self->{hidden};
1488 $self->{layout}->set_text ("$text "); 2120 $self->{layout}->set_text ("$text ");
2121 delete $self->{size_req};
1489 2122
1490 $self->emit (changed => $self->{text}); 2123 $self->emit (changed => $self->{text});
2124
2125 $self->realloc;
2126 $self->update;
1491} 2127}
1492 2128
1493sub set_text { 2129sub set_text {
1494 my ($self, $text) = @_; 2130 my ($self, $text) = @_;
1495 2131
1496 $self->{cursor} = length $text; 2132 $self->{cursor} = length $text;
1497 $self->_set_text ($text); 2133 $self->_set_text ($text);
1498 $self->update;
1499 $self->check_size;
1500} 2134}
1501 2135
1502sub get_text { 2136sub get_text {
1503 $_[0]{text} 2137 $_[0]{text}
1504} 2138}
… …
1509 my ($w, $h) = $self->SUPER::size_request; 2143 my ($w, $h) = $self->SUPER::size_request;
1510 2144
1511 ($w + 1, $h) # add 1 for cursor 2145 ($w + 1, $h) # add 1 for cursor
1512} 2146}
1513 2147
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1518}
1519
1520sub key_down { 2148sub invoke_key_down {
1521 my ($self, $ev) = @_; 2149 my ($self, $ev) = @_;
1522 2150
1523 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1524 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1525 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1526 2154
1527 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;
1528 2158
1529 if ($uni == 8) { 2159 if ($uni == 8) {
1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1531 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1532 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1533 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1534 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1535 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1536 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1537 } 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 = "";
1538 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1539 } elsif ($sym == CFClient::SDLK_END) {
1540 $self->{cursor} = length $text;
1541 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1542 $self->emit ('escape'); 2183 $self->emit ('escape');
1543 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1544 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
2188 } else {
2189 return 0;
1545 } 2190 }
1546 2191
1547 $self->_set_text ($text); 2192 $self->_set_text ($text);
2193
2194 $self->realloc;
1548 $self->update; 2195 $self->update;
1549 $self->check_size;
1550}
1551 2196
2197 1
2198}
2199
1552sub focus_in { 2200sub invoke_focus_in {
1553 my ($self) = @_; 2201 my ($self) = @_;
1554 2202
1555 $self->{last_activity} = $::NOW; 2203 $self->{last_activity} = $::NOW;
1556 2204
1557 $self->SUPER::focus_in; 2205 $self->SUPER::invoke_focus_in
1558} 2206}
1559 2207
1560sub button_down { 2208sub invoke_button_down {
1561 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1562 2210
1563 $self->SUPER::button_down ($ev, $x, $y); 2211 $self->SUPER::invoke_button_down ($ev, $x, $y);
1564 2212
1565 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1566 2214
1567 # byte-index to char-index 2215 # byte-index to char-index
1568 my $text = $self->{text}; 2216 my $text = $self->{text};
1569 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1570 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1571 2219
1572 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1573 $self->update; 2221 $self->update;
2222
2223 1
1574} 2224}
1575 2225
1576sub mouse_motion { 2226sub invoke_mouse_motion {
1577 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1578# 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
1579} 2231}
1580 2232
1581sub _draw { 2233sub _draw {
1582 my ($self) = @_; 2234 my ($self) = @_;
1583 2235
1584 local $self->{fg} = $self->{fg}; 2236 local $self->{fg} = $self->{fg};
1585 2237
1586 if ($FOCUS == $self) { 2238 if ($FOCUS == $self) {
1587 glColor @{$self->{active_bg}}; 2239 glColor_premultiply @{$self->{active_bg}};
1588 $self->{fg} = $self->{active_fg}; 2240 $self->{fg} = $self->{active_fg};
1589 } else { 2241 } else {
1590 glColor @{$self->{bg}}; 2242 glColor_premultiply @{$self->{bg}};
1591 } 2243 }
1592 2244
1593 glEnable GL_BLEND; 2245 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1595 glBegin GL_QUADS; 2247 glBegin GL_QUADS;
1596 glVertex 0 , 0; 2248 glVertex 0 , 0;
1597 glVertex 0 , $self->{h}; 2249 glVertex 0 , $self->{h};
1598 glVertex $self->{w}, $self->{h}; 2250 glVertex $self->{w}, $self->{h};
1599 glVertex $self->{w}, 0; 2251 glVertex $self->{w}, 0;
… …
1610 utf8::encode $text; 2262 utf8::encode $text;
1611 2263
1612 @$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)
1613 } 2265 }
1614 2266
1615 glColor @{$self->{fg}};
1616 glBegin GL_LINES; 2267 glBegin GL_LINES;
1617 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};
1618 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};
1619 glEnd; 2270 glEnd;
1620 } 2271 }
1621} 2272}
1622 2273
2274#############################################################################
2275
1623package CFClient::UI::Entry; 2276package CFPlus::UI::Entry;
1624 2277
1625our @ISA = CFClient::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1626 2279
1627use CFClient::OpenGL; 2280use CFPlus::OpenGL;
1628 2281
1629sub key_down { 2282sub invoke_key_down {
1630 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1631 2284
1632 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1633 2286
1634 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1635 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1636 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
2290
1637 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
1639 $self->emit (activate => $txt); 2293 $self->emit (activate => $txt);
1640 $self->update; 2294 $self->update;
1641 2295
1642 } elsif ($sym == CFClient::SDLK_UP) { 2296 } elsif ($sym == CFPlus::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) { 2297 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text; 2298 $self->{history_saveback} = $self->get_text;
1645 } 2299 }
1646 if (@{$self->{history} || []} > 0) { 2300 if (@{$self->{history} || []} > 0) {
1647 $self->{history_pointer}++; 2301 $self->{history_pointer}++;
… …
1649 $self->{history_pointer} = @{$self->{history} || []} - 1; 2303 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 } 2304 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1652 } 2306 }
1653 2307
1654 } elsif ($sym == CFClient::SDLK_DOWN) { 2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
1655 $self->{history_pointer}--; 2309 $self->{history_pointer}--;
1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657 2311
1658 if ($self->{history_pointer} >= 0) { 2312 if ($self->{history_pointer} >= 0) {
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } else { 2314 } else {
1661 $self->set_text ($self->{history_saveback}); 2315 $self->set_text ($self->{history_saveback});
1662 } 2316 }
1663 2317
1664 } else { 2318 } else {
1665 $self->SUPER::key_down ($ev); 2319 return $self->SUPER::invoke_key_down ($ev)
2320 }
2321
1666 } 2322 1
1667
1668} 2323}
1669 2324
1670############################################################################# 2325#############################################################################
1671 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
1672package CFClient::UI::Button; 2366package CFPlus::UI::Button;
1673 2367
1674our @ISA = CFClient::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
1675 2369
1676use CFClient::OpenGL; 2370use CFPlus::OpenGL;
1677 2371
1678my @tex = 2372my @tex =
1679 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1680 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
1681 2375
1682sub new { 2376sub new {
1683 my $class = shift; 2377 my $class = shift;
1684 2378
1685 $class->SUPER::new ( 2379 $class->SUPER::new (
1686 padding => 4, 2380 padding_x => 4,
2381 padding_y => 4,
1687 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
1688 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
1689 can_hover => 1, 2384 can_hover => 1,
1690 align => 0, 2385 align => 0,
1691 valign => 0, 2386 valign => 0,
1692 can_events => 1, 2387 can_events => 1,
1693 @_ 2388 @_
1694 ) 2389 )
1695} 2390}
1696 2391
1697sub button_up { 2392sub invoke_button_up {
1698 my ($self, $ev, $x, $y) = @_; 2393 my ($self, $ev, $x, $y) = @_;
1699 2394
2395 $self->emit ("activate")
1700 if ($x >= 0 && $x < $self->{w} 2396 if $x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) { 2397 && $y >= 0 && $y < $self->{h};
1702 $self->emit ("activate"); 2398
1703 } 2399 1
1704} 2400}
1705 2401
1706sub _draw { 2402sub _draw {
1707 my ($self) = @_; 2403 my ($self) = @_;
1708 2404
1709 local $self->{fg} = $self->{fg}; 2405 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714 2406
1715 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
1718 2410
2411 my $tex = $tex[$GRAB == $self];
1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1720 2413
1721 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1722 2415
1723 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
1724} 2417}
1725 2418
1726############################################################################# 2419#############################################################################
1727 2420
1728package CFClient::UI::CheckBox; 2421package CFPlus::UI::CheckBox;
1729 2422
1730our @ISA = CFClient::UI::DrawBG::; 2423our @ISA = CFPlus::UI::DrawBG::;
1731 2424
1732my @tex = 2425my @tex =
1733 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1734 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2427 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1735 2428
1736use CFClient::OpenGL; 2429use CFPlus::OpenGL;
1737 2430
1738sub new { 2431sub new {
1739 my $class = shift; 2432 my $class = shift;
1740 2433
1741 $class->SUPER::new ( 2434 $class->SUPER::new (
1742 padding => 2, 2435 padding_x => 2,
2436 padding_y => 2,
1743 fg => [1, 1, 1], 2437 fg => [1, 1, 1],
1744 active_fg => [1, 1, 0], 2438 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2], 2439 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5], 2440 active_bg => [1, 1, 1, 0.5],
1747 state => 0, 2441 state => 0,
… …
1751} 2445}
1752 2446
1753sub size_request { 2447sub size_request {
1754 my ($self) = @_; 2448 my ($self) = @_;
1755 2449
1756 ($self->{padding} * 2 + 6) x 2 2450 (6) x 2
1757} 2451}
1758 2452
2453sub toggle {
2454 my ($self) = @_;
2455
2456 $self->{state} = !$self->{state};
2457 $self->emit (changed => $self->{state});
2458 $self->update;
2459}
2460
1759sub button_down { 2461sub invoke_button_down {
1760 my ($self, $ev, $x, $y) = @_; 2462 my ($self, $ev, $x, $y) = @_;
1761 2463
1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2464 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2465 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1764 $self->{state} = !$self->{state}; 2466 $self->toggle;
1765 $self->emit (changed => $self->{state}); 2467 } else {
2468 return 0
2469 }
2470
1766 } 2471 1
1767} 2472}
1768 2473
1769sub _draw { 2474sub _draw {
1770 my ($self) = @_; 2475 my ($self) = @_;
1771 2476
1772 $self->SUPER::_draw; 2477 $self->SUPER::_draw;
1773 2478
1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1775 2480
1776 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;
1777 2484
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2485 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779 2486
1780 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2487 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781 2488
… …
1784 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
1785} 2492}
1786 2493
1787############################################################################# 2494#############################################################################
1788 2495
1789package CFClient::UI::Image; 2496package CFPlus::UI::Image;
1790 2497
1791our @ISA = CFClient::UI::Base::; 2498our @ISA = CFPlus::UI::Base::;
1792 2499
1793use CFClient::OpenGL; 2500use CFPlus::OpenGL;
1794use Carp qw/confess/;
1795 2501
1796our %loaded_images; 2502our %texture_cache;
1797 2503
1798sub new { 2504sub new {
1799 my $class = shift; 2505 my $class = shift;
1800 2506
1801 my $self = $class->SUPER::new (can_events => 0, @_); 2507 my $self = $class->SUPER::new (
2508 can_events => 0,
2509 @_,
2510 );
1802 2511
1803 $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";
1804 2514
1805 $loaded_images{$self->{image}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1806 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;
1807 2517
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
1809 2519
1810 Scalar::Util::weaken $loaded_images{$self->{image}}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813 2521
1814 $self 2522 $self
1815} 2523}
1816 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
1817sub size_request { 2540sub size_request {
1818 my ($self) = @_; 2541 my ($self) = @_;
1819 2542
1820 ($self->{tex}->{w}, $self->{tex}->{h}) 2543 ($self->{tex}{w}, $self->{tex}{h})
1821} 2544}
1822 2545
1823sub _draw { 2546sub _draw {
1824 my ($self) = @_; 2547 my ($self) = @_;
1825 2548
… …
1835 } 2558 }
1836 2559
1837 glEnable GL_TEXTURE_2D; 2560 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 2562
1840 $tex->draw_quad_alpha (0, 0, $w, $h); 2563 $tex->draw_quad (0, 0, $w, $h);
1841 2564
1842 glDisable GL_TEXTURE_2D; 2565 glDisable GL_TEXTURE_2D;
1843} 2566}
1844 2567
1845############################################################################# 2568#############################################################################
1846 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
1847package CFClient::UI::VGauge; 2606package CFPlus::UI::VGauge;
1848 2607
1849our @ISA = CFClient::UI::Base::; 2608our @ISA = CFPlus::UI::Base::;
1850 2609
1851use List::Util qw(min max); 2610use List::Util qw(min max);
1852 2611
1853use CFClient::OpenGL; 2612use CFPlus::OpenGL;
1854 2613
1855my %tex = ( 2614my %tex = (
1856 food => [ 2615 food => [
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1858 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1859 ], 2618 ],
1860 grace => [ 2619 grace => [
1861 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1862 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/
1863 ], 2622 ],
1864 hp => [ 2623 hp => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1866 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1867 ], 2626 ],
1868 mana => [ 2627 mana => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1870 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/
1871 ], 2630 ],
1872); 2631);
1873 2632
1874# eg. VGauge->new (gauge => 'food'), default gauge: food 2633# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1934 my $ycut1 = max 0, min 1, $ycut; 2693 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1; 2694 my $ycut2 = max 0, min 1, $ycut - 1;
1936 2695
1937 my $h1 = $self->{h} * (1 - $ycut1); 2696 my $h1 = $self->{h} * (1 - $ycut1);
1938 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);
1939 2701
1940 glEnable GL_BLEND; 2702 glEnable GL_BLEND;
1941 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;
1942 glEnable GL_TEXTURE_2D; 2705 glEnable GL_TEXTURE_2D;
1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1944 2707
1945 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2708 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS; 2709 glBegin GL_QUADS;
… …
1961 2724
1962 if ($t3) { 2725 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2726 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS; 2727 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2728 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2729 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2730 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2731 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd; 2732 glEnd;
1970 } 2733 }
1971 2734
1972 glDisable GL_BLEND; 2735 glDisable GL_BLEND;
1973 glDisable GL_TEXTURE_2D; 2736 glDisable GL_TEXTURE_2D;
1974} 2737}
1975 2738
1976############################################################################# 2739#############################################################################
1977 2740
1978package CFClient::UI::Gauge; 2741package CFPlus::UI::Gauge;
1979 2742
1980our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFPlus::UI::VBox::;
1981 2744
1982sub new { 2745sub new {
1983 my ($class, %arg) = @_; 2746 my ($class, %arg) = @_;
1984 2747
1985 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
… …
1987 can_hover => 1, 2750 can_hover => 1,
1988 can_events => 1, 2751 can_events => 1,
1989 %arg, 2752 %arg,
1990 ); 2753 );
1991 2754
1992 $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");
1993 $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);
1994 $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");
1995 2758
1996 $self 2759 $self
1997} 2760}
1998 2761
1999sub set_fontsize { 2762sub set_fontsize {
… …
2020 $self->{value}->set_text ($val); 2783 $self->{value}->set_text ($val);
2021} 2784}
2022 2785
2023############################################################################# 2786#############################################################################
2024 2787
2025package CFClient::UI::Slider; 2788package CFPlus::UI::Slider;
2026 2789
2027use strict; 2790use strict;
2028 2791
2029use CFClient::OpenGL; 2792use CFPlus::OpenGL;
2030 2793
2031our @ISA = CFClient::UI::DrawBG::; 2794our @ISA = CFPlus::UI::DrawBG::;
2032 2795
2033my @tex = 2796my @tex =
2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2035 qw(s1_slider.png s1_slider_bg.png); 2798 qw(s1_slider.png s1_slider_bg.png);
2036 2799
2037sub new { 2800sub new {
2038 my $class = shift; 2801 my $class = shift;
2039 2802
… …
2045 my $self = $class->SUPER::new ( 2808 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2809 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2810 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2811 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2812 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2813 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2814 min_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2815 min_h => $::WIDTH / 80,
2053 vertical => 0, 2816 vertical => 0,
2054 can_hover => 1, 2817 can_hover => 1,
2055 inner_pad => .05, 2818 inner_pad => 0.02,
2056 @_ 2819 @_
2057 ); 2820 );
2058 2821
2059 $self->set_value ($self->{range}[0]); 2822 $self->set_value ($self->{range}[0]);
2060 $self->update; 2823 $self->update;
2061 2824
2062 $self 2825 $self
2063} 2826}
2064 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
2065sub set_value { 2839sub set_value {
2066 my ($self, $value) = @_; 2840 my ($self, $value) = @_;
2067 2841
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2842 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2843
2070 $hi = $lo + 1 if $hi <= $lo; 2844 $hi = $lo + 1 if $hi <= $lo;
2071 2845
2846 $page = $hi - $lo if $page > $hi - $lo;
2847
2072 $value = $lo if $value < $lo; 2848 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2849 $value = $hi - $page if $value > $hi - $page;
2074 2850
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2851 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2852 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2853
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2854 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2855
2082 if ($value != $old_value) { 2856 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2857 $self->emit (changed => $value);
… …
2086} 2860}
2087 2861
2088sub size_request { 2862sub size_request {
2089 my ($self) = @_; 2863 my ($self) = @_;
2090 2864
2091 my $w = $self->{req_w}; 2865 ($self->{req_w}, $self->{req_h})
2092 my $h = $self->{req_h};
2093
2094 $self->{vertical} ? ($h, $w) : ($w, $h)
2095} 2866}
2096 2867
2097sub button_down { 2868sub invoke_button_down {
2098 my ($self, $ev, $x, $y) = @_; 2869 my ($self, $ev, $x, $y) = @_;
2099 2870
2100 $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
2101 $self->mouse_motion ($ev, $x, $y); 2875 $self->invoke_mouse_motion ($ev, $x, $y)
2102} 2876}
2103 2877
2104sub mouse_motion { 2878sub invoke_mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2106 2880
2107 if ($GRAB == $self) { 2881 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2882 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2883
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2884 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2885
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2886 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2887
2114 $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
2115 } 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
2116} 2906}
2117 2907
2118sub update { 2908sub update {
2119 my ($self) = @_; 2909 my ($self) = @_;
2120 2910
2121 $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}) {
2122 $self->set_value ($self->{range}[0]); 2919 $self->set_value ($self->{range}[0]);
2123 2920
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2921 my ($value, $lo, $hi, $page) = @{$self->{range}};
2922 my $range = ($hi - $page - $lo) || 1e-100;
2125 2923
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2924 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2925
2128 $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;
2129 2928
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2929 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2930 $value = $value * $self->{scale} + $self->{offset};
2132 2931
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2932 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2933 $self->{knob_w} = $knob_w;
2140 }); 2934 }
2141
2142 $self->SUPER::update;
2143}
2144
2145sub _draw {
2146 my ($self) = @_;
2147 2935
2148 $self->SUPER::_draw (); 2936 $self->SUPER::_draw ();
2149 2937
2150 glScale $self->{w}, $self->{h}; 2938 glScale $self->{w}, $self->{h};
2151 2939
… …
2171 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2172} 2960}
2173 2961
2174############################################################################# 2962#############################################################################
2175 2963
2176package CFClient::UI::TextView; 2964package CFPlus::UI::ValSlider;
2177 2965
2178our @ISA = CFClient::UI::HBox::; 2966our @ISA = CFPlus::UI::HBox::;
2179 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
2180use CFClient::OpenGL; 3009use CFPlus::OpenGL;
2181 3010
2182sub new { 3011sub new {
2183 my $class = shift; 3012 my $class = shift;
2184 3013
2185 my $self = $class->SUPER::new ( 3014 my $self = $class->SUPER::new (
2186 fontsize => 1, 3015 fontsize => 1,
2187 can_events => 0, 3016 can_events => 1,
3017 indent => 0,
2188 #font => default_font 3018 #font => default_font
2189 @_, 3019 @_,
2190 3020
2191 layout => (new CFClient::Layout 1), 3021 layout => (new CFPlus::Layout),
2192 par => [], 3022 par => [],
3023 max_par => 0,
2193 height => 0, 3024 height => 0,
2194 children => [ 3025 children => [
2195 (new CFClient::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2196 (new CFClient::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2197 ], 3028 ],
2198 ); 3029 );
2199 3030
2200 $self->{children}[1]->connect (changed => sub { $self->update }); 3031 $self->{children}[1]->connect (changed => sub { $self->update });
2201 3032
… …
2207 3038
2208 $self->{fontsize} = $fontsize; 3039 $self->{fontsize} = $fontsize;
2209 $self->reflow; 3040 $self->reflow;
2210} 3041}
2211 3042
2212sub 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 {
2213 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) = @_;
2214 3081
2215 my $layout = $self->{layout}; 3082 my $layout = $self->{layout};
2216 3083
3084 $layout->set_font ($self->{font}) if $self->{font};
3085 $layout->set_foreground (@{$para->{fg}});
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3086 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $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});
2219 $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}}
2220 3095 );
2221 ($layout->size)[1] 3096
3097 $layout
2222} 3098}
2223 3099
2224sub reflow { 3100sub reflow {
2225 my ($self) = @_; 3101 my ($self) = @_;
2226 3102
2227 $self->{need_reflow}++; 3103 $self->{need_reflow}++;
2228 $self->update; 3104 $self->update;
2229} 3105}
2230 3106
2231sub 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 {
2232 my ($self, $w, $h) = @_; 3121 my ($self, $para) = @_;
2233 3122
2234 $self->SUPER::size_allocate ($w, $h); 3123 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2235 3124
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3125 $self->{scroll_to} = $para;
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3126 $self->update;
2238 $self->{layout}->set_width ($self->{children}[0]{w}); 3127}
2239 3128
2240 $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]);
2241} 3138}
2242 3139
2243sub add_paragraph { 3140sub add_paragraph {
2244 my ($self, $color, $text) = @_; 3141 my $self = shift;
2245 3142
2246 #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 };
2247 3153
2248 my $height = $self->text_height ($text); 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3155 push @{$self->{par}}, $para;
3156 }
2249 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
2250 $self->{height} += $height; 3195 $self->{height} = $height;
3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2251 3197
2252 push @{$self->{par}}, [$height, $color, $text]; 3198 delete $self->{texture};
3199 }
2253 3200
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3201 if (my $paridx = delete $self->{scroll_to}) {
2255 $self->{children}[1]->update; 3202 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3203 }
2256} 3204}
2257 3205
2258sub update { 3206sub update {
2259 my ($self) = @_; 3207 my ($self) = @_;
2260 3208
… …
2262 3210
2263 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2264 3212
2265 delete $self->{texture}; 3213 delete $self->{texture};
2266 3214
2267 $ROOT->on_post_alloc ($self, sub { 3215 $ROOT->on_post_alloc ($self => sub {
2268 if (delete $self->{need_reflow}) { 3216 $self->force_uptodate;
2269 my $height = 0;
2270 3217
2271 $height += $_->[0] = $self->text_height ($_->[2]) 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2272 for @{$self->{par}};
2273 3219
2274 $self->{height} = $height; 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2275
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2277
2278 delete $self->{texture};
2279 }
2280
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 3221 glClearColor 0, 0, 0, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2284 3223
2285 glEnable GL_TEXTURE_2D; 3224 package CFPlus::UI::Base;
2286 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});
2287 3227
2288 my $top = int $self->{children}[1]{range}[0]; 3228 my $top = int $self->{children}[1]{range}[0];
2289 3229
3230 my $paridx = 0;
3231 my $top_paragraph;
3232 my $top = int $self->{children}[1]{range}[0];
3233
2290 my $y0 = $top; 3234 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 3235 my $y1 = $top + $H;
2292 3236
2293 my $y = 0;
2294
2295 my $layout = $self->{layout};
2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
2299 for my $par (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2300 my $h = $par->[0]; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2301 3240
2302 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 3242 my $layout = $self->get_layout ($para);
2304 $layout->set_markup ($par->[2]);
2305 3243
2306 my ($W, $H) = $layout->size; 3244 $layout->render ($para->{indent}, $y - $y0);
2307 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 }
2308 } 3258 }
2309 3259
2310 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2311 } 3262 }
2312 3263
2313 glDisable GL_TEXTURE_2D; 3264 $self->{top_paragraph} = $top_paragraph;
2314 }; 3265 };
2315 }); 3266 });
2316} 3267}
2317 3268
3269sub reconfigure {
3270 my ($self) = @_;
3271
3272 $self->SUPER::reconfigure;
3273
3274 $_->{w} = 1e10 for @{ $self->{par} };
3275 $self->reflow;
3276}
3277
2318sub _draw { 3278sub _draw {
2319 my ($self) = @_; 3279 my ($self) = @_;
2320 3280
2321 glEnable GL_TEXTURE_2D; 3281 glEnable GL_TEXTURE_2D;
2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1; 3283 glColor 0, 0, 0, 1;
2324 $self->{texture}->draw_quad_alpha (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});
2325 glDisable GL_TEXTURE_2D; 3285 glDisable GL_TEXTURE_2D;
2326 3286
2327 $self->{children}[1]->draw; 3287 $self->{children}[1]->draw;
2328
2329} 3288}
2330 3289
2331############################################################################# 3290#############################################################################
2332 3291
2333package CFClient::UI::Animator; 3292package CFPlus::UI::Animator;
2334 3293
2335use CFClient::OpenGL; 3294use CFPlus::OpenGL;
2336 3295
2337our @ISA = CFClient::UI::Bin::; 3296our @ISA = CFPlus::UI::Bin::;
2338 3297
2339sub moveto { 3298sub moveto {
2340 my ($self, $x, $y) = @_; 3299 my ($self, $x, $y) = @_;
2341 3300
2342 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2370 glPopMatrix; 3329 glPopMatrix;
2371} 3330}
2372 3331
2373############################################################################# 3332#############################################################################
2374 3333
2375package CFClient::UI::Flopper; 3334package CFPlus::UI::Flopper;
2376 3335
2377our @ISA = CFClient::UI::Button::; 3336our @ISA = CFPlus::UI::Button::;
2378 3337
2379sub new { 3338sub new {
2380 my $class = shift; 3339 my $class = shift;
2381 3340
2382 my $self = $class->SUPER::new ( 3341 my $self = $class->SUPER::new (
2383 state => 0, 3342 state => 0,
2384 connect_activate => \&toggle_flopper, 3343 on_activate => \&toggle_flopper,
2385 @_ 3344 @_
2386 ); 3345 );
2387 3346
2388 if ($self->{state}) {
2389 $self->{state} = 0;
2390 $self->toggle_flopper;
2391 }
2392
2393 $self 3347 $self
2394} 3348}
2395 3349
2396sub toggle_flopper { 3350sub toggle_flopper {
2397 my ($self) = @_; 3351 my ($self) = @_;
2398 3352
2399 # TODO: use animation 3353 $self->{other}->toggle_visibility;
2400 if ($self->{state} = !$self->{state}) {
2401 $CFClient::UI::ROOT->add ($self->{other});
2402 $self->{other}->move ($self->coord2global (0, $self->{h}));
2403 $self->emit ("open");
2404 } else {
2405 $CFClient::UI::ROOT->remove ($self->{other});
2406 $self->emit ("close");
2407 }
2408
2409 $self->emit (changed => $self->{state});
2410} 3354}
2411 3355
2412############################################################################# 3356#############################################################################
2413 3357
2414package CFClient::UI::Tooltip; 3358package CFPlus::UI::Tooltip;
2415 3359
2416our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2417 3361
2418use CFClient::OpenGL; 3362use CFPlus::OpenGL;
2419 3363
2420sub new { 3364sub new {
2421 my $class = shift; 3365 my $class = shift;
2422 3366
2423 $class->SUPER::new ( 3367 $class->SUPER::new (
… …
2427} 3371}
2428 3372
2429sub set_tooltip_from { 3373sub set_tooltip_from {
2430 my ($self, $widget) = @_; 3374 my ($self, $widget) = @_;
2431 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
2432 $self->add (new CFClient::UI::Label 3391 $self->add (new CFPlus::UI::Label
2433 markup => $widget->{tooltip}, 3392 markup => $tooltip,
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8, 3394 fontsize => 0.8,
2436 fg => [0, 0, 0, 1], 3395 style => 1, # FLAG_INVERSE
2437 ellipsise => 0, 3396 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP), 3397 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 ); 3398 );
2440} 3399}
2441 3400
… …
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3404 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446 3405
2447 ($w + 4, $h + 4) 3406 ($w + 4, $h + 4)
2448} 3407}
2449 3408
2450sub size_allocate { 3409sub invoke_size_allocate {
2451 my ($self, $w, $h) = @_; 3410 my ($self, $w, $h) = @_;
2452 3411
2453 $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 });
2454} 3435}
2455 3436
2456sub _draw { 3437sub _draw {
2457 my ($self) = @_; 3438 my ($self) = @_;
2458 3439
… …
2475 glVertex $w, $h; 3456 glVertex $w, $h;
2476 glVertex $w, 0; 3457 glVertex $w, 0;
2477 glEnd; 3458 glEnd;
2478 3459
2479 glTranslate 2 - 0.375, 2 - 0.375; 3460 glTranslate 2 - 0.375, 2 - 0.375;
3461
2480 $self->SUPER::_draw; 3462 $self->SUPER::_draw;
2481} 3463}
2482 3464
2483############################################################################# 3465#############################################################################
2484 3466
2485package CFClient::UI::Face; 3467package CFPlus::UI::Face;
2486 3468
2487our @ISA = CFClient::UI::Base::; 3469our @ISA = CFPlus::UI::DrawBG::;
2488 3470
2489use CFClient::OpenGL; 3471use CFPlus::OpenGL;
2490 3472
2491sub new { 3473sub new {
2492 my $class = shift; 3474 my $class = shift;
2493 3475
2494 $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
2495 aspect => 1, 3479 aspect => 1,
3480 can_events => 0,
2496 @_, 3481 @_,
2497 ) 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 }
3536 }
2498} 3537}
2499 3538
2500sub size_request { 3539sub size_request {
2501 (32, 8) 3540 my ($self) = @_;
3541
3542 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) {
3545 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3546 } else {
3547 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3548 $self->realloc;
3549 });
3550 }
3551 }
3552 }
3553
3554 ($self->{size_w} || 8, $self->{size_h} || 8)
3555}
3556
3557sub update {
3558 my ($self) = @_;
3559
3560 return unless $self->{visible};
3561
3562 $self->SUPER::update;
3563}
3564
3565sub invoke_visibility_change {
3566 my ($self) = @_;
3567
3568 $self->update_timer;
3569
3570 0
2502} 3571}
2503 3572
2504sub _draw { 3573sub _draw {
2505 my ($self) = @_; 3574 my ($self) = @_;
2506 3575
2507 return unless $::CONN;#d# manage and cache textures differently 3576 return unless $::CONN;
3577
3578 $self->SUPER::_draw;
3579
3580 my $faceid = $::CONN->{faceid}[$self->{face}]
3581 or return;
3582
2508 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3583 my $tex = $::CONN->{texture}[$faceid];
2509 3584
2510 # TODO animation
2511 if ($tex) { 3585 if ($tex) {
2512 glEnable GL_TEXTURE_2D; 3586 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3588 glColor 0, 0, 0, 1;
2515 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3589 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2516 glDisable GL_TEXTURE_2D; 3590 glDisable GL_TEXTURE_2D;
2517 } 3591 }
2518} 3592}
2519 3593
3594sub destroy {
3595 my ($self) = @_;
3596
3597 (delete $self->{timer})->cancel
3598 if $self->{timer};
3599
3600 $self->SUPER::destroy;
3601}
3602
2520############################################################################# 3603#############################################################################
2521 3604
2522package CFClient::UI::InventoryItem; 3605package CFPlus::UI::Buttonbar;
2523 3606
2524our @ISA = CFClient::UI::HBox::; 3607our @ISA = CFPlus::UI::HBox::;
2525 3608
2526sub _item_to_desc { 3609# TODO: should actually wrap buttons and other goodies.
2527 my ($item) = @_;
2528
2529 my $desc =
2530 $item->{nrof} < 2
2531 ? $item->{name}
2532 : "$item->{nrof} $item->{name_pl}";
2533
2534 $item->{flags} & Crossfire::Protocol::F_OPEN
2535 and $desc .= " (open)";
2536 $item->{flags} & Crossfire::Protocol::F_APPLIED
2537 and $desc .= " (applied)";
2538 $item->{flags} & Crossfire::Protocol::F_UNPAID
2539 and $desc .= " (unpaid)";
2540 $item->{flags} & Crossfire::Protocol::F_MAGIC
2541 and $desc .= " (magic)";
2542 $item->{flags} & Crossfire::Protocol::F_CURSED
2543 and $desc .= " (cursed)";
2544 $item->{flags} & Crossfire::Protocol::F_DAMNED
2545 and $desc .= " (damned)";
2546 $item->{flags} & Crossfire::Protocol::F_LOCKED
2547 and $desc .= " *";
2548
2549 $desc
2550}
2551
2552sub new {
2553 my $class = shift;
2554
2555 my %args = @_;
2556
2557 my $item = delete $args{item};
2558
2559 my $desc = _item_to_desc ($item);
2560
2561 my $self = $class->SUPER::new (
2562 can_hover => 1,
2563 can_events => 1,
2564 tooltip => ((CFClient::UI::Label::escape $desc)
2565 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2566 connect_button_down => sub {
2567 my ($self, $ev, $x, $y) = @_;
2568
2569 # todo: maybe put examine on 1? but should just be a tooltip :(
2570 if ($ev->{button} == 1) {
2571 my $targ = $::CONN->{player}{tag};
2572
2573 if ($item->{container} == $::CONN->{player}{tag}) {
2574 $targ = $main::OPENCONT;
2575 }
2576
2577 $::CONN->send ("move $targ $item->{tag} 0");
2578 } elsif ($ev->{button} == 2) {
2579 $::CONN->send ("apply $item->{tag}");
2580 } elsif ($ev->{button} == 3) {
2581 my @menu_items = (
2582 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2583 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2584 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2585 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2586 [
2587 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2588 sub { $::CONN->send ("lock $item->{tag}") },
2589 ],
2590 );
2591
2592 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2593 }
2594
2595 1
2596 },
2597 %args
2598 );
2599
2600
2601 $self->add (new CFClient::UI::Face
2602 can_events => 0,
2603 face => $item->{face},
2604 anim => $item->{anim},
2605 animspeed => $item->{animspeed},
2606 );
2607
2608 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2609
2610 $self->{item} = $item;
2611
2612 $self->update_item;
2613
2614 $self
2615}
2616
2617sub update_item {
2618 my ($self) = @_;
2619
2620 my $desc = _item_to_desc ($self->{item});
2621
2622 $self->{name_lbl}->set_text ($desc);
2623}
2624 3610
2625############################################################################# 3611#############################################################################
2626 3612
2627package CFClient::UI::Inventory;
2628
2629our @ISA = CFClient::UI::ScrolledWindow::;
2630
2631sub new {
2632 my $class = shift;
2633
2634 my $self = $class->SUPER::new (
2635 scrolled => (new CFClient::UI::VBox),
2636 @_,
2637 );
2638
2639 $self
2640}
2641
2642sub set_items {
2643 my ($self, $items) = @_;
2644
2645 $self->{scrolled}->clear;
2646 return unless $items;
2647
2648 my @items = sort {
2649 ($a->{type} <=> $b->{type})
2650 or ($a->{name} cmp $b->{name})
2651 } @$items;
2652
2653 $self->{real_items} = \@items;
2654
2655 for my $item (@items) {
2656 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2657 $item->update_item ();
2658 }
2659
2660 $self->{scrolled}->add (@items);
2661
2662# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2663}
2664
2665sub size_request {
2666 my ($self) = @_;
2667 ($self->{req_w}, $self->{req_h});
2668}
2669
2670#############################################################################
2671
2672package CFClient::UI::Menu; 3613package CFPlus::UI::Menu;
2673 3614
2674our @ISA = CFClient::UI::FancyFrame::; 3615our @ISA = CFPlus::UI::Toplevel::;
2675 3616
2676use CFClient::OpenGL; 3617use CFPlus::OpenGL;
2677 3618
2678sub new { 3619sub new {
2679 my $class = shift; 3620 my $class = shift;
2680 3621
2681 my $self = $class->SUPER::new ( 3622 my $self = $class->SUPER::new (
2682 items => [], 3623 items => [],
2683 z => 100, 3624 z => 100,
2684 @_, 3625 @_,
2685 ); 3626 );
2686 3627
2687 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3628 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2688 3629
2689 for my $item (@{ $self->{items} }) { 3630 for my $item (@{ $self->{items} }) {
2690 my ($widget, $cb) = @$item; 3631 my ($widget, $cb, $tooltip) = @$item;
2691 3632
2692 # handle various types of items, only text for now 3633 # handle various types of items, only text for now
2693 if (!ref $widget) { 3634 if (!ref $widget) {
3635 if ($widget =~ /\t/) {
3636 my ($left, $right) = split /\t/, $widget, 2;
3637
2694 $widget = new CFClient::UI::Label 3638 $widget = new CFPlus::UI::HBox
2695 can_hover => 1, 3639 can_hover => 1,
2696 can_events => 1, 3640 can_events => 1,
3641 tooltip => $tooltip,
3642 children => [
3643 (new CFPlus::UI::Label markup => $left, expand => 1),
3644 (new CFPlus::UI::Label markup => $right, align => +1),
3645 ],
3646 ;
3647
3648 } else {
3649 $widget = new CFPlus::UI::Label
3650 can_hover => 1,
3651 can_events => 1,
2697 text => $widget; 3652 markup => $widget,
3653 tooltip => $tooltip;
3654 }
2698 } 3655 }
2699 3656
2700 $self->{item}{$widget} = $item; 3657 $self->{item}{$widget} = $item;
2701 3658
2702 $self->{vbox}->add ($widget); 3659 $self->{vbox}->add ($widget);
… …
2714 # maybe save $GRAB? must be careful about events... 3671 # maybe save $GRAB? must be careful about events...
2715 $GRAB = $self; 3672 $GRAB = $self;
2716 $self->{button} = $ev->{button}; 3673 $self->{button} = $ev->{button};
2717 3674
2718 $self->show; 3675 $self->show;
2719 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3676 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2720} 3677}
2721 3678
2722sub mouse_motion { 3679sub invoke_mouse_motion {
2723 my ($self, $ev, $x, $y) = @_; 3680 my ($self, $ev, $x, $y) = @_;
2724 3681
2725 # TODO: should use vbox->find_widget or so 3682 # TODO: should use vbox->find_widget or so
2726 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3683 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2727 $self->{hover} = $self->{item}{$HOVER}; 3684 $self->{hover} = $self->{item}{$HOVER};
2728}
2729 3685
3686 0
3687}
3688
2730sub button_up { 3689sub invoke_button_up {
2731 my ($self, $ev, $x, $y) = @_; 3690 my ($self, $ev, $x, $y) = @_;
2732 3691
2733 if ($ev->{button} == $self->{button}) { 3692 if ($ev->{button} == $self->{button}) {
2734 undef $GRAB; 3693 undef $GRAB;
2735 $self->hide; 3694 $self->hide;
2736 3695
2737 $self->emit ("popdown"); 3696 $self->emit ("popdown");
2738 $self->{hover}[1]->() if $self->{hover}; 3697 $self->{hover}[1]->() if $self->{hover};
3698 } else {
3699 return 0
3700 }
3701
2739 } 3702 1
2740} 3703}
2741 3704
2742############################################################################# 3705#############################################################################
2743 3706
2744package CFClient::UI::Statusbox; 3707package CFPlus::UI::Multiplexer;
2745 3708
2746our @ISA = CFClient::UI::VBox::; 3709our @ISA = CFPlus::UI::Container::;
2747 3710
2748sub new { 3711sub new {
2749 my $class = shift; 3712 my $class = shift;
2750 3713
2751 $class->SUPER::new ( 3714 my $self = $class->SUPER::new (
3715 @_,
3716 );
3717
3718 $self->{current} = $self->{children}[0]
3719 if @{ $self->{children} };
3720
3721 $self
3722}
3723
3724sub add {
3725 my ($self, @widgets) = @_;
3726
3727 $self->SUPER::add (@widgets);
3728
3729 $self->{current} = $self->{children}[0]
3730 if @{ $self->{children} };
3731}
3732
3733sub get_current_page {
3734 my ($self) = @_;
3735
3736 $self->{current}
3737}
3738
3739sub set_current_page {
3740 my ($self, $page_or_widget) = @_;
3741
3742 my $widget = ref $page_or_widget
3743 ? $page_or_widget
3744 : $self->{children}[$page_or_widget];
3745
3746 $self->{current} = $widget;
3747 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3748
3749 $self->emit (page_changed => $self->{current});
3750
3751 $self->realloc;
3752}
3753
3754sub visible_children {
3755 $_[0]{current}
3756}
3757
3758sub size_request {
3759 my ($self) = @_;
3760
3761 $self->{current}->size_request
3762}
3763
3764sub invoke_size_allocate {
3765 my ($self, $w, $h) = @_;
3766
3767 $self->{current}->configure (0, 0, $w, $h);
3768
3769 1
3770}
3771
3772sub _draw {
3773 my ($self) = @_;
3774
3775 $self->{current}->draw;
3776}
3777
3778#############################################################################
3779
3780package CFPlus::UI::Notebook;
3781
3782our @ISA = CFPlus::UI::VBox::;
3783
3784sub new {
3785 my $class = shift;
3786
3787 my $self = $class->SUPER::new (
3788 buttonbar => (new CFPlus::UI::Buttonbar),
3789 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3790 # filter => # will be put between multiplexer and $self
3791 @_,
3792 );
3793
3794 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3795 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3796
3797 $self
3798}
3799
3800sub add {
3801 my ($self, $title, $widget, $tooltip) = @_;
3802
3803 CFPlus::weaken $self;
3804
3805 $self->{buttonbar}->add (new CFPlus::UI::Button
3806 markup => $title,
3807 tooltip => $tooltip,
3808 on_activate => sub { $self->set_current_page ($widget) },
3809 );
3810
3811 $self->{multiplexer}->add ($widget);
3812}
3813
3814sub get_current_page {
3815 my ($self) = @_;
3816
3817 $self->{multiplexer}->get_current_page
3818}
3819
3820sub set_current_page {
3821 my ($self, $page) = @_;
3822
3823 $self->{multiplexer}->set_current_page ($page);
3824 $self->emit (page_changed => $self->{multiplexer}{current});
3825}
3826
3827#############################################################################
3828
3829package CFPlus::UI::Selector;
3830
3831use utf8;
3832
3833our @ISA = CFPlus::UI::Button::;
3834
3835sub new {
3836 my $class = shift;
3837
3838 my $self = $class->SUPER::new (
3839 options => [], # [value, title, longdesc], ...
3840 value => undef,
3841 @_,
3842 );
3843
3844 $self->_set_value ($self->{value});
3845
3846 $self
3847}
3848
3849sub invoke_button_down {
3850 my ($self, $ev) = @_;
3851
3852 my @menu_items;
3853
3854 for (@{ $self->{options} }) {
3855 my ($value, $title, $tooltip) = @$_;
3856
3857 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3858 }
3859
3860 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3861}
3862
3863sub _set_value {
3864 my ($self, $value) = @_;
3865
3866 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3867 or return;
3868
3869 $self->{value} = $item->[0];
3870 $self->set_markup ("$item->[1] ⇓");
3871 $self->set_tooltip ($item->[2]);
3872}
3873
3874sub set_value {
3875 my ($self, $value) = @_;
3876
3877 return unless $self->{value} ne $value;
3878
3879 $self->_set_value ($value);
3880 $self->emit (changed => $value);
3881}
3882
3883#############################################################################
3884
3885package CFPlus::UI::Statusbox;
3886
3887our @ISA = CFPlus::UI::VBox::;
3888
3889sub new {
3890 my $class = shift;
3891
3892 my $self = $class->SUPER::new (
2752 fontsize => 0.8, 3893 fontsize => 0.8,
2753 @_, 3894 @_,
2754 ) 3895 );
3896
3897 CFPlus::weaken (my $this = $self);
3898
3899 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3900
3901 $self
2755} 3902}
2756 3903
2757sub reorder { 3904sub reorder {
2758 my ($self) = @_; 3905 my ($self) = @_;
2759 my $NOW = time; 3906 my $NOW = Time::HiRes::time;
3907
3908 # freeze display when hovering over any label
3909 return if $CFPlus::UI::TOOLTIP->{owner}
3910 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3911 values %{ $self->{item} };
2760 3912
2761 while (my ($k, $v) = each %{ $self->{item} }) { 3913 while (my ($k, $v) = each %{ $self->{item} }) {
2762 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3914 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2763 } 3915 }
2764 3916
… …
2767 my @items = sort { 3919 my @items = sort {
2768 $a->{pri} <=> $b->{pri} 3920 $a->{pri} <=> $b->{pri}
2769 or $b->{id} <=> $a->{id} 3921 or $b->{id} <=> $a->{id}
2770 } values %{ $self->{item} }; 3922 } values %{ $self->{item} };
2771 3923
3924 $self->{timer}->interval (1);
3925
2772 my $count = 10 + 1; 3926 my $count = 10 + 1;
2773 for my $item (@items) { 3927 for my $item (@items) {
2774 last unless --$count; 3928 last unless --$count;
2775 3929
2776 push @widgets, $item->{label} ||= do { 3930 my $label = $item->{label} ||= do {
2777 # TODO: doesn't handle markup well (read as: at all) 3931 # TODO: doesn't handle markup well (read as: at all)
2778 my $short = $item->{count} > 1 3932 my $short = $item->{count} > 1
2779 ? "<b>$item->{count} ×</b> $item->{text}" 3933 ? "<b>$item->{count} ×</b> $item->{text}"
2780 : $item->{text}; 3934 : $item->{text};
2781 3935
2782 for ($short) { 3936 for ($short) {
2783 s/^\s+//; 3937 s/^\s+//;
2784 s/\s+/ /g; 3938 s/\s+/ /g;
2785 } 3939 }
2786 3940
2787 new CFClient::UI::Label 3941 new CFPlus::UI::Label
2788 markup => $short, 3942 markup => $short,
2789 tooltip => $item->{tooltip}, 3943 tooltip => $item->{tooltip},
2790 tooltip_font => $::FONT_PROP, 3944 tooltip_font => $::FONT_PROP,
2791 tooltip_width => 0.67, 3945 tooltip_width => 0.67,
2792 fontsize => $item->{fontsize} || $self->{fontsize}, 3946 fontsize => $item->{fontsize} || $self->{fontsize},
2793 max_w => $::WIDTH * 0.44, 3947 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3948 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3949 can_events => 1,
2796 can_hover => 1 3950 can_hover => 1
2797 }; 3951 };
3952
3953 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3954 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3955 $label->update;
3956 $label->set_max_size (undef, $label->{req_h} * $diff)
3957 if $diff < 1;
3958 $self->{timer}->interval (1/30);
3959 } else {
3960 $label->{fg}[3] = $item->{fg}[3] || 1;
3961 }
3962
3963 push @widgets, $label;
2798 } 3964 }
2799 3965
2800 $self->clear; 3966 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3967 $self->SUPER::add (reverse @widgets);
2802} 3968}
… …
2805 my ($self, $text, %arg) = @_; 3971 my ($self, $text, %arg) = @_;
2806 3972
2807 $text =~ s/^\s+//; 3973 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3974 $text =~ s/\s+$//;
2809 3975
3976 return unless $text;
3977
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3978 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3979
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3980 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3981
2814 if (my $item = $self->{item}{$group}) { 3982 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3983 if ($item->{text} eq $text) {
2816 $item->{count}++; 3984 $item->{count}++;
2817 } else { 3985 } else {
2818 $item->{count} = 1; 3986 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3987 $item->{text} = $item->{tooltip} = $text;
2820 } 3988 }
2821 $item->{id} = ++$self->{id}; 3989 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3990 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3991 delete $item->{label};
2824 } else { 3992 } else {
2825 $self->{item}{$group} = { 3993 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3994 id => ++$self->{id},
… …
2832 count => 1, 4000 count => 1,
2833 %arg, 4001 %arg,
2834 }; 4002 };
2835 } 4003 }
2836 4004
4005 $ROOT->on_refresh (reorder => sub {
2837 $self->reorder; 4006 $self->reorder;
4007 });
2838} 4008}
2839 4009
2840sub reconfigure { 4010sub reconfigure {
2841 my ($self) = @_; 4011 my ($self) = @_;
2842 4012
… …
2845 4015
2846 $self->reorder; 4016 $self->reorder;
2847 $self->SUPER::reconfigure; 4017 $self->SUPER::reconfigure;
2848} 4018}
2849 4019
4020sub destroy {
4021 my ($self) = @_;
4022
4023 $self->{timer}->cancel;
4024
4025 $self->SUPER::destroy;
4026}
4027
2850############################################################################# 4028#############################################################################
2851 4029
2852package CFClient::UI::Root; 4030package CFPlus::UI::Root;
2853 4031
2854our @ISA = CFClient::UI::Container::; 4032our @ISA = CFPlus::UI::Container::;
2855 4033
4034use List::Util qw(min max);
4035
2856use CFClient::OpenGL; 4036use CFPlus::OpenGL;
2857 4037
2858sub new { 4038sub new {
2859 my $class = shift; 4039 my $class = shift;
2860 4040
2861 $class->SUPER::new ( 4041 my $self = $class->SUPER::new (
4042 visible => 1,
2862 @_, 4043 @_,
2863 ) 4044 );
2864}
2865 4045
2866sub configure { 4046 CFPlus::weaken ($self->{root} = $self);
2867 my ($self, $x, $y, $w, $h) = @_;
2868 4047
2869 $self->{w} = $w; 4048 $self
2870 $self->{h} = $h;
2871}
2872
2873sub check_size {
2874 my ($self) = @_;
2875
2876 $self->size_allocate ($self->{w}, $self->{h})
2877 if $self->{w};
2878} 4049}
2879 4050
2880sub size_request { 4051sub size_request {
2881 my ($self) = @_; 4052 my ($self) = @_;
2882 4053
2883 ($self->{w}, $self->{h}) 4054 ($self->{w}, $self->{h})
2884} 4055}
2885 4056
4057sub _to_pixel {
4058 my ($coord, $size, $max) = @_;
4059
4060 $coord =
4061 $coord eq "center" ? ($max - $size) * 0.5
4062 : $coord eq "max" ? $max
4063 : $coord;
4064
4065 $coord = 0 if $coord < 0;
4066 $coord = $max - $size if $coord > $max - $size;
4067
4068 int $coord + 0.5
4069}
4070
2886sub size_allocate { 4071sub invoke_size_allocate {
2887 my ($self, $w, $h) = @_; 4072 my ($self, $w, $h) = @_;
2888
2889 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2890 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2891
2892 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2893 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2894 4073
2895 for my $child ($self->children) { 4074 for my $child ($self->children) {
2896 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4075 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2897 4076
2898 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4077 $X = $child->{force_x} if exists $child->{force_x};
2899 if exists $child->{req_x}; 4078 $Y = $child->{force_y} if exists $child->{force_y};
2900 4079
2901 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4080 $X = _to_pixel $X, $W, $self->{w};
2902 if exists $child->{req_y}; 4081 $Y = _to_pixel $Y, $H, $self->{h};
2903
2904 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2905 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2906 4082
2907 $child->configure ($X, $Y, $W, $H); 4083 $child->configure ($X, $Y, $W, $H);
2908 } 4084 }
4085
4086 1
2909} 4087}
2910 4088
2911sub coord2local { 4089sub coord2local {
2912 my ($self, $x, $y) = @_; 4090 my ($self, $x, $y) = @_;
2913 4091
… …
2921} 4099}
2922 4100
2923sub update { 4101sub update {
2924 my ($self) = @_; 4102 my ($self) = @_;
2925 4103
2926 $self->check_size;
2927 $::WANT_REFRESH++; 4104 $::WANT_REFRESH++;
2928} 4105}
2929 4106
2930sub add { 4107sub add {
2931 my ($self, @children) = @_; 4108 my ($self, @children) = @_;
2932 4109
2933 for my $child (@children) {
2934 $child->{toplevel} = 1; 4110 $_->{is_toplevel} = 1
2935 4111 for @children;
2936 # integerise window positions
2937 $child->{x} = int $child->{x};
2938 $child->{y} = int $child->{y};
2939 }
2940 4112
2941 $self->SUPER::add (@children); 4113 $self->SUPER::add (@children);
4114}
4115
4116sub remove {
4117 my ($self, @children) = @_;
4118
4119 $self->SUPER::remove (@children);
4120
4121 delete $self->{is_toplevel}
4122 for @children;
4123
4124 while (@children) {
4125 my $w = pop @children;
4126 push @children, $w->children;
4127 $w->set_invisible;
4128 }
2942} 4129}
2943 4130
2944sub on_refresh { 4131sub on_refresh {
2945 my ($self, $id, $cb) = @_; 4132 my ($self, $id, $cb) = @_;
2946 4133
… …
2959 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
2960 $_->() 4147 $_->()
2961 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
2962 } 4149 }
2963 4150
2964 if ($self->{check_size}) { 4151 while ($self->{realloc}) {
2965 my @queue = ([], []); 4152 my %queue;
4153 my @queue;
4154 my $widget;
2966 4155
2967 for (;;) { 4156 outer:
2968 if ($self->{check_size}) { 4157 while () {
2969 # heuristic: check containers last 4158 if (my $realloc = delete $self->{realloc}) {
2970 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4159 for $widget (values %$realloc) {
2971 for values %{delete $self->{check_size}} 4160 $widget->{visible} or next; # do not resize invisible widgets
4161
4162 $queue{$widget+0}++ and next; # duplicates are common
4163
4164 push @{ $queue[$widget->{visible}] }, $widget;
4165 }
2972 } 4166 }
2973 4167
2974 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4168 while () {
4169 @queue or last outer;
2975 4170
2976 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4171 $widget = pop @{ $queue[-1] || [] }
2977 ? @$widget{qw(user_w user_h)} 4172 and last;
2978 : $widget->size_request;
2979
2980 if (delete $widget->{force_alloc}
2981 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2982 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2983 4173
4174 pop @queue;
4175 }
4176
4177 delete $queue{$widget+0};
4178
4179 my ($w, $h) = $widget->size_request;
4180
4181 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4182 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4183
4184 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4185 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4186
4187 $w = $widget->{force_w} if exists $widget->{force_w};
4188 $h = $widget->{force_h} if exists $widget->{force_h};
4189
4190 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4191 || delete $widget->{force_realloc}) {
2984 $widget->{req_w} = $w; 4192 $widget->{req_w} = $w;
2985 $widget->{req_h} = $h; 4193 $widget->{req_h} = $h;
2986 4194
2987 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4195 $self->{size_alloc}{$widget+0} = $widget;
2988 4196
2989 $widget->{parent}->check_size
2990 if $widget->{parent}; 4197 if (my $parent = $widget->{parent}) {
4198 $self->{realloc}{$parent+0} = $parent
4199 unless $queue{$parent+0};
4200
4201 $parent->{force_size_alloc} = 1;
4202 $self->{size_alloc}{$parent+0} = $parent;
4203 }
2991 } 4204 }
4205
4206 delete $self->{realloc}{$widget+0};
2992 } 4207 }
2993 }
2994 4208
2995 while ($self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
2996 for (values %{delete $self->{size_alloc}}) { 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
2997 my ($widget, $w, $h) = @$_; 4211 values %$size_alloc;
2998 4212
4213 while () {
4214 my $widget = pop @queue || last;
4215
4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4217
4218 $w = max $widget->{min_w}, $w;
4219 $h = max $widget->{min_h}, $h;
4220
4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4223
4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4226
2999 $w = 0 if $w < 0; 4227 $w = int $w + 0.5;
3000 $h = 0 if $h < 0; 4228 $h = int $h + 0.5;
3001 4229
4230 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4231 $widget->{old_w} = $widget->{w};
4232 $widget->{old_h} = $widget->{h};
4233
3002 $widget->{w} = $w; 4234 $widget->{w} = $w;
3003 $widget->{h} = $h; 4235 $widget->{h} = $h;
3004 $widget->size_allocate ($w, $h); 4236
3005 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
4239 }
3006 } 4240 }
3007 } 4241 }
3008 4242
3009 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {
3010 $_->() 4244 $_->()
… …
3015 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4249 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3016 glClear GL_COLOR_BUFFER_BIT; 4250 glClear GL_COLOR_BUFFER_BIT;
3017 4251
3018 glMatrixMode GL_PROJECTION; 4252 glMatrixMode GL_PROJECTION;
3019 glLoadIdentity; 4253 glLoadIdentity;
3020 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4254 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3021 glMatrixMode GL_MODELVIEW; 4255 glMatrixMode GL_MODELVIEW;
3022 glLoadIdentity; 4256 glLoadIdentity;
3023 4257
4258 {
4259 package CFPlus::UI::Base;
4260
4261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4262 (0, 0, $self->{w}, $self->{h});
4263
3024 $self->_draw; 4264 $self->_draw;
4265 }
3025} 4266}
3026 4267
3027############################################################################# 4268#############################################################################
3028 4269
3029package CFClient::UI; 4270package CFPlus::UI;
3030 4271
3031$ROOT = new CFClient::UI::Root; 4272$ROOT = new CFPlus::UI::Root;
3032$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4273$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3033 4274
30341 42751
3035 4276

Diff Legend

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