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.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.60 by root, Tue Apr 11 13:14:36 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 79}
36 80
37sub move { 81sub move {
38 my ($self, $x, $y, $z) = @_; 82 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 83 $self->{x} = $x;
… …
44sub needs_redraw { 88sub needs_redraw {
45 0 89 0
46} 90}
47 91
48sub size_request { 92sub size_request {
93 require Carp;
49 die "size_request is abtract"; 94 Carp::confess "size_request is abtract";
95}
96
97sub size_allocate {
98 my ($self, $w, $h) = @_;
99
100 $self->{w} = $w;
101 $self->{h} = $h;
102}
103
104# translate global koordinates to local coordinate system
105sub translate {
106 my ($self, $x, $y) = @_;
107
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 109}
51 110
52sub focus_in { 111sub focus_in {
53 my ($widget) = @_; 112 my ($self) = @_;
54 $FOCUS = $widget; 113
114 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus;
116 $FOCUS->update;
55} 117}
56 118
57sub focus_out { 119sub focus_out {
58 my ($widget) = @_; 120 my ($self) = @_;
59}
60 121
61sub key_down { 122 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 123
65sub key_up { 124 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 125 $focus->update if $focus; #?
67} 126}
68 127
128sub mouse_motion { }
129sub button_up { }
69sub button_down { 130sub button_down { }
70 my ($widget, $sdlev) = @_; 131sub key_down { }
71} 132sub key_up { }
72 133
73sub button_up { 134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 139
83sub draw { 140sub draw {
84 my ($self) = @_; 141 my ($self) = @_;
85 142
86 glPushMatrix; 143 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 144 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 145 $self->_draw;
146 if ($self == $HOVER) {
147 glColor 1, 1, 1, 0.4;
148 glEnable GL_BLEND;
149 glBegin GL_QUADS;
150 glVertex 0 , 0;
151 glVertex $self->{w}, 0;
152 glVertex $self->{w}, $self->{h};
153 glVertex 0 , $self->{h};
154 glEnd;
155 glDisable GL_BLEND;
156 }
89 glPopMatrix; 157 glPopMatrix;
90} 158}
91 159
92sub _draw { 160sub _draw {
93 my ($widget) = @_; 161 my ($self) = @_;
162
163 warn "no draw defined for $self\n";
94} 164}
95 165
96sub bbox { 166sub bbox {
97 my ($widget) = @_; 167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175}
176
177sub find_widget {
178 my ($self, $x, $y) = @_;
179
180 return $self
181 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183
184 ()
185}
186
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent {
190 my ($self, $par) = @_;
191
192 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent};
194}
195
196sub get_parent {
197 $_[0]->{parent}
198}
199
200sub update {
201 my ($self) = @_;
202
203 $self->{parent}->update
204 if $self->{parent};
98} 205}
99 206
100sub DESTROY { 207sub DESTROY {
101 my ($self) = @_; 208 my ($self) = @_;
102 209
103 $self->deactivate; 210 #$self->deactivate;
104} 211}
105 212
213#############################################################################
214
106package Crossfire::Client::Widget::Container; 215package CFClient::Widget::Container;
107 216
108our @ISA = Crossfire::Client::Widget::; 217our @ISA = CFClient::Widget::;
218
219sub new {
220 my ($class, @widgets) = @_;
221
222 my $self = $class->SUPER::new (children => []);
223 $self->add ($_) for @widgets;
224
225 $self
226}
227
228sub add {
229 my ($self, $chld, $expand) = @_;
230
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self);
233
234 @{$self->{children}} =
235 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld;
237
238 $self->size_allocate ($self->{w}, $self->{h})
239 if $self->{w}; #TODO: check for "realised state"
240}
241
242sub remove {
243 my ($self, $widget) = @_;
244
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246
247 $self->size_allocate ($self->{w}, $self->{h});
248}
249
250sub find_widget {
251 my ($self, $x, $y) = @_;
252
253 $x -= $self->{x};
254 $y -= $self->{y};
255
256 my $res;
257
258 for (reverse @{ $self->{children} }) {
259 $res = $_->find_widget ($x, $y)
260 and return $res;
261 }
262
263 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
264}
265
266sub _draw {
267 my ($self) = @_;
268
269 $_->draw for @{$self->{children}};
270}
271
272#############################################################################
273
274package CFClient::Widget::Bin;
275
276our @ISA = CFClient::Widget::Container::;
277
278sub child { $_[0]->{children}[0] }
279
280sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0];
282}
283
284sub size_allocate {
285 my ($self, $w, $h) = @_;
286
287 $self->SUPER::size_allocate ($w, $h);
288 $self->{children}[0]->size_allocate ($w, $h)
289 if $self->{children}[0]
290}
291
292#############################################################################
293
294package CFClient::Widget::Window;
295
296our @ISA = CFClient::Widget::Bin::;
109 297
110use SDL::OpenGL; 298use SDL::OpenGL;
111 299
112sub add { $_[0]->{child} = $_[1] } 300sub new {
113sub get { $_[0]->{child} } 301 my ($class, $x, $y, $z, $w, $h) = @_;
114 302
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 303 my $self = $class->SUPER::new;
116 304
117sub _draw { die "Containers can't be drawn!" } 305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306}
118 307
119package Crossfire::Client::Widget::Window; 308sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 309 my ($self) = @_;
127 $self->SUPER::add ($chld); 310
128 $self->render_chld; #TODO: Move this to the size_request event propably? 311 $self->render_chld;
312 $self->SUPER::update;
129} 313}
130 314
131sub render_chld { 315sub render_chld {
132 my ($self) = @_; 316 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 317
136 $self->{texture} = 318 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 319 CFClient::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 320 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 321 );
140 $self->{texture}->upload;
141} 322}
142 323
143sub size_request { 324sub size_allocate {
144 my ($self) = @_; 325 my ($self, $w, $h) = @_;
145 my $chld = $self->get 326
146 or return (0, 0); 327 $self->{w} = $w;
147 $chld->size_request 328 $self->{h} = $h;
329
330 $self->child->size_allocate ($w, $h);
331
332 $self->render_chld;
148} 333}
149 334
150sub _draw { 335sub _draw {
151 my ($self) = @_; 336 my ($self) = @_;
152 337
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 338 my ($w, $h) = ($self->w, $self->h);
339
154 my $tex = $self->{texture} 340 my $tex = $self->{texture}
155 or return; 341 or return;
156 342
157 glEnable GL_BLEND; 343 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 344 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name};
161 346
162 glColor 1, 1, 1; 347 $tex->draw_quad (0, 0, $w, $h);
163
164 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h;
168 glTexCoord 1, 0; glVertex $w, 0;
169 glEnd;
170 348
171 glDisable GL_BLEND; 349 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 350 glDisable GL_TEXTURE_2D;
173} 351}
174 352
353#############################################################################
354
175package Crossfire::Client::Widget::Frame; 355package CFClient::Widget::Frame;
176 356
177our @ISA = Crossfire::Client::Widget::Container::; 357our @ISA = CFClient::Widget::Bin::;
178 358
179use SDL::OpenGL; 359use SDL::OpenGL;
180 360
181sub size_request { 361sub size_request {
182 my ($self) = @_; 362 my ($self) = @_;
183 my $chld = $self->get 363 my $chld = $self->child
184 or return (0, 0); 364 or return (0, 0);
365
366 $chld->move (2, 2);
367
185 map { $_ + 4 } $chld->size_request; 368 map { $_ + 4 } $chld->size_request;
186} 369}
187 370
371sub size_allocate {
372 my ($self, $w, $h) = @_;
373
374 $self->{w} = $w;
375 $self->{h} = $h;
376
377 $self->child->size_allocate ($w - 4, $h - 4);
378 $self->child->move (2, 2);
379}
380
188sub _draw { 381sub _draw {
189 my ($self) = @_; 382 my ($self) = @_;
190 383
191 my $chld = $self->get; 384 my $chld = $self->child;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
194 385
195 my ($w, $h) = $chld->size_request; 386 my ($w, $h) = $chld->size_request;
196 387
197 glColor 1, 0, 0;
198 glBegin GL_QUADS; 388 glBegin GL_QUADS;
199 glTexCoord 0, 0; glVertex 0 , 0; 389 glColor 0, 0, 0;
390 glVertex 0 , 0;
200 glTexCoord 0, 1; glVertex 0 , $h + 4; 391 glVertex 0 , $h + 4;
201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 392 glVertex $w + 4 , $h + 4;
202 glTexCoord 1, 0; glVertex $w + 4 , 0; 393 glVertex $w + 4 , 0;
203 glEnd; 394 glEnd;
204 395
205 $chld->draw; 396 $chld->draw;
206} 397}
207 398
399#############################################################################
400
401package CFClient::Widget::FancyFrame;
402
403our @ISA = CFClient::Widget::Bin::;
404
405use SDL::OpenGL;
406
407my @tex =
408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410
411sub size_request {
412 my ($self) = @_;
413
414 my ($w, $h) = $self->SUPER::size_request;
415
416 $h += $tex[1]->{height};
417 $h += $tex[4]->{height};
418 $w += $tex[2]->{width};
419 $w += $tex[3]->{width};
420
421 ($w, $h)
422}
423
424sub size_allocate {
425 my ($self, $w, $h) = @_;
426
427 $self->SUPER::size_allocate ($w, $h);
428
429 $h -= $tex[1]->{height};
430 $h -= $tex[4]->{height};
431 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width};
433
434 $h = $h < 0 ? 0 : $h;
435 $w = $w < 0 ? 0 : $w;
436
437 $self->child->size_allocate ($w, $h);
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
439}
440
441sub _draw {
442 my ($self) = @_;
443
444 my ($w, $h) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446
447 glEnable GL_BLEND;
448 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
451
452 my $top = $tex[1];
453 $top->draw_quad (0, 0, $w, $top->{height});
454
455 my $left = $tex[3];
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
457
458 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
460
461 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
463
464 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469
470 my $rep_x = $cw / $bg->{width};
471 my $rep_y = $ch / $bg->{height};
472
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
474
475 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477
478 $self->child->draw;
479
480}
481
482#############################################################################
483
208package Crossfire::Client::Widget::Table; 484package CFClient::Widget::Table;
209 485
210our @ISA = Crossfire::Client::Widget::Container::; 486our @ISA = CFClient::Widget::Bin::;
211 487
212use SDL::OpenGL; 488use SDL::OpenGL;
213 489
214sub add { 490sub add {
215 my ($self, $x, $y, $chld) = @_; 491 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493
216 $self->{childs}[$y][$x] = $chld; 494 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self);
496 $self->update;
217} 497}
218 498
219sub max_row_height { 499sub max_row_height {
220 my ($self, $row) = @_; 500 my ($self, $row) = @_;
221 501
222 my $hs = 0; 502 my $hs = 0;
223 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
224 my $c = $self->{childs}->[$row]->[$xi]; 504 my $c = $self->{children}->[$row]->[$xi];
225 if ($c) { 505 if ($c) {
226 my ($w, $h) = $c->size_request; 506 my ($w, $h) = $c->size_request;
227 if ($hs < $h) { $hs = $h } 507 if ($hs < $h) { $hs = $h }
228 } 508 }
229 } 509 }
… …
232 512
233sub max_col_width { 513sub max_col_width {
234 my ($self, $col) = @_; 514 my ($self, $col) = @_;
235 515
236 my $ws = 0; 516 my $ws = 0;
237 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
238 my $c = ($self->{childs}->[$yi] || [])->[$col]; 518 my $c = ($self->{children}->[$yi] || [])->[$col];
239 if ($c) { 519 if ($c) {
240 my ($w, $h) = $c->size_request; 520 my ($w, $h) = $c->size_request;
241 if ($ws < $w) { $ws = $w } 521 if ($ws < $w) { $ws = $w }
242 } 522 }
243 } 523 }
… …
247sub size_request { 527sub size_request {
248 my ($self) = @_; 528 my ($self) = @_;
249 529
250 my ($hs, $ws) = (0, 0); 530 my ($hs, $ws) = (0, 0);
251 531
252 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
253 $hs += $self->max_row_height ($yi); 533 $hs += $self->max_row_height ($yi);
254 } 534 }
255 535
256 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
257 my $wm = 0; 537 my $wm = 0;
258 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
259 $wm += $self->max_col_width ($xi) 539 $wm += $self->max_col_width ($xi)
260 } 540 }
261 if ($ws < $wm) { $ws = $wm } 541 if ($ws < $wm) { $ws = $wm }
262 } 542 }
263 543
… …
266 546
267sub _draw { 547sub _draw {
268 my ($self) = @_; 548 my ($self) = @_;
269 549
270 my $y = 0; 550 my $y = 0;
271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
272 my $x = 0; 552 my $x = 0;
273 553
274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
275 555
276 my $c = $self->{childs}->[$yi]->[$xi]; 556 my $c = $self->{children}->[$yi]->[$xi];
277 if ($c) { 557 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request 558 $c->move ($x, $y, 0); #TODO: Move to size_request
279 $c->draw if $c; 559 $c->draw if $c;
280 } 560 }
281 561
… …
284 564
285 $y += $self->max_row_height ($yi); 565 $y += $self->max_row_height ($yi);
286 } 566 }
287} 567}
288 568
569#############################################################################
570
289package Crossfire::Client::Widget::VBox; 571package CFClient::Widget::VBox;
290 572
291our @ISA = Crossfire::Client::Widget::Container::; 573our @ISA = CFClient::Widget::Container::;
292 574
293use SDL::OpenGL; 575use SDL::OpenGL;
294 576
295sub add {
296 my ($self, $chld) = @_;
297 push @{$self->{childs}}, $chld;
298}
299
300sub size_request { 577sub size_request {
301 my ($self) = @_; 578 my ($self) = @_;
302 579
303 my ($hs, $ws) = (0, 0); 580 my @alloc = map [$_->size_request], @{$self->{children}};
581
582 (
583 (List::Util::max map $_->[0], @alloc),
584 (List::Util::sum map $_->[1], @alloc),
585 )
586}
587
588sub size_allocate {
589 my ($self, $w, $h) = @_;
590
591 $self->w ($w);
592 $self->h ($h);
593
594 my $exp;
595 my @oth;
596 # find expand widget
304 for (@{$self->{childs} || []}) { 597 for (@{$self->{children}}) {
598 if ($_->{expand}) {
599 $exp = $_;
600 last;
601 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
305 my ($w, $h) = $_->size_request; 609 my ($w, $h) = $_->size_request;
306 $hs += $h; 610 $oh += $h;
307 if ($ws < $w) { $ws = $w } 611 if ($ow < $w) { $ow = $w }
308 } 612 }
309 613
310 return ($ws, $hs); 614 my $y = 0;
311}
312
313sub _draw {
314 my ($self) = @_;
315
316 my ($x, $y);
317 for (@{$self->{childs} || []}) { 615 for (@{$self->{children}}) {
318 $_->move (0, $y, 0); #TODO: move to size_request 616 $_->move (0, $y);
319 $_->draw; 617
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
320 my ($w, $h) = $_->size_request; 622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h);
321 $y += $h; 624 $y += $h;
625 }
322 } 626 }
323} 627}
324 628
629#############################################################################
630
325package Crossfire::Client::Widget::Label; 631package CFClient::Widget::Label;
326 632
327our @ISA = Crossfire::Client::Widget::; 633our @ISA = CFClient::Widget::;
328 634
329use SDL::OpenGL; 635use SDL::OpenGL;
330 636
331sub new { 637sub new {
332 my ($class, $x, $y, $z, $height, $text) = @_; 638 my ($class, $x, $y, $z, $height, $text) = @_;
333 639
334 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new (
644 x => $x,
645 y => $y,
646 z => $z,
647 height => $height,
648 layout => new CFClient::Layout,
649 );
335 650
336 $self->set_text ($text); 651 $self->set_text ($text);
337 652
338 $self 653 $self
339} 654}
340 655
341sub set_text { 656sub set_text {
342 my ($self, $text) = @_; 657 my ($self, $text) = @_;
343 658
344 $self->{text} = $text; 659 $self->{text} = $text;
660 $self->{layout}->set_markup ($text);
345 661
346 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 662 delete $self->{texture};
347} 663}
348 664
349sub get_text { 665sub get_text {
350 my ($self, $text) = @_; 666 my ($self, $text) = @_;
351 667
… …
353} 669}
354 670
355sub size_request { 671sub size_request {
356 my ($self) = @_; 672 my ($self) = @_;
357 673
358 ( 674 $self->{layout}->set_width;
675 $self->{layout}->size
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
677# (
359 $self->{texture}{width}, 678# $self->{texture}{width},
360 $self->{texture}{height}, 679# $self->{texture}{height},
361 ) 680# )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686}
687
688sub size_allocate {
689 my ($self, $w, $h) = @_;
690
691 $self->SUPER::size_allocate ($w, $h);
692 delete $self->{texture};
362} 693}
363 694
364sub _draw { 695sub _draw {
365 my ($self) = @_; 696 my ($self) = @_;
366 697
367 my $tex = $self->{texture}; 698 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w});
700 new_from_layout CFClient::Texture $self->{layout};
701 };
368 702
369 glEnable GL_BLEND; 703 glEnable GL_BLEND;
370 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
371 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
372 glBindTexture GL_TEXTURE_2D, $tex->{name};
373 707
374 glColor 1, 0, 1; 708 glColor 1, 0, 0, 1; # TODO color
375 709
376 glBegin GL_QUADS; 710 $tex->draw_quad (0, 0);
377 glTexCoord 0, 0; glVertex 0 , 0;
378 glTexCoord 0, 1; glVertex 0 , $tex->{height};
379 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
380 glTexCoord 1, 0; glVertex $tex->{width}, 0;
381 glEnd;
382 711
383 glDisable GL_BLEND; 712 glDisable GL_BLEND;
384 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
385} 714}
386 715
387package Crossfire::Client::Widget::TextView; 716#############################################################################
388 717
389use strict; 718package CFClient::Widget::Entry;
390 719
391our @ISA = qw/Crossfire::Client::Widget/; 720our @ISA = CFClient::Widget::Label::;
392 721
722use SDL;
393use SDL::OpenGL; 723use SDL::OpenGL;
394use SDL::OpenGL::Constants;
395 724
396sub add_line { 725sub key_down {
397 my ($self, $line) = @_; 726 my ($self, $ev) = @_;
398 push @{$self->{lines}}, $line; 727
728 my $mod = $ev->key_mod;
729 my $sym = $ev->key_sym;
730
731 my $uni = $ev->key_unicode;
732
733 my $text = $self->get_text;
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742}
743
744sub button_down {
745 my ($self, $ev) = @_;
746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
399} 753}
400 754
401sub _draw { 755sub _draw {
402 my ($self) = @_; 756 my ($self) = @_;
403 757
404} 758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
405 763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
406package Crossfire::Client::Widget::MapWidget; 776package CFClient::Widget::MapWidget;
407 777
408use strict; 778use strict;
409 779
410use List::Util qw(min max); 780use List::Util qw(min max);
411 781
412use SDL; 782use SDL;
413use SDL::OpenGL; 783use SDL::OpenGL;
414use SDL::OpenGL::Constants; 784use SDL::OpenGL::Constants;
415 785
416our @ISA = Crossfire::Client::Widget::; 786our @ISA = CFClient::Widget::;
417 787
418sub key_down { 788sub key_down {
419 print "MAPKEYDOWN\n"; 789 print "MAPKEYDOWN\n";
420} 790}
421 791
422sub key_up { 792sub key_up {
793}
794
795sub size_request {
796 (
797 1 + int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32,
799 )
423} 800}
424 801
425sub _draw { 802sub _draw {
426 my ($self) = @_; 803 my ($self) = @_;
427 804
… …
447 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 824 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
448 } 825 }
449 826
450 glEnable GL_TEXTURE_2D; 827 glEnable GL_TEXTURE_2D;
451 glEnable GL_BLEND; 828 glEnable GL_BLEND;
452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
830
831 my $sw4 = ($sw + 3) & ~3;
832 my $darkness = "\x00" x ($sw4 * $sh);
453 833
454 for my $x (0 .. $sw - 1) { 834 for my $x (0 .. $sw - 1) {
835 my $row = $map->[$x + $xofs];
455 for my $y (0 .. $sh - 1) { 836 for my $y (0 .. $sh - 1) {
456 837
457 my $cell = $map->[$x + $xofs][$y + $yofs] 838 my $cell = $row->[$y + $yofs]
458 or next; 839 or next;
459 840
460 my $darkness = $cell->[0] * (1 / 255); 841 my $dark = $cell->[0];
461 if ($darkness < 0) { 842 if ($dark < 0) {
462 glColor 0.3, 0.3, 0.3; 843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
463 } else { 844 } else {
464 glColor $darkness, $darkness, $darkness; 845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
465 } 846 }
466 847
467 for my $num (grep $_, @$cell[1,2,3]) { 848 for my $num (grep $_, @$cell[1,2,3]) {
468 my $tex = $::CONN->{face}[$num]{texture} || next; 849 my $tex = $::CONN->{face}[$num]{texture} || next;
469 850
470 glBindTexture GL_TEXTURE_2D, $tex->{name};
471
472 my $w = $tex->{width}; 851 my $w = $tex->{width};
473 my $h = $tex->{height}; 852 my $h = $tex->{height};
474 853
475 my $px = ($x + 1) * 32 - $w; 854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
476 my $py = ($y + 1) * 32 - $h;
477
478 glBegin GL_QUADS;
479 glTexCoord 0, 0; glVertex $px , $py;
480 glTexCoord 0, 1; glVertex $px , $py + $h;
481 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
482 glTexCoord 1, 0; glVertex $px + $w, $py;
483 glEnd;
484 } 855 }
485 } 856 }
486 } 857 }
858
859# if (1) { # higher quality darkness
860# $lighting =~ s/(.)/$1$1$1/gs;
861# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
862#
863# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
864#
865# $lighting = $pb->get_pixels;
866# $lighting =~ s/(.)../$1/gs;
867# }
868
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871
872 $darkness = new CFClient::Texture
873 width => $sw4,
874 height => $sh,
875 data => $darkness,
876 internalformat => GL_ALPHA,
877 format => GL_ALPHA;
878
879 glColor 0.45, 0.45, 0.45, 1;
880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
487 881
488 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
489 glDisable GL_BLEND; 883 glDisable GL_BLEND;
490} 884}
491 885
… …
538 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 932 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
539 $::CONN->send ("command run_stop"); 933 $::CONN->send ("command run_stop");
540 } 934 }
541} 935}
542 936
5431; 937#############################################################################
544 938
939package CFClient::Widget::Animator;
940
941use SDL::OpenGL;
942
943our @ISA = CFClient::Widget::Bin::;
944
945sub moveto {
946 my ($self, $x, $y) = @_;
947
948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
949 $self->{speed} = 0.001;
950 $self->{time} = 1;
951
952 ::animation_start $self;
953}
954
955sub animate {
956 my ($self, $interval) = @_;
957
958 $self->{time} -= $interval * $self->{speed};
959 if ($self->{time} <= 0) {
960 $self->{time} = 0;
961 ::animation_stop $self;
962 }
963
964 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
965
966 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
967 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
968}
969
970sub _draw {
971 my ($self) = @_;
972
973 glPushMatrix;
974 glRotate $self->{time} * 1000, 0, 1, 0;
975 $self->{children}[0]->draw;
976 glPopMatrix;
977}
978
979#############################################################################
980
981package CFClient::Widget::Toplevel;
982
983our @ISA = CFClient::Widget::Container::;
984
985sub size_request {
986 ($::WIDTH, $::HEIGHT)
987}
988
989sub size_allocate {
990 my ($self, $w, $h) = @_;
991
992 $self->SUPER::size_allocate ($w, $h);
993
994 $_->size_allocate ($_->size_request)
995 for @{$self->{children}};
996}
997
998sub translate {
999 my ($self, $x, $y) = @_;
1000
1001 ($x, $y)
1002}
1003
1004sub update {
1005 my ($self) = @_;
1006
1007 $self->size_allocate ($self->size_request);
1008 ::refresh ();
1009}
1010
1011sub add {
1012 my ($self, $widget) = @_;
1013
1014 $self->SUPER::add ($widget);
1015
1016 $widget->size_allocate ($widget->size_request);
1017}
1018
1019sub draw {
1020 my ($self) = @_;
1021
1022 $self->_draw;
1023}
1024
1025#############################################################################
1026
1027package CFClient::Widget;
1028
1029$TOPLEVEL = new CFClient::Widget::Toplevel;
1030
10311
1032

Diff Legend

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