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.66 by root, Tue Apr 11 14:36:02 2006 UTC vs.
Revision 1.98 by root, Fri Apr 14 02:06:22 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
74 72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { 84 my $self = bless {
79 x => 0, 85 x => 0,
80 y => 0, 86 y => 0,
81 z => 0, 87 z => 0,
88 w => -1,
89 h => -1,
82 @_ 90 @_
83 }, $class 91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
84} 100}
85 101
86sub move { 102sub move {
87 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 104 $self->{x} = $x;
… …
97sub size_request { 113sub size_request {
98 require Carp; 114 require Carp;
99 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
100} 116}
101 117
102sub size_allocate { 118sub _size_allocate {
103 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
104 125
105 $self->{w} = $w; 126 $self->{w} = $w;
106 $self->{h} = $h; 127 $self->{h} = $h;
107}
108 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
109# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
110sub translate { 139sub translate {
111 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
112 141
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114} 143}
115 144
116sub focus_in { 145sub focus_in {
117 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
118 150
119 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 152 $focus->update if $focus;
121 $FOCUS->update; 153 $FOCUS->update;
122} 154}
… …
130 $focus->update if $focus; #? 162 $focus->update if $focus; #?
131} 163}
132 164
133sub mouse_motion { } 165sub mouse_motion { }
134sub button_up { } 166sub button_up { }
135sub button_down { }
136sub key_down { } 167sub key_down { }
137sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
138 175
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 181
145sub draw { 182sub draw {
146 my ($self) = @_; 183 my ($self) = @_;
147 184
185 return unless $self->{h} && $self->{w};
186
148 glPushMatrix; 187 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 189 $self->_draw;
151 if ($self == $HOVER) { 190 glPopMatrix;
152 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 198 glBegin GL_QUADS;
155 glVertex 0 , 0; 199 glVertex $x , $y;
156 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
159 glEnd; 203 glEnd;
160 glDisable GL_BLEND; 204 glDisable GL_BLEND;
161 } 205 }
162 glPopMatrix;
163} 206}
164 207
165sub _draw { 208sub _draw {
166 my ($self) = @_; 209 my ($self) = @_;
167 210
168 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 212}
181 213
182sub find_widget { 214sub find_widget {
183 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
184 216
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 220
189 () 221 ()
190} 222}
191 223
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 224sub set_parent {
195 my ($self, $par) = @_; 225 my ($self, $par) = @_;
196 226
197 $self->{parent} = $par; 227 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
207 237
208 $self->{parent}->update 238 $self->{parent}->update
209 if $self->{parent}; 239 if $self->{parent};
210} 240}
211 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
212sub DESTROY { 255sub DESTROY {
213 my ($self) = @_; 256 my ($self) = @_;
214 257
215 #$self->deactivate; 258 #$self->deactivate;
216} 259}
217 260
218############################################################################# 261#############################################################################
219 262
263package CFClient::UI::DrawBG;
264
265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
269
270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
220package CFClient::Widget::Empty; 303package CFClient::UI::Empty;
221 304
222our @ISA = CFClient::Widget::; 305our @ISA = CFClient::UI::Base::;
223 306
224sub size_request { 307sub size_request {
225 (0, 0) 308 (0, 0)
226} 309}
227 310
228sub draw { 311sub draw { }
229}
230 312
231############################################################################# 313#############################################################################
232 314
233package CFClient::Widget::Container; 315package CFClient::UI::Container;
234 316
235our @ISA = CFClient::Widget::; 317our @ISA = CFClient::UI::Base::;
236 318
237sub new { 319sub new {
238 my ($class, %arg) = @_; 320 my ($class, %arg) = @_;
239 321
240 my $children = delete $arg{children} || []; 322 my $children = delete $arg{children} || [];
… …
244 326
245 $self 327 $self
246} 328}
247 329
248sub add { 330sub add {
249 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
250 332
251 $chld->{expand} = $expand;
252 $chld->set_parent ($self); 333 $chld->set_parent ($self);
253 334
254 $self->{children} = [ 335 $self->{children} = [
255 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
256 @{$self->{children}}, $chld 337 @{$self->{children}}, $chld
257 ]; 338 ];
258 339
259 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
260 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
261} 342}
262 343
263sub remove { 344sub remove {
264 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
265 346
266 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
267 348
268 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
269} 350}
270 351
271sub find_widget { 352sub find_widget {
272 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
273 354
… …
290 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
291} 372}
292 373
293############################################################################# 374#############################################################################
294 375
295package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
296 377
297our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
298 379
299sub new { 380sub new {
300 my ($class, %arg) = @_; 381 my ($class, %arg) = @_;
301 382
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
303 384
304 $class->SUPER::new (children => [$child], %arg) 385 $class->SUPER::new (children => [$child], %arg)
305} 386}
306 387
307sub add { 388sub add {
… …
315sub remove { 396sub remove {
316 my ($self, $widget) = @_; 397 my ($self, $widget) = @_;
317 398
318 $self->SUPER::remove ($widget); 399 $self->SUPER::remove ($widget);
319 400
320 $self->{children} = [new CFClient::Widget::Empty] 401 $self->{children} = [new CFClient::UI::Empty]
321 unless @{$self->{children}}; 402 unless @{$self->{children}};
322} 403}
323 404
324sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
325 406
326sub size_request { 407sub size_request {
327 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
328} 409}
329 410
330sub size_allocate { 411sub size_allocate {
331 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
332 413
333 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
334 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
335 if $self->{children}[0]
336} 417}
337 418
338############################################################################# 419#############################################################################
339 420
340package CFClient::Widget::Window; 421package CFClient::UI::Window;
341 422
342our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
343 424
344use SDL::OpenGL; 425use SDL::OpenGL;
345 426
346sub new { 427sub new {
347 my ($class, %arg) = @_; 428 my ($class, %arg) = @_;
… …
365 $self->{w}, $self->{h}, sub { $self->child->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
366 ); 447 );
367} 448}
368 449
369sub size_allocate { 450sub size_allocate {
370 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
371 452
372 $self->{w} = $w; 453 $self->_size_allocate ($x, $y, $w, $h) or return;
373 $self->{h} = $h;
374 454
375 $self->child->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
376 456
377 $self->render_chld; 457 $self->render_chld;
378} 458}
379 459
380sub _draw { 460sub _draw {
… …
384 464
385 my $tex = $self->{texture} 465 my $tex = $self->{texture}
386 or return; 466 or return;
387 467
388 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
389 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
391 472
392 $tex->draw_quad (0, 0, $w, $h); 473 $tex->draw_quad (0, 0, $w, $h);
393 474
… …
395 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
396} 477}
397 478
398############################################################################# 479#############################################################################
399 480
400package CFClient::Widget::Frame; 481package CFClient::UI::Frame;
401 482
402our @ISA = CFClient::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
403 484
404use SDL::OpenGL; 485use SDL::OpenGL;
405 486
406sub size_request { 487sub size_request {
407 my ($self) = @_; 488 my ($self) = @_;
… …
412 493
413 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
414} 495}
415 496
416sub size_allocate { 497sub size_allocate {
417 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
418 499
419 $self->{w} = $w; 500 $self->_size_allocate ($x, $y, $w, $h) or return;
420 $self->{h} = $h;
421 501
422 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
423 $self->child->move (2, 2);
424} 503}
425 504
426sub _draw { 505sub _draw {
427 my ($self) = @_; 506 my ($self) = @_;
428 507
… …
441 $chld->draw; 520 $chld->draw;
442} 521}
443 522
444############################################################################# 523#############################################################################
445 524
446package CFClient::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
447 526
448our @ISA = CFClient::Widget::Bin::; 527our @ISA = CFClient::UI::Bin::;
449 528
450use SDL::OpenGL; 529use SDL::OpenGL;
451 530
452my @tex = 531my @tex =
453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
455 534
535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
456sub size_request { 548sub size_request {
457 my ($self) = @_; 549 my ($self) = @_;
458 550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
459 my ($w, $h) = $self->SUPER::size_request; 553 my ($w, $h) = $self->SUPER::size_request;
460 554
461 $h += $tex[1]->{height}; 555 (
462 $h += $tex[4]->{height}; 556 $w + $self->{border} * 2,
463 $w += $tex[2]->{width}; 557 $h + $self->{border} * 2,
464 $w += $tex[3]->{width}; 558 )
465
466 ($w, $h)
467} 559}
468 560
469sub size_allocate { 561sub size_allocate {
470 my ($self, $w, $h) = @_; 562 my ($self, $x, $y, $w, $h) = @_;
471 563
472 $self->SUPER::size_allocate ($w, $h); 564 $self->_size_allocate ($x, $y, $w, $h) or return;
473 565
474 $h -= $tex[1]->{height}; 566 $h -= List::Util::max 0, $self->{border} * 2;
475 $h -= $tex[4]->{height}; 567 $w -= List::Util::max 0, $self->{border} * 2;
476 $w -= $tex[2]->{width};
477 $w -= $tex[3]->{width};
478 568
479 $h = $h < 0 ? 0 : $h; 569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
480 $w = $w < 0 ? 0 : $w; 570}
481 571
482 my $child = $self->child; 572sub button_down {
573 my ($self, $ev, $x, $y) = @_;
483 574
484 $child->size_allocate ($w, $h); 575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
485 $child->move ($tex[3]->{width}, $tex[1]->{height}); 576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
486} 618}
487 619
488sub _draw { 620sub _draw {
489 my ($self) = @_; 621 my ($self) = @_;
490 622
491 my ($w, $h) = ($self->{w}, $self->{h}); 623 my ($w, $h ) = ($self->{w}, $self->{h});
492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
493 625
494 glEnable GL_BLEND; 626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
495 glEnable GL_TEXTURE_2D; 628 glEnable GL_TEXTURE_2D;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
498 630
499 my $top = $tex[1]; 631 glColor @{ $self->{border_bg} };
500 $top->draw_quad (0, 0, $w, $top->{height}); 632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
501 633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
502 my $left = $tex[3]; 634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
504
505 my $right = $tex[2];
506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
507
508 my $bottom = $tex[4];
509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
510 636
511 my $bg = $tex[0]; 637 my $bg = $tex[0];
512 glBindTexture GL_TEXTURE_2D, $bg->{name};
513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
516 638
639 # TODO: repeat texture not scale
517 my $rep_x = $cw / $bg->{width}; 640 my $rep_x = $cw / $bg->{w};
518 my $rep_y = $ch / $bg->{height}; 641 my $rep_y = $ch / $bg->{h};
519 642
643 glColor @{ $self->{bg} };
520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 644 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
521 645
646 glDisable GL_TEXTURE_2D;
522 glDisable GL_BLEND; 647 glDisable GL_BLEND;
523 glDisable GL_TEXTURE_2D;
524 648
525 $self->child->draw; 649 $self->child->draw;
526
527} 650}
528 651
529############################################################################# 652#############################################################################
530 653
531package CFClient::Widget::Table; 654package CFClient::UI::Table;
532 655
533our @ISA = CFClient::Widget::Bin::; 656our @ISA = CFClient::UI::Base::;
657
658use List::Util qw(max sum);
534 659
535use SDL::OpenGL; 660use SDL::OpenGL;
661
662sub new {
663 my $class = shift;
664
665 $class->SUPER::new (
666 col_expand => [],
667 @_
668 )
669}
536 670
537sub add { 671sub add {
538 my ($self, $x, $y, $chld) = @_; 672 my ($self, $x, $y, $chld) = @_;
539 my $old_chld = $self->{children}[$y][$x];
540 673
541 $self->{children}[$y][$x] = $chld; 674 $self->{children}[$y][$x] = $chld;
542 $chld->set_parent ($self); 675 $chld->set_parent ($self);
676
677 $self->{w} = $self->{h} = -1;
543 $self->update; 678 $self->update;
544} 679}
545 680
546sub max_row_height { 681sub get_wh {
547 my ($self, $row) = @_; 682 my ($self) = @_;
548 683
549 my $hs = 0; 684 my (@w, @h);
550 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 685
686 for my $y (0 .. $#{$self->{children}}) {
551 my $c = $self->{children}->[$row]->[$xi]; 687 my $row = $self->{children}[$y]
552 if ($c) { 688 or next;
689
690 for my $x (0 .. $#$row) {
691 my $widget = $row->[$x]
692 or next;
553 my ($w, $h) = $c->size_request; 693 my ($w, $h) = $widget->size_request;
554 if ($hs < $h) { $hs = $h } 694
695 $w[$x] = max $w[$x], $w;
696 $h[$y] = max $h[$y], $h;
555 } 697 }
556 } 698 }
557 return $hs;
558}
559 699
560sub max_col_width { 700 (\@w, \@h)
701}
702
703sub size_request {
561 my ($self, $col) = @_; 704 my ($self) = @_;
562 705
706 my ($ws, $hs) = $self->get_wh;
707
708 (
709 (sum @$ws),
710 (sum @$hs),
711 )
712}
713
714sub size_allocate {
715 my ($self, $x, $y, $w, $h) = @_;
716
717 $self->_size_allocate ($x, $y, $w, $h) or return;
718
719 my ($ws, $hs) = $self->get_wh;
720
721 my $req_w = sum @$ws;
722 my $req_h = sum @$hs;
723
724 # TODO: nicer code && do row_expand
725 my @col_expand = @{$self->{col_expand}};
726 @col_expand = (1) x @$ws unless @col_expand;
727 my $col_expand = (sum @col_expand) || 1;
728
729 # linearly scale sizes
730 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
731 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
732
733 my $y;
734
735 for my $r (0 .. $#{$self->{children}}) {
736 my $row = $self->{children}[$r]
737 or next;
738
563 my $ws = 0; 739 my $x = 0;
564 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 740 my $row_h = $hs->[$r];
565 my $c = ($self->{children}->[$yi] || [])->[$col]; 741
566 if ($c) { 742 for my $c (0 .. $#$row) {
567 my ($w, $h) = $c->size_request; 743 my $col_w = $ws->[$c];
568 if ($ws < $w) { $ws = $w } 744
745 if (my $widget = $row->[$c]) {
746 $widget->size_allocate ($x, $y, $col_w, $row_h);
747 }
748
749 $x += $col_w;
569 } 750 }
751
752 $y += $row_h;
570 } 753 }
571 return $ws; 754
572} 755}
756
757sub find_widget {
758 my ($self, $x, $y) = @_;
759
760 $x -= $self->{x};
761 $y -= $self->{y};
762
763 my $res;
764
765 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
766 $res = $_->find_widget ($x, $y)
767 and return $res;
768 }
769
770 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
771}
772
773sub _draw {
774 my ($self) = @_;
775
776 for (grep $_, @{$self->{children}}) {
777 $_->draw for grep $_, @$_;
778 }
779}
780
781#############################################################################
782
783package CFClient::UI::HBox;
784
785# TODO: wrap into common Box base class
786
787our @ISA = CFClient::UI::Container::;
573 788
574sub size_request { 789sub size_request {
575 my ($self) = @_; 790 my ($self) = @_;
576 791
792 my @alloc = map [$_->size_request], @{$self->{children}};
793
794 (
795 (List::Util::sum map $_->[0], @alloc),
796 (List::Util::max map $_->[1], @alloc),
797 )
798}
799
800sub size_allocate {
801 my ($self, $x, $y, $w, $h) = @_;
802
803 $self->_size_allocate ($x, $y, $w, $h);
804
577 my ($hs, $ws) = (0, 0); 805 ($h, $w) = ($w, $h);
578 806
579 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 807 my $children = $self->{children};
580 $hs += $self->max_row_height ($yi);
581 }
582 808
583 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 809 my @h = map +($_->size_request)[0], @$children;
584 my $wm = 0; 810
585 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 811 my $req_h = List::Util::sum @h;
586 $wm += $self->max_col_width ($xi) 812
813 if ($req_h > $h) {
814 # ah well, not enough space
815 $_ *= $h / $req_h for @h;
816 } else {
817 my $exp = List::Util::sum map $_->{expand}, @$children;
818 $exp ||= 1;
819
820 for (0 .. $#$children) {
821 my $child = $children->[$_];
822
823 my $alloc_h = $h[$_];
824 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825 $h[$_] = $alloc_h;
587 } 826 }
588 if ($ws < $wm) { $ws = $wm }
589 } 827 }
590
591 return ($ws, $hs);
592}
593
594sub _draw {
595 my ($self) = @_;
596 828
597 my $y = 0; 829 my $y = 0;
598 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 830 for (0 .. $#$children) {
831 my $child = $children->[$_];
599 my $x = 0; 832 my $h = $h[$_];
833 $child->size_allocate ($y, 0, $h, $w);
600 834
601 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 835 $y += $h;
602
603 my $c = $self->{children}->[$yi]->[$xi];
604 if ($c) {
605 $c->move ($x, $y, 0); #TODO: Move to size_request
606 $c->draw if $c;
607 }
608
609 $x += $self->max_col_width ($xi);
610 }
611
612 $y += $self->max_row_height ($yi);
613 } 836 }
614} 837}
615 838
616############################################################################# 839#############################################################################
617 840
618package CFClient::Widget::VBox; 841package CFClient::UI::VBox;
619 842
843# TODO: wrap into common Box base class
844
620our @ISA = CFClient::Widget::Container::; 845our @ISA = CFClient::UI::Container::;
621
622use SDL::OpenGL;
623 846
624sub size_request { 847sub size_request {
625 my ($self) = @_; 848 my ($self) = @_;
626 849
627 my @alloc = map [$_->size_request], @{$self->{children}}; 850 my @alloc = map [$_->size_request], @{$self->{children}};
… …
631 (List::Util::sum map $_->[1], @alloc), 854 (List::Util::sum map $_->[1], @alloc),
632 ) 855 )
633} 856}
634 857
635sub size_allocate { 858sub size_allocate {
636 my ($self, $w, $h) = @_; 859 my ($self, $x, $y, $w, $h) = @_;
637 860
638 $self->w ($w); 861 $self->_size_allocate ($x, $y, $w, $h);
639 $self->h ($h);
640 862
641 my $exp; 863 my $children = $self->{children};
642 my @oth; 864
643 # find expand widget 865 my @h = map +($_->size_request)[1], @$children;
644 for (@{$self->{children}}) { 866
645 if ($_->{expand}) { 867 my $req_h = List::Util::sum @h;
868
869 if ($req_h > $h) {
870 # ah well, not enough space
871 $_ *= $h / $req_h for @h;
872 } else {
873 my $exp = List::Util::sum map $_->{expand}, @$children;
646 $exp = $_; 874 $exp ||= 1;
647 last; 875
876 for (0 .. $#$children) {
877 my $child = $children->[$_];
878
879 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
648 } 880 }
649 push @oth, $_;
650 }
651
652 my ($ow, $oh);
653
654 # get sizes of other widgets
655 for (@oth) {
656 my ($w, $h) = $_->size_request;
657 $oh += $h;
658 if ($ow < $w) { $ow = $w }
659 } 881 }
660 882
661 my $y = 0; 883 my $y = 0;
662 for (@{$self->{children}}) { 884 for (0 .. $#$children) {
663 $_->move (0, $y); 885 my $child = $children->[$_];
664 886 my $h = $h[$_];
665 if ($_ == $exp) {
666 $_->size_allocate ($w, $h - $oh);
667 $y += $h - $oh;
668 } else {
669 my ($cw, $h) = $_->size_request;
670 $_->size_allocate ($w, $h); 887 $child->size_allocate (0, $y, $w, $h);
888
671 $y += $h; 889 $y += $h;
672 }
673 } 890 }
674} 891}
675 892
676############################################################################# 893#############################################################################
677 894
678package CFClient::Widget::Label; 895package CFClient::UI::Label;
679 896
680our @ISA = CFClient::Widget::; 897our @ISA = CFClient::UI::Base::;
681 898
682use SDL::OpenGL; 899use SDL::OpenGL;
683 900
684sub new { 901sub new {
685 my ($class, %arg) = @_; 902 my ($class, %arg) = @_;
686 903
687 # TODO: color, and make height, xyz etc. optional
688 my $self = $class->SUPER::new ( 904 my $self = $class->SUPER::new (
689 color => [1, 1, 1], 905 fg => [1, 1, 1],
690 height => $::FONTSIZE, 906 height => $::FONTSIZE,
691 text => "", 907 text => "",
908 align => -1,
909 padding => 2,
692 layout => new CFClient::Layout, 910 layout => new CFClient::Layout,
693 %arg 911 %arg
694 ); 912 );
695 913
696 $self->set_text ($self->{text}); 914 $self->set_text ($self->{text});
697 915
698 $self 916 $self
699} 917}
700 918
919sub escape_text {
920 local $_ = $_[1];
921
922 s/&/&amp;/g;
923 s/>/&gt;/g;
924 s/</&lt;/g;
925
926 $_[1]
927}
928
701sub set_text { 929sub set_text {
702 my ($self, $text) = @_; 930 my ($self, $text) = @_;
703 931
704 $self->{text} = $text; 932 $self->{text} = $text;
705 $self->{layout}->set_markup ($text); 933 $self->{layout}->set_markup ($text);
706 934
707 delete $self->{texture}; 935 delete $self->{texture};
936# $self->{w} = $self->{h} = -1;
937 $self->update;
708} 938}
709 939
710sub get_text { 940sub get_text {
711 my ($self, $text) = @_; 941 my ($self, $text) = @_;
712 942
… …
716sub size_request { 946sub size_request {
717 my ($self) = @_; 947 my ($self) = @_;
718 948
719 $self->{layout}->set_width; 949 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height}); 950 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size 951 my ($w, $h) = $self->{layout}->size;
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952
723# ( 953 (
724# $self->{texture}{width}, 954 $w + $self->{padding} * 2,
725# $self->{texture}{height}, 955 $h + $self->{padding} * 2,
726# ) 956 )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732} 957}
733 958
734sub size_allocate { 959sub size_allocate {
735 my ($self, $w, $h) = @_; 960 my ($self, $x, $y, $w, $h) = @_;
736 961
737 $self->SUPER::size_allocate ($w, $h); 962 $self->_size_allocate ($x, $y, $w, $h) or return;
963
738 delete $self->{texture}; 964 delete $self->{texture};
965}
966
967sub update {
968 my ($self) = @_;
969
970 delete $self->{texture};
971 $self->SUPER::update;
739} 972}
740 973
741sub _draw { 974sub _draw {
742 my ($self) = @_; 975 my ($self) = @_;
743 976
744 my $tex = $self->{texture} ||= do { 977 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w}); 978 $self->{layout}->set_width ($self->{w});
979 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
746 new_from_layout CFClient::Texture $self->{layout}; 980 new_from_layout CFClient::Texture $self->{layout}
747 }; 981 };
982
983 glEnable GL_BLEND;
984 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
985 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987
988 glColor @{$self->{fg}};
989
990 my $x =
991 $self->{align} < 0 ? $self->{padding}
992 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
993 : ($self->{w} - $tex->{w}) * 0.5;
994
995 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
996 $tex->draw_quad (0, 0);
997
998 glDisable GL_TEXTURE_2D;
999 glDisable GL_BLEND;
1000}
1001
1002#############################################################################
1003
1004package CFClient::UI::Entry;
1005
1006our @ISA = CFClient::UI::Label::;
1007
1008use SDL;
1009use SDL::OpenGL;
1010
1011sub new {
1012 my $class = shift;
1013
1014 $class->SUPER::new (
1015 fg => [1, 1, 1],
1016 bg => [0, 0, 0, 0.2],
1017 active_bg => [1, 1, 1, 0.5],
1018 active_fg => [0, 0, 0],
1019 can_hover => 1,
1020 can_focus => 1,
1021 @_
1022 )
1023}
1024
1025sub _set_text {
1026 my ($self, $text) = @_;
1027
1028 $self->{last_activity} = $::NOW;
1029
1030 $self->{text} = $text;
1031 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1033
1034 $text =~ s/./*/g if $self->{hidden};
1035
1036 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1037
1038 $text = substr $text, 0, $self->{cursor};
1039 utf8::encode $text;
1040
1041 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1042}
1043
1044sub size_request {
1045 my ($self) = @_;
1046
1047 my ($w, $h) = $self->SUPER::size_request;
1048
1049 ($w + 1, $h) # add 1 for cursor
1050}
1051
1052sub size_allocate {
1053 my ($self, $x, $y, $w, $h) = @_;
1054
1055 $self->SUPER::size_allocate ($x, $y, $w, $h);
1056
1057 $self->_set_text ($self->{text});
1058}
1059
1060sub set_text {
1061 my ($self, $text) = @_;
1062
1063 $self->{cursor} = length $text;
1064 $self->_set_text ($text);
1065 $self->update;
1066}
1067
1068sub key_down {
1069 my ($self, $ev) = @_;
1070
1071 my $mod = $ev->key_mod;
1072 my $sym = $ev->key_sym;
1073
1074 my $uni = $ev->key_unicode;
1075
1076 my $text = $self->get_text;
1077
1078 if ($sym == SDLK_BACKSPACE) {
1079 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1080 } elsif ($sym == SDLK_DELETE) {
1081 substr $text, $self->{cursor}, 1, "";
1082 } elsif ($sym == SDLK_LEFT) {
1083 --$self->{cursor} if $self->{cursor};
1084 } elsif ($sym == SDLK_RIGHT) {
1085 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1086 } elsif ($sym == SDLK_HOME) {
1087 $self->{cursor} = 0;
1088 } elsif ($sym == SDLK_END) {
1089 $self->{cursor} = length $text;
1090 } elsif ($uni) {
1091 substr $text, $self->{cursor}++, 0, chr $uni;
1092 }
1093
1094 $self->_set_text ($text);
1095 $self->update;
1096}
1097
1098sub focus_in {
1099 my ($self) = @_;
1100
1101 $self->{last_activity} = $::NOW;
1102
1103 $self->SUPER::focus_in;
1104}
1105
1106sub button_down {
1107 my ($self, $ev, $x, $y) = @_;
1108
1109 $self->SUPER::button_down ($ev, $x, $y);
1110
1111 my $idx = $self->{layout}->xy_to_index ($x, $y);
1112
1113 # byte-index to char-index
1114 my $text = $self->{text};
1115 utf8::encode $text;
1116 $self->{cursor} = length substr $text, 0, $idx;
1117
1118 $self->_set_text ($self->{text});
1119 $self->update;
1120}
1121
1122sub mouse_motion {
1123 my ($self, $ev, $x, $y) = @_;
1124# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1125}
1126
1127sub _draw {
1128 my ($self) = @_;
1129
1130 local $self->{fg} = $self->{fg};
1131
1132 if ($FOCUS == $self) {
1133 glColor @{$self->{active_bg}};
1134 $self->{fg} = $self->{active_fg};
1135 } else {
1136 glColor @{$self->{bg}};
1137 }
1138
1139 glEnable GL_BLEND;
1140 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1141 glBegin GL_QUADS;
1142 glVertex 0 , 0;
1143 glVertex 0 , $self->{h};
1144 glVertex $self->{w}, $self->{h};
1145 glVertex $self->{w}, 0;
1146 glEnd;
1147 glDisable GL_BLEND;
1148
1149 $self->SUPER::_draw;
1150
1151 #TODO: force update every cursor change :(
1152 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1153 glColor @{$self->{fg}};
1154 glBegin GL_LINES;
1155 glVertex $self->{cur_x}, $self->{cur_y};
1156 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1157 glEnd;
1158 }
1159}
1160
1161#############################################################################
1162
1163package CFClient::UI::Button;
1164
1165our @ISA = CFClient::UI::Label::;
1166
1167use SDL;
1168use SDL::OpenGL;
1169
1170my @tex =
1171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1172 qw(b1_button_active.png);
1173
1174sub new {
1175 my $class = shift;
1176
1177 $class->SUPER::new (
1178 padding => 4,
1179 fg => [1, 1, 1],
1180 bg => [1, 1, 1, 0.2],
1181 active_fg => [1, 1, 0],
1182 can_hover => 1,
1183 @_
1184 )
1185}
1186
1187sub button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if ($x >= 0 && $x < $self->{w}
1191 && $y >= 0 && $y < $self->{h}) {
1192 $self->emit ("activate");
1193 }
1194}
1195
1196sub _draw {
1197 my ($self) = @_;
1198
1199 local $self->{fg} = $self->{fg};
1200 my $tex = $tex[0];
748 1201
749 glEnable GL_BLEND; 1202 glEnable GL_BLEND;
750 glEnable GL_TEXTURE_2D; 1203 glEnable GL_TEXTURE_2D;
751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205
1206 if ($GRAB == $self) {
1207 $self->{fg} = $self->{active_fg};
1208 }
1209
1210 glBindTexture GL_TEXTURE_2D, $tex->{name};
752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
753 1212
754 glColor @{$self->{color}}; 1213 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
755 1214
756 $tex->draw_quad (0, 0); 1215 glDisable GL_TEXTURE_2D;
757
758 glDisable GL_BLEND; 1216 glDisable GL_BLEND;
759 glDisable GL_TEXTURE_2D;
760}
761 1217
762############################################################################# 1218 $self->SUPER::_draw;
1219}
763 1220
764package CFClient::Widget::Entry; 1221#############################################################################
765 1222
1223package CFClient::UI::CheckBox;
1224
766our @ISA = CFClient::Widget::Label::; 1225our @ISA = CFClient::UI::DrawBG::;
767 1226
768use SDL; 1227use SDL;
769use SDL::OpenGL; 1228use SDL::OpenGL;
770 1229
771sub key_down { 1230sub new {
1231 my $class = shift;
1232
1233 $class->SUPER::new (
1234 padding => 2,
1235 fg => [1, 1, 1],
1236 active_fg => [1, 1, 0],
1237 state => 0,
1238 can_hover => 1,
1239 @_
1240 )
1241}
1242
1243sub size_request {
772 my ($self, $ev) = @_; 1244 my ($self) = @_;
773 1245
774 my $mod = $ev->key_mod; 1246 ($self->{padding} * 2 + 6) x 2
775 my $sym = $ev->key_sym; 1247}
776 1248
777 my $uni = $ev->key_unicode; 1249sub size_allocate {
1250 my ($self, $x, $y, $w, $h) = @_;
778 1251
779 my $text = $self->get_text; 1252 $self->_size_allocate ($x, $y, $w, $h);
780
781 if ($sym == SDLK_BACKSPACE) {
782 substr $text, -1, 1, '';
783 } elsif ($uni) {
784 $text .= chr $uni;
785 }
786
787 $self->set_text ($text);
788} 1253}
789 1254
790sub button_down { 1255sub button_down {
1256 my ($self, $ev, $x, $y) = @_;
1257
1258 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1259 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1260 $self->{state} = !$self->{state};
1261 $self->emit (changed => $self->{state});
1262 }
1263}
1264
1265sub _draw {
791 my ($self, $ev) = @_; 1266 my ($self) = @_;
792 1267
793 $self->focus_in; 1268 $self->SUPER::_draw;
1269
1270 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1271
1272 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1273
1274 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1275
1276 glBegin GL_LINE_LOOP;
1277 glVertex 0 , 0;
1278 glVertex 0 , $s;
1279 glVertex $s, $s;
1280 glVertex $s, 0;
1281 glEnd;
1282
1283 if ($self->{state}) {
1284 glBegin GL_LINES;
1285 glVertex 0 , 0;
1286 glVertex $s, $s;
1287 glVertex $s, 0;
1288 glVertex 0 , $s;
1289 glEnd;
1290 }
1291}
1292
1293#############################################################################
1294
1295package CFClient::UI::Slider;
1296
1297use strict;
1298
1299use SDL::OpenGL;
1300
1301our @ISA = CFClient::UI::DrawBG::;
1302
1303sub new {
1304 my $class = shift;
1305
1306 # range [value, low, high, page]
1307
1308 # TODO: 0-width page
1309 # TODO: req_w/h are wrong with vertical
1310 # TODO: calculations are off
1311 my $self = $class->SUPER::new (
1312 fg => [1, 1, 1],
1313 active_fg => [0, 0, 0],
1314 range => [0, 0, 100, 10],
1315 req_w => 40,
1316 req_h => 13,
1317 vertical => 0,
1318 can_hover => 1,
1319 @_
1320 );
1321
1322 $self
1323}
1324
1325sub size_request {
1326 my ($self) = @_;
1327
1328 my $w = $self->{req_w};
1329 my $h = $self->{req_h};
1330
1331 $self->{vertical} ? ($h, $w) : ($w, $h)
1332}
1333
1334sub button_down {
1335 my ($self, $ev, $x, $y) = @_;
1336
1337 $self->SUPER::button_down ($ev, $x, $y);
1338 $self->mouse_motion ($ev, $x, $y);
794} 1339}
795 1340
796sub mouse_motion { 1341sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_; 1342 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1343
1344 if ($GRAB == $self) {
1345 my ($value, $lo, $hi, $page) = @{$self->{range}};
1346
1347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1348
1349 $x = $x * ($hi - $lo) / $w + $lo;
1350 $x = $lo if $x < $lo;
1351 $x = $hi - $page if $x > $hi - $page;
1352 $self->{range}[0] = $x;
1353
1354 $self->emit (changed => $x);
1355 $self->update;
1356 }
799} 1357}
800 1358
801sub _draw { 1359sub _draw {
802 my ($self) = @_; 1360 my ($self) = @_;
803 1361
804 if ($FOCUS == $self) { 1362 $self->SUPER::_draw ();
805 glColor 1, 1, 1; 1363
806 } else { 1364 my ($w, $h) = @$self{qw(w h)};
807 glColor 0.7, 0.7, 0.7; 1365
1366 if ($self->{vertical}) {
1367 # draw a vertical slider like a rotated horizontal slider
1368
1369 glRotate 90, 0, 0, 1;
1370 glTranslate 0, -$self->{w}, 0;
1371
1372 ($w, $h) = ($h, $w);
808 } 1373 }
1374
1375 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1376 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1377
1378 my ($value, $lo, $hi, $page) = @{$self->{range}};
1379
1380 $page = int $page * $w / ($hi - $lo);
1381 $value = int +($value - $lo) * $w / ($hi - $lo);
1382
1383 $w -= $page;
1384 $page &= ~1;
1385 glTranslate $page * 0.5, 0, 0;
1386 $page ||= 2;
1387
1388 glColor @$fg;
1389 glBegin GL_LINES;
1390 glVertex 0, 0; glVertex 0, $h;
1391 glVertex $w - 1, 0; glVertex $w - 1, $h;
1392 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1393 glEnd;
1394
1395 my $knob_a = $value - $page * 0.5;
1396 my $knob_b = $value + $page * 0.5;
809 1397
810 glBegin GL_QUADS; 1398 glBegin GL_QUADS;
811 glVertex 0 , 0; 1399 glColor @$fg;
812 glVertex 0 , $self->{h} - 1; 1400 glVertex $knob_a, 0;
813 glVertex $self->{w} - 1, $self->{h} - 1; 1401 glVertex $knob_a, $h;
814 glVertex $self->{w} - 1, 0; 1402 glVertex $knob_b, $h;
1403 glVertex $knob_b, 0;
1404
1405 if ($knob_a < $knob_b - 2) {
1406 glColor @$bg;
1407 glVertex $knob_a + 1, 1;
1408 glVertex $knob_a + 1, $h - 1;
1409 glVertex $knob_b - 1, $h - 1;
1410 glVertex $knob_b - 1, 1;
1411 }
815 glEnd; 1412 glEnd;
816
817 $self->SUPER::_draw;
818} 1413}
819 1414
820############################################################################# 1415#############################################################################
821 1416
1417package CFClient::UI::TextView;
1418
1419our @ISA = CFClient::UI::HBox::;
1420
1421use SDL::OpenGL;
1422
1423sub new {
1424 my $class = shift;
1425
1426 my $self = $class->SUPER::new (
1427 par => [],
1428 @_,
1429 children => [
1430 (new CFClient::UI::Empty expand => 1),
1431 (new CFClient::UI::Slider vertical => 1),
1432 ],
1433 );
1434
1435 $self
1436}
1437
1438sub add_paragraph {
1439 my ($self, $color, $text) = @_;
1440
1441 push @{$self->{par}}, [$color, $text];
1442 my $count = scalar @{$self->{par}};
1443 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1444 $self->{children}[1]->update;
1445}
1446
1447sub _draw {
1448 my ($self) = @_;
1449
1450 my $par = $self->{par};
1451
1452 my $bottom = (scalar @$par) - 1;
1453
1454 my $w = $self->{children}[0]{w};
1455 my $y = $self->{h};
1456
1457 glEnable GL_BLEND;
1458 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1459 glEnable GL_TEXTURE_2D;
1460 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1461
1462 # TODO: everything!
1463 while ($y > 0 && $bottom >= 0) {
1464 my $par = $par->[$bottom--];
1465
1466 my $layout = new CFClient::Layout;
1467
1468 $layout->set_height ($::FONTSIZE);
1469 $layout->set_width ($w);
1470 $layout->set_text ($par->[1]);
1471 my $tex = new_from_layout CFClient::Texture $layout;
1472 $y -= $tex->{h};
1473
1474 glColor @{ $par->[0] };
1475 $tex->draw_quad (0, $y);
1476 }
1477
1478 glDisable GL_TEXTURE_2D;
1479 glDisable GL_BLEND;
1480}
1481
1482#############################################################################
1483
822package CFClient::Widget::MapWidget; 1484package CFClient::UI::MapWidget;
823 1485
824use strict; 1486use strict;
825 1487
826use List::Util qw(min max); 1488use List::Util qw(min max);
827 1489
828use SDL; 1490use SDL;
829use SDL::OpenGL; 1491use SDL::OpenGL;
830use SDL::OpenGL::Constants;
831 1492
832our @ISA = CFClient::Widget::; 1493our @ISA = CFClient::UI::Base::;
833 1494
834sub new { 1495sub new {
835 my $class = shift; 1496 my $class = shift;
836 1497
837 $class->SUPER::new ( 1498 $class->SUPER::new (
838 z => -1, 1499 z => -1,
1500 can_focus => 1,
839 list => (glGenLists 1), 1501 list => (glGenLists 1),
840 @_ 1502 @_
841 ) 1503 )
842} 1504}
843 1505
844sub key_down { 1506sub key_down {
… …
848sub key_up { 1510sub key_up {
849} 1511}
850 1512
851sub size_request { 1513sub size_request {
852 ( 1514 (
853 1 + int $::WIDTH / 32, 1515 1 + 32 * int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32, 1516 1 + 32 * int $::HEIGHT / 32,
855 ) 1517 )
856} 1518}
857 1519
858sub update { 1520sub update {
859 my ($self) = @_; 1521 my ($self) = @_;
860 1522
861 $self->{need_update} = 1; 1523 $self->{need_update} = 1;
1524 $self->SUPER::update;
862} 1525}
863 1526
864sub _draw { 1527sub draw {
865 my ($self) = @_; 1528 my ($self) = @_;
866 1529
1530 $self->{need_update}++;#d#
867 if (delete $self->{need_update}) { 1531 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE; 1532 glNewList $self->{list}, GL_COMPILE;
869 1533
870 my $mx = $::CONN->{mapx};
871 my $my = $::CONN->{mapy};
872
873 my $map = $::CONN->{map};
874
875 my ($xofs, $yofs);
876
877 my $sw = 1 + int $::WIDTH / 32; 1534 my $sw = int $::WIDTH / 32;
878 my $sh = 1 + int $::HEIGHT / 32; 1535 my $sh = int $::HEIGHT / 32;
879 1536
880 if ($::CONN->{mapw} > $sw) { 1537 if ($::MAP) {
881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1538 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
882 } else {
883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
884 }
885 1539
886 if ($::CONN->{maph} > $sh) { 1540 if ($::CFG->{fow_enable}) {
887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1541 if ($::CFG->{fow_smooth}) { # smooth fog of war
888 } else { 1542 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1543 glConvolutionFilter2D
890 } 1544 GL_CONVOLUTION_2D,
891 1545 GL_ALPHA,
892 glEnable GL_TEXTURE_2D; 1546 3, 3,
893 glEnable GL_BLEND; 1547 GL_ALPHA, GL_FLOAT,
894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1548 pack "f*",
895 1549 0.1, 0.1, 0.1,
896 my $sw4 = ($sw + 3) & ~3; 1550 0.1, 0.2, 0.1,
897 my $darkness = "\x00" x ($sw4 * $sh); 1551 0.1, 0.1, 0.1,
898
899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
901 for my $y (0 .. $sh - 1) {
902
903 my $cell = $row->[$y + $yofs]
904 or next; 1552 ;
905 1553 glEnable GL_CONVOLUTION_2D;
906 my $dark = $cell->[0];
907 if ($dark < 0) {
908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
911 } 1554 }
912 1555
913 for my $num (grep $_, @$cell[1,2,3]) { 1556 my $tex = new CFClient::Texture
914 my $tex = $::CONN->{face}[$num]{texture} || next; 1557 w => $w,
915 1558 h => $h,
916 my $w = $tex->{width}; 1559 data => $data,
917 my $h = $tex->{height}; 1560 internalformat => GL_ALPHA,
1561 format => GL_ALPHA;
918 1562
919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1563 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
920 } 1564
1565 glEnable GL_BLEND;
1566 glEnable GL_TEXTURE_2D;
1567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1568
1569 glColor +($::CFG->{fow_intensity}) x 3, 1;
1570 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1571
1572 glDisable GL_TEXTURE_2D;
1573 glDisable GL_BLEND;
921 } 1574 }
922 } 1575 }
923 1576
924# if (1) { # higher quality darkness
925# $lighting =~ s/(.)/$1$1$1/gs;
926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
927#
928# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
929#
930# $lighting = $pb->get_pixels;
931# $lighting =~ s/(.)../$1/gs;
932# }
933
934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
947 glDisable GL_TEXTURE_2D;
948 glDisable GL_BLEND;
949
950 glEndList; 1577 glEndList;
951 } 1578 }
952 1579
953 glCallList $self->{list}; 1580 glCallList $self->{list};
1581
1582 if ($FOCUS != $self) {
1583 glColor 64/255, 64/255, 64/255;
1584 glLogicOp GL_AND;
1585 glEnable GL_COLOR_LOGIC_OP;
1586 glBegin GL_QUADS;
1587 glVertex 0, 0;
1588 glVertex 0, $::HEIGHT;
1589 glVertex $::WIDTH, $::HEIGHT;
1590 glVertex $::WIDTH, 0;
1591 glEnd;
1592 glDisable GL_COLOR_LOGIC_OP;
1593 }
954} 1594}
955 1595
956my %DIR = ( 1596my %DIR = (
957 SDLK_KP8, [1, "north"], 1597 SDLK_KP8, [1, "north"],
958 SDLK_KP9, [2, "northeast"], 1598 SDLK_KP9, [2, "northeast"],
… …
974 1614
975 my $mod = $ev->key_mod; 1615 my $mod = $ev->key_mod;
976 my $sym = $ev->key_sym; 1616 my $sym = $ev->key_sym;
977 1617
978 if ($sym == SDLK_KP5) { 1618 if ($sym == SDLK_KP5) {
979 $::CONN->send ("command stay fire"); 1619 $::CONN->user_send ("command stay fire");
1620 } elsif ($sym == SDLK_a) {
1621 $::CONN->user_send ("command apply");
980 } elsif (exists $DIR{$sym}) { 1622 } elsif (exists $DIR{$sym}) {
981 if ($mod & KMOD_SHIFT) { 1623 if ($mod & KMOD_SHIFT) {
982 $self->{shft}++; 1624 $self->{shft}++;
983 $::CONN->send ("command fire $DIR{$sym}[0]"); 1625 $::CONN->user_send ("command fire $DIR{$sym}[0]");
984 } elsif ($mod & KMOD_CTRL) { 1626 } elsif ($mod & KMOD_CTRL) {
985 $self->{ctrl}++; 1627 $self->{ctrl}++;
986 $::CONN->send ("command run $DIR{$sym}[0]"); 1628 $::CONN->user_send ("command run $DIR{$sym}[0]");
987 } else { 1629 } else {
988 $::CONN->send ("command $DIR{$sym}[1]"); 1630 $::CONN->user_send ("command $DIR{$sym}[1]");
989 } 1631 }
990 } 1632 }
991} 1633}
992 1634
993sub key_up { 1635sub key_up {
… …
995 1637
996 my $mod = $ev->key_mod; 1638 my $mod = $ev->key_mod;
997 my $sym = $ev->key_sym; 1639 my $sym = $ev->key_sym;
998 1640
999 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1641 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1000 $::CONN->send ("command fire_stop"); 1642 $::CONN->user_send ("command fire_stop");
1001 } 1643 }
1002 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1644 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1003 $::CONN->send ("command run_stop"); 1645 $::CONN->user_send ("command run_stop");
1004 } 1646 }
1005} 1647}
1006 1648
1007############################################################################# 1649#############################################################################
1008 1650
1009package CFClient::Widget::Animator; 1651package CFClient::UI::Animator;
1010 1652
1011use SDL::OpenGL; 1653use SDL::OpenGL;
1012 1654
1013our @ISA = CFClient::Widget::Bin::; 1655our @ISA = CFClient::UI::Bin::;
1014 1656
1015sub moveto { 1657sub moveto {
1016 my ($self, $x, $y) = @_; 1658 my ($self, $x, $y) = @_;
1017 1659
1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1660 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1046 glPopMatrix; 1688 glPopMatrix;
1047} 1689}
1048 1690
1049############################################################################# 1691#############################################################################
1050 1692
1693package CFClient::UI::Flopper;
1694
1695our @ISA = CFClient::UI::Button::;
1696
1697sub new {
1698 my $class = shift;
1699
1700 my $self = $class->SUPER::new (
1701 state => 0,
1702 connect_activate => \&toggle_flopper,
1703 @_
1704 );
1705
1706 if ($self->{state}) {
1707 $self->{state} = 0;
1708 $self->toggle_flopper;
1709 }
1710
1711 $self
1712}
1713
1714sub toggle_flopper {
1715 my ($self) = @_;
1716
1717 # TODO: use animation
1718 if ($self->{state} = !$self->{state}) {
1719 $CFClient::UI::TOPLEVEL->add ($self->{other});
1720 $self->{other}->move (
1721 ($::WIDTH - $self->{other}{w}) * 0.5,
1722 ($::HEIGHT - $self->{other}{h}) * 0.5,
1723 );
1724 } else {
1725 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1726 }
1727}
1728
1729#############################################################################
1730
1051package CFClient::Widget::Toplevel; 1731package CFClient::UI::Toplevel;
1052 1732
1053our @ISA = CFClient::Widget::Container::; 1733our @ISA = CFClient::UI::Container::;
1054 1734
1055sub size_request { 1735sub size_request {
1056 ($::WIDTH, $::HEIGHT) 1736 ($::WIDTH, $::HEIGHT)
1057} 1737}
1058 1738
1059sub size_allocate { 1739sub size_allocate {
1060 my ($self, $w, $h) = @_; 1740 my ($self, $x, $y, $w, $h) = @_;
1061 1741
1062 $self->SUPER::size_allocate ($w, $h); 1742 $self->_size_allocate ($x, $y, $w, $h);
1063 1743
1064 $_->size_allocate ($_->size_request) 1744 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1065 for @{$self->{children}}; 1745 for @{$self->{children}};
1066} 1746}
1067 1747
1068sub translate { 1748sub translate {
1069 my ($self, $x, $y) = @_; 1749 my ($self, $x, $y) = @_;
… …
1072} 1752}
1073 1753
1074sub update { 1754sub update {
1075 my ($self) = @_; 1755 my ($self) = @_;
1076 1756
1077 $self->size_allocate ($self->size_request); 1757 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1078 ::refresh (); 1758 ::refresh ();
1079} 1759}
1080 1760
1081sub add { 1761sub add {
1082 my ($self, $widget) = @_; 1762 my ($self, $widget) = @_;
1083 1763
1084 $self->SUPER::add ($widget); 1764 $self->SUPER::add ($widget);
1085 1765
1086 $widget->size_allocate ($widget->size_request); 1766 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1087} 1767}
1088 1768
1089sub draw { 1769sub draw {
1090 my ($self) = @_; 1770 my ($self) = @_;
1091 1771
1092 $self->_draw; 1772 $self->_draw;
1093} 1773}
1094 1774
1095############################################################################# 1775#############################################################################
1096 1776
1097package CFClient::Widget; 1777package CFClient::UI;
1098 1778
1099$TOPLEVEL = new CFClient::Widget::Toplevel; 1779$TOPLEVEL = new CFClient::UI::Toplevel;
1100 1780
11011 17811
1102 1782

Diff Legend

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