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

Diff Legend

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