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.55 by root, Mon Apr 10 19:34:04 2006 UTC vs.
Revision 1.81 by root, Wed Apr 12 00:40:45 2006 UTC

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

Diff Legend

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